5 changed files with 77 additions and 104 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/LWP-Protocol-https-6.10.tar.gz
+SOURCES/LWP-Protocol-https-6.13.tar.gz
--- a/.perl-LWP-Protocol-https.metadata
+++ b/.perl-LWP-Protocol-https.metadata
@ -1 +1 @@
-d20775d8b08a24a77ffef153b8d10e4e9cd664db SOURCES/LWP-Protocol-https-6.10.tar.gz
+16e1740b7b33149527bc22354769f555213bbd5e SOURCES/LWP-Protocol-https-6.13.tar.gz
--- a/SOURCES/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch
+++ b/SOURCES/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch
@ -1,30 +0,0 @@
-From 1b924708663f457a4f7c25ed35d7dfb3bb5b334d Mon Sep 17 00:00:00 2001
-From: Steffen Ullrich <Steffen_Ullrich@genua.de>
-Date: Sat, 3 May 2014 23:04:36 +0200
-Subject: [PATCH 1/2] Debian #746576 - don't disale verification if only
- hostnames should not be verified
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
---
- lib/LWP/Protocol/https.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
-index a707917..8c87e81 100644
--- a/lib/LWP/Protocol/https.pm
-+++ b/lib/LWP/Protocol/https.pm
-@@ -21,7 +21,7 @@ sub _extra_sock_opts
- 	$ssl_opts{SSL_verifycn_scheme} = 'www';
-     }
-     else {
-	$ssl_opts{SSL_verify_mode} = 0;
-+	$ssl_opts{SSL_verifycn_scheme} = 'none';
-     }
-     if ($ssl_opts{SSL_verify_mode}) {
- 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-- 
-1.9.0
-
--- a/SOURCES/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch
+++ b/SOURCES/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch
@ -1,51 +0,0 @@
-From 6b5c876de80451ee54de5d853de37a62e26bf6fe Mon Sep 17 00:00:00 2001
-From: Steffen Ullrich <Steffen_Ullrich@genua.de>
-Date: Sun, 4 May 2014 09:14:13 +0200
-Subject: [PATCH 2/2] Debian #746576 - fix test, make it workable for
- Crypt::SSLeay/Net::SSL too
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
---
- lib/LWP/Protocol/https.pm | 6 +++++-
- t/https_proxy.t           | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
-index 8c87e81..6223ddf 100644
--- a/lib/LWP/Protocol/https.pm
-+++ b/lib/LWP/Protocol/https.pm
-@@ -21,7 +21,11 @@ sub _extra_sock_opts
- 	$ssl_opts{SSL_verifycn_scheme} = 'www';
-     }
-     else {
-	$ssl_opts{SSL_verifycn_scheme} = 'none';
-+	if ( $Net::HTTPS::SSL_SOCKET_CLASS eq 'Net::SSL' ) {
-+	    $ssl_opts{SSL_verifycn_scheme} = '';
-+	} else {
-+	    $ssl_opts{SSL_verifycn_scheme} = 'none';
-+	}
-     }
-     if ($ssl_opts{SSL_verify_mode}) {
- 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-diff --git a/t/https_proxy.t b/t/https_proxy.t
-index 5196960..c78345b 100644
--- a/t/https_proxy.t
-+++ b/t/https_proxy.t
-@@ -66,7 +66,10 @@ my %ua;
- $ua{noproxy} = LWP::UserAgent->new(
-     keep_alive => 10, # size of connection cache
-     # server does not know the expected name and returns generic certificate
-    ssl_opts => { verify_hostname => 0 }
-+    ssl_opts => { 
-+	verify_hostname => 0, 
-+	SSL_ca_file => $cafile,
-+    }
- );
- 
- $ua{proxy} = LWP::UserAgent->new(
-- 
-1.9.0
-
--- a/SPECS/perl-LWP-Protocol-https.spec
+++ b/SPECS/perl-LWP-Protocol-https.spec
@ -2,18 +2,12 @@
 %bcond_with perl_LWP_Protocol_https_enables_internet_test

 Name:           perl-LWP-Protocol-https
-Version:        6.10
-Release:        4%{?dist}
+Version:        6.13
+Release:        2%{?dist}
 Summary:        Provide HTTPS support for LWP::UserAgent
-License:        GPL+ or Artistic
+License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 URL:            https://metacpan.org/release/LWP-Protocol-https
 Source0:        https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-%{version}.tar.gz
-# Fix CVE-2014-3230, bug #1094442,
-# proposed in https://github.com/libwww-perl/lwp-protocol-https/pull/14
-Patch0:         LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch
-# Fix CVE-2014-3230, bug #1094442,
-# proposed in https://github.com/libwww-perl/lwp-protocol-https/pull/14
-Patch1:         LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  make
@ -25,7 +19,7 @@ BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
 # Run-time:
 BuildRequires:  perl(base)
-BuildRequires:  perl(IO::Socket::SSL) >= 1.54
+BuildRequires:  perl(IO::Socket::SSL) >= 1.970
 BuildRequires:  perl(LWP::Protocol::http)
 BuildRequires:  perl(LWP::Protocol::http::SocketMethods)
 BuildRequires:  perl(Mozilla::CA) >= 20180117
@ -39,13 +33,13 @@ BuildRequires:  perl(IO::Socket::INET)
 BuildRequires:  perl(LWP::UserAgent) >= 6.06
 BuildRequires:  perl(Socket)
 BuildRequires:  perl(Test::More) >= 0.96
+BuildRequires:  perl(Test::Needs) >= 0.002010
 %if %{with perl_LWP_Protocol_https_enables_internet_test}
 BuildRequires:  perl(Test::RequiresInternet)
 %endif
 # Optional tests:
 BuildRequires:  perl(IO::Socket::SSL) >= 1.953
 BuildRequires:  perl(IO::Socket::SSL::Utils)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(IO::Socket::SSL) >= 1.54
 Requires:       perl(Mozilla::CA) >= 20180117
 Requires:       perl(Net::HTTPS) >= 6
@ -59,14 +53,26 @@ URLs with LWP. This module is a plug-in to the LWP protocol handling, so
 you don't use it directly. Once the module is installed LWP is able to
 access sites using HTTP over SSL/TLS.

+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n LWP-Protocol-https-%{version}
-%patch0 -p1
-%patch1 -p1
 %if !%{with perl_LWP_Protocol_https_enables_internet_test}
-rm t/apache.t
-perl -i -ne 'print $_ unless m{^t/apache.t}' MANIFEST
+rm t/example.t
+perl -i -ne 'print $_ unless m{^t/example.t}' MANIFEST
 %endif
+# Help generators to recognize Perl scripts
+for F in $(find t/ -name '*.t'); do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done

 %build
 perl Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 INSTALLDIRS=vendor
@ -74,7 +80,16 @@ perl Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 INSTALLDIRS=vendor

 %install
 %{make_install}
-%{_fixperms} $RPM_BUILD_ROOT/*
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+rm -f %{buildroot}%{_libexecdir}/%{name}/t/00*
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" -r
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+%{_fixperms} %{buildroot}/*

 %check
 make test
@ -85,13 +100,52 @@ make test
 %{perl_vendorlib}/*
 %{_mandir}/man3/*

+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.10-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.13-2
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.13-2
+- Bump release for June 2024 mass rebuild
+
+* Tue Feb 06 2024 Michal Josef Špaček <mspacek@redhat.com> - 6.13-1
+- 0.13 bump
+
+* Wed Jan 24 2024 Michal Josef Špaček <mspacek@redhat.com> - 6.12-1
+- 0.12 bump
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jul 24 2023 Michal Josef Špaček <mspacek@redhat.com> - 6.11-1
+- 6.11 bump
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 08 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.10-8
+- Package tests
+- Update license to SPDX format
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 6.10-6
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.10-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 6.10-3
+- Perl 5.34 rebuild

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild