From 4ed35c468c2e9db2df552eb6638ae742ed440ced Mon Sep 17 00:00:00 2001 From: Kevin Lockwood Date: Tue, 24 Dec 2024 15:59:08 -0800 Subject: [PATCH] Update perl-LWP-Protocol-https to version 6.14-1 - Drop LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch - Drop LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch Both were merged into master here: https://github.com/libwww-perl/lwp-protocol-https/pull/14 --- ...n-t-disale-verification-if-only-host.patch | 30 ----------- ...x-test-make-it-workable-for-Crypt-SS.patch | 51 ------------------- .../perl-LWP-Protocol-https.signatures.json | 4 +- .../perl-LWP-Protocol-https.spec | 28 +++++----- cgmanifest.json | 4 +- 5 files changed, 17 insertions(+), 100 deletions(-) delete mode 100644 SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch delete mode 100644 SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch diff --git a/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch b/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch deleted file mode 100644 index 31521fff8c2..00000000000 --- a/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-don-t-disale-verification-if-only-host.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1b924708663f457a4f7c25ed35d7dfb3bb5b334d Mon Sep 17 00:00:00 2001 -From: Steffen Ullrich -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ř ---- - 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 - diff --git a/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch b/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch deleted file mode 100644 index 1e85dbe2ce2..00000000000 --- a/SPECS-EXTENDED/perl-LWP-Protocol-https/LWP-Protocol-https-6.06-Debian-746576-fix-test-make-it-workable-for-Crypt-SS.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6b5c876de80451ee54de5d853de37a62e26bf6fe Mon Sep 17 00:00:00 2001 -From: Steffen Ullrich -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ř ---- - 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 - diff --git a/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.signatures.json b/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.signatures.json index e6efe25101b..7bfe4df8528 100644 --- a/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.signatures.json +++ b/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-LWP-Protocol-https-6.10.tar.gz": "cecfc31fe2d4fc854cac47fce13d3a502e8fdfe60c5bc1c09535743185f2a86c" + "perl-LWP-Protocol-https-6.14.tar.gz": "59cdeabf26950d4f1bef70f096b0d77c5b1c5a7b5ad1b66d71b681ba279cbb2a" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.spec b/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.spec index acc0c8d43c0..ca9ffc2be1c 100644 --- a/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.spec +++ b/SPECS-EXTENDED/perl-LWP-Protocol-https/perl-LWP-Protocol-https.spec @@ -1,21 +1,16 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux # Perform tests that need the Internet %bcond_with perl_LWP_Protocol_https_enables_internet_test +Vendor: Microsoft Corporation +Distribution: Azure Linux Name: perl-LWP-Protocol-https -Version: 6.10 -Release: 2%{?dist} +Version: 6.14 +Release: 1%{?dist} Summary: Provide HTTPS support for LWP::UserAgent License: GPL+ or Artistic URL: https://metacpan.org/release/LWP-Protocol-https Source0: https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-%{version}.tar.gz#/perl-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 @@ -40,6 +35,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 @@ -61,12 +57,10 @@ you don't use it directly. Once the module is installed LWP is able to access sites using HTTP over SSL/TLS. %prep -%setup -q -n LWP-Protocol-https-%{version} -%patch 0 -p1 -%patch 1 -p1 +%autosetup -n LWP-Protocol-https-%{version} %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 %build @@ -87,6 +81,10 @@ make test %{_mandir}/man3/* %changelog +* Tue Dec 24 2024 Kevin Lockwood - 6.14-1 +- Update to 6.14 +- License verified. + * Fri Jan 29 2021 Joe Schmitt - 6.10-2 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Remove double buildrequire conditional diff --git a/cgmanifest.json b/cgmanifest.json index e724680b882..8808687dfc3 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -18163,8 +18163,8 @@ "type": "other", "other": { "name": "perl-LWP-Protocol-https", - "version": "6.10", - "downloadUrl": "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.10.tar.gz" + "version": "6.14", + "downloadUrl": "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.14.tar.gz" } } },