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] 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