Index: www/caddy/Makefile =================================================================== --- www/caddy/Makefile (revision 535863) +++ www/caddy/Makefile (working copy) @@ -1,75 +1,119 @@ -# Created by: fabian.freyer@physik.tu-berlin.de # $FreeBSD$ PORTNAME= caddy DISTVERSIONPREFIX= v -DISTVERSION= 1.0.4 +DISTVERSION= 2.0.0 CATEGORIES= www -MAINTAINER= fabian.freyer@physik.tu-berlin.de -COMMENT= Fast, cross-platform HTTP/2 web server with automatic HTTPS +MAINTAINER= daniel.tihanyi@tetragir.com +COMMENT= Caddy 2 is a powerful, enterprise-ready, open source web server LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +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 +SUB_FILES= ${PORTNAME} ${CADDY_SAMPLE} pkg-message +SUB_LIST= CADDY_CONFIG=${CADDY_CONFIG} \ + CADDY_SAMPLE=${CADDY_SAMPLE} + +GO_TARGET= ./cmd/caddy + USE_GITHUB= yes -GH_ACCOUNT= mholt +GH_ACCOUNT= caddyserver + GH_TUPLE= \ - cenkalti:backoff:v3.0.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff/v3 \ + AndreasBriese:bbloom:e2d15f34fcf9:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \ + Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \ + Masterminds:semver:v3.0.3:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \ + Masterminds:sprig:v3.0.2:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \ + alecthomas:chroma:v0.7.2:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ + antlr:antlr4:b43a4c3a8015:antlr_antlr4/vendor/github.com/antlr/antlr4 \ + aryann:difflib:e206f873d14a:aryann_difflib/vendor/github.com/aryann/difflib \ + caddyserver:certmagic:v0.10.12:caddyserver_certmagic/vendor/github.com/caddyserver/certmagic \ + cenkalti:backoff:v4.0.0:cenkalti_backoff_v4/vendor/github.com/cenkalti/backoff/v4 \ + census-instrumentation:opencensus-go:v0.22.3:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \ - dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ - flynn:go-shlex:3f9db97f8568:flynn_go_shlex/vendor/github.com/flynn/go-shlex \ - fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \ - go-acme:lego:v3.2.0:go_acme_lego/vendor/github.com/go-acme/lego/v3 \ - go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \ - go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:crypto:227b76d455e7:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:83d349e8ac1a:golang_net/vendor/golang.org/x/net \ - golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \ + chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \ + 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.5.3:dgraph_io_badger/vendor/github.com/dgraph-io/badger \ + 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 \ + francoispqt:gojay:v1.2.13:francoispqt_gojay/vendor/github.com/francoispqt/gojay \ + go-acme:lego:v3.6.0:go_acme_lego_v3/vendor/github.com/go-acme/lego/v3 \ + go-sql-driver:mysql:v1.4.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ + go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ + golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ + golang:crypto:729f1e841bcc:golang_crypto/vendor/golang.org/x/crypto \ + golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \ + golang:net:ff2c4b7c35a0:golang_net/vendor/golang.org/x/net \ + golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:protobuf:v1.3.4:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sys:85ca7c5b95cd:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ + google:cel-go:v0.4.1:google_cel_go/vendor/github.com/google/cel-go \ + google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \ + google:go-genproto:b5235f65be36:google_go_genproto/vendor/google.golang.org/genproto \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ - gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \ - hashicorp:go-syslog:v1.0.0:hashicorp_go_syslog/vendor/github.com/hashicorp/go-syslog \ - hpcloud:tail:v1.0.0:hpcloud_tail/vendor/github.com/hpcloud/tail \ - jimstudt:http-authentication:3eca13d6893a:jimstudt_http_authentication/vendor/github.com/jimstudt/http-authentication \ - klauspost:cpuid:v1.2.0:klauspost_cpuid/vendor/github.com/klauspost/cpuid \ - lucas-clemente:quic-go:v0.13.1:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \ - marten-seemann:chacha20:v0.2.0:marten_seemann_chacha20/vendor/github.com/marten-seemann/chacha20 \ + googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ + googleapis:google-api-go-client:v0.20.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ + googleapis:google-cloud-go:v0.54.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ + grpc:grpc-go:v1.27.1:grpc_grpc_go/vendor/google.golang.org/grpc \ + huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \ + imdario:mergo:v0.3.7: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.10.4:klauspost_compress/vendor/github.com/klauspost/compress \ + klauspost:cpuid:v1.2.3:klauspost_cpuid/vendor/github.com/klauspost/cpuid \ + libdns:libdns:186724ffc821:libdns_libdns/vendor/github.com/libdns/libdns \ + lucas-clemente:quic-go:v0.15.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.1.0:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \ - marten-seemann:qtls:v0.4.1:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \ - mcuadros:go-syslog:v2.2.1:mcuadros_go_syslog/vendor/gopkg.in/mcuadros/go-syslog.v2 \ - mholt:certmagic:v0.8.3:mholt_certmagic/vendor/github.com/mholt/certmagic \ - miekg:dns:v1.1.15:miekg_dns/vendor/github.com/miekg/dns \ + marten-seemann:qtls:v0.9.0:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \ + mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ + mattn:go-isatty:v0.0.11:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ + miekg:dns:v1.1.27: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 \ 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 \ - onsi:ginkgo:v1.7.0:onsi_ginkgo/vendor/github.com/onsi/ginkgo \ - russross:blackfriday:067529f716f4:russross_blackfriday/vendor/github.com/russross/blackfriday \ - square:go-jose:v2.3.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 + pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ + 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 \ + smallstep:certificates:v0.14.2:smallstep_certificates/vendor/github.com/smallstep/certificates \ + smallstep:cli:v0.14.2:smallstep_cli/vendor/github.com/smallstep/cli \ + smallstep:nosql:v0.2.0:smallstep_nosql/vendor/github.com/smallstep/nosql \ + smallstep:truststore:v0.9.5:smallstep_truststore/vendor/github.com/smallstep/truststore \ + spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \ + square:go-jose:v2.4.0: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.14.1: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.1.28:yuin_goldmark/vendor/github.com/yuin/goldmark -GO_TARGET= ./caddy +GL_TUPLE= https://gitlab.howett.net:go:plist:77e249a2e2ba6362794925035a31bea61b902a1e:go_plist/vendor/howett.net/plist -SUB_FILES= pkg-message -PLIST_FILES= bin/caddy etc/rc.d/caddy +PLIST_FILES= ${LOCALBASE}/bin/${PORTNAME} \ + "@sample ${ETCDIR}/${CADDY_SAMPLE}" -OPTIONS_DEFINE= TELEMETRY - -TELEMETRY_DESC= Enable telemetry support -TELEMETRY_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-disable-telemetry - -# It is a bit involved to get caddy --version to work correctly, so this -# simple hack gets the right version number that the port has downloaded. See -# https://github.com/caddyserver/caddy/issues/2875 for more details. -post-patch: - @${REINPLACE_CMD} -e 's|module.Version|"v${DISTVERSION}"|g' ${WRKSRC}/caddy/caddymain/run.go - post-install: - ${INSTALL_SCRIPT} ${GO_WRKSRC}/dist/init/freebsd/${PORTNAME} \ - ${STAGEDIR}/${PREFIX}/etc/rc.d/${PORTNAME} + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} \ + ${WRKDIR}/${CADDY_SAMPLE} \ + ${STAGEDIR}${ETCDIR}/${CADDY_SAMPLE} .include Index: www/caddy/distinfo =================================================================== --- www/caddy/distinfo (revision 535863) +++ www/caddy/distinfo (working copy) @@ -1,58 +1,120 @@ -TIMESTAMP = 1578057972 -SHA256 (mholt-caddy-v1.0.4_GH0.tar.gz) = bf81245d2b347c89a8e8aa358a224b722d55cb6e1c266bbdffbe6acc54d130a5 -SIZE (mholt-caddy-v1.0.4_GH0.tar.gz) = 394038 -SHA256 (cenkalti-backoff-v3.0.0_GH0.tar.gz) = e68ff17e455840ec14812e6d991d3284a103f7e29f82b8075beb1ab11c6c1719 -SIZE (cenkalti-backoff-v3.0.0_GH0.tar.gz) = 8675 +TIMESTAMP = 1593173583 +SHA256 (caddyserver-caddy-v2.0.0_GH0.tar.gz) = 620e2a58ff904ae8bb9543cd5000d5806ba720f275dd6f4774cdc2abba0a746f +SIZE (caddyserver-caddy-v2.0.0_GH0.tar.gz) = 350050 +SHA256 (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = e88bd873a2251d70b5d2cbf9dceff24fa25ca5652ac1f99165c303e98df494a1 +SIZE (AndreasBriese-bbloom-e2d15f34fcf9_GH0.tar.gz) = 7704 +SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae +SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610 +SHA256 (Masterminds-semver-v3.0.3_GH0.tar.gz) = da69b88d88751537a18634a497c0aefd3de4c4ef79f3fb3ca8ebca7f81ff1052 +SIZE (Masterminds-semver-v3.0.3_GH0.tar.gz) = 23824 +SHA256 (Masterminds-sprig-v3.0.2_GH0.tar.gz) = 861ec05ce38b0138e8ff6e8b91b2ee61795947dd151d5e9a89314cc27c38cd08 +SIZE (Masterminds-sprig-v3.0.2_GH0.tar.gz) = 47799 +SHA256 (alecthomas-chroma-v0.7.2_GH0.tar.gz) = abea864f1f5f5361a0324828748f07231b78e5fe9cd53f4e3341e8305661bbfd +SIZE (alecthomas-chroma-v0.7.2_GH0.tar.gz) = 603745 +SHA256 (antlr-antlr4-b43a4c3a8015_GH0.tar.gz) = 5f95402c737ea58554cd1fb614482bcf5179ed8adf06dc1dc84dbeaaab658c12 +SIZE (antlr-antlr4-b43a4c3a8015_GH0.tar.gz) = 4265182 +SHA256 (aryann-difflib-e206f873d14a_GH0.tar.gz) = 180ffc8657adf51af48f2cfa60110ebd0a4574d103e5727e108ec12ac19247b5 +SIZE (aryann-difflib-e206f873d14a_GH0.tar.gz) = 5584 +SHA256 (caddyserver-certmagic-v0.10.12_GH0.tar.gz) = 74ef9fcfd3f8d662a8b23d8f2f549c4fde122881169bccbebfdd25e82c80a556 +SIZE (caddyserver-certmagic-v0.10.12_GH0.tar.gz) = 101173 +SHA256 (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 976c5d645edf39b748d4941157f750849a809657435bdfea9b47b51f1fe463aa +SIZE (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 9317 +SHA256 (census-instrumentation-opencensus-go-v0.22.3_GH0.tar.gz) = 05eaf69808d0ba27b82d71fe620e8ecf97c1dd2d0ef8616d960c9d9170d7fdfa +SIZE (census-instrumentation-opencensus-go-v0.22.3_GH0.tar.gz) = 167276 SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73 SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585 -SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba -SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 -SHA256 (flynn-go-shlex-3f9db97f8568_GH0.tar.gz) = fbe293093bb4dbb07985d7ee5f6cd975fe4065d7c7106d711cb48d6bf480c7e8 -SIZE (flynn-go-shlex-3f9db97f8568_GH0.tar.gz) = 7677 -SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd -SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 -SHA256 (go-acme-lego-v3.2.0_GH0.tar.gz) = 64f4e810826ae28fc903bcfcfcb5114233089847fd89bddb3b2bb378304e5e12 -SIZE (go-acme-lego-v3.2.0_GH0.tar.gz) = 321570 -SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554 -SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631 -SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff -SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 -SHA256 (golang-crypto-227b76d455e7_GH0.tar.gz) = f6eef37c7e4df60af1de2d018d396cb5e4901388cc43a2e5361dc4c4648cd8a6 -SIZE (golang-crypto-227b76d455e7_GH0.tar.gz) = 1692189 -SHA256 (golang-net-83d349e8ac1a_GH0.tar.gz) = 5752c376bc6383bf2055281336101c062b881f17ded2e960d718c8256023f9c7 -SIZE (golang-net-83d349e8ac1a_GH0.tar.gz) = 1103298 -SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 -SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 -SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5 -SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659 +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-v1.5.3_GH0.tar.gz) = 653dccac0adde8462e2ce88cb6ce8eaf1e50d9cb3ec5d57269307b2dabb4885c +SIZE (dgraph-io-badger-v1.5.3_GH0.tar.gz) = 1018875 +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 (francoispqt-gojay-v1.2.13_GH0.tar.gz) = 69de41c398b38217fbbb7e16a71893c7165bc8e59ba5d5b88b00db48f50cb3d5 +SIZE (francoispqt-gojay-v1.2.13_GH0.tar.gz) = 165255 +SHA256 (go-acme-lego-v3.6.0_GH0.tar.gz) = a18ec4447b341ffc28771b11714db530a9cda1e7c6ffeef95eed21ad63ed1173 +SIZE (go-acme-lego-v3.6.0_GH0.tar.gz) = 372018 +SHA256 (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 9b5d435903a674cd761310365df992a1b4eed2e4e2f0c8aa90bdc996c330d7ae +SIZE (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 83524 +SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045 +SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732 +SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236 +SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188 +SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316 +SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903 +SHA256 (golang-crypto-729f1e841bcc_GH0.tar.gz) = 118ea7d7e54f6b4b169655a79138048f6eca16e182b4c645f1226eab1f757335 +SIZE (golang-crypto-729f1e841bcc_GH0.tar.gz) = 1729138 +SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865 +SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047 +SHA256 (golang-net-ff2c4b7c35a0_GH0.tar.gz) = 0fb9448f6194b35e765516f8a7867f2b61abfa6c90e616f20eeac697765ed83f +SIZE (golang-net-ff2c4b7c35a0_GH0.tar.gz) = 1174436 +SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8 +SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016 +SHA256 (golang-protobuf-v1.3.4_GH0.tar.gz) = 5e4279eb197ff7271cb06ae97a16f721d0fd6962ff2d2560831309c0900e72c4 +SIZE (golang-protobuf-v1.3.4_GH0.tar.gz) = 315552 +SHA256 (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 06a5cbc446381df9653d4b410239720eea6b27461597de88f3e621664c811294 +SIZE (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 1047239 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.4.1_GH0.tar.gz) = 051ceff2e46a2af9d799198d60dbc137c46a073ad1e6a1a8f798592f8a96c3c2 +SIZE (google-cel-go-v0.4.1_GH0.tar.gz) = 2111743 +SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a +SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600 +SHA256 (google-go-genproto-b5235f65be36_GH0.tar.gz) = 2535a908e7a0f07b84769d7cbcebc4465ba594c10dff6638be7781ce4f47ed77 +SIZE (google-go-genproto-b5235f65be36_GH0.tar.gz) = 7818095 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543 -SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d -SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228 -SHA256 (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = be4bda814c068311ea8e185e2d108077f167897cfa868ada7f56d97a10f3d602 -SIZE (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = 4517 -SHA256 (hpcloud-tail-v1.0.0_GH0.tar.gz) = 3aa982c4a779b1c1dc5723bbf2345eed1dd46cd5bcc490e69de4beab8f5d4b02 -SIZE (hpcloud-tail-v1.0.0_GH0.tar.gz) = 37816 -SHA256 (jimstudt-http-authentication-3eca13d6893a_GH0.tar.gz) = d9c31a2599929db250fa1141804941c57bd4ed6ec5ccc4b25d635317e936594f -SIZE (jimstudt-http-authentication-3eca13d6893a_GH0.tar.gz) = 54188 -SHA256 (klauspost-cpuid-v1.2.0_GH0.tar.gz) = aa29ebcf12669eef96c7c54b551617b90b65c55d126ef0ff9fbacd605e738a67 -SIZE (klauspost-cpuid-v1.2.0_GH0.tar.gz) = 278872 -SHA256 (lucas-clemente-quic-go-v0.13.1_GH0.tar.gz) = ed034384e65a1ef26b580945bc40b04974d7668c08569f25efdb8e98ea5cb0de -SIZE (lucas-clemente-quic-go-v0.13.1_GH0.tar.gz) = 396094 -SHA256 (marten-seemann-chacha20-v0.2.0_GH0.tar.gz) = 8a7e5659a7a7768c99d77156c02ed88153a136db88e5662ff167c01397f9f99e -SIZE (marten-seemann-chacha20-v0.2.0_GH0.tar.gz) = 59585 +SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c +SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328 +SHA256 (googleapis-google-api-go-client-v0.20.0_GH0.tar.gz) = 93f55b3f529e26e0c9c263aa323b3968f90b5d8a4faa09e7b24b05bc59226cd5 +SIZE (googleapis-google-api-go-client-v0.20.0_GH0.tar.gz) = 14017412 +SHA256 (googleapis-google-cloud-go-v0.54.0_GH0.tar.gz) = d9f08ce087ea69d1679bc2f1122006fc3797b6cd14dcfa527eb9fe8fc9f122eb +SIZE (googleapis-google-cloud-go-v0.54.0_GH0.tar.gz) = 2569218 +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.2.0_GH0.tar.gz) = c43737734bb260e7d77329af8a33bf687f9430abc1b21d3b1f4a8fa6fb3dbde3 +SIZE (huandu-xstrings-v1.2.0_GH0.tar.gz) = 16628 +SHA256 (imdario-mergo-v0.3.7_GH0.tar.gz) = ce29171c44a6b4084ed514bc9b4ed6c3c01462c210b7ec6fe5e56691a46eb939 +SIZE (imdario-mergo-v0.3.7_GH0.tar.gz) = 16668 +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.10.4_GH0.tar.gz) = 03d3e31b53d73d5c865f42f6df4d9bdcf71ed334cf41b8bf01fe922a2ffef2f5 +SIZE (klauspost-compress-v1.10.4_GH0.tar.gz) = 16718772 +SHA256 (klauspost-cpuid-v1.2.3_GH0.tar.gz) = d1a620aa258e950c78f5ea644fa8241b98504f5ac008cca1b66d50613c4a0ace +SIZE (klauspost-cpuid-v1.2.3_GH0.tar.gz) = 356439 +SHA256 (libdns-libdns-186724ffc821_GH0.tar.gz) = b3bddf20015bfa35e267206d3f78d9e142179034dc9d6a47df2304fe71cf6aff +SIZE (libdns-libdns-186724ffc821_GH0.tar.gz) = 4259 +SHA256 (lucas-clemente-quic-go-v0.15.3_GH0.tar.gz) = 6b98f71cdfee28a4311b1f0904ddbbf77ec27ecb41b19116a6fef733b8b8cffb +SIZE (lucas-clemente-quic-go-v0.15.3_GH0.tar.gz) = 452045 +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.1.0_GH0.tar.gz) = 6e94df6ee1ed3f1a38dec97a48e25bf6fe62c0bd18abd720bb090747a4f502c2 SIZE (marten-seemann-qpack-v0.1.0_GH0.tar.gz) = 36739 -SHA256 (marten-seemann-qtls-v0.4.1_GH0.tar.gz) = 91a8c4f43928f0537310f5e840206b2be08b67ab7b5b457ab454e7fd6bc44b75 -SIZE (marten-seemann-qtls-v0.4.1_GH0.tar.gz) = 396031 -SHA256 (mcuadros-go-syslog-v2.2.1_GH0.tar.gz) = b9b27b28b59198d6c32a8aa297226bfa15d0623c6f90b1bc71f49bd9303486bd -SIZE (mcuadros-go-syslog-v2.2.1_GH0.tar.gz) = 25939 -SHA256 (mholt-certmagic-v0.8.3_GH0.tar.gz) = cca44531c69367f71c69dd1d5a861182bff9dff69f19a8f82170828367a853f7 -SIZE (mholt-certmagic-v0.8.3_GH0.tar.gz) = 84968 -SHA256 (miekg-dns-v1.1.15_GH0.tar.gz) = a27dbc6e920596548db7edb0996a9338f60f14dd65255787a78dad8de039aba3 -SIZE (miekg-dns-v1.1.15_GH0.tar.gz) = 1692734 +SHA256 (marten-seemann-qtls-v0.9.0_GH0.tar.gz) = 086e6df7433933da26e027065d3f1cf32e7d010b379e6685e55450b510b8e03a +SIZE (marten-seemann-qtls-v0.9.0_GH0.tar.gz) = 738133 +SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11 +SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981 +SHA256 (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 631fab18253998a4e27e9d260c445e9852bd86cf5a42693623d305c3e59c415a +SIZE (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 4396 +SHA256 (miekg-dns-v1.1.27_GH0.tar.gz) = f0dfa99cea9f97063114f6680b1718364323ff817d49211de1a98464a498f672 +SIZE (miekg-dns-v1.1.27_GH0.tar.gz) = 183862 +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 @@ -59,9 +121,35 @@ 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 (onsi-ginkgo-v1.7.0_GH0.tar.gz) = b6c221fe050cbdbbb1b2e2937a73949dad5aabb94213343a31786a5cd78314f9 -SIZE (onsi-ginkgo-v1.7.0_GH0.tar.gz) = 132975 -SHA256 (russross-blackfriday-067529f716f4_GH0.tar.gz) = 6bb6720e3a15e5e691842c16c130c92233684b468d8e5d41ad46af53c86e4e4b -SIZE (russross-blackfriday-067529f716f4_GH0.tar.gz) = 73867 -SHA256 (square-go-jose-v2.3.1_GH0.tar.gz) = 325bc36d91cc97d724c5c7d107adb7d75c1de32a18e9ff75a3b8341a995c3b6a -SIZE (square-go-jose-v2.3.1_GH0.tar.gz) = 299480 +SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 +SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 +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 (smallstep-certificates-v0.14.2_GH0.tar.gz) = 3d4e93fba5798e3ce6ef45ae2a40a25aa623b84a72f884c7208ee5a1662c8c39 +SIZE (smallstep-certificates-v0.14.2_GH0.tar.gz) = 17540124 +SHA256 (smallstep-cli-v0.14.2_GH0.tar.gz) = bc3732082d6800bf1a60784631bd9f916a04d07bdd25e1775cb564e4776152bc +SIZE (smallstep-cli-v0.14.2_GH0.tar.gz) = 446978 +SHA256 (smallstep-nosql-v0.2.0_GH0.tar.gz) = 368bd3c0beee1f94aa5deb26cc9cffa830ca94939928bc17d7ba8237e5b199a5 +SIZE (smallstep-nosql-v0.2.0_GH0.tar.gz) = 18508 +SHA256 (smallstep-truststore-v0.9.5_GH0.tar.gz) = b6512020f0b976cda76ca505e35ffbe82a38a4a1866cd1a6442750c52fbf5b8a +SIZE (smallstep-truststore-v0.9.5_GH0.tar.gz) = 12755 +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.4.0_GH0.tar.gz) = 3824f79c5f851784032a7800d72f32229ce6617612fab28642c18b5150b52493 +SIZE (square-go-jose-v2.4.0_GH0.tar.gz) = 303589 +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.14.1_GH0.tar.gz) = 6d6a64adc83b084c777f8e6c876eb2953376a92e7099571119185a004d53b1f0 +SIZE (uber-go-zap-v1.14.1_GH0.tar.gz) = 125870 +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.1.28_GH0.tar.gz) = fd00f74f742ed5d6819ed31e84369e24f8f70fa5329d7d0b714c86101686985c +SIZE (yuin-goldmark-v1.1.28_GH0.tar.gz) = 225363 Index: www/caddy/files/Caddyfile.sample.in =================================================================== --- www/caddy/files/Caddyfile.sample.in (nonexistent) +++ www/caddy/files/Caddyfile.sample.in (working copy) @@ -0,0 +1,25 @@ +# The Caddyfile is an easy way to configure your Caddy web server. +# +# Unless the file starts with a global options block, the first +# uncommented line is always the address of your site. +# +# To use your own domain name (with automatic HTTPS), first make +# 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 + +# Set this path to your site's directory. +root * %%WWWDIR%% + +# Enable the static file server. +file_server + +# Another common task is to set up a reverse proxy: +# reverse_proxy localhost:8080 + +# Or serve a PHP site through php-fpm: +# php_fastcgi localhost:9000 + +# Refer to the Caddy docs for more information: +# https://caddyserver.com/docs/caddyfile Property changes on: www/caddy/files/Caddyfile.sample.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/caddy/files/caddy.in =================================================================== --- www/caddy/files/caddy.in (nonexistent) +++ www/caddy/files/caddy.in (working copy) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: caddy +# REQUIRE: LOGIN DAEMON NETWORKING +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# 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 + +. /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" + +load_rc_config $name + +# Defaults +: ${caddy_enable:=NO} +: ${caddy_config:=%%ETCDIR%%/%%CADDY_CONFIG%%} +: ${caddy_adapter:=caddyfile} +: ${caddy_extra_flags:="--watch"} + +command="%%PREFIX%%/bin/${name}" +caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}" + +# Extra Commands +extra_commands="validate reload" +start_cmd="${command} start ${caddy_flags} ${caddy_extra_flags}" +validate_cmd="${command} validate ${caddy_flags}" +reload_cmd="${command} reload ${caddy_flags}" +stop_cmd="${command} stop" +restart_cmd="${stop_cmd} && ${start_cmd}" + +run_rc_command "$1" Property changes on: www/caddy/files/caddy.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/caddy/files/extra-patch-disable-telemetry =================================================================== --- www/caddy/files/extra-patch-disable-telemetry (revision 535863) +++ www/caddy/files/extra-patch-disable-telemetry (nonexistent) @@ -1,8 +0,0 @@ ---- caddy/caddymain/run.go.orig 2019-03-04 19:14:25 UTC -+++ caddy/caddymain/run.go -@@ -598,4 +598,4 @@ var ( - ) - - // EnableTelemetry defines whether telemetry is enabled in Run. --var EnableTelemetry = true -+var EnableTelemetry = false Property changes on: www/caddy/files/extra-patch-disable-telemetry ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: www/caddy/files/pkg-message.in =================================================================== --- www/caddy/files/pkg-message.in (revision 535863) +++ www/caddy/files/pkg-message.in (working copy) @@ -1,53 +1,12 @@ [ { type: install message: <