From nobody Sun Jun 05 12:57:33 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 25EA71BD93E8; Sun, 5 Jun 2022 12:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LGGqd6ffVz3q0b; Sun, 5 Jun 2022 12:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654433853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yK4ysEA7RwSWkzrwVsRFq2gNY6nXoTZWqUXor2iFWU=; b=vkop3GrAWb5K1PZtT2frkX9xlIv16c45XDxn9Q7CeunyvZ/HKr0QBjFwqVKIxpZfn3CpKt a9fojcrKLB207denOlpAW01WAR8QOkT8gKgFVsJ2ank9bH3NvwsHCV4DyWbIB7Kb7xSZuz cCsF6V5CKs1HlueVvG4iPbd22Y4iXLJCQGk2hn9LYPi4DTrtkmFjsjquB6oME6WMkPwWvc LXDppoD6c3BOqbAEET8mOfn/kVuxo5gQBFGuJPBHL/DTzLWbCT+IoQj3wxuo9u2TnxdAvk 4daVFzkwBsVRd2TKQkNQoVwwUIQbiAnAPWsXC1WSOcGDjHxsvr1gOePOtgi+Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A84FC12669; Sun, 5 Jun 2022 12:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 255CvXMK007093; Sun, 5 Jun 2022 12:57:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 255CvX1N007092; Sun, 5 Jun 2022 12:57:33 GMT (envelope-from git) Date: Sun, 5 Jun 2022 12:57:33 GMT Message-Id: <202206051257.255CvX1N007092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 32877d0369a1 - main - security/easy-rsa: fix EASYRSA override and locale List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654433853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yK4ysEA7RwSWkzrwVsRFq2gNY6nXoTZWqUXor2iFWU=; b=NdXe084cJ8OoPZ4s3sFlEUphQ6651ZKfPXZtL6QDGgO7QLp9/NUA7UTULHazLTTn+NJ9Ju tw01Ncnii7u3IcsrzOAtooi/tbuVJ87/TYILExP/r9cwTTvb2JtjB1zG/G8xCqtyBE5xhh I375Ut00NBrWfUY566MvTlwXLyLRRr2VWE9RthrevBakRKM7rOGl+46/OIBqvamdEnrKYy JWWvgPC6FZLOc3Tp11/9dSmNKbbf/l71aGJf9GL77IihJO4cD7DHIzikbzllPjX7JaWfg2 /8zIZfKu7x/B4lEmYRcwIxUhd+gYm+o1JDaq1GpZzV7n37t/KpxPYpXIHip4Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654433853; a=rsa-sha256; cv=none; b=P0lmq2GIN7FpAf6XPSyhaqzbZNdVQrVRAahalVQBuB8CD4q48P670y8lNOHYejli6nZGtT gxcvsSKCN/rImU5ikB5JddAcfd8yI7rbHHOWEpWeAZEzPLyHLqDXNRH+4VOmOb6kK6DmyZ rFmNUY69xhtZuCWmKOBhveV2v0pdpf/nTZE+3+8f13nHryTwavjeZMAKtClJz7flKN3JSD GRShJjVZs0Lxb1+zg5mp0QbtIpuYOxxgYPoGluf4MgNHGq05x1iPHHIIpi9bIvi4LqR5wy qpxGgqBCGGhmLXzz0BTcHpBIyC+yHOF7mmmyIUL2DIGlTIxNW4hP8/T5ocbjLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b commit 32877d0369a1bf4ac1cbd0a6c11ac3347bb5653b Author: Matthias Andree AuthorDate: 2022-06-05 12:55:34 +0000 Commit: Matthias Andree CommitDate: 2022-06-05 12:57:25 +0000 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 --- security/easy-rsa/Makefile | 7 ++----- security/easy-rsa/files/easyrsa.in | 4 ---- security/easy-rsa/files/patch-easyrsa | 14 ++++++++++++++ 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 + +--- 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