git: a68aac13edbc - main - www/caddy: Update packages

From: Adam Weinberger <adamw_at_FreeBSD.org>
Date: Thu, 24 Mar 2022 15:29:37 UTC
The branch main has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a68aac13edbce5372b125a1d4b74712007e40c37

commit a68aac13edbce5372b125a1d4b74712007e40c37
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2022-03-24 15:27:37 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2022-03-24 15:29:31 +0000

    www/caddy: Update packages
    
    This fixes build with go 1.18.
---
 www/caddy/Makefile   |   7 +-
 www/caddy/distinfo   | 212 +++++++++++++++++++++++++++++++++++++++++++++++++--
 www/caddy/modules.mk |  52 ++++++++-----
 3 files changed, 244 insertions(+), 27 deletions(-)

diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 66c8eda3c75d..6edad21c5be3 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	www
 DIST_SUBDIR=	caddy
 
@@ -23,11 +24,11 @@ SUB_FILES=	Caddyfile.sample caddy pkg-message
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR_REL}/Caddyfile.sample"
 
-# If go.mod is sufficient:
-GO_MODULE=	github.com/caddyserver/caddy/v2
 GO_TARGET=	./cmd/caddy
+# If go.mod is sufficient:
+# GO_MODULE=	github.com/caddyserver/caddy/v2
 # If modules must be specified manually:
-#.include "${.CURDIR}/modules.mk"
+.include "${.CURDIR}/modules.mk"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/www/caddy/distinfo b/www/caddy/distinfo
index ca428c23f42f..8b51ab77c9c3 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,207 @@
-TIMESTAMP = 1636467585
-SHA256 (go/www_caddy/caddy-v2.4.6/v2.4.6.mod) = 7e943a27159a58582b46634a659f6fe973c363fa70f38345b317aab2bdc3bea0
-SIZE (go/www_caddy/caddy-v2.4.6/v2.4.6.mod) = 1625
-SHA256 (go/www_caddy/caddy-v2.4.6/v2.4.6.zip) = 734145634f6617901f1049817a9006a6c0022893cf8ef8a0dbfb1104f37a6734
-SIZE (go/www_caddy/caddy-v2.4.6/v2.4.6.zip) = 674783
+TIMESTAMP = 1648134967
+SHA256 (caddy/caddyserver-caddy-v2.4.6_GH0.tar.gz) = 5a450a4ff0d2dbd165d62f957ecdaebdc4bd0445c66a06a27d0025a82843402d
+SIZE (caddy/caddyserver-caddy-v2.4.6_GH0.tar.gz) = 471625
+SHA256 (caddy/AndreasBriese-bbloom-46b345b51c96_GH0.tar.gz) = 49b41b2b20e73f31091222e4a6abf12762231cbad9de642d2227c16dae29b4ff
+SIZE (caddy/AndreasBriese-bbloom-46b345b51c96_GH0.tar.gz) = 8005
+SHA256 (caddy/DataDog-zstd-v1.4.5_GH0.tar.gz) = be75f3ea541bb7bb02c2329059ad81dff504087f89970426d23252e502a0f899
+SIZE (caddy/DataDog-zstd-v1.4.5_GH0.tar.gz) = 512697
+SHA256 (caddy/DHowett-go-plist-591f970eefbb_GH0.tar.gz) = 993a39284627cad36e3df69dcfb5d00e1d7f19ed330a678d28f33fa407cd7890
+SIZE (caddy/DHowett-go-plist-591f970eefbb_GH0.tar.gz) = 49086
+SHA256 (caddy/Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d
+SIZE (caddy/Masterminds-goutils-v1.1.1_GH0.tar.gz) = 14847
+SHA256 (caddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f
+SIZE (caddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506
+SHA256 (caddy/Masterminds-sprig-v3.2.2_GH0.tar.gz) = 877f3d46e9eadec5644944ac265dd960f58f2b77355b636b2c0a3308b9a0e6ec
+SIZE (caddy/Masterminds-sprig-v3.2.2_GH0.tar.gz) = 55500
+SHA256 (caddy/alecthomas-chroma-v0.10.0_GH0.tar.gz) = 98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56
+SIZE (caddy/alecthomas-chroma-v0.10.0_GH0.tar.gz) = 798272
+SHA256 (caddy/antlr-antlr4-621b933c7a7f_GH0.tar.gz) = b1ecc011d1dfc6cbfba6c293a4631077b162c3435e35136a421876e00701de77
+SIZE (caddy/antlr-antlr4-621b933c7a7f_GH0.tar.gz) = 4328406
+SHA256 (caddy/aryann-difflib-ff5ff6dc229b_GH0.tar.gz) = 9dc3eade691cf335fb741d0fa83016764c4c1c4f6a99f7f4062bc1058c7a1c68
+SIZE (caddy/aryann-difflib-ff5ff6dc229b_GH0.tar.gz) = 5311
+SHA256 (caddy/beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (caddy/beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (caddy/caddyserver-certmagic-v0.15.4_GH0.tar.gz) = e10979ce222d487f173f1ae89e9b04361acb812ccbe2769e011da81b4f03f06d
+SIZE (caddy/caddyserver-certmagic-v0.15.4_GH0.tar.gz) = 107859
+SHA256 (caddy/cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
+SIZE (caddy/cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
+SHA256 (caddy/cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (caddy/cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (caddy/cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
+SIZE (caddy/cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
+SHA256 (caddy/chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da
+SIZE (caddy/chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825
+SHA256 (caddy/cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
+SIZE (caddy/cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
+SHA256 (caddy/danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
+SIZE (caddy/danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
+SHA256 (caddy/dgraph-io-badger-v1.6.2_GH0.tar.gz) = 34dcd22a2a2fcb013eb8e8817c4375a1c38929eaad090a1e5ec066e4a0e1e2c1
+SIZE (caddy/dgraph-io-badger-v1.6.2_GH0.tar.gz) = 304997
+SHA256 (caddy/dgraph-io-badger-v2.2007.4_GH0.tar.gz) = c595c20a5134ce97aac1af59408d9486ca4528d39ec03aa974442d0c653a5eef
+SIZE (caddy/dgraph-io-badger-v2.2007.4_GH0.tar.gz) = 348547
+SHA256 (caddy/dgraph-io-ristretto-41ebdbffecfd_GH0.tar.gz) = 23072e79f7805254d5e719800ce541990fcacc6ca9f910e981621debe109d611
+SIZE (caddy/dgraph-io-ristretto-41ebdbffecfd_GH0.tar.gz) = 277925
+SHA256 (caddy/dgryski-go-farm-a6ae2369ad13_GH0.tar.gz) = ae5ab67a14ec1339016b8a3ec6be36917a1d77a0fc2ff26d5b399c88958d161b
+SIZE (caddy/dgryski-go-farm-a6ae2369ad13_GH0.tar.gz) = 27127
+SHA256 (caddy/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 774718cb87c5cc7b954e4f17056f6a189c8d542ecbf989330296bc7e3885851b
+SIZE (caddy/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 205882
+SHA256 (caddy/dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 30086bdc35bb19afafd7fe2f1b111b28aea3480f66e0fffd59ba25762c8fc89d
+SIZE (caddy/dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 17281
+SHA256 (caddy/etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 63fed2e9bbdcc2aa279c2a7ea4a59c39bc21616ec2c96abff0020872beb3dbad
+SIZE (caddy/etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 96494
+SHA256 (caddy/go-chi-chi-v4.1.2_GH0.tar.gz) = 9382097218bb6922ecc26707fb683a4568825010fb0cc5168621b88661d5e42e
+SIZE (caddy/go-chi-chi-v4.1.2_GH0.tar.gz) = 75928
+SHA256 (caddy/go-kit-kit-v0.10.0_GH0.tar.gz) = c0fac2e37b981e4c18e4f210b92e1393bd59dadd7c7fc043ec46d1c9834eba85
+SIZE (caddy/go-kit-kit-v0.10.0_GH0.tar.gz) = 274801
+SHA256 (caddy/go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 76727000951c187d058289d8e83d3e2ad480a5d44c7c83b025b78b7eb6bf0258
+SIZE (caddy/go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 11745
+SHA256 (caddy/go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
+SIZE (caddy/go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
+SHA256 (caddy/go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
+SIZE (caddy/go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
+SHA256 (caddy/golang-crypto-e495a2d5b3d3_GH0.tar.gz) = c640d018652cccc231882d40cd53698af14b220f692d3f8e9b3f478e288ad244
+SIZE (caddy/golang-crypto-e495a2d5b3d3_GH0.tar.gz) = 1734470
+SHA256 (caddy/golang-net-abc453219eb5_GH0.tar.gz) = 4be86d74b852b0c8ed2eb9431e21e78b9d914edb611fb976bd98fdcb45b9a888
+SIZE (caddy/golang-net-abc453219eb5_GH0.tar.gz) = 1251746
+SHA256 (caddy/golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
+SIZE (caddy/golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
+SHA256 (caddy/golang-snappy-v0.0.3_GH0.tar.gz) = c22541bf48b252b55ea0e618a5887e3d4f95c6ec5e46bbd60d1020366ffa2580
+SIZE (caddy/golang-snappy-v0.0.3_GH0.tar.gz) = 65976
+SHA256 (caddy/golang-sys-ebe580a85c40_GH0.tar.gz) = b70e2301ad08c3ae255b004b8160f866798b95c0c1f88f12641343ed81ce523b
+SIZE (caddy/golang-sys-ebe580a85c40_GH0.tar.gz) = 1197502
+SHA256 (caddy/golang-term-a79de5458b56_GH0.tar.gz) = e2456003e6399902c70947a068f3e0f043de033c8ade1713d8d7294a5c6521ab
+SIZE (caddy/golang-term-a79de5458b56_GH0.tar.gz) = 14927
+SHA256 (caddy/golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (caddy/golang-text-v0.3.6_GH0.tar.gz) = 8351095
+SHA256 (caddy/google-cel-go-v0.7.3_GH0.tar.gz) = 31c0e0cf71b0beebfd1983f1329a08d849041dd09bc07172cd81a03dc19da3d4
+SIZE (caddy/google-cel-go-v0.7.3_GH0.tar.gz) = 2151936
+SHA256 (caddy/google-go-genproto-f16073e35f0c_GH0.tar.gz) = a42664db5442fd4dc4acac922949a735d37f44240394ab55a0d5ee3c9f8410d6
+SIZE (caddy/google-go-genproto-f16073e35f0c_GH0.tar.gz) = 9270161
+SHA256 (caddy/google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
+SIZE (caddy/google-uuid-v1.2.0_GH0.tar.gz) = 14158
+SHA256 (caddy/grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b
+SIZE (caddy/grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222
+SHA256 (caddy/huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
+SIZE (caddy/huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
+SHA256 (caddy/imdario-mergo-v0.3.11_GH0.tar.gz) = 36544167ad735d458781b89ce3c3bfd56dd6ebdeadd5f3b4e1e0c6e0ab4f2191
+SIZE (caddy/imdario-mergo-v0.3.11_GH0.tar.gz) = 22060
+SHA256 (caddy/jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4
+SIZE (caddy/jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038
+SHA256 (caddy/jackc-pgconn-v1.10.1_GH0.tar.gz) = 7045b8e2059025229f1b1344d28289b753e0b1f1f6196adbcb10f07e56e10462
+SIZE (caddy/jackc-pgconn-v1.10.1_GH0.tar.gz) = 54190
+SHA256 (caddy/jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab
+SIZE (caddy/jackc-pgio-v1.0.0_GH0.tar.gz) = 1884
+SHA256 (caddy/jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603
+SIZE (caddy/jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254
+SHA256 (caddy/jackc-pgproto3-v2.2.0_GH0.tar.gz) = 752bf556fd414ca91e4ef0947c63a42566f46b9c26a4493deca7e9f135044f21
+SIZE (caddy/jackc-pgproto3-v2.2.0_GH0.tar.gz) = 23690
+SHA256 (caddy/jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e
+SIZE (caddy/jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991
+SHA256 (caddy/jackc-pgtype-v1.9.0_GH0.tar.gz) = a6b67604990e8813101553ca5be89f13917c451e3dca3e7189ac35aa95dc95fa
+SIZE (caddy/jackc-pgtype-v1.9.0_GH0.tar.gz) = 177338
+SHA256 (caddy/jackc-pgx-v4.14.0_GH0.tar.gz) = 70002159268a2f94c0dd7a52ebd059f9222e4c43c573a95e8bd013271e43c1dc
+SIZE (caddy/jackc-pgx-v4.14.0_GH0.tar.gz) = 110518
+SHA256 (caddy/juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 5595c2dc8973aab36a69648d4d94cac75a9ff4a28eb074a7b82b030fc7edbf64
+SIZE (caddy/juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 15417
+SHA256 (caddy/klauspost-compress-v1.15.0_GH0.tar.gz) = f4d06e703c1f47d5d39d8aa15d93123c53895b8d904f703992a011c88b43e798
+SIZE (caddy/klauspost-compress-v1.15.0_GH0.tar.gz) = 15631358
+SHA256 (caddy/klauspost-cpuid-v1.2.5_GH0.tar.gz) = bec2ea696ec25a2577dd0996cbbc0675e57f242da61e4edad071983b65fed988
+SIZE (caddy/klauspost-cpuid-v1.2.5_GH0.tar.gz) = 360978
+SHA256 (caddy/klauspost-cpuid-v2.0.11_GH0.tar.gz) = 7975f8c1e860555d246d28a780ba00889373b6ae23b47ff70a16785c034d1d7d
+SIZE (caddy/klauspost-cpuid-v2.0.11_GH0.tar.gz) = 343061
+SHA256 (caddy/konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3
+SIZE (caddy/konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983
+SHA256 (caddy/libdns-libdns-v0.2.1_GH0.tar.gz) = 3d4d534d1a04ec0890803c99d7f3a9c540c10afb0215831c2d2f9944c3e2f892
+SIZE (caddy/libdns-libdns-v0.2.1_GH0.tar.gz) = 5838
+SHA256 (caddy/lucas-clemente-quic-go-v0.26.0_GH0.tar.gz) = 894a4c6131da0fe48b9a562a6af35c082adb916fae5c9ed8336a559f815028b1
+SIZE (caddy/lucas-clemente-quic-go-v0.26.0_GH0.tar.gz) = 527264
+SHA256 (caddy/lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 38aa5c60284f77cbb4be1de4af8907ce66954ff1a11e4f910d02e0283ce13b33
+SIZE (caddy/lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 4213
+SHA256 (caddy/manifoldco-promptui-v0.9.0_GH0.tar.gz) = 84a72dfb56f61436a04fdde28f62b32aa07af75895e3423f199f7872aea43114
+SIZE (caddy/manifoldco-promptui-v0.9.0_GH0.tar.gz) = 25926
+SHA256 (caddy/marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 4d8ee343223e2433119fce12d53e90d70e04953bff80a00aae8fa3b7dd888134
+SIZE (caddy/marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 42738
+SHA256 (caddy/marten-seemann-qtls-go1-18-v0.1.1_GH0.tar.gz) = 17284b1fed3b5e916122cd31f3c36ffbd782244e096c7165f588df612a16adf4
+SIZE (caddy/marten-seemann-qtls-go1-18-v0.1.1_GH0.tar.gz) = 422031
+SHA256 (caddy/mattn-go-colorable-v0.1.6_GH0.tar.gz) = e313129503025c383b5e69082fb1144e83a864d12ec45bb7a224d3fc4a635fbc
+SIZE (caddy/mattn-go-colorable-v0.1.6_GH0.tar.gz) = 9472
+SHA256 (caddy/mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (caddy/mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (caddy/matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (caddy/matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (caddy/mgutz-ansi-b6bd2ded7189_GH0.tar.gz) = 01cb78eb5c20624c6a02d185584e1b6815495e2c915e441926d66772721e258f
+SIZE (caddy/mgutz-ansi-b6bd2ded7189_GH0.tar.gz) = 4566
+SHA256 (caddy/mholt-acmez-v1.0.2_GH0.tar.gz) = 6bca300463e078eb9d127a8f5739d293fe808716c70429ba3046c06ff183e2ab
+SIZE (caddy/mholt-acmez-v1.0.2_GH0.tar.gz) = 50809
+SHA256 (caddy/micromdm-scep-v2.1.0_GH0.tar.gz) = 23ad4c46c7fa5813ad7e87d5e790fb0e3524bd1d128561dc8c96db8cfb1eafcd
+SIZE (caddy/micromdm-scep-v2.1.0_GH0.tar.gz) = 64294
+SHA256 (caddy/miekg-dns-v1.1.43_GH0.tar.gz) = 889d61c9ce9594ef0fa4b8b601fcf094082b8c12f5638063652d8dee7ee5339a
+SIZE (caddy/miekg-dns-v1.1.43_GH0.tar.gz) = 200617
+SHA256 (caddy/mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
+SIZE (caddy/mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
+SHA256 (caddy/mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
+SIZE (caddy/mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
+SHA256 (caddy/mozilla-services-pkcs7-33d05740a352_GH0.tar.gz) = d7af21e028258fd8967e34ac61b3ccd24c2f6005b11b8f8af6ff216fb8fff318
+SIZE (caddy/mozilla-services-pkcs7-33d05740a352_GH0.tar.gz) = 48543
+SHA256 (caddy/naoina-go-stringutil-v0.1.0_GH0.tar.gz) = 0d9d4e4d8d1112e7ac7a5ea6089bdf18585a22274802bcac6ef5f02aa2c43edc
+SIZE (caddy/naoina-go-stringutil-v0.1.0_GH0.tar.gz) = 6136
+SHA256 (caddy/naoina-toml-v0.1.1_GH0.tar.gz) = 5f0875fb6eb8ed9683f925329c05cdbaa809a1ec9b676c43ea14899c25462fee
+SIZE (caddy/naoina-toml-v0.1.1_GH0.tar.gz) = 41259
+SHA256 (caddy/natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd
+SIZE (caddy/natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631
+SHA256 (caddy/pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (caddy/pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (caddy/prometheus-client_golang-v1.12.1_GH0.tar.gz) = 3f7929ec4837932e68a0e7da9e0f1ff5aa19bc02de7a67823d0533a0d6852014
+SIZE (caddy/prometheus-client_golang-v1.12.1_GH0.tar.gz) = 194206
+SHA256 (caddy/prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (caddy/prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (caddy/prometheus-common-v0.26.0_GH0.tar.gz) = 35cfd6f896655c848042802652394cc9da57ef01437f0d78bffb85a467f62a1b
+SIZE (caddy/prometheus-common-v0.26.0_GH0.tar.gz) = 116907
+SHA256 (caddy/prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
+SIZE (caddy/prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
+SHA256 (caddy/protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
+SIZE (caddy/protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
+SHA256 (caddy/rs-xid-v1.2.1_GH0.tar.gz) = bb207227d5ae99bda71d38ae11e29b822c9b572223781bc282ad2f8e69002f2c
+SIZE (caddy/rs-xid-v1.2.1_GH0.tar.gz) = 9553
+SHA256 (caddy/russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
+SIZE (caddy/russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
+SHA256 (caddy/samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 01cb78eb5c20624c6a02d185584e1b6815495e2c915e441926d66772721e258f
+SIZE (caddy/samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 4566
+SHA256 (caddy/shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58
+SIZE (caddy/shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755
+SHA256 (caddy/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
+SIZE (caddy/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
+SHA256 (caddy/sirupsen-logrus-v1.6.0_GH0.tar.gz) = 536151aa2fed39e2b74925f81c8cd31f0c02c013881ba2d30982731d12424ed0
+SIZE (caddy/sirupsen-logrus-v1.6.0_GH0.tar.gz) = 45748
+SHA256 (caddy/smallstep-certificates-v0.18.0_GH0.tar.gz) = 1d6c4b6b6371f69b0d43c510c551fb7fbd050a93b1ab8173d82b68a37753de41
+SIZE (caddy/smallstep-certificates-v0.18.0_GH0.tar.gz) = 17745811
+SHA256 (caddy/smallstep-cli-v0.18.0_GH0.tar.gz) = 63bb164865f8b61478b4cb64e9bfb7055e9b85845cb9962cfb7de1e55962d24a
+SIZE (caddy/smallstep-cli-v0.18.0_GH0.tar.gz) = 1804502
+SHA256 (caddy/smallstep-cli-utils-v0.7.0_GH0.tar.gz) = 7f1cc93903106831bbbac098885bca9351ab6060b10839361e08e3d36bc75744
+SIZE (caddy/smallstep-cli-utils-v0.7.0_GH0.tar.gz) = 139597
+SHA256 (caddy/smallstep-crypto-v0.13.0_GH0.tar.gz) = 3b4e7a61edeea6200ba1b113588c0dc27b1c67f3207d0a466d88d6abdc0b1934
+SIZE (caddy/smallstep-crypto-v0.13.0_GH0.tar.gz) = 147720
+SHA256 (caddy/smallstep-linkedca-v0.7.0_GH0.tar.gz) = a63a05d645039c31c4358a2446a3ba04fe1c68022c2d935125fc3dc1c41e83e8
+SIZE (caddy/smallstep-linkedca-v0.7.0_GH0.tar.gz) = 47593
+SHA256 (caddy/smallstep-nosql-v0.4.0_GH0.tar.gz) = 7645fdd1e85f7c387f052030e53d1a14be40267e0b7b225b90e44da41d07daeb
+SIZE (caddy/smallstep-nosql-v0.4.0_GH0.tar.gz) = 33741
+SHA256 (caddy/smallstep-truststore-v0.9.6_GH0.tar.gz) = 31180e68b8731a9c091e31059632b41eabbee9d78ae91cd1fe1ee97a25ddf358
+SIZE (caddy/smallstep-truststore-v0.9.6_GH0.tar.gz) = 12754
+SHA256 (caddy/spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
+SIZE (caddy/spf13-cast-v1.3.1_GH0.tar.gz) = 11102
+SHA256 (caddy/square-go-jose-v2.5.1_GH0.tar.gz) = 74c65592183c542b254eb2933f7a99ee869abdf9e7ac02aad4d9f0dce980ace8
+SIZE (caddy/square-go-jose-v2.5.1_GH0.tar.gz) = 309860
+SHA256 (caddy/stoewer-go-strcase-v1.2.0_GH0.tar.gz) = 5015a14dc191baa9f0b606e755534ddc45742b81f9f4be88bd4e65d92f29937d
+SIZE (caddy/stoewer-go-strcase-v1.2.0_GH0.tar.gz) = 5286
+SHA256 (caddy/uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1
+SIZE (caddy/uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
+SHA256 (caddy/uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717
+SIZE (caddy/uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369
+SHA256 (caddy/uber-go-zap-v1.17.0_GH0.tar.gz) = 9608554d14e846718c5ebe44ab172ce6b748356679c17e144226af94ff232d9a
+SIZE (caddy/uber-go-zap-v1.17.0_GH0.tar.gz) = 142719
+SHA256 (caddy/urfave-cli-v1.22.4_GH0.tar.gz) = 83d628fdd261accd4dc0b232bfc8ff06e734ec5137e134a8cee916693a8bb117
+SIZE (caddy/urfave-cli-v1.22.4_GH0.tar.gz) = 78034
+SHA256 (caddy/yuin-goldmark-highlighting-594be1970594_GH0.tar.gz) = b9c18dfbfb744654525ce4730a6f665622ab93b2d499bda8ea42e0a3bc89fae5
+SIZE (caddy/yuin-goldmark-highlighting-594be1970594_GH0.tar.gz) = 10048
+SHA256 (caddy/yuin-goldmark-v1.4.8_GH0.tar.gz) = becc9befdc0dceecb8345b4e5111b3ea96fed8b350fa84e400a02fc5070b2b89
+SIZE (caddy/yuin-goldmark-v1.4.8_GH0.tar.gz) = 257379
diff --git a/www/caddy/modules.mk b/www/caddy/modules.mk
index 726471f47f85..ae37394446af 100644
--- a/www/caddy/modules.mk
+++ b/www/caddy/modules.mk
@@ -6,11 +6,11 @@ GH_TUPLE=	AndreasBriese:bbloom:46b345b51c96:andreasbriese_bbloom/vendor/github.c
 		Masterminds:goutils:v1.1.1:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
 		Masterminds:sprig:v3.2.2:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \
-		alecthomas:chroma:v0.9.1:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
+		alecthomas:chroma:v0.10.0:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
 		antlr:antlr4:621b933c7a7f:antlr_antlr4/vendor/github.com/antlr/antlr4 \
 		aryann:difflib:ff5ff6dc229b:aryann_difflib/vendor/github.com/aryann/difflib \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		caddyserver:certmagic:v0.14.0:caddyserver_certmagic/vendor/github.com/caddyserver/certmagic \
+		caddyserver:certmagic:v0.15.4:caddyserver_certmagic/vendor/github.com/caddyserver/certmagic \
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
 		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
@@ -18,16 +18,18 @@ GH_TUPLE=	AndreasBriese:bbloom:46b345b51c96:andreasbriese_bbloom/vendor/github.c
 		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
 		dgraph-io:badger:v1.6.2:dgraph_io_badger/vendor/github.com/dgraph-io/badger \
-		dgraph-io:badger:5d1bab4fc658:dgraph_io_badger_v2/vendor/github.com/dgraph-io/badger/v2 \
+		dgraph-io:badger:v2.2007.4:dgraph_io_badger_v2/vendor/github.com/dgraph-io/badger/v2 \
 		dgraph-io:ristretto:41ebdbffecfd:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
 		dgryski:go-farm:a6ae2369ad13:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
 		dlclark:regexp2:v1.4.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
 		dustin:go-humanize:afde56e7acac:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		etcd-io:bbolt:v1.3.5:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
 		go-chi:chi:v4.1.2:go_chi_chi/vendor/github.com/go-chi/chi \
+		go-kit:kit:v0.10.0:go_kit_kit/vendor/github.com/go-kit/kit \
+		go-logfmt:logfmt:v0.5.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
 		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-yaml:yaml:496545a6307b:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:e495a2d5b3d3:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:abc453219eb5:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.3:golang_snappy/vendor/github.com/golang/snappy \
@@ -40,29 +42,40 @@ GH_TUPLE=	AndreasBriese:bbloom:46b345b51c96:andreasbriese_bbloom/vendor/github.c
 		grpc:grpc-go:v1.38.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		huandu:xstrings:v1.3.1:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		imdario:mergo:v0.3.11:imdario_mergo/vendor/github.com/imdario/mergo \
+		jackc:chunkreader:v2.0.1:jackc_chunkreader/vendor/github.com/jackc/chunkreader/v2 \
+		jackc:pgconn:v1.10.1:jackc_pgconn/vendor/github.com/jackc/pgconn \
+		jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \
+		jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \
+		jackc:pgproto3:v2.2.0:jackc_pgproto3/vendor/github.com/jackc/pgproto3/v2 \
+		jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \
+		jackc:pgtype:v1.9.0:jackc_pgtype/vendor/github.com/jackc/pgtype \
+		jackc:pgx:v4.14.0:jackc_pgx/vendor/github.com/jackc/pgx/v4 \
 		juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \
-		klauspost:compress:v1.13.0:klauspost_compress/vendor/github.com/klauspost/compress \
+		klauspost:compress:v1.15.0:klauspost_compress/vendor/github.com/klauspost/compress \
 		klauspost:cpuid:v1.2.5:klauspost_cpuid/vendor/github.com/klauspost/cpuid \
-		klauspost:cpuid:v2.0.6:klauspost_cpuid_v2/vendor/github.com/klauspost/cpuid/v2 \
+		klauspost:cpuid:v2.0.11:klauspost_cpuid_v2/vendor/github.com/klauspost/cpuid/v2 \
 		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		libdns:libdns:v0.2.1:libdns_libdns/vendor/github.com/libdns/libdns \
-		lucas-clemente:quic-go:v0.23.0:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
+		lucas-clemente:quic-go:v0.26.0:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
 		lunixbochs:vtclean:v1.0.0:lunixbochs_vtclean/vendor/github.com/lunixbochs/vtclean \
-		manifoldco:promptui:v0.8.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
+		manifoldco:promptui:v0.9.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
 		marten-seemann:qpack:v0.2.1:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
-		marten-seemann:qtls-go1-17:v0.1.0:marten_seemann_qtls_go1_17/vendor/github.com/marten-seemann/qtls-go1-17 \
+		marten-seemann:qtls-go1-18:v0.1.1:marten_seemann_qtls_go1_18/vendor/github.com/marten-seemann/qtls-go1-18 \
 		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		mholt:acmez:v0.1.3:mholt_acmez/vendor/github.com/mholt/acmez \
-		miekg:dns:v1.1.42:miekg_dns/vendor/github.com/miekg/dns \
+		mgutz:ansi:b6bd2ded7189:mgutz_ansi/vendor/github.com/mgutz/ansi \
+		mholt:acmez:v1.0.2:mholt_acmez/vendor/github.com/mholt/acmez \
+		micromdm:scep:v2.1.0:micromdm_scep/vendor/github.com/micromdm/scep/v2 \
+		miekg:dns:v1.1.43:miekg_dns/vendor/github.com/miekg/dns \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		mozilla-services:pkcs7:33d05740a352:mozilla_services_pkcs7/vendor/go.mozilla.org/pkcs7 \
 		naoina:go-stringutil:v0.1.0:naoina_go_stringutil/vendor/github.com/naoina/go-stringutil \
 		naoina:toml:v0.1.1:naoina_toml/vendor/github.com/naoina/toml \
 		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		prometheus:client_golang:253906201bda:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.12.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.26.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
@@ -73,11 +86,12 @@ GH_TUPLE=	AndreasBriese:bbloom:46b345b51c96:andreasbriese_bbloom/vendor/github.c
 		shopspring:decimal:v1.2.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		smallstep:certificates:v0.15.15:smallstep_certificates/vendor/github.com/smallstep/certificates \
-		smallstep:cli:v0.15.16:smallstep_cli/vendor/github.com/smallstep/cli \
-		smallstep:cli-utils:v0.2.0:smallstep_cli_utils/vendor/go.step.sm/cli-utils \
-		smallstep:crypto:v0.8.0:smallstep_crypto/vendor/go.step.sm/crypto \
-		smallstep:nosql:v0.3.6:smallstep_nosql/vendor/github.com/smallstep/nosql \
+		smallstep:certificates:v0.18.0:smallstep_certificates/vendor/github.com/smallstep/certificates \
+		smallstep:cli:v0.18.0:smallstep_cli/vendor/github.com/smallstep/cli \
+		smallstep:cli-utils:v0.7.0:smallstep_cli_utils/vendor/go.step.sm/cli-utils \
+		smallstep:crypto:v0.13.0:smallstep_crypto/vendor/go.step.sm/crypto \
+		smallstep:linkedca:v0.7.0:smallstep_linkedca/vendor/go.step.sm/linkedca \
+		smallstep:nosql:v0.4.0:smallstep_nosql/vendor/github.com/smallstep/nosql \
 		smallstep:truststore:v0.9.6:smallstep_truststore/vendor/github.com/smallstep/truststore \
 		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
 		square:go-jose:v2.5.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \
@@ -86,5 +100,5 @@ GH_TUPLE=	AndreasBriese:bbloom:46b345b51c96:andreasbriese_bbloom/vendor/github.c
 		uber-go:multierr:v1.6.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.17.0:uber_go_zap/vendor/go.uber.org/zap \
 		urfave:cli:v1.22.4:urfave_cli/vendor/github.com/urfave/cli \
-		yuin:goldmark-highlighting:9216f9c5aa01:yuin_goldmark_highlighting/vendor/github.com/yuin/goldmark-highlighting \
-		yuin:goldmark:v1.3.7:yuin_goldmark/vendor/github.com/yuin/goldmark
+		yuin:goldmark-highlighting:594be1970594:yuin_goldmark_highlighting/vendor/github.com/yuin/goldmark-highlighting \
+		yuin:goldmark:v1.4.8:yuin_goldmark/vendor/github.com/yuin/goldmark