diff options
| author | Matthew Horan <matt@matthoran.com> | 2025-09-20 19:47:32 +0300 |
|---|---|---|
| committer | Vladimir Druzenko <vvd@FreeBSD.org> | 2025-09-20 19:52:58 +0300 |
| commit | 43eed48b66cc966db284ab1a966b695a65f5cbd7 (patch) | |
| tree | 82bcfccedaa8419173f8611f3bb097393d044c02 | |
| parent | net/liveMedia: Update to 2025.09.17 (diff) | |
security/lego: Update 4.25.2 => 4.26.0
Changelog:
https://github.com/go-acme/lego/blob/v4.26.0/CHANGELOG.md
- Fix using custom user.
- Optimize post-install - reduce MKDIR and INSTALL_SCRIPT calls.
- Fix user parametrization in periodic script.
PR: 289636
Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
| -rw-r--r-- | security/lego/Makefile | 21 | ||||
| -rw-r--r-- | security/lego/distinfo | 10 | ||||
| -rw-r--r-- | security/lego/files/604.lego.in | 2 | ||||
| -rw-r--r-- | security/lego/pkg-plist | 8 |
4 files changed, 21 insertions, 20 deletions
diff --git a/security/lego/Makefile b/security/lego/Makefile index 3dc4af5aefa6..8a6f7b43b848 100644 --- a/security/lego/Makefile +++ b/security/lego/Makefile @@ -1,7 +1,6 @@ PORTNAME= lego DISTVERSIONPREFIX= v -DISTVERSION= 4.25.2 -PORTREVISION= 1 +DISTVERSION= 4.26.0 CATEGORIES= security MAINTAINER= matt@matthoran.com @@ -24,20 +23,22 @@ SUB_LIST= LEGO_USER=${LEGO_USER} \ PORTNAME=${PORTNAME} LEGO_USER?= _lego - +.if ${LEGO_USER} == _lego USERS= ${LEGO_USER} GROUPS= ${LEGO_USER} +.endif +GROUPS+= www +PLIST_SUB= LEGO_USER=${LEGO_USER} PERIODIC_DIRS= etc/periodic/weekly PERIODIC_FILES= 604.lego post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS} - ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES} - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl/lego \ - ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR} -. for d in ${SAMPLE_FILES} - ${INSTALL_SCRIPT} ${WRKDIR}/${d} ${STAGEDIR}${ETCDIR}/${d} -. endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS} \ + ${STAGEDIR}${PREFIX}/etc/ssl/lego \ + ${STAGEDIR}${ETCDIR} \ + ${STAGEDIR}${WWWDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS} + ${INSTALL_SCRIPT} ${SAMPLE_FILES:C|^|${WRKDIR}/|} ${STAGEDIR}${ETCDIR} .include <bsd.port.mk> diff --git a/security/lego/distinfo b/security/lego/distinfo index c7efe10364c1..33c9158bf88b 100644 --- a/security/lego/distinfo +++ b/security/lego/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1754576407 -SHA256 (go/security_lego/lego-v4.25.2/v4.25.2.mod) = d4a62b1d418a18edeb1389150c8d2b6726ce7dd8fb4b4f17958562a5e0136884 -SIZE (go/security_lego/lego-v4.25.2/v4.25.2.mod) = 10758 -SHA256 (go/security_lego/lego-v4.25.2/v4.25.2.zip) = ecf3cd5c1056d13a6a0d7f841834df8492c7a0877d4934cfade0dbdddfc6d551 -SIZE (go/security_lego/lego-v4.25.2/v4.25.2.zip) = 1562189 +TIMESTAMP = 1757982174 +SHA256 (go/security_lego/lego-v4.26.0/v4.26.0.mod) = 7beedcefda490a8f0f99f5057d3da951e2dfebcf325fec1053a247ba7e43d0ef +SIZE (go/security_lego/lego-v4.26.0/v4.26.0.mod) = 10962 +SHA256 (go/security_lego/lego-v4.26.0/v4.26.0.zip) = 3f2287156a729865a5b49d92f6f9890da69fd1d482c164e9f45795334fa37989 +SIZE (go/security_lego/lego-v4.26.0/v4.26.0.zip) = 1600833 diff --git a/security/lego/files/604.lego.in b/security/lego/files/604.lego.in index c2a776f6d1c5..e27d8d07b611 100644 --- a/security/lego/files/604.lego.in +++ b/security/lego/files/604.lego.in @@ -15,7 +15,7 @@ case "$weekly_lego_enable" in echo "Checking Let's Encrypt certificate status:" if [ -x "$weekly_lego_renewscript" ] ; then - echo "$weekly_lego_renewscript" | su -fm _lego || exit 3 + echo "$weekly_lego_renewscript" | su -fm %%LEGO_USER%% || exit 3 fi if [ -n "$weekly_lego_deployscript" ] ; then diff --git a/security/lego/pkg-plist b/security/lego/pkg-plist index 65ad98b95bb8..1aff9aa2f1cf 100644 --- a/security/lego/pkg-plist +++ b/security/lego/pkg-plist @@ -1,8 +1,8 @@ bin/lego etc/periodic/weekly/604.lego -@dir(_lego,_lego,0700) etc/lego +@dir(%%LEGO_USER%%,%%LEGO_USER%%,0700) etc/lego @dir(,,0755) etc/ssl -@dir(_lego,_lego,0755) etc/ssl/lego -@dir(_lego,www,) %%WWWDIR%% -@sample(_lego,_lego,0700) etc/lego/lego.sh.sample +@dir(%%LEGO_USER%%,%%LEGO_USER%%,0755) etc/ssl/lego +@dir(%%LEGO_USER%%,www,) %%WWWDIR%% +@sample(%%LEGO_USER%%,%%LEGO_USER%%,0700) etc/lego/lego.sh.sample @sample etc/lego/deploy.sh.sample |