mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

security/easy-rsa: fix EASYRSA override and locale

Browse Source 
* 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
This commit is contained in:
Matthias Andree 2022-06-05 14:55:34 +02:00
parent 54340b37ac
commit 32877d0369
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/easy-rsa/Makefile
View File

@ -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/)

4
security/easy-rsa/files/easyrsa.in
View File

@ -1,4 +0,0 @@
#! /bin/sh
: ${EASYRSA:="%%PREFIX%%/share/easy-rsa"}
export EASYRSA
exec "%%PREFIX%%/share/easy-rsa/easyrsa.real" "$@"

14
security/easy-rsa/files/patch-easyrsa Normal file
View File

@ -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}"

1
security/easy-rsa/pkg-plist
View File

@ -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