From d2b29581c9e03dbfbba4b11a38b2298fd673d683f12ea2df302a9faa8a68df2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jul 2013 07:21:30 +0000 Subject: [PATCH 1/3] Accepting request 182794 from home:bmwiedemann:branches:devel:languages:perl use /etc/ssl/certs as default SSL_ca_path to fix bnc#828881 OBS-URL: https://build.opensuse.org/request/show/182794 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-LWP-Protocol-https?expand=0&rev=6 --- LWP-Protocol-https-6.04-systemca.diff | 9 ++++----- perl-LWP-Protocol-https.changes | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/LWP-Protocol-https-6.04-systemca.diff b/LWP-Protocol-https-6.04-systemca.diff index cb7f1b5..e8098f5 100644 --- a/LWP-Protocol-https-6.04-systemca.diff +++ b/LWP-Protocol-https-6.04-systemca.diff @@ -54,11 +54,10 @@ diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm index f7230e2..e210049 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -22,29 +22,6 @@ sub _extra_sock_opts - else { +@@ -23,27 +23,7 @@ sub _extra_sock_opts $ssl_opts{SSL_verify_mode} = 0; } -- if ($ssl_opts{SSL_verify_mode}) { + if ($ssl_opts{SSL_verify_mode}) { - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; @@ -80,10 +79,10 @@ index f7230e2..e210049 100644 - } - $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file(); - } -- } ++ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs'; + } $self->{ssl_opts} = \%ssl_opts; return (%ssl_opts, $self->SUPER::_extra_sock_opts); - } -- 1.8.1.4 diff --git a/perl-LWP-Protocol-https.changes b/perl-LWP-Protocol-https.changes index 8b6d04c..9440621 100644 --- a/perl-LWP-Protocol-https.changes +++ b/perl-LWP-Protocol-https.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 11 07:43:42 UTC 2013 - bwiedemann@suse.com + +- use /etc/ssl/certs as default SSL_ca_path to fix bnc#828881 + ------------------------------------------------------------------- Wed Jul 3 09:32:03 UTC 2013 - lnussel@suse.de From 63854e2f1fc1e8ca12d3b510ec50cf4aed091fe552701ab137576e8f7bae2ef7 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Wed, 24 Jul 2013 14:53:54 +0000 Subject: [PATCH 2/3] reverting after lnussels review, proper fix in perl-IO-Socket-SSL OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-LWP-Protocol-https?expand=0&rev=7 --- LWP-Protocol-https-6.04-systemca.diff | 9 +++++---- perl-LWP-Protocol-https.changes | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/LWP-Protocol-https-6.04-systemca.diff b/LWP-Protocol-https-6.04-systemca.diff index e8098f5..cb7f1b5 100644 --- a/LWP-Protocol-https-6.04-systemca.diff +++ b/LWP-Protocol-https-6.04-systemca.diff @@ -54,10 +54,11 @@ diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm index f7230e2..e210049 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -23,27 +23,7 @@ sub _extra_sock_opts +@@ -22,29 +22,6 @@ sub _extra_sock_opts + else { $ssl_opts{SSL_verify_mode} = 0; } - if ($ssl_opts{SSL_verify_mode}) { +- if ($ssl_opts{SSL_verify_mode}) { - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; @@ -79,10 +80,10 @@ index f7230e2..e210049 100644 - } - $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file(); - } -+ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs'; - } +- } $self->{ssl_opts} = \%ssl_opts; return (%ssl_opts, $self->SUPER::_extra_sock_opts); + } -- 1.8.1.4 diff --git a/perl-LWP-Protocol-https.changes b/perl-LWP-Protocol-https.changes index 9440621..8b6d04c 100644 --- a/perl-LWP-Protocol-https.changes +++ b/perl-LWP-Protocol-https.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Jul 11 07:43:42 UTC 2013 - bwiedemann@suse.com - -- use /etc/ssl/certs as default SSL_ca_path to fix bnc#828881 - ------------------------------------------------------------------- Wed Jul 3 09:32:03 UTC 2013 - lnussel@suse.de From cc6100c0173b6755e9794c137a46c44159f7a7c751020c71be054fcecd305246 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 30 Apr 2014 18:38:52 +0000 Subject: [PATCH 3/3] Accepting request 232256 from home:leonardocf:branches:devel:languages:perl Remove old tarball. OBS-URL: https://build.opensuse.org/request/show/232256 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-LWP-Protocol-https?expand=0&rev=8 --- LWP-Protocol-https-6.03.tar.gz | 3 --- perl-LWP-Protocol-https.changes | 5 +++++ perl-LWP-Protocol-https.spec | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 LWP-Protocol-https-6.03.tar.gz diff --git a/LWP-Protocol-https-6.03.tar.gz b/LWP-Protocol-https-6.03.tar.gz deleted file mode 100644 index 6b97ee1..0000000 --- a/LWP-Protocol-https-6.03.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb864de7677cc3fc9f8f4aaa17c2984d970fdfa46fc7e3cb90bc5ef2c3e3c6f1 -size 3555 diff --git a/perl-LWP-Protocol-https.changes b/perl-LWP-Protocol-https.changes index 8b6d04c..9748448 100644 --- a/perl-LWP-Protocol-https.changes +++ b/perl-LWP-Protocol-https.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 30 17:23:34 UTC 2014 - lchiquitto@suse.com + +- Remove old tarball (6.03). + ------------------------------------------------------------------- Wed Jul 3 09:32:03 UTC 2013 - lnussel@suse.de diff --git a/perl-LWP-Protocol-https.spec b/perl-LWP-Protocol-https.spec index ab14384..17ff9b7 100644 --- a/perl-LWP-Protocol-https.spec +++ b/perl-LWP-Protocol-https.spec @@ -1,7 +1,7 @@ # # spec file for package perl-LWP-Protocol-https # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed