commit: bf0d3297f2fb4aeef7eefd611562b55edc44ac7d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 2 13:17:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 2 13:17:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0d3297
dev-perl/Net-SSLeay: fix remaining test failure w/ openssl-3.4(.1) Closes: https://bugs.gentoo.org/949707 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild | 1 + ...Net-SSLeay-1.940.0-openssl-3.4-tests-more.patch | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild index 9754787a3915..161d9e265aed 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild @@ -38,6 +38,7 @@ 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" ) PERL_RM_FILES=( 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 000000000000..f36ba6f073ca --- /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 <[email protected]> +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 <[email protected]> +--- + 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 ) {
