From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77EEE1582EF for ; Sun, 02 Mar 2025 15:37:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 600F734305D for ; Sun, 02 Mar 2025 15:37:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6034A1102D0; Sun, 02 Mar 2025 15:37:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 54F7F1102D0 for ; Sun, 02 Mar 2025 15:37:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EED4834305D for ; Sun, 02 Mar 2025 15:37:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8465116DF for ; Sun, 02 Mar 2025 15:37:04 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1740929625.7aaec68133b87a2311bdf418cb6aba9477ff87c2.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests.patch X-VCS-Directories: dev-perl/Net-SSLeay/ dev-perl/Net-SSLeay/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 7aaec68133b87a2311bdf418cb6aba9477ff87c2 X-VCS-Branch: master Date: Sun, 02 Mar 2025 15:37:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5dcbcbbe-3023-4907-b84b-bfc4d0c00a3b X-Archives-Hash: 63a031d728dacc404b2f3a0f794abf28 commit: 7aaec68133b87a2311bdf418cb6aba9477ff87c2 Author: orbea riseup net> AuthorDate: Sun Mar 2 15:33:45 2025 +0000 Commit: orbea riseup net> CommitDate: Sun Mar 2 15:33:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7aaec681 dev-perl/Net-SSLeay: add 1.940.0-r1, drop 1.940.0 Signed-off-by: orbea riseup.net> ...1.940.0.ebuild => Net-SSLeay-1.940.0-r1.ebuild} | 9 +++--- ...Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch | 36 ++++++++++++++++++++++ .../Net-SSLeay-1.940.0-openssl-3.4-tests.patch | 29 +++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild similarity index 86% rename from dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild rename to dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild index eec5700..9da7e99 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,31 +17,30 @@ IUSE="minimal examples" RDEPEND=" dev-libs/openssl:= - virtual/perl-MIME-Base64 " DEPEND="${RDEPEND}" BDEPEND=" ${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - virtual/perl-File-Spec test? ( !minimal? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-NoWarnings ) - virtual/perl-Test-Simple ) " PATCHES=( "${FILESDIR}/${PN}-1.88-fix-network-tests.patch" "${FILESDIR}/${PN}-1.940.0-avoid-runtime-check.patch" + "${FILESDIR}/${PN}-1.940.0-openssl-3.4-tests.patch" + "${FILESDIR}/${PN}-1.940.0-openssl-3.4-tests-more.patch" "${FILESDIR}/${PN}-1.94-libressl.patch" #903001 ) PERL_RM_FILES=( # Author tests + # https://github.com/radiator-software/p5-net-ssleay/pull/393 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t' diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch new file mode 100644 index 0000000..f36ba6f --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/949707 +https://github.com/radiator-software/p5-net-ssleay/issues/513 +https://github.com/sebastianas/p5-net-ssleay/commit/800a8c1ea63ef9edd145e7b334c64a7d8f1ef1a7 +(https://github.com/radiator-software/p5-net-ssleay/pull/514) + +From 800a8c1ea63ef9edd145e7b334c64a7d8f1ef1a7 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Tue, 18 Feb 2025 18:57:15 +0100 +Subject: [PATCH] tests: Address another formatting difference in OpenSSL 3.4.1 + +Since OpenSSL 3.4.1, commit 8a28bca8ee08 ("x509: add a newline after +printing Full Name") to be exact, there is another new line change. + +Adapt the testsuite. + +Fixes: #513 + +Signed-off-by: Sebastian Andrzej Siewior +--- + t/local/32_x509_get_cert_info.t | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t +index 0fd1b68..08316bf 100644 +--- a/t/local/32_x509_get_cert_info.t ++++ b/t/local/32_x509_get_cert_info.t +@@ -218,6 +218,9 @@ for my $f (keys (%$dump)) { + # OpenSSL 1.0.0 to 1.1.1: + $ext_data =~ s{(Full Name:\n )}{\n$1}g; + $ext_data .= "\n"; ++ } elsif ( Net::SSLeay::SSLeay > 0x3040000f ) { ++ $ext_data =~ s{(\nFull Name:)}{\n$1}g; ++ $ext_data .= "\n"; + } + } + elsif ( $nid == 126 ) { diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests.patch new file mode 100644 index 0000000..ca20b5e --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.940.0-openssl-3.4-tests.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/949707 +https://github.com/radiator-software/p5-net-ssleay/issues/493 +https://github.com/radiator-software/p5-net-ssleay/issues/494 +https://github.com/radiator-software/p5-net-ssleay/issues/511 +https://github.com/radiator-software/p5-net-ssleay/pull/487 + +From e73cf1139a6651a968828d1634be8fec5beb50ba Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Wed, 16 Oct 2024 21:48:51 +0200 +Subject: [PATCH] test: 32_x509_get_cert_info allow single colon. + +Starting with 3.4.0 the double colon in emailAddress has been removed. +Adapt the test to allow a single colon in 3.4.0 and later. + +Signed-off-by: Sebastian Andrzej Siewior +--- a/t/local/32_x509_get_cert_info.t ++++ b/t/local/32_x509_get_cert_info.t +@@ -188,6 +188,10 @@ for my $f (keys (%$dump)) { + ) { + $ext_data =~ s{(othername:) [^, ]+}{$1}g; + } ++ # Starting with 3.4.0 the double colon in emailAddress has been removed. ++ if (Net::SSLeay::SSLeay >= 0x30400000) { ++ $ext_data =~ s{emailAddress::}{emailAddress:}; ++ } + } + elsif ( $nid == 89 ) { + # The output formatting for certificate policies has a +