commit: 7aaec68133b87a2311bdf418cb6aba9477ff87c2
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Mar 2 15:33:45 2025 +0000
Commit: orbea <orbea <AT> riseup <DOT> 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 <orbea <AT> 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 <[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 ) {
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 <[email protected]>
+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 <[email protected]>
+--- 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<unsupported>}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
+
