6.11 bump

2023-07-24 20:58:26 +02:00 · 2023-07-24 20:58:26 +02:00 · 96139d3761
commit 96139d3761
parent 8fcd3c8f7c
5 changed files with 11 additions and 95 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@
 /LWP-Protocol-https-6.07.tar.gz
 /LWP-Protocol-https-6.09.tar.gz
 /LWP-Protocol-https-6.10.tar.gz
+/LWP-Protocol-https-6.11.tar.gz
--- a/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch
+++ b/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/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch
+++ b/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/perl-LWP-Protocol-https.spec
+++ b/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:        10%{?dist}
+Version:        6.11
+Release:        1%{?dist}
 Summary:        Provide HTTPS support for LWP::UserAgent
 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,6 +33,7 @@ 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
@ -69,11 +64,9 @@ 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
@ -111,6 +104,9 @@ make test
 %{_libexecdir}/%{name}

 %changelog
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (LWP-Protocol-https-6.10.tar.gz) = 4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31
+SHA512 (LWP-Protocol-https-6.11.tar.gz) = 1e74c45898778c58d00eefbdd04a3ed47cf38164296278bec66c9b85f48ad635931873d2bf5423be8562df2c22b4bbf8eff0502bd29ba1c790bbbf76f3616ecf