Attachment 209947 Details for Bug 242441 – caddy-1.0.4.diff v1.1

[patch] caddy-1.0.4.diff v1.1

caddy-1.0.4.diff (text/plain), 1.70 KB, created by Shawn Wilsher on 2019-12-14 17:15:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Wilsher

Created: 2019-12-14 17:15:39 UTC

Size: 1.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile    (revision 519050)
>+++ 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
>@@ -17,7 +16,7 @@
>
> USES=          go
> USE_GITHUB=    yes
>-GH_ACCOUNT=    mholt
>+GH_ACCOUNT=    caddyserver
>
> GO_PKGNAME=    github.com/${GH_ACCOUNT}/${PORTNAME}
> GO_TARGET=     ./caddy
>@@ -30,6 +29,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: distinfo
>===================================================================
>--- distinfo    (revision 519050)
>+++ distinfo    (working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1554061971
>-SHA256 (mholt-caddy-v0.11.5_GH0.tar.gz) = ab2dc210bc7089fa7d041e702663e592b480945aa99f14b348090091103b7ec5
>-SIZE (mholt-caddy-v0.11.5_GH0.tar.gz) = 5794844
>+TIMESTAMP = 1575504116
>+SHA256 (caddyserver-caddy-v1.0.4_GH0.tar.gz) = bf81245d2b347c89a8e8aa358a224b722d55cb6e1c266bbdffbe6acc54d130a5
>+SIZE (caddyserver-caddy-v1.0.4_GH0.tar.gz) = 394038

Actions: View | Diff

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