diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2022-06-05 12:55:34 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2022-06-05 12:57:25 +0000 |
| commit | 32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b (patch) | |
| tree | c11d39c0979075c90d05c9e13683318d2443cff5 | |
| parent | 54340b37ac37706b3c6e094511a480d08cf4dca4 (diff) | |
| download | ports-32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b.tar.gz ports-32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b.zip | |
security/easy-rsa: fix EASYRSA override and locale
* remove our own wrapper, overriding the EASYRSA folder is no
longer working since 3.1.0.
* patch EasyRSA to unset LC_ALL and override LC_TIME, to avoid
date command failures
* bump PORTREVISION=2
see comment #7 ff. of
PR: 264415
| -rw-r--r-- | security/easy-rsa/Makefile | 7 | ||||
| -rw-r--r-- | security/easy-rsa/files/easyrsa.in | 4 | ||||
| -rw-r--r-- | security/easy-rsa/files/patch-easyrsa | 14 | ||||
| -rw-r--r-- | security/easy-rsa/pkg-plist | 1 |
4 files changed, 16 insertions, 10 deletions
diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile index 7cbe849e9b68..feadd55a966a 100644 --- a/security/easy-rsa/Makefile +++ b/security/easy-rsa/Makefile @@ -1,6 +1,6 @@ PORTNAME= easy-rsa DISTVERSION= 3.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-mgmt MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ DISTNAME= EasyRSA-${DISTVERSION} @@ -28,14 +28,11 @@ _pd_files= ChangeLog COPYING.md README.md README.quickstart.md mktemp.txt _pd_dirs= doc/ PORTDOCS= ${_pd_files} ${_pd_dirs} -SUB_FILES= easyrsa - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/ - ${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${PREFIX}/bin/ ${LN} -fh ${STAGEDIR}${PREFIX}/bin/easyrsa ${STAGEDIR}${PREFIX}/bin/easy-rsa - ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real ${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/openssl-easyrsa.cnf ${STAGEDIR}${DATADIR}/openssl-easyrsa.cnf.example (cd ${WRKSRC}/x509-types/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/x509-types/) diff --git a/security/easy-rsa/files/easyrsa.in b/security/easy-rsa/files/easyrsa.in deleted file mode 100644 index f70f2e490a24..000000000000 --- a/security/easy-rsa/files/easyrsa.in +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -: ${EASYRSA:="%%PREFIX%%/share/easy-rsa"} -export EASYRSA -exec "%%PREFIX%%/share/easy-rsa/easyrsa.real" "$@" diff --git a/security/easy-rsa/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa new file mode 100644 index 000000000000..c6582845c35b --- /dev/null +++ b/security/easy-rsa/files/patch-easyrsa @@ -0,0 +1,14 @@ +Isolate date -j -f ... + ... from locale. +Filed upstream as Issue #591 <https://github.com/OpenVPN/easy-rsa/issues/591> + +--- easyrsa.orig 2022-05-19 01:53:50 UTC ++++ easyrsa +@@ -3829,6 +3829,8 @@ VERSION_TEXT + NL=' + ' + ++LC_TIME=C ; export LC_TIME ; unset LC_ALL ++ + # Be secure with a restrictive umask + [ -z "$EASYRSA_NO_UMASK" ] && umask "${EASYRSA_UMASK:-077}" + diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist index af2c06e18188..ac7f3222a0b9 100644 --- a/security/easy-rsa/pkg-plist +++ b/security/easy-rsa/pkg-plist @@ -1,5 +1,4 @@ bin/easyrsa bin/easy-rsa -%%DATADIR%%/easyrsa.real @sample %%DATADIR%%/openssl-easyrsa.cnf.example %%DATADIR%%/openssl-easyrsa.cnf %%DATADIR%%/vars.example |