From nobody Sat Oct 15 08:21:23 2022 X-Original-To: dev-commits-ports-all@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 4MqGS41P67z4V7bL; Sat, 15 Oct 2022 08:21:24 +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 4MqGS40rd1z3J0B; Sat, 15 Oct 2022 08:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665822084; 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=INKIiDW3eL+1YTstcZJ09Jf6/RgyLw3vCmdmm6uskuY=; b=MLAsyylCz4ljQ7eQvgqp9l+wSmqjR71O/CNDmU7Uebo9u9v1KpHy8FwaSn/xaQEDrs14Vy uce4hYDIM7U7SNbKGxP6xiRUIqD440JiSCwK1AOPP9qdOH3WU3hE+od5soJBFblmFFyQm7 svVGeKSx+HRr4AGh82fEW/KFpVrgOgiT/z2MTenI84pgRfei1NLRhYiJNawCKgqrw8//Ed h9Gq0jKldDeJFWaTQRGHpvThTvue6ydM3/5rJB0OfC+Mrj0qy18wTk5qhBIifR+4C1+jT3 QjaVZDs79JJBWyGUsVURb8cNt+ba8q1AhXYza8V1wIKJaY99CwePx7mSpfH9UQ== 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 4MqGS373q4z13nk; Sat, 15 Oct 2022 08:21:23 +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 29F8LNj7062012; Sat, 15 Oct 2022 08:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29F8LNF8062011; Sat, 15 Oct 2022 08:21:23 GMT (envelope-from git) Date: Sat, 15 Oct 2022 08:21:23 GMT Message-Id: <202210150821.29F8LNF8062011@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: 22ecf341139a - main - security/easy-rsa: update to v3.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 22ecf341139a2015b94b6e1a8da15239e5119732 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665822084; 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=INKIiDW3eL+1YTstcZJ09Jf6/RgyLw3vCmdmm6uskuY=; b=kwmffG+Tzh/nBjYDe7lgbSfRUe4VINLdf9JBjQEhKRgyBLgD8qNVd8iihl51eVAJ5tIwdO 85NI5YOW2v1ZJ3IUIrSVEVUYdbU5QCwvgaaM1oVrxRPU0gFn8m0aO8Wd9ubyEKuG4fYG1W lQE2xAIdswfMCjn1/uRTzVFroumnMcgv97asryUYG/3rSmrbAfSXReB2Z4lTDXJupFkGc9 09Lyk8ollil9JS0jQjW+id+LEw2yHSbZGqRe5+6/dnj3YoF90xehyIZU3L7gEt2iJ2JWFa irkBAU82jQbnJP9Wdstq6qrgJYv660PM0QvjFo9m0zecNu66hJ4KozSjAt+u5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665822084; a=rsa-sha256; cv=none; b=Vzh5WaK7i0v64AknJUYrkc6gX3KXiUj8vMgz+p0lD/MSFg3DNjyXQpxIz3WixZaB/BYkxQ 7hxnj3W3hZd8j0+8fnT+neBoQfGQ3kng321sJwDUUmuKIJPaLbcYqfKrTUKMzS++18cdWZ CVi+Sx8xGEQ4DSGaLLjOZFk6ckwt0ZFwXXel7qOdxq1DTeN0wynrW0N6UAUvj5EzKxCCnQ 3aVpGsRYElLHsIdqaiJeiVhXCNYPDMSocyN/QhPLW48n2ZWj1fiOYEYcPrzLU8SGPsjCYG iMvXEpEzJlV7IY+yn+/t6MwwEctHJoqm/sV5mh5wnI+l5gwuTnPQmj+DvVHzUA== 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=22ecf341139a2015b94b6e1a8da15239e5119732 commit 22ecf341139a2015b94b6e1a8da15239e5119732 Author: Matthias Andree AuthorDate: 2022-10-15 08:19:26 +0000 Commit: Matthias Andree CommitDate: 2022-10-15 08:21:21 +0000 security/easy-rsa: update to v3.1.1 Changelog: https://github.com/OpenVPN/easy-rsa/releases/tag/v3.1.1 Detailed: https://github.com/OpenVPN/easy-rsa/compare/v3.1.0...v3.1.1 also fixes PR: 266727 Reported by: topical@gmx.net --- security/easy-rsa/Makefile | 6 ++--- security/easy-rsa/distinfo | 6 ++--- security/easy-rsa/files/patch-easyrsa | 41 ++++++++++------------------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile index 8a3ff8cf0c9d..52c2ec6782b2 100644 --- a/security/easy-rsa/Makefile +++ b/security/easy-rsa/Makefile @@ -1,8 +1,8 @@ PORTNAME= easy-rsa -DISTVERSION= 3.1.0 -PORTREVISION= 3 +DISTVERSION= 3.1.1 CATEGORIES= security net-mgmt -MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ +MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ \ + LOCAL/mandree/ DISTNAME= EasyRSA-${DISTVERSION} MAINTAINER= mandree@FreeBSD.org diff --git a/security/easy-rsa/distinfo b/security/easy-rsa/distinfo index 7d8559944507..196b1bb67416 100644 --- a/security/easy-rsa/distinfo +++ b/security/easy-rsa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653138476 -SHA256 (EasyRSA-3.1.0.tgz) = 01b07ecb58dc003e47d4e74f9fc4da35ec6842e96cd003d66ed72a43df983659 -SIZE (EasyRSA-3.1.0.tgz) = 61255 +TIMESTAMP = 1665821482 +SHA256 (EasyRSA-3.1.1.tgz) = 779d425cacf1de56262b7a7ed6b90b36e614ce9273f08ad7b86992740cb3b2a5 +SIZE (EasyRSA-3.1.1.tgz) = 68434 diff --git a/security/easy-rsa/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa index f839ca4b6015..c0141db47a8d 100644 --- a/security/easy-rsa/files/patch-easyrsa +++ b/security/easy-rsa/files/patch-easyrsa @@ -1,32 +1,13 @@ -Isolate date -j -f ... + ... from locale. -Filed upstream as Issue #591 +workaround to fix https://github.com/OpenVPN/easy-rsa/issues/725 ---- easyrsa.orig 2022-05-19 01:53:50 UTC +--- easyrsa.orig 2022-10-13 11:37:48 UTC +++ easyrsa -@@ -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 - - # Be secure with a restrictive umask - [ -z "$EASYRSA_NO_UMASK" ] && umask "${EASYRSA_UMASK:-077}" +@@ -1317,7 +1317,7 @@ Missing X509-type 'COMMON'" + + # Check for insert-marker in ssl config file + if ! grep -q '^#%CA_X509_TYPES_EXTRA_EXTS%' "$EASYRSA_SSL_CONF"; then +- die "\ ++ warn "\ + The copy of openssl-easyrsa.cnf in use does not support X509-type 'ca'. + * $EASYRSA_SSL_CONF + Please update openssl-easyrsa.cnf to the latest official release."