Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Mar 2021 17:27:54 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r568926 - in head/www/caddy: . files
Message-ID:  <202103211727.12LHRsMj014998@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sun Mar 21 17:27:54 2021
New Revision: 568926
URL: https://svnweb.freebsd.org/changeset/ports/568926

Log:
  www/caddy: Update to 2.3.0 and take maintainership
  
  Thanks to Daniel Tihanyi for all his work maintaining this port!
  
  While here, a number of cleanups:
  - Simplify Makefile
  - Remove pkg-message whose instructions were superseded by @sample
  - Re-enable cgo. It seems to work fine now.
  - Rename the rc(8) 'validate' subcommand to 'configtest' for clarity and consistency
  - Add a little more info to the sample Caddyfile
  - Point to instructions for getting access logs working
  
  Changes: https://github.com/caddyserver/caddy/releases/tag/v2.3.0
  
  PR:		254436
  Approved by:	Daniel Tihanyi (outgoing maintainer)

Deleted:
  head/www/caddy/files/pkg-message.in
Modified:
  head/www/caddy/Makefile
  head/www/caddy/distinfo
  head/www/caddy/files/Caddyfile.sample.in
  head/www/caddy/files/caddy.in
  head/www/caddy/pkg-descr

Modified: head/www/caddy/Makefile
==============================================================================
--- head/www/caddy/Makefile	Sun Mar 21 16:29:31 2021	(r568925)
+++ head/www/caddy/Makefile	Sun Mar 21 17:27:54 2021	(r568926)
@@ -3,10 +3,11 @@
 
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.1
+DISTVERSION=	2.3.0
 CATEGORIES=	www
+DIST_SUBDIR=	caddy
 
-MAINTAINER=	daniel.tihanyi@tetragir.com
+MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Fast, cross-platform HTTP/2 web server with automatic HTTPS
 
 LICENSE=	APACHE20
@@ -15,31 +16,27 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		go:modules
-USE_RC_SUBR=	${PORTNAME}
-CADDY_CONFIG=	Caddyfile
-CADDY_SAMPLE=	${CADDY_CONFIG}.sample
+USE_RC_SUBR=	caddy
+GO_TARGET=	./cmd/caddy
 
-SUB_FILES=	${PORTNAME} ${CADDY_SAMPLE} pkg-message
-SUB_LIST=	CADDY_CONFIG=${CADDY_CONFIG} \
-		CADDY_SAMPLE=${CADDY_SAMPLE}
+SUB_FILES=	caddy Caddyfile.sample
 
-GO_TARGET=	./cmd/caddy
-CGO_ENABLED=	0
+PLIST_FILES=	bin/${PORTNAME} \
+		"@sample ${ETCDIR_REL}/Caddyfile.sample"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	caddyserver
-
-GH_TUPLE=	\
-		AndreasBriese:bbloom:e2d15f34fcf9:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
+GH_TUPLE=	AndreasBriese:bbloom:e2d15f34fcf9:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
 		DataDog:zstd:v1.4.1:datadog_zstd/vendor/github.com/DataDog/zstd \
+		DHowett:go-plist:591f970eefbb:go_plist/vendor/howett.net/plist \
 		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v3.1.0:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
 		Masterminds:sprig:v3.1.0:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \
-		alecthomas:chroma:v0.8.0:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
+		alecthomas:chroma:v0.8.2:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
 		antlr:antlr4:621b933c7a7f:antlr_antlr4/vendor/github.com/antlr/antlr4 \
 		aryann:difflib:e206f873d14a:aryann_difflib/vendor/github.com/aryann/difflib \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		caddyserver:certmagic:v0.12.0:caddyserver_certmagic/vendor/github.com/caddyserver/certmagic \
+		caddyserver:certmagic:201f83a06067: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 \
@@ -52,17 +49,17 @@ GH_TUPLE=	\
 		dgryski:go-farm:6a90982ecee2:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
 		dlclark:regexp2:v1.2.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.2:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		etcd-io:bbolt:v1.3.3:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
 		go-chi:chi:v4.1.2:go_chi_chi/vendor/github.com/go-chi/chi \
 		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:crypto:123391ffb6de:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:ab3426394381:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:net:69a78807bb2b:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sys:f1bc736245b1:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		google:cel-go:v0.5.1:google_cel_go/vendor/github.com/google/cel-go \
+		golang:sys:f9fddec55a1e:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
+		google:cel-go:v0.6.0:google_cel_go/vendor/github.com/google/cel-go \
 		google:go-genproto:86f49bd18e98:google_go_genproto/vendor/google.golang.org/genproto \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
 		grpc:grpc-go:v1.27.1:grpc_grpc_go/vendor/google.golang.org/grpc \
@@ -70,20 +67,21 @@ GH_TUPLE=	\
 		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
 		jsternberg:zap-logfmt:v1.2.0:jsternberg_zap_logfmt/vendor/github.com/jsternberg/zap-logfmt \
 		juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \
-		klauspost:compress:v1.11.0:klauspost_compress/vendor/github.com/klauspost/compress \
+		klauspost:compress:v1.11.3:klauspost_compress/vendor/github.com/klauspost/compress \
 		klauspost:cpuid:v1.2.5:klauspost_cpuid/vendor/github.com/klauspost/cpuid \
-		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
-		libdns:libdns:v0.1.0:libdns_libdns/vendor/github.com/libdns/libdns \
-		lucas-clemente:quic-go:v0.18.0:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
+		klauspost:cpuid:v2.0.1: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.0:libdns_libdns/vendor/github.com/libdns/libdns \
+		lucas-clemente:quic-go:v0.19.3: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.3.1:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
-		marten-seemann:qpack:v0.2.0:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
-		marten-seemann:qtls-go1-15:v0.1.0:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
+		marten-seemann:qpack:v0.2.1:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
+		marten-seemann:qtls-go1-15:v0.1.1:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
 		marten-seemann:qtls:v0.10.0:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \
 		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.1:mholt_acmez/vendor/github.com/mholt/acmez \
+		mholt:acmez:v0.1.3:mholt_acmez/vendor/github.com/mholt/acmez \
 		miekg:dns:v1.1.30: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 \
@@ -91,39 +89,36 @@ GH_TUPLE=	\
 		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:v1.7.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.9.0: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.10.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.1.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.24.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		rs:xid:v1.2.1:rs_xid/vendor/github.com/rs/xid \
 		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		samfoo:ansi:b6bd2ded7189:samfoo_ansi/vendor/github.com/samfoo/ansi \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
-		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		smallstep:certificates:v0.15.4:smallstep_certificates/vendor/github.com/smallstep/certificates \
 		smallstep:cli:v0.15.2:smallstep_cli/vendor/github.com/smallstep/cli \
 		smallstep:crypto:v0.6.0:smallstep_crypto/vendor/go.step.sm/crypto \
 		smallstep:nosql:v0.3.0:smallstep_nosql/vendor/github.com/smallstep/nosql \
+		smallstep:crypto:70072f45afc0f699:smallstep_pemutil/vendor/go.step.sm/crypto/pemutil \
+		smallstep:crypto:70072f45afc0f699:smallstep_randutil/vendor/go.step.sm/crypto/randutil \
+		smallstep:crypto:70072f45afc0f699:smallstep_sshutil/vendor/go.step.sm/crypto/sshutil \
 		smallstep:truststore:v0.9.6:smallstep_truststore/vendor/github.com/smallstep/truststore \
+		smallstep:crypto:70072f45afc0f699:smallstep_x509util/vendor/go.step.sm/crypto/x509util \
 		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 \
 		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
-		uber-go:zap:v1.15.0:uber_go_zap/vendor/go.uber.org/zap \
+		uber-go:zap:v1.16.0:uber_go_zap/vendor/go.uber.org/zap \
 		urfave:cli:v1.22.2:urfave_cli/vendor/github.com/urfave/cli \
 		yuin:goldmark-highlighting:60d527fdb691:yuin_goldmark_highlighting/vendor/github.com/yuin/goldmark-highlighting \
 		yuin:goldmark:v1.2.1:yuin_goldmark/vendor/github.com/yuin/goldmark
 
-GL_TUPLE=	https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist
-
-PLIST_FILES=	${LOCALBASE}/bin/${PORTNAME} \
-		"@sample ${ETCDIR}/${CADDY_SAMPLE}"
-
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} \
-		${WRKDIR}/${CADDY_SAMPLE} \
-		${STAGEDIR}${ETCDIR}/${CADDY_SAMPLE}
+	${INSTALL_DATA} ${WRKDIR}/Caddyfile.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>

Modified: head/www/caddy/distinfo
==============================================================================
--- head/www/caddy/distinfo	Sun Mar 21 16:29:31 2021	(r568925)
+++ head/www/caddy/distinfo	Sun Mar 21 17:27:54 2021	(r568926)
@@ -1,171 +1,183 @@
-TIMESTAMP = 1602689026
-SHA256 (caddyserver-caddy-v2.2.1_GH0.tar.gz) = dd1f313968a54c3e6be9b5d007b8b2ed88c46fbefc1eed49dcac35c08fbef1e2
-SIZE (caddyserver-caddy-v2.2.1_GH0.tar.gz) = 390153
-SHA256 (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = e88bd873a2251d70b5d2cbf9dceff24fa25ca5652ac1f99165c303e98df494a1
-SIZE (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = 7704
-SHA256 (DataDog-zstd-v1.4.1_GH0.tar.gz) = 48c0ad82d9bc66d77ca95aa47374bed6b6466510da66a2b2f9215cb239cb8137
-SIZE (DataDog-zstd-v1.4.1_GH0.tar.gz) = 498749
-SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
-SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
-SHA256 (Masterminds-semver-v3.1.0_GH0.tar.gz) = a91e6fe3121bb0c158bbd89721be3f44cd84e1f76a6d89840e244c1f5524ee28
-SIZE (Masterminds-semver-v3.1.0_GH0.tar.gz) = 24481
-SHA256 (Masterminds-sprig-v3.1.0_GH0.tar.gz) = a9e5031c3891ce95e799c5b07de9572eed90acd716e458eb42f1bbcb1b17328a
-SIZE (Masterminds-sprig-v3.1.0_GH0.tar.gz) = 49979
-SHA256 (alecthomas-chroma-v0.8.0_GH0.tar.gz) = 03bbe1fd43109b125cb33cf72e26338376056b961ea1c9ab1ecc02a60651e67b
-SIZE (alecthomas-chroma-v0.8.0_GH0.tar.gz) = 623074
-SHA256 (antlr-antlr4-621b933c7a7f_GH0.tar.gz) = b1ecc011d1dfc6cbfba6c293a4631077b162c3435e35136a421876e00701de77
-SIZE (antlr-antlr4-621b933c7a7f_GH0.tar.gz) = 4328406
-SHA256 (aryann-difflib-e206f873d14a_GH0.tar.gz) = 180ffc8657adf51af48f2cfa60110ebd0a4574d103e5727e108ec12ac19247b5
-SIZE (aryann-difflib-e206f873d14a_GH0.tar.gz) = 5584
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (caddyserver-certmagic-v0.12.0_GH0.tar.gz) = f8581761cf038cdf3f997563091df0e83f685dd7b2d026779082322bbd6811f7
-SIZE (caddyserver-certmagic-v0.12.0_GH0.tar.gz) = 94258
-SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
-SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
-SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
-SHA256 (chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da
-SIZE (chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825
-SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
-SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
-SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
-SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
-SHA256 (dgraph-io-badger-09dd2e1a4195_GH0.tar.gz) = add05687c0e351117e9ca7917bbb21616cc1014596801de44d18d9d6a6dd6086
-SIZE (dgraph-io-badger-09dd2e1a4195_GH0.tar.gz) = 332877
-SHA256 (dgraph-io-badger-v1.5.3_GH0.tar.gz) = 653dccac0adde8462e2ce88cb6ce8eaf1e50d9cb3ec5d57269307b2dabb4885c
-SIZE (dgraph-io-badger-v1.5.3_GH0.tar.gz) = 1018875
-SHA256 (dgraph-io-ristretto-8f368f2f2ab3_GH0.tar.gz) = 1efee19b05912787664c145bd1f5c64368caac8dc49583d75680d5c21a1cf3cd
-SIZE (dgraph-io-ristretto-8f368f2f2ab3_GH0.tar.gz) = 39672
-SHA256 (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 47bda738d281105cc7b1cb832880f93d220eae40b18095dc322b0b7bf44fdf23
-SIZE (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 26800
-SHA256 (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 9b4d25630d0ce86bcd518d79ce47365a84c7c75de2334b2708f1bddcc1df47fe
-SIZE (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 204926
-SHA256 (dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 30086bdc35bb19afafd7fe2f1b111b28aea3480f66e0fffd59ba25762c8fc89d
-SIZE (dustin-go-humanize-afde56e7acac_GH0.tar.gz) = 17281
-SHA256 (etcd-io-bbolt-v1.3.2_GH0.tar.gz) = 0f4bd88cce84f7b42f6364fc8c77ae7dd7d2f70224d1bb2abf410fc2f552c9a9
-SIZE (etcd-io-bbolt-v1.3.2_GH0.tar.gz) = 93921
-SHA256 (go-chi-chi-v4.1.2_GH0.tar.gz) = 9382097218bb6922ecc26707fb683a4568825010fb0cc5168621b88661d5e42e
-SIZE (go-chi-chi-v4.1.2_GH0.tar.gz) = 75928
-SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
-SIZE (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
-SHA256 (golang-crypto-123391ffb6de_GH0.tar.gz) = 09cadc5885fb57e7c3e3cdfd245a4dffb103adc90eb7f97efbc106905293c538
-SIZE (golang-crypto-123391ffb6de_GH0.tar.gz) = 1732577
-SHA256 (golang-net-ab3426394381_GH0.tar.gz) = ddf23e17a147972ad0dd11824a912eaa0174cba60ab63da6ae6ced2c76345946
-SIZE (golang-net-ab3426394381_GH0.tar.gz) = 1177700
-SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
-SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
-SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
-SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
-SHA256 (golang-sys-f1bc736245b1_GH0.tar.gz) = 3d505599b75124b006f437147b838efc9c3c59cb95f9b545e3352160abb073aa
-SIZE (golang-sys-f1bc736245b1_GH0.tar.gz) = 1054443
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (google-cel-go-v0.5.1_GH0.tar.gz) = cd8a907820ddf5d1e40e2fd270486336a1a3c77f0ea4ee7f8a708851dab921cd
-SIZE (google-cel-go-v0.5.1_GH0.tar.gz) = 2118082
-SHA256 (google-go-genproto-86f49bd18e98_GH0.tar.gz) = 164030f63ee1b68867ab1247e2e22811664fdb5b065c5cb66672ed1dd98a3997
-SIZE (google-go-genproto-86f49bd18e98_GH0.tar.gz) = 11258844
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 2e25c66a7fe59a49d94d24280afabfbc563967e47c1e6d8df0a72aaf11fae6fb
-SIZE (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 826728
-SHA256 (huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
-SIZE (huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
-SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
-SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
-SHA256 (jsternberg-zap-logfmt-v1.2.0_GH0.tar.gz) = 897791d07f6d093c55051054e1e7e271568127ab59b85aaa16206fba1b9af045
-SIZE (jsternberg-zap-logfmt-v1.2.0_GH0.tar.gz) = 6679
-SHA256 (juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 5595c2dc8973aab36a69648d4d94cac75a9ff4a28eb074a7b82b030fc7edbf64
-SIZE (juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 15417
-SHA256 (klauspost-compress-v1.11.0_GH0.tar.gz) = 921d54cd6384e48e489afa06cd4e276a9a0e3ef760f934d971137c06eac474ae
-SIZE (klauspost-compress-v1.11.0_GH0.tar.gz) = 17324280
-SHA256 (klauspost-cpuid-v1.2.5_GH0.tar.gz) = bec2ea696ec25a2577dd0996cbbc0675e57f242da61e4edad071983b65fed988
-SIZE (klauspost-cpuid-v1.2.5_GH0.tar.gz) = 360978
-SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
-SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
-SHA256 (libdns-libdns-v0.1.0_GH0.tar.gz) = 1e7eec578d894c902ae83fe60b04a420ea05ca9348fe538e01debe468561f45a
-SIZE (libdns-libdns-v0.1.0_GH0.tar.gz) = 4258
-SHA256 (lucas-clemente-quic-go-v0.18.0_GH0.tar.gz) = dc0b7b098744459c9a87d896eb85abe3a98354bcc0449e76db75354d8a33c820
-SIZE (lucas-clemente-quic-go-v0.18.0_GH0.tar.gz) = 488591
-SHA256 (lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 38aa5c60284f77cbb4be1de4af8907ce66954ff1a11e4f910d02e0283ce13b33
-SIZE (lunixbochs-vtclean-v1.0.0_GH0.tar.gz) = 4213
-SHA256 (manifoldco-promptui-v0.3.1_GH0.tar.gz) = 8860f2166c1913b2f66d4e8992957128037cc8c9495f225208c8462d1b0236cc
-SIZE (manifoldco-promptui-v0.3.1_GH0.tar.gz) = 22986
-SHA256 (marten-seemann-qpack-v0.2.0_GH0.tar.gz) = cf53d1a2c8dd3288ce1c15d6225354b64bb19bbc064814ece34e97873883ad2e
-SIZE (marten-seemann-qpack-v0.2.0_GH0.tar.gz) = 42644
-SHA256 (marten-seemann-qtls-go1-15-v0.1.0_GH0.tar.gz) = df68f63d09c62c901f417669fa7b55e506f8ce7b57c8b9646f62e6dc0e13ae60
-SIZE (marten-seemann-qtls-go1-15-v0.1.0_GH0.tar.gz) = 413517
-SHA256 (marten-seemann-qtls-v0.10.0_GH0.tar.gz) = b852f137be07c4e26c12b3225a13012fe879226210efa40b084e85a9ce726a84
-SIZE (marten-seemann-qtls-v0.10.0_GH0.tar.gz) = 403869
-SHA256 (mattn-go-colorable-v0.1.6_GH0.tar.gz) = e313129503025c383b5e69082fb1144e83a864d12ec45bb7a224d3fc4a635fbc
-SIZE (mattn-go-colorable-v0.1.6_GH0.tar.gz) = 9472
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (mholt-acmez-v0.1.1_GH0.tar.gz) = 42b5f847b7608dea0028fd8f8e812729465f6630371378c5e5b403ecd9b8c750
-SIZE (mholt-acmez-v0.1.1_GH0.tar.gz) = 50332
-SHA256 (miekg-dns-v1.1.30_GH0.tar.gz) = 3e030f867ad89e24af06919378c2bbcea8277893eca258f6f40b7707f6b7afd5
-SIZE (miekg-dns-v1.1.30_GH0.tar.gz) = 185111
-SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
-SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
-SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
-SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
-SHA256 (naoina-go-stringutil-v0.1.0_GH0.tar.gz) = 0d9d4e4d8d1112e7ac7a5ea6089bdf18585a22274802bcac6ef5f02aa2c43edc
-SIZE (naoina-go-stringutil-v0.1.0_GH0.tar.gz) = 6136
-SHA256 (naoina-toml-v0.1.1_GH0.tar.gz) = 5f0875fb6eb8ed9683f925329c05cdbaa809a1ec9b676c43ea14899c25462fee
-SIZE (naoina-toml-v0.1.1_GH0.tar.gz) = 41259
-SHA256 (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd
-SIZE (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (prometheus-client_golang-v1.7.1_GH0.tar.gz) = e61fefe06b7ac561c77435c98336f4ccc8cee60420de3a39db6d09fb7b83e9ed
-SIZE (prometheus-client_golang-v1.7.1_GH0.tar.gz) = 160050
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.10.0_GH0.tar.gz) = 349381082ea8e66637c2d2475f1ae0e74ca04a7b91eb3b96817c261b87668fd3
-SIZE (prometheus-common-v0.10.0_GH0.tar.gz) = 107763
-SHA256 (prometheus-procfs-v0.1.3_GH0.tar.gz) = 0b0872058bfdef11d9942535c992420150724c3b5a912a48a8d2ea26ac39efa6
-SIZE (prometheus-procfs-v0.1.3_GH0.tar.gz) = 156868
-SHA256 (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56
-SIZE (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640
-SHA256 (rs-xid-v1.2.1_GH0.tar.gz) = bb207227d5ae99bda71d38ae11e29b822c9b572223781bc282ad2f8e69002f2c
-SIZE (rs-xid-v1.2.1_GH0.tar.gz) = 9553
-SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
-SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
-SHA256 (samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 01cb78eb5c20624c6a02d185584e1b6815495e2c915e441926d66772721e258f
-SIZE (samfoo-ansi-b6bd2ded7189_GH0.tar.gz) = 4566
-SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
-SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
-SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
-SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
-SHA256 (smallstep-certificates-v0.15.4_GH0.tar.gz) = 4d0645af1163137c7e2ed610528e4add5b9aee0a5405f33ca19335fd49061c95
-SIZE (smallstep-certificates-v0.15.4_GH0.tar.gz) = 17588636
-SHA256 (smallstep-cli-v0.15.2_GH0.tar.gz) = 936c59243982b9c05b47bdf55738b9583f26c837fc634d04e00038ce32882675
-SIZE (smallstep-cli-v0.15.2_GH0.tar.gz) = 476601
-SHA256 (smallstep-crypto-v0.6.0_GH0.tar.gz) = f5de2fcd3661f821b1926989baff0e4194d3130a321a1612687ec739ecf9bd9d
-SIZE (smallstep-crypto-v0.6.0_GH0.tar.gz) = 133163
-SHA256 (smallstep-nosql-v0.3.0_GH0.tar.gz) = 6020dc16800b55f6fd83be95e0e5c9d0d1ed4aee530a3510e06cd8ce7aa4b470
-SIZE (smallstep-nosql-v0.3.0_GH0.tar.gz) = 21961
-SHA256 (smallstep-truststore-v0.9.6_GH0.tar.gz) = 31180e68b8731a9c091e31059632b41eabbee9d78ae91cd1fe1ee97a25ddf358
-SIZE (smallstep-truststore-v0.9.6_GH0.tar.gz) = 12754
-SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
-SIZE (spf13-cast-v1.3.1_GH0.tar.gz) = 11102
-SHA256 (square-go-jose-v2.5.1_GH0.tar.gz) = 74c65592183c542b254eb2933f7a99ee869abdf9e7ac02aad4d9f0dce980ace8
-SIZE (square-go-jose-v2.5.1_GH0.tar.gz) = 309860
-SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
-SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
-SHA256 (uber-go-multierr-v1.5.0_GH0.tar.gz) = 15fdd69d5f35e1c5c472d02b58fe3e229795d930398f9017c6c43a108504eaf1
-SIZE (uber-go-multierr-v1.5.0_GH0.tar.gz) = 12336
-SHA256 (uber-go-zap-v1.15.0_GH0.tar.gz) = 947479b8ecf1d2c618675f12da02dcd36eab04c889e4d7b38312029114f73a6e
-SIZE (uber-go-zap-v1.15.0_GH0.tar.gz) = 128221
-SHA256 (urfave-cli-v1.22.2_GH0.tar.gz) = 38a93b363b3d668506fa094937cd8b81dde333c74b59388cecf95443c8cdabf3
-SIZE (urfave-cli-v1.22.2_GH0.tar.gz) = 76132
-SHA256 (yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 151eceff70451c95cb2e6737f8593d58b6d218509726f1f58150b7157496813e
-SIZE (yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 10767
-SHA256 (yuin-goldmark-v1.2.1_GH0.tar.gz) = e927704f56c06b59b4b9f8b4cf7bcaa1bd98b873ce8f3c23c720f520711c16f9
-SIZE (yuin-goldmark-v1.2.1_GH0.tar.gz) = 228462
+TIMESTAMP = 1616346452
+SHA256 (caddy/caddyserver-caddy-v2.3.0_GH0.tar.gz) = 4688b122ac05be39622aa81324d1635f1642e4a66d731e82d210aef78cf2766a
+SIZE (caddy/caddyserver-caddy-v2.3.0_GH0.tar.gz) = 412978
+SHA256 (caddy/AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = e88bd873a2251d70b5d2cbf9dceff24fa25ca5652ac1f99165c303e98df494a1
+SIZE (caddy/AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = 7704
+SHA256 (caddy/DataDog-zstd-v1.4.1_GH0.tar.gz) = 48c0ad82d9bc66d77ca95aa47374bed6b6466510da66a2b2f9215cb239cb8137
+SIZE (caddy/DataDog-zstd-v1.4.1_GH0.tar.gz) = 498749
+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.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
+SIZE (caddy/Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
+SHA256 (caddy/Masterminds-semver-v3.1.0_GH0.tar.gz) = a91e6fe3121bb0c158bbd89721be3f44cd84e1f76a6d89840e244c1f5524ee28
+SIZE (caddy/Masterminds-semver-v3.1.0_GH0.tar.gz) = 24481
+SHA256 (caddy/Masterminds-sprig-v3.1.0_GH0.tar.gz) = a9e5031c3891ce95e799c5b07de9572eed90acd716e458eb42f1bbcb1b17328a
+SIZE (caddy/Masterminds-sprig-v3.1.0_GH0.tar.gz) = 49979
+SHA256 (caddy/alecthomas-chroma-v0.8.2_GH0.tar.gz) = b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
+SIZE (caddy/alecthomas-chroma-v0.8.2_GH0.tar.gz) = 637306
+SHA256 (caddy/antlr-antlr4-621b933c7a7f_GH0.tar.gz) = b1ecc011d1dfc6cbfba6c293a4631077b162c3435e35136a421876e00701de77
+SIZE (caddy/antlr-antlr4-621b933c7a7f_GH0.tar.gz) = 4328406
+SHA256 (caddy/aryann-difflib-e206f873d14a_GH0.tar.gz) = 180ffc8657adf51af48f2cfa60110ebd0a4574d103e5727e108ec12ac19247b5
+SIZE (caddy/aryann-difflib-e206f873d14a_GH0.tar.gz) = 5584
+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-201f83a06067_GH0.tar.gz) = 25c9be5dbf96f991add3214549750b0fb6df1d9060b5f7238f58769e26ae41ea
+SIZE (caddy/caddyserver-certmagic-201f83a06067_GH0.tar.gz) = 97841
+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-09dd2e1a4195_GH0.tar.gz) = add05687c0e351117e9ca7917bbb21616cc1014596801de44d18d9d6a6dd6086
+SIZE (caddy/dgraph-io-badger-09dd2e1a4195_GH0.tar.gz) = 332877
+SHA256 (caddy/dgraph-io-badger-v1.5.3_GH0.tar.gz) = 653dccac0adde8462e2ce88cb6ce8eaf1e50d9cb3ec5d57269307b2dabb4885c
+SIZE (caddy/dgraph-io-badger-v1.5.3_GH0.tar.gz) = 1018875
+SHA256 (caddy/dgraph-io-ristretto-8f368f2f2ab3_GH0.tar.gz) = 1efee19b05912787664c145bd1f5c64368caac8dc49583d75680d5c21a1cf3cd
+SIZE (caddy/dgraph-io-ristretto-8f368f2f2ab3_GH0.tar.gz) = 39672
+SHA256 (caddy/dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 47bda738d281105cc7b1cb832880f93d220eae40b18095dc322b0b7bf44fdf23
+SIZE (caddy/dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 26800
+SHA256 (caddy/dlclark-regexp2-v1.2.0_GH0.tar.gz) = 9b4d25630d0ce86bcd518d79ce47365a84c7c75de2334b2708f1bddcc1df47fe
+SIZE (caddy/dlclark-regexp2-v1.2.0_GH0.tar.gz) = 204926
+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.3_GH0.tar.gz) = 089ae9a1651531dcac069370212abfe16e83af1c6f331d59e0154fa64fe9b120
+SIZE (caddy/etcd-io-bbolt-v1.3.3_GH0.tar.gz) = 94626
+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-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-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
+SIZE (caddy/go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (caddy/golang-crypto-123391ffb6de_GH0.tar.gz) = 09cadc5885fb57e7c3e3cdfd245a4dffb103adc90eb7f97efbc106905293c538
+SIZE (caddy/golang-crypto-123391ffb6de_GH0.tar.gz) = 1732577
+SHA256 (caddy/golang-net-69a78807bb2b_GH0.tar.gz) = 1114d9d74fc1297add7be9ae8e61fae9f8522884ef46b518e1f3546f843a0223
+SIZE (caddy/golang-net-69a78807bb2b_GH0.tar.gz) = 1248808
+SHA256 (caddy/golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
+SIZE (caddy/golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
+SHA256 (caddy/golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
+SIZE (caddy/golang-snappy-v0.0.1_GH0.tar.gz) = 62605
+SHA256 (caddy/golang-sys-f9fddec55a1e_GH0.tar.gz) = 1ab3f80841babed9c5cd8e93f69bfcb7847c406e767b5d86d5da7dc3c0f24931
+SIZE (caddy/golang-sys-f9fddec55a1e_GH0.tar.gz) = 1090464
+SHA256 (caddy/golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
+SIZE (caddy/golang-text-v0.3.3_GH0.tar.gz) = 7747332
+SHA256 (caddy/google-cel-go-v0.6.0_GH0.tar.gz) = 0dc9c40a43cdd1d8d2fe95114e78e845813efd2d61147b6dfd5a158f87820563
+SIZE (caddy/google-cel-go-v0.6.0_GH0.tar.gz) = 2138079
+SHA256 (caddy/google-go-genproto-86f49bd18e98_GH0.tar.gz) = 164030f63ee1b68867ab1247e2e22811664fdb5b065c5cb66672ed1dd98a3997
+SIZE (caddy/google-go-genproto-86f49bd18e98_GH0.tar.gz) = 11258844
+SHA256 (caddy/google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
+SIZE (caddy/google-uuid-v1.1.1_GH0.tar.gz) = 13543
+SHA256 (caddy/grpc-grpc-go-v1.27.1_GH0.tar.gz) = 2e25c66a7fe59a49d94d24280afabfbc563967e47c1e6d8df0a72aaf11fae6fb
+SIZE (caddy/grpc-grpc-go-v1.27.1_GH0.tar.gz) = 826728
+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.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
+SIZE (caddy/imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
+SHA256 (caddy/jsternberg-zap-logfmt-v1.2.0_GH0.tar.gz) = 897791d07f6d093c55051054e1e7e271568127ab59b85aaa16206fba1b9af045
+SIZE (caddy/jsternberg-zap-logfmt-v1.2.0_GH0.tar.gz) = 6679
+SHA256 (caddy/juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 5595c2dc8973aab36a69648d4d94cac75a9ff4a28eb074a7b82b030fc7edbf64
+SIZE (caddy/juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 15417
+SHA256 (caddy/klauspost-compress-v1.11.3_GH0.tar.gz) = cdd26d4ee5af294e837695c9f9302bd330487ad6428435d40f76b15dd46a41ac
+SIZE (caddy/klauspost-compress-v1.11.3_GH0.tar.gz) = 17345956
+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.1_GH0.tar.gz) = bdd57621b732fca76b662a9767513694a1a443e78866e70e90747647225ca407
+SIZE (caddy/klauspost-cpuid-v2.0.1_GH0.tar.gz) = 337825
+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.0_GH0.tar.gz) = b4363f4aca4e8633f474480669d4924909f3856411ea4974e09481eca2a9fbfe
+SIZE (caddy/libdns-libdns-v0.2.0_GH0.tar.gz) = 5805
+SHA256 (caddy/lucas-clemente-quic-go-v0.19.3_GH0.tar.gz) = a1ccd4284dd238d5174192152aec9c180abaaa2a4ce389341c7576e15f3d74d1
+SIZE (caddy/lucas-clemente-quic-go-v0.19.3_GH0.tar.gz) = 495536
+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.3.1_GH0.tar.gz) = 8860f2166c1913b2f66d4e8992957128037cc8c9495f225208c8462d1b0236cc
+SIZE (caddy/manifoldco-promptui-v0.3.1_GH0.tar.gz) = 22986
+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-15-v0.1.1_GH0.tar.gz) = 6af56a620c947db5199015776e47fec0d7a7dbfeeb2e3c432da7c3349ea6c6f9
+SIZE (caddy/marten-seemann-qtls-go1-15-v0.1.1_GH0.tar.gz) = 413658
+SHA256 (caddy/marten-seemann-qtls-v0.10.0_GH0.tar.gz) = b852f137be07c4e26c12b3225a13012fe879226210efa40b084e85a9ce726a84
+SIZE (caddy/marten-seemann-qtls-v0.10.0_GH0.tar.gz) = 403869
+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/mholt-acmez-v0.1.3_GH0.tar.gz) = 5512f8b11ec2ed363f3dcc0a7aecf3498597f872d9ee803e8d5fad316cfe6ac0
+SIZE (caddy/mholt-acmez-v0.1.3_GH0.tar.gz) = 50413
+SHA256 (caddy/miekg-dns-v1.1.30_GH0.tar.gz) = 3e030f867ad89e24af06919378c2bbcea8277893eca258f6f40b7707f6b7afd5
+SIZE (caddy/miekg-dns-v1.1.30_GH0.tar.gz) = 185111
+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/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.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1
+SIZE (caddy/prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330
+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.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6
+SIZE (caddy/prometheus-common-v0.15.0_GH0.tar.gz) = 124369
+SHA256 (caddy/prometheus-procfs-v0.2.0_GH0.tar.gz) = b6c013031ac8b9f8f9e1595103c48feb80dfe59c37aac73efe724fddbc0b3f50
+SIZE (caddy/prometheus-procfs-v0.2.0_GH0.tar.gz) = 157368
+SHA256 (caddy/protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56
+SIZE (caddy/protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640
+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/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.15.4_GH0.tar.gz) = 4d0645af1163137c7e2ed610528e4add5b9aee0a5405f33ca19335fd49061c95
+SIZE (caddy/smallstep-certificates-v0.15.4_GH0.tar.gz) = 17588636
+SHA256 (caddy/smallstep-cli-v0.15.2_GH0.tar.gz) = 936c59243982b9c05b47bdf55738b9583f26c837fc634d04e00038ce32882675
+SIZE (caddy/smallstep-cli-v0.15.2_GH0.tar.gz) = 476601
+SHA256 (caddy/smallstep-crypto-v0.6.0_GH0.tar.gz) = f5de2fcd3661f821b1926989baff0e4194d3130a321a1612687ec739ecf9bd9d
+SIZE (caddy/smallstep-crypto-v0.6.0_GH0.tar.gz) = 133163
+SHA256 (caddy/smallstep-nosql-v0.3.0_GH0.tar.gz) = 6020dc16800b55f6fd83be95e0e5c9d0d1ed4aee530a3510e06cd8ce7aa4b470
+SIZE (caddy/smallstep-nosql-v0.3.0_GH0.tar.gz) = 21961
+SHA256 (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 03ffc4cfe642e8c5b93f9883a6b4e9130d2ae347eadc30a4e26a1dbcc3516dc9
+SIZE (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 140570
+SHA256 (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 03ffc4cfe642e8c5b93f9883a6b4e9130d2ae347eadc30a4e26a1dbcc3516dc9
+SIZE (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 140570
+SHA256 (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 03ffc4cfe642e8c5b93f9883a6b4e9130d2ae347eadc30a4e26a1dbcc3516dc9
+SIZE (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 140570
+SHA256 (caddy/smallstep-truststore-v0.9.6_GH0.tar.gz) = 31180e68b8731a9c091e31059632b41eabbee9d78ae91cd1fe1ee97a25ddf358
+SIZE (caddy/smallstep-truststore-v0.9.6_GH0.tar.gz) = 12754
+SHA256 (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 03ffc4cfe642e8c5b93f9883a6b4e9130d2ae347eadc30a4e26a1dbcc3516dc9
+SIZE (caddy/smallstep-crypto-70072f45afc0f699_GH0.tar.gz) = 140570
+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/uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
+SIZE (caddy/uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
+SHA256 (caddy/uber-go-multierr-v1.5.0_GH0.tar.gz) = 15fdd69d5f35e1c5c472d02b58fe3e229795d930398f9017c6c43a108504eaf1
+SIZE (caddy/uber-go-multierr-v1.5.0_GH0.tar.gz) = 12336
+SHA256 (caddy/uber-go-zap-v1.16.0_GH0.tar.gz) = 098ceed0ab0aea975c1b816f222ac815b3c6a60940329f914709c47a4edda4f7
+SIZE (caddy/uber-go-zap-v1.16.0_GH0.tar.gz) = 131768
+SHA256 (caddy/urfave-cli-v1.22.2_GH0.tar.gz) = 38a93b363b3d668506fa094937cd8b81dde333c74b59388cecf95443c8cdabf3
+SIZE (caddy/urfave-cli-v1.22.2_GH0.tar.gz) = 76132
+SHA256 (caddy/yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 151eceff70451c95cb2e6737f8593d58b6d218509726f1f58150b7157496813e
+SIZE (caddy/yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 10767
+SHA256 (caddy/yuin-goldmark-v1.2.1_GH0.tar.gz) = e927704f56c06b59b4b9f8b4cf7bcaa1bd98b873ce8f3c23c720f520711c16f9
+SIZE (caddy/yuin-goldmark-v1.2.1_GH0.tar.gz) = 228462

Modified: head/www/caddy/files/Caddyfile.sample.in
==============================================================================
--- head/www/caddy/files/Caddyfile.sample.in	Sun Mar 21 16:29:31 2021	(r568925)
+++ head/www/caddy/files/Caddyfile.sample.in	Sun Mar 21 17:27:54 2021	(r568926)
@@ -7,7 +7,7 @@
 # sure your domain's A/AAAA DNS records are properly pointed to
 # this machine's public IP, then replace the line below with your
 # domain name.
-:80
+localhost
 
 # Set this path to your site's directory.
 root * %%WWWDIR%%
@@ -20,6 +20,12 @@ file_server
 
 # Or serve a PHP site through php-fpm:
 # php_fastcgi localhost:9000
+
+# Caddy will automatically obtain ACME certs for domains
+# example.com {
+#     root * /path/to/example.com
+#     file_server
+# }
 
 # Refer to the Caddy docs for more information:
 # https://caddyserver.com/docs/caddyfile

Modified: head/www/caddy/files/caddy.in
==============================================================================
--- head/www/caddy/files/caddy.in	Sun Mar 21 16:29:31 2021	(r568925)
+++ head/www/caddy/files/caddy.in	Sun Mar 21 17:27:54 2021	(r568926)
@@ -11,23 +11,23 @@
 # to enable this service:
 # caddy_enable (bool):   Set to NO by default. Set it to YES to enable caddy.
 #
-# caddy_config (string): Optional full path for caddy config file
-# caddy_adapter (string):  Optional adapter type if the configuration is not in caddyfile format
-# caddy_extra_flags (string):  Optional flags passed to caddy start
-# caddy_logfile (string):     Set to "/var/log/caddy.log" by default.
-#                             Defines where the process log file is written, this is not a web access log
+# caddy_config (string):      (Optional) Full path to caddy config file
+# caddy_adapter (string):     (Optional) Adapter type if the configuration is not in caddyfile format
+# caddy_extra_flags (string): (Optional) Flags passed to caddy start
+# caddy_logfile (string):     Location of process log. This is for startup/shutdown/error messages.
+#                             To create an access log, see https://caddyserver.com/docs/caddyfile/directives/log
 
 . /etc/rc.subr
 
 name=caddy
 rcvar=caddy_enable
-desc="Caddy 2 is a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
+desc="Powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
 
 load_rc_config $name
 
 # Defaults
 : ${caddy_enable:=NO}
-: ${caddy_config:=%%ETCDIR%%/%%CADDY_CONFIG%%}
+: ${caddy_config:=%%ETCDIR%%/Caddyfile}
 : ${caddy_adapter:=caddyfile}
 : ${caddy_extra_flags:=""}
 : ${caddy_logfile="/var/log/caddy.log"}
@@ -39,9 +39,11 @@ pidfile="/var/run/${name}.pid"
 required_files="${caddy_config} ${command}"
 
 # Extra Commands
-extra_commands="validate reload"
-start_cmd="${command} start ${caddy_flags} ${caddy_extra_flags} --pidfile ${pidfile} >> ${caddy_logfile} 2>&1"
-validate_cmd="${command} validate ${caddy_flags}"
+extra_commands="configtest reload"
+
+configtest_cmd="${command} validate ${caddy_flags}"
 reload_cmd="${command} reload ${caddy_flags}"
+start_cmd="${command} start ${caddy_flags} ${caddy_extra_flags} --pidfile ${pidfile} >> ${caddy_logfile} 2>&1"
+stop_cmd="${command} stop"
 
 run_rc_command "$1"

Modified: head/www/caddy/pkg-descr
==============================================================================
--- head/www/caddy/pkg-descr	Sun Mar 21 16:29:31 2021	(r568925)
+++ head/www/caddy/pkg-descr	Sun Mar 21 17:27:54 2021	(r568926)
@@ -1,23 +1,17 @@
-Caddy is the HTTP/2 web server with automatic HTTPS.
+Caddy is a powerful, enterprise-ready, open source web server with automatic
+HTTPS written in Go.
 
 Features:
 
 - Easy configuration with the Caddyfile
-- Powerful configuration with its native JSON config
-- Dynamic configuration with the JSON API
+- Powerful configuration with JSON config
+- Dynamic configuration with a JSON API
 - Config adapters if you don't like JSON
 - Automatic HTTPS by default
-  - Let's Encrypt for public sites
-  - Fully-managed local CA for internal names & IPs
+  - ACME (Let's Encrypt) for public sites
+  - Fully-managed local CA for internal names and IPs
   - Can coordinate with other Caddy instances in a cluster
-- Stays up when other servers go down due to TLS/OCSP/certificate-related
-  issues
 - HTTP/1.1, HTTP/2, and experimental HTTP/3 support
-- Highly extensible modular architecture lets Caddy do anything without bloat
-- Runs anywhere with no external dependencies (not even libc)
-- Written in Go, a language with higher memory safety guarantees than other
-  servers
 - Actually fun to use
-- So, so much more to discover
 
-WWW: https://caddyserver.com/
+WWW: https://caddyserver.com



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103211727.12LHRsMj014998>