From nobody Sun Oct 02 09:08:44 2022 X-Original-To: dev-commits-ports-branches@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 4MgJ6h634wz4TygB; Sun, 2 Oct 2022 09:08:44 +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 4MgJ6h5WDRz3b7w; Sun, 2 Oct 2022 09:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664701724; 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=iY/XUXFRxsoHrj4W7f4ikdymHAOhQX5vxY4SsjZBL8g=; b=C6uzoQ/oCutlXksqVfOZhSqmoWBKQo/a+gKM+vi8VysJVT++pqjXVRe+PHcoOqgyOuXXQv ka6GppYueDPaP1K8hKFtGF6uRFHP3JR0jiBmLq7K+DlgB96QUeGmmQeD4+RRujsrCbZkaf S2J0Qm9cHS+aIQxD6YAb8BjtCtcj6u1X4gMBYGjHDFFF0LEyWqrB/FByI/BnoUzbD0R4cR svtL2uczomW7ddw+kYq4pASL3/688hXxi8eQcX09n+XOusemDG3r89/7HFr80y4FjkLxnL rtuBcWX8sIzUYW68QUimloCNrB/rgDLpjYANMP0P9Nye6N+HWiRy2InLiS5pAg== 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 4MgJ6h4WtmzpZx; Sun, 2 Oct 2022 09:08:44 +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 29298ivX007307; Sun, 2 Oct 2022 09:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29298iMl007306; Sun, 2 Oct 2022 09:08:44 GMT (envelope-from git) Date: Sun, 2 Oct 2022 09:08:44 GMT Message-Id: <202210020908.29298iMl007306@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 55ea846ac6a5 - 2022Q4 - security/easy-rsa: sed \s -> [[:space:]] List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 55ea846ac6a5a99865b07472505789b9d8835fc3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664701724; 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=iY/XUXFRxsoHrj4W7f4ikdymHAOhQX5vxY4SsjZBL8g=; b=v4VpNnxYlrpnMe1kKv8PEeBzc/Ott8y4mNrcGd+AeGQUcpwOmgLVRSJH2aWr1GJzwskTQd DfW7ldHH5QkOJDFvzxJ7P39Kroezx/By/WQu62Zi5nnXkWrOCppgz1d5JxyE7bvNnqsE+M rNsxkQrb2wZVbIgjruUiq8M+lCUYDFlpUJgk1ZK6XozQNC2bOzWMuzRjiaXtmdkVjvxQXA YrghPv7c+g1elE3uJGA5JjCcWqCXNm9ud1yY1mez9lQi+PJf0d5NG6BJ+mEoZJCG9BI1xK 519JL5++Fu145C5vmkUuFL4Z97d05u7cyMjuW0GPbmZuJU4l0/ES3J0J1BjjwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664701724; a=rsa-sha256; cv=none; b=WZe2xLVzACXxP4sHj7qP8XR80ehIMj46u6M2XWwHUax4CQuQN5Gb+zjAD7OMOa/BzCh4VK qWbAUK6hxyfDaIqEZrrusJ42grm+VWFsyAjaHbMzSJClzC91oj6us6ZFWFdxaJuKanhI8p qli3nKBSpkBpRX3l0fqjk/M2xtv3KKfeFesHGKJzkcuh2uH8AifnsWHULFkcDClMx/A0k8 AQVNGk6aGZn3g2x9B+ogK2qYQci3dkpDwhccIieRB5H66X3dkp8bBmVOGSyQGDPm2DDHIy oNFyrS3AyOMyt/v9PE8KWpjuABTtonF/MpbSHXl72UsYEZZHn0XV4ZCqo0OkIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=55ea846ac6a5a99865b07472505789b9d8835fc3 commit 55ea846ac6a5a99865b07472505789b9d8835fc3 Author: Matthias Andree AuthorDate: 2022-10-02 09:07:03 +0000 Commit: Matthias Andree CommitDate: 2022-10-02 09:08:40 +0000 security/easy-rsa: sed \s -> [[:space:]] Fix https://github.com/OpenVPN/easy-rsa/issues/714 Patch suggested (needed to be integrated) and Reported by: topical@gmx.net PR: 266726 MFH: 2022Q4 (cherry picked from commit 5d062d5c18a1de48b8c30bf69929e1e3cb37679f) --- security/easy-rsa/Makefile | 4 +--- security/easy-rsa/files/patch-easyrsa | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile index 02cd6237fa37..8a3ff8cf0c9d 100644 --- a/security/easy-rsa/Makefile +++ b/security/easy-rsa/Makefile @@ -1,12 +1,10 @@ PORTNAME= easy-rsa DISTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net-mgmt MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ DISTNAME= EasyRSA-${DISTVERSION} -# Eric F. Crist does not require my -# approval for changes to this package. -- mandree@FreeBSD.org MAINTAINER= mandree@FreeBSD.org COMMENT= Small RSA key management package based on openssl WWW= https://github.com/OpenVPN/easy-rsa diff --git a/security/easy-rsa/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa index c6582845c35b..f839ca4b6015 100644 --- a/security/easy-rsa/files/patch-easyrsa +++ b/security/easy-rsa/files/patch-easyrsa @@ -3,12 +3,30 @@ Filed upstream as Issue #591 --- easyrsa.orig 2022-05-19 01:53:50 UTC +++ easyrsa -@@ -3829,6 +3829,8 @@ VERSION_TEXT +@@ -2037,7 +2037,7 @@ renewable() { + verify_ca_init + + in_dir="$EASYRSA_PKI" +- MATCH=$(echo "$*" | sed -re 's/\s+/|/g') ++ MATCH=$(echo "$*" | sed -re 's/[[:space:]]+/|/g') + DATE=$(date --date \ + "+${EASYRSA_CERT_RENEW} days" \ + +"%y%m%d%H%M%S") +@@ -2445,7 +2445,7 @@ display_san() { + + if echo "$EASYRSA_EXTRA_EXTS" | grep -q subjectAltName; then + print "$(echo "$EASYRSA_EXTRA_EXTS" | grep subjectAltName | +- sed 's/^\s*subjectAltName\s*=\s*//')" ++ sed 's/^[[:space:]]*subjectAltName[[:space:]]*=[[:space:]]*//')" + else + san="$( + x509v3san="X509v3 Subject Alternative Name:" +@@ -3828,6 +3828,8 @@ VERSION_TEXT + NL=' ' - -+LC_TIME=C ; export LC_TIME ; unset LC_ALL + ++LC_TIME=C ; export LC_TIME ; unset LC_ALL + # Be secure with a restrictive umask [ -z "$EASYRSA_NO_UMASK" ] && umask "${EASYRSA_UMASK:-077}" -