Attachment 210417 Details for Bug 242441 – caddy-1.0.4.diff v2

[patch] caddy-1.0.4.diff v2

caddy-1.0.4.patch (text/plain), 9.38 KB, created by Dmitri Goutnik on 2020-01-03 13:40:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2020-01-03 13:40:39 UTC

Size: 9.38 KB

patch

obsolete

>Index: www/caddy/Makefile
>===================================================================
>--- www/caddy/Makefile	(revision 521933)
>+++ www/caddy/Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	caddy
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.11.5
>-PORTREVISION=	2
>+DISTVERSION=	1.0.4
> CATEGORIES=	www
> 
> MAINTAINER=	fabian.freyer@physik.tu-berlin.de
>@@ -15,11 +14,44 @@
> 
> RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
> 
>-USES=		go
>+USES=		go:modules
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	mholt
>+GH_TUPLE=	\
>+		cenkalti:backoff:v3.0.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff/v3 \
>+		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 \
>+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
>+		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 \
>+		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 \
>+		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
> 
>-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
> GO_TARGET=	./caddy
> 
> SUB_FILES=	pkg-message
>@@ -30,6 +62,12 @@
> 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}
>Index: www/caddy/distinfo
>===================================================================
>--- www/caddy/distinfo	(revision 521933)
>+++ www/caddy/distinfo	(working copy)
>@@ -1,3 +1,67 @@
>-TIMESTAMP = 1554061971
>-SHA256 (mholt-caddy-v0.11.5_GH0.tar.gz) = ab2dc210bc7089fa7d041e702663e592b480945aa99f14b348090091103b7ec5
>-SIZE (mholt-caddy-v0.11.5_GH0.tar.gz) = 5794844
>+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
>+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 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
>+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
>+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 (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 (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 (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

Flags:

dmgk: maintainer-approval?

Actions: View | Diff

Attachments on bug 242441: 209710 | 209947 | 209988 | 210417