From e80366239656555a306569c7feb8d0c61910907df2fa4dd7052b0a1f1281f533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Tue, 29 Mar 2011 11:53:57 +0000 Subject: [PATCH] Accepting request 65366 from home:lnussel:branches:devel:languages:perl ok, thanks OBS-URL: https://build.opensuse.org/request/show/65366 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-libwww-perl?expand=0&rev=28 --- libwww-perl-6.01-systemca.diff | 31 +++++++++++++++++++++++++++++++ perl-libwww-perl.changes | 5 +++++ perl-libwww-perl.spec | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 libwww-perl-6.01-systemca.diff diff --git a/libwww-perl-6.01-systemca.diff b/libwww-perl-6.01-systemca.diff new file mode 100644 index 0000000..62fc080 --- /dev/null +++ b/libwww-perl-6.01-systemca.diff @@ -0,0 +1,31 @@ +Index: libwww-perl-6.01/lib/LWP/Protocol/https.pm +=================================================================== +--- libwww-perl-6.01.orig/lib/LWP/Protocol/https.pm ++++ libwww-perl-6.01/lib/LWP/Protocol/https.pm +@@ -21,25 +21,7 @@ sub _extra_sock_opts + } + if ($ssl_opts{SSL_verify_mode}) { + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { +- eval { +- require Mozilla::CA; +- }; +- if ($@) { +- if ($@ =! /^Can't locate Mozilla\/CA\.pm/) { +- $@ = <<'EOT'; +-Can't verify SSL peers without knowning which Certificate Authorities to trust +- +-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE +-envirionment variable or by installing the Mozilla::CA module. +- +-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME +-envirionment variable to 0. If you do this you can't be sure that you +-communicate with the expected peer. +-EOT +- } +- die $@; +- } +- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file(); ++ $ssl_opts{SSL_ca_path} = '/etc/ssl/certs'; + } + } + $self->{ssl_opts} = \%ssl_opts; diff --git a/perl-libwww-perl.changes b/perl-libwww-perl.changes index c091465..5d4af04 100644 --- a/perl-libwww-perl.changes +++ b/perl-libwww-perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 28 14:43:32 CEST 2011 - lnussel@suse.de + +- use system CAs in /etc/ssl/certs + ------------------------------------------------------------------- Thu Mar 17 11:01:06 UTC 2011 - chris@computersalat.de diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index 18a7c9f..e4c1e5a 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -29,6 +29,7 @@ Url: http://search.cpan.org/dist/libwww-perl/ Source: %{cpan_name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE -- disable one perl requires that would be created automatically and we're unable to provide Patch0: disable-ghttp.diff +Patch1: libwww-perl-6.01-systemca.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -99,6 +100,7 @@ help you implement simple HTTP servers. %prep %setup -q -n %{cpan_name}-%{version} %patch0 -p1 +%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor