diff --git a/SOURCES/Net-SSLeay-1.94-openssl3.4.0-tests-fix.patch b/SOURCES/Net-SSLeay-1.94-openssl3.4.0-tests-fix.patch new file mode 100644 index 0000000..f19353e --- /dev/null +++ b/SOURCES/Net-SSLeay-1.94-openssl3.4.0-tests-fix.patch @@ -0,0 +1,25 @@ +diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t +index 0f7e2d5..08316bf 100644 +--- 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 +@@ -214,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/SPECS/perl-Net-SSLeay.spec b/SPECS/perl-Net-SSLeay.spec index e0405b9..30d1eac 100644 --- a/SPECS/perl-Net-SSLeay.spec +++ b/SPECS/perl-Net-SSLeay.spec @@ -6,13 +6,14 @@ Name: perl-Net-SSLeay Version: 1.94 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Perl extension for using OpenSSL License: Artistic-2.0 URL: https://metacpan.org/release/Net-SSLeay Source0: https://cpan.metacpan.org/modules/by-module/Net/Net-SSLeay-%{version}.tar.gz Patch1: Net-SSLeay-1.90-pkgconfig.patch Patch2: Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch +Patch3: Net-SSLeay-1.94-openssl3.4.0-tests-fix.patch # =========== Module Build =========================== BuildRequires: coreutils BuildRequires: findutils @@ -107,6 +108,10 @@ with "%{_libexecdir}/%{name}/test". # Disable TLS1 and TLS1_1 from tests %patch -P2 -p1 +# Fix test suite to work with OpenSSL 3.4.0 and newer +# https://github.com/radiator-software/p5-net-ssleay/pull/520 +%patch -P3 -p1 + # Fix permissions in examples to avoid bogus doc-file dependencies chmod -c 644 examples/* @@ -147,7 +152,6 @@ cd %{_libexecdir}/%{name} && exec prove -I . -r -j "$(getconf _NPROCESSORS_ONLN) EOF chmod +x %{buildroot}%{_libexecdir}/%{name}/test - %check unset RELEASE_TESTING OPENSSL_ENABLE_SHA1_SIGNATURES=1 make test @@ -167,6 +171,13 @@ OPENSSL_ENABLE_SHA1_SIGNATURES=1 make test %{_libexecdir}/%{name} %changelog +* Mon May 26 2025 Jitka Plesnikova - 1.94-3 +- Resolves: RHEL-92846 - Fix typo in macro + +* Thu May 22 2025 Jitka Plesnikova - 1.94-2 +- Fix test suite to work with OpenSSL 3.4.0 and newer + Resolves: RHEL-92846 + * Mon Jun 17 2024 Jitka Plesnikova - 1.94-1 - Resolves: RHEL-40758 - Update to 1.94