.gitignore

@@ -1 +1 @@
-SOURCES/Net-SSLeay-1.92.tar.gz
+SOURCES/Net-SSLeay-1.88.tar.gz

.perl-Net-SSLeay.metadata

@@ -1 +1 @@
-03daf8b342ea57a9b1eef0689275ec99e5008e21 SOURCES/Net-SSLeay-1.92.tar.gz
+ab4a63502433b91b9a54504475d9df2ae2887714 SOURCES/Net-SSLeay-1.88.tar.gz

SOURCES/Net-SSLeay-1.88-pkgconfig.patch

@@ -0,0 +1,45 @@
+From 67d9ad2238c6b58ea160df731208cc6f50b64e96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 13 Jun 2019 13:14:26 +0200
+Subject: [PATCH] pkgconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Link to OpenSSL library according to pkgconfig output if available.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 31d9c74..6d7ceba 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -200,11 +200,17 @@ EOM
+         @{ $opts->{lib_links} } = map { $_ =~ s/32\b//g } @{ $opts->{lib_links} } if $Config{use64bitall};
+     }
+     else {
+-        push @{ $opts->{lib_links} },
+-             ($rsaref
+-              ? qw( ssl crypto RSAglue rsaref z )
+-              : qw( ssl crypto z )
+-             );
++        my $libsflags = `pkg-config --libs-only-l openssl`;
++        if ( $libsflags ne '' ) {
++            push @{ $opts->{lib_links} }, map { s/^-l//; $_ } split(' ', $libsflags);
++        }
++        else {
++            push @{ $opts->{lib_links} },
++                 ($rsaref
++                  ? qw( ssl crypto RSAglue rsaref z )
++                  : qw( ssl crypto z )
++                 );
++        }
+ 
+         if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
+             print "*** Enabling HPUX aCC options (+e)\n";
+-- 
+2.20.1
+

SOURCES/Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch

@@ -1,37 +0,0 @@
-diff -ru Net-SSLeay-1.90.orig/t/local/44_sess.t Net-SSLeay-1.90/t/local/44_sess.t
---- Net-SSLeay-1.90.orig/t/local/44_sess.t	2020-12-12 14:55:23.000000000 +0100
-+++ Net-SSLeay-1.90/t/local/44_sess.t	2021-06-04 18:50:09.733150048 +0200
-@@ -13,13 +13,13 @@
- if (not can_fork()) {
-     plan skip_all => "fork() not supported on this system";
- } else {
--    plan tests => 58;
-+    plan tests => 34;
- }
- 
- initialise_libssl();
- 
- my @rounds = qw(
--    TLSv1 TLSv1.1 TLSv1.2 TLSv1.3 TLSv1.3-num-tickets-ssl
-+    TLSv1.2 TLSv1.3 TLSv1.3-num-tickets-ssl
-     TLSv1.3-num-tickets-ctx-6 TLSv1.3-num-tickets-ctx-0
- );
- 
-diff -ru Net-SSLeay-1.90.orig/t/local/45_exporter.t Net-SSLeay-1.90/t/local/45_exporter.t
---- Net-SSLeay-1.90.orig/t/local/45_exporter.t	2020-12-12 14:55:23.000000000 +0100
-+++ Net-SSLeay-1.90/t/local/45_exporter.t	2021-06-04 18:50:13.931192784 +0200
-@@ -15,12 +15,12 @@
- } elsif (!defined &Net::SSLeay::export_keying_material) {
-     plan skip_all => "No export_keying_material()";
- } else {
--    plan tests => 36;
-+    plan tests => 18;
- }
- 
- initialise_libssl();
- 
--my @rounds = qw( TLSv1 TLSv1.1 TLSv1.2 TLSv1.3 );
-+my @rounds = qw( TLSv1.2 TLSv1.3 );
- 
- my %usable =
-     map {

SOURCES/Net-SSLeay-1.90-pkgconfig.patch

@@ -1,16 +0,0 @@
---- Makefile.PL
-+++ Makefile.PL
-@@ -209,7 +209,12 @@ EOM
-         @{ $opts->{lib_links} } = map { $_ =~ s/32\b//g } @{ $opts->{lib_links} } if $Config{use64bitall};
-     }
-     else {
--        push @{ $opts->{lib_links} }, qw( ssl crypto z );
-+        if ( eval { require ExtUtils::PkgConfig; ExtUtils::PkgConfig->VERSION('1.16') } && ExtUtils::PkgConfig->exists('openssl') ) {
-+            push @{ $opts->{lib_links} }, map { s/^-l//; $_ } split(' ', ExtUtils::PkgConfig->libs_only_l('openssl'));
-+        }
-+        else {
-+             push @{ $opts->{lib_links} }, qw( ssl crypto z );
-+        }
- 
-         if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
-             print "*** Enabling HPUX aCC options (+e)\n";

SPECS/perl-Net-SSLeay.spec

@@ -4,15 +4,18 @@
 %{bcond_with perl_Net_SSLeay_enables_optional_test}
 %endif
 
+# Provides/Requires filtering is different from rpm 4.9 onwards
+%global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e' 2>/dev/null || echo 0)
+
 Name:		perl-Net-SSLeay
-Version:	1.92
+Version:	1.88
-Release:	2%{?dist}
+Release:	1%{?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
+# To prevent from linking to zlib
-Patch2:		Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch
+Patch1:		Net-SSLeay-1.88-pkgconfig.patch
 # =========== Module Build ===========================
 BuildRequires:	coreutils
 BuildRequires:	findutils
@@ -23,18 +26,13 @@ BuildRequires:	openssl-devel
 BuildRequires:	perl-devel
 BuildRequires:	perl-generators
 BuildRequires:	perl-interpreter
-BuildRequires:	perl(constant)
 BuildRequires:	perl(Cwd)
-BuildRequires:	perl(English)
+BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.76
-BuildRequires:	perl(ExtUtils::PkgConfig)
 BuildRequires:	perl(ExtUtils::MM)
 BuildRequires:	perl(File::Basename)
 BuildRequires:	perl(File::Path)
-BuildRequires:	perl(File::Spec::Functions)
 BuildRequires:	perl(Symbol)
-BuildRequires:	perl(Text::Wrap)
+BuildRequires:	pkgconf-pkg-config
-BuildRequires:	perl(utf8)
 # =========== Module Runtime =========================
 BuildRequires:	perl(AutoLoader)
 BuildRequires:	perl(Carp)
@@ -45,14 +43,12 @@ BuildRequires:	perl(XSLoader)
 # =========== Test Suite =============================
 BuildRequires:	perl(Config)
 BuildRequires:	perl(File::Spec)
-BuildRequires:	perl(FindBin)
 BuildRequires:	perl(HTTP::Tiny)
 BuildRequires:	perl(IO::Handle)
 BuildRequires:	perl(IO::Socket::INET)
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Storable)
 BuildRequires:	perl(strict)
-BuildRequires:	perl(Test::Builder)
 BuildRequires:	perl(Test::More) >= 0.61
 BuildRequires:	perl(threads)
 BuildRequires:	perl(warnings)
@@ -85,25 +81,27 @@ so you can write servers or clients for more complicated applications.
 
 # Get libraries to link against from pkg-config
 # https://github.com/radiator-software/p5-net-ssleay/pull/127
-%patch1
+%patch1 -p1
-
-# Disable TLS1 and TLS1_1 from tests
-%patch2 -p1
 
 # Fix permissions in examples to avoid bogus doc-file dependencies
 chmod -c 644 examples/*
 
+# Remove redundant unversioned provide if we don't have rpm 4.9 or later
+%if ! %{rpm49}
+%global provfilt /bin/sh -c "%{__perl_provides} | grep -Fvx 'perl(Net::SSLeay)'"
+%global __perl_provides %{provfilt}
+%endif
+
 %build
 unset OPENSSL_PREFIX
 PERL_MM_USE_DEFAULT=1 perl Makefile.PL \
 	INSTALLDIRS=vendor \
-	NO_PACKLIST=1 \
-	NO_PERLLOCAL=1 \
 	OPTIMIZE="%{optflags}" </dev/null
-%{make_build}
+make %{?_smp_mflags}
 
 %install
-%{make_install}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
 find %{buildroot} -type f -name '*.bs' -empty -delete
 %{_fixperms} -c %{buildroot}
 
@@ -112,10 +110,14 @@ rm -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
 
 %check
 unset RELEASE_TESTING
-OPENSSL_ENABLE_SHA1_SIGNATURES=1 make test
+make test
 
 %files
+%if 0%{?_licensedir:1}
 %license LICENSE
+%else
+%doc LICENSE
+%endif
 %doc Changes CONTRIBUTING.md Credits QuickRef README examples/
 %{perl_vendorarch}/auto/Net/
 %dir %{perl_vendorarch}/Net/
@@ -126,150 +128,34 @@ OPENSSL_ENABLE_SHA1_SIGNATURES=1 make test
 %{_mandir}/man3/Net::SSLeay::Handle.3*
 
 %changelog
-* Wed Jul 27 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.92-2
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.88-1
-- Enable using SHA1 for tests
+- Rebuilt for MSVSphere 8.8
-- Resolves: rhbz#2107670
-
-* Wed Jan 26 2022 Michal Josef Špaček <mspacek@redhat.com> - 1.92-1
-- Update to 1.92
-
-* Wed Aug 11 2021 Michal Josef Špaček <mspacek@redhat.com> - 1.90-8
-- Fix tests for openssl 3.0.0-beta2. rhbz#1992571
-  - Add another fix for t/05_passwd_cb.t, because change in passphrase caching
-- Remove XXX in spec file
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.90-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 23 2021 Michal Josef Špaček <mspacek@redhat.com> - 1.90-6
-- Fix tests for openssl 3.0.0-beta1. rhbz#1964854
-  - Add fix for t/05_passwd_cb.t
-  - Update Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch to accept beta version
-- Fix tab vs space in spec file
-- Update Net-SSLeay-1.90-openssl3.0.0-39_pkcs12.patch patch to upstream version
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.90-5
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Jun 04 2021 Michal Josef Špaček <mspacek@redhat.com> - 1.90-4
-- Fix tests for openssl 3.0.0-alpha16. rhbz#1964854
-  - Fix check across alpha1 vs alpha17
-  - Change default alg for PEM_get_string_PrivateKey()
-  - Different order in CA chain in some versions
-  - Changed API of CTX_set_ciphersuites() and set_ciphersuites(), ignore
-    unknown ciphers
-  - Disable TLSv1 and TLSv1_1 usage in test
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.90-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.90-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 21 2021 Paul Howarth <paul@city-fan.org> - 1.90-1
-- Update to 1.90
-  - Formalised libssl version support policy: all stable versions of OpenSSL
-    in the 0.9.8-1.1.1 branches (with the exception of 0.9.8-0.9.8b) and all
-    stable releases of LibreSSL in the 2.0-3.1 series are supported
-  - The LibreSSL 3.2 series is not yet fully supported because its TLSv1.3
-    implementation is not currently libssl-compatible
-  - Added support for LibreSSL on Windows when built with Visual C++
-  - Exposed P_X509_CRL_add_extensions, several SSL_CIPHER functions, and
-    several stack functions
-  - Fixed crashes in the callback functions CTX_set_next_proto_select_cb and
-    CTX_set_alpn_select_cb
-  - The test suite is now compatible with OpenSSL 1.1.1e onwards, as well as
-    OpenSSL security level 2 (the default on many Linux distributions)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.88-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.88-8
-- Perl 5.32 rebuild
-
-* Sat Mar 21 2020 Paul Howarth <paul@city-fan.org> - 1.88-7
-- Add SSL_shutdown() calls in Net::SSLeay::sslcat() and t/local/07_sslecho.t
-  to fix compatibility with OpenSSL 1.1.1e (GH#160, GH#161)
-
-* Tue Mar 10 2020 Paul Howarth <paul@city-fan.org> - 1.88-6
-- BR: perl(FindBin) for test suite
-
-* Wed Feb 05 2020 Tom Stellard <tstellar@redhat.com> - 1.88-5
-- Spec file cleanups: Use make_build and make_install macros
-- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
-- https://fedoraproject.org/wiki/Perl/Tips#ExtUtils::MakeMaker
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.88-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.88-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.88-2
-- Perl 5.30 rebuild
-
-* Sat May 11 2019 Paul Howarth <paul@city-fan.org> - 1.88-1
-- Update to 1.88
-  Summary of major changes since version 1.85
-  - Mike McCauley has stepped down as maintainer: the new maintainers are Chris
-    Novakovic, Heikki Vatiainen and Tuure Vartiainen
-  - The source code has moved from the now-defunct Debian Subversion server
-    (alioth.debian.org) to GitHub
-    (https://github.com/radiator-software/p5-net-ssleay)
-  - Net-SSLeay is provided under the terms of the Artistic License 2.0; this
-    has been the case since version 1.66, but references to other licenses
-    remained in the source code, causing ambiguity
-  - Perl 5.8.1 or newer is now required to use Net-SSLeay; this has already
-    been the case for some time in practice, as the test suite hasn't fully
-    passed on Perl 5.6 for several years
-  - Much-improved compatibility with OpenSSL 1.1.1, and improved support for
-    TLS 1.3
-  - Fixed a long-standing bug in cb_data_advanced_put() that caused memory
-    leaks when callbacks were frequently added and removed
-  - Support in the test suite for "hardened" OpenSSL configurations that set a
-    default security level of 2 or higher (e.g., in the OpenSSL packages that
-    ship with recent versions of Debian, Fedora and Ubuntu)
-
-* Thu Apr 18 2019 Petr Pisar <ppisar@redhat.com> - 1.86-0.3.09
-- Replace expired test certificates (CPAN RT#129201)
-
-* Fri Mar 29 2019 Paul Howarth <paul@city-fan.org> - 1.86-0.2.09
-- Get libraries to link against from pkg-config
-  https://github.com/radiator-software/p5-net-ssleay/pull/127
-
-* Wed Mar 20 2019 Petr Pisar <ppisar@redhat.com> - 1.86-0.1.09
-- Update to 1.86_09 (see Changes file for details)
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.85-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Sep 29 2018 Paul Howarth <paul@city-fan.org> - 1.85-9
-- OpenSSL 1.1.1 in Fedora disables SSL3 API, so stop trying to test it
 
-* Wed Sep 19 2018 Paul Howarth <paul@city-fan.org> - 1.85-8
+* Thu Jun 13 2019 Petr Pisar <ppisar@redhat.com>- 1.88-1
-- Expose SSL_CTX_set_post_handshake_auth (#1630391)
+- Update to 1.88 (bug #1632597, bug #1633630)
-  https://github.com/radiator-software/p5-net-ssleay/pull/68
 
-* Fri Aug 17 2018 Petr Pisar <ppisar@redhat.com> - 1.85-7
+* Sat Sep 29 2018 Paul Howarth <paul@city-fan.org> - 1.85-6
-- Revert retry in Net::SSLeay::write_partial() (bug #1614884)
+- OpenSSL 1.1.1 in Fedora disables SSL3 API, so stop trying to test it
+  (bug #1610376)
 
-* Wed Aug 15 2018 Petr Pisar <ppisar@redhat.com> - 1.85-6
+* Wed Aug 15 2018 Petr Pisar <ppisar@redhat.com> - 1.85-5
-- Revert retry in Net::SSLeay::{read,write}() (bug #1614884)
+- Revert retry in Net::SSLeay::{read,write}() (bug #1610376)
+- Revert retry in Net::SSLeay::write_partial() (bug #1610376)
 
-* Tue Aug 14 2018 Petr Pisar <ppisar@redhat.com> - 1.85-5
+* Tue Aug 14 2018 Petr Pisar <ppisar@redhat.com> - 1.85-4
-- Avoid SIGPIPE in t/local/36_verify.t (bug #1614884)
+- Avoid SIGPIPE in t/local/36_verify.t (bug #1610376)
 
-* Mon Aug 13 2018 Petr Pisar <ppisar@redhat.com> - 1.85-4
+* Mon Aug 13 2018 Petr Pisar <ppisar@redhat.com> - 1.85-3
-- Adapt to OpenSSL 1.1.1 (bug #1614884)
+- Adapt to OpenSSL 1.1.1 (bug #1610376)
-- Adapt tests to system-wide crypto policy (bug #1614884)
+- Adapt tests to system-wide crypto policy (bug #1610376)
+- Adapt tests to security level 2 system-wide crypt policy (bug #1610376)
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.85-3
+* Mon Aug 13 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.85-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Add missing call to va_end() in TRACE() (bug #1607018)
 
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.85-2
+* Sat Aug 11 2018 Troy Dawson <tdawson@redhat.com>
-- Perl 5.28 rebuild
+- Disable %%check so package will build for Mass Rebuild
+- Related: bug#1614611
 
 * Wed Mar 14 2018 Paul Howarth <paul@city-fan.org> - 1.85-1
 - Update to 1.85