Dominique Leuenberger 2020-10-20 13:59:38 +00:00 committed by Git OBS Bridge
commit 20846baf05
7 changed files with 64 additions and 80 deletions

View File

@ -1,66 +0,0 @@
From 39d26115250c9c233018e487ce495e5a16faacc2 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 3 Jul 2013 11:25:38 +0200
Subject: [PATCH] Don't require Mozilla::CA
IO::Socket::SSL will fall back to using the system's root
CA-certificates if no options are passed.
---
Makefile.PL | 1 -
README | 9 +--------
lib/LWP/Protocol/https.pm | 23 -----------------------
3 files changed, 1 insertion(+), 32 deletions(-)
Index: LWP-Protocol-https-6.07/Makefile.PL
===================================================================
--- LWP-Protocol-https-6.07.orig/Makefile.PL
+++ LWP-Protocol-https-6.07/Makefile.PL
@@ -26,7 +26,6 @@ my %WriteMakefileArgs = (
'LWP::UserAgent' => '6.06',
'Net::HTTPS' => 6,
'IO::Socket::SSL' => "1.54",
- 'Mozilla::CA' => "20110101",
'perl' => '5.008001',
},
},
Index: LWP-Protocol-https-6.07/README
===================================================================
--- LWP-Protocol-https-6.07.orig/README
+++ LWP-Protocol-https-6.07/README
@@ -17,13 +17,6 @@ DESCRIPTION
you don't use it directly. Once the module is installed LWP is able to
access sites using HTTP over SSL/TLS.
- If hostname verification is requested by LWP::UserAgent's "ssl_opts",
- and neither "SSL_ca_file" nor "SSL_ca_path" is set, then "SSL_ca_file"
- is implied to be the one provided by Mozilla::CA. If the Mozilla::CA
- module isn't available SSL requests will fail. Either install this
- module, set up an alternative "SSL_ca_file" or disable hostname
- verification.
-
This module used to be bundled with the libwww-perl, but it was
unbundled in v6.02 in order to be able to declare its dependencies
properly for the CPAN tool-chain. Applications that need https support
@@ -31,7 +24,7 @@ DESCRIPTION
longer need to know what underlying modules to install.
SEE ALSO
- IO::Socket::SSL, Crypt::SSLeay, Mozilla::CA
+ IO::Socket::SSL, Crypt::SSLeay
COPYRIGHT
Copyright 1997-2011 Gisle Aas.
Index: LWP-Protocol-https-6.07/lib/LWP/Protocol/https.pm
===================================================================
--- LWP-Protocol-https-6.07.orig/lib/LWP/Protocol/https.pm
+++ LWP-Protocol-https-6.07/lib/LWP/Protocol/https.pm
@@ -23,7 +23,8 @@ sub _extra_sock_opts
else {
$ssl_opts{SSL_verify_mode} = 0;
}
- if ($ssl_opts{SSL_verify_mode}) {
+ my $suse_allows_mozilla_ca = 0;
+ if ($suse_allows_mozilla_ca && $ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
eval {
require Mozilla::CA;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:522cc946cf84a1776304a5737a54b8822ec9e79b264d0ba0722a70473dbfb9e7
size 9184

View File

@ -0,0 +1,24 @@
diff -ur LWP-Protocol-https-6.09/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.09_fix/lib/LWP/Protocol/https.pm
--- LWP-Protocol-https-6.09/lib/LWP/Protocol/https.pm 2020-07-16 15:33:07.000000000 +0200
+++ LWP-Protocol-https-6.09_fix/lib/LWP/Protocol/https.pm 2020-10-15 15:56:49.380284037 +0200
@@ -22,7 +22,8 @@
else {
$ssl_opts{SSL_verify_mode} = 0;
}
- if ($ssl_opts{SSL_verify_mode}) {
+ my $suse_allows_mozilla_ca = 0;
+ if ($suse_allows_mozilla_ca && $ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
eval {
require Mozilla::CA;
diff -ur LWP-Protocol-https-6.09/Makefile.PL LWP-Protocol-https-6.09_fix/Makefile.PL
--- LWP-Protocol-https-6.09/Makefile.PL 2020-07-16 15:33:07.000000000 +0200
+++ LWP-Protocol-https-6.09_fix/Makefile.PL 2020-10-15 15:56:08.235630479 +0200
@@ -22,7 +22,6 @@
"IO::Socket::SSL" => "1.54",
"LWP::Protocol::http" => 0,
"LWP::UserAgent" => "6.06",
- "Mozilla::CA" => 20180117,
"Net::HTTPS" => 6,
"base" => 0,
"strict" => 0

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16cfe1a511690b066db5667c8714802ee2b9c5d28a31a3e7bd36fbc70a3af592
size 33557

View File

@ -6,7 +6,7 @@
# - source2
patches:
# patch for using system certificates
"%{cpan_name}-6.04-systemca.diff": -p1
"%{cpan_name}-6.09-systemca.diff": -p1
# see https://github.com/libwww-perl/lwp-protocol-https/pull/14
CVE-2014-3230.patch: -p1
#preamble: |-

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Oct 15 13:58:08 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>
- updated to 6.09
see /usr/share/doc/packages/perl-LWP-Protocol-https/Changes
6.09 2020-07-16 13:33:05Z
- Make available the version of SSL/TLS protocol used in the connection
(GH#56) (Jon Jensen)
6.08 2020-03-23 20:19:22Z (TRIAL RELEASE)
- Add defined check (GH#53) (Mohammad S Anwar)
- Fix copyright year (GH#55) (Olaf Alders)
- Upgrade Mozilla::CA dependency; originally #26 by dolmen (GH#54) (Shoichi Kaji)
- Adds coverage tests (GH#51) (Juan Julin Merelo Guervs)
- Migrated to DZil (GH PR#30)
- Moved bug tracking from RT to GitHub (GH#48) (Olaf Alders)
Rebase patch LWP-Protocol-https-6.04-systemca.diff to LWP-Protocol-https-6.09-systemca.diff
-------------------------------------------------------------------
Thu Sep 13 15:42:12 UTC 2018 - pmonrealgonzalez@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package perl-LWP-Protocol-https
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,33 +12,38 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define cpan_name LWP-Protocol-https
Name: perl-LWP-Protocol-https
Version: 6.07
Version: 6.09
Release: 0
%define cpan_name LWP-Protocol-https
Summary: Provide https support for LWP::UserAgent
License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
Url: https://metacpan.org/release/%{cpan_name}
URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/O/OA/OALDERS/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
Patch0: %{cpan_name}-6.04-systemca.diff
Patch0: %{cpan_name}-6.09-systemca.diff
Patch1: CVE-2014-3230.patch
BuildRequires: ca-certificates
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(IO::Socket::SSL) >= 1.54
BuildRequires: perl(IO::Socket::SSL::Utils)
BuildRequires: perl(LWP::Protocol::http)
BuildRequires: perl(LWP::UserAgent) >= 6.06
#BuildRequires: perl(Mozilla::CA) >= 20180117
BuildRequires: perl(Net::HTTPS) >= 6
BuildRequires: perl(Test::RequiresInternet)
Requires: perl(IO::Socket::SSL) >= 1.54
Requires: perl(LWP::Protocol::http)
Requires: perl(LWP::UserAgent) >= 6.06
#Requires: perl(Mozilla::CA) >= 20180117
Requires: perl(Net::HTTPS) >= 6
BuildArch: noarch
%{perl_requires}
%description
@ -69,7 +74,7 @@ perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%check
make %{?_smp_mflags} test
make test
%install
%perl_make_install
@ -78,6 +83,7 @@ make %{?_smp_mflags} test
%files -f %{name}.files
%defattr(-,root,root,755)
%doc Changes README
%doc Changes CONTRIBUTING.md
%license LICENSE
%changelog