From 73533b0c6934b5c57f134ccf56afe099bd72d2459483eef31cca73450fd9e123 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 1 Mar 2012 16:24:54 +0000 Subject: [PATCH] Accepting request 106295 from devel:languages:perl - updated to 6.03 * Skip test if offline [RT#74163] * Typo fixes * Restore perl-5.8.1 compatibility. OBS-URL: https://build.opensuse.org/request/show/106295 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-LWP-Protocol-https?expand=0&rev=5 --- LWP-Protocol-https-6.02-systemca.diff | 31 ------------------ LWP-Protocol-https-6.02.tar.gz | 3 -- LWP-Protocol-https-6.03-systemca.diff | 12 +++++++ LWP-Protocol-https-6.03.tar.gz | 3 ++ perl-LWP-Protocol-https.changes | 8 +++++ perl-LWP-Protocol-https.spec | 45 +++++++++++++-------------- 6 files changed, 44 insertions(+), 58 deletions(-) delete mode 100644 LWP-Protocol-https-6.02-systemca.diff delete mode 100644 LWP-Protocol-https-6.02.tar.gz create mode 100644 LWP-Protocol-https-6.03-systemca.diff create mode 100644 LWP-Protocol-https-6.03.tar.gz diff --git a/LWP-Protocol-https-6.02-systemca.diff b/LWP-Protocol-https-6.02-systemca.diff deleted file mode 100644 index 6c4b065..0000000 --- a/LWP-Protocol-https-6.02-systemca.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm -=================================================================== ---- LWP-Protocol-https-6.02.orig/lib/LWP/Protocol/https.pm -+++ LWP-Protocol-https-6.02/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/LWP-Protocol-https-6.02.tar.gz b/LWP-Protocol-https-6.02.tar.gz deleted file mode 100644 index 7fb496f..0000000 --- a/LWP-Protocol-https-6.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c50388fde02a4c3eb98f9cfb74fa4422a6136a4244ccafb54355927736b14a78 -size 3443 diff --git a/LWP-Protocol-https-6.03-systemca.diff b/LWP-Protocol-https-6.03-systemca.diff new file mode 100644 index 0000000..5685aa4 --- /dev/null +++ b/LWP-Protocol-https-6.03-systemca.diff @@ -0,0 +1,12 @@ +Index: LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm +=================================================================== +--- LWP-Protocol-https-6.03.orig/lib/LWP/Protocol/https.pm 2012-02-18 23:53:36.000000000 +0100 ++++ LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm 2012-02-21 12:32:56.614080436 +0100 +@@ -20,6 +20,7 @@ sub _extra_sock_opts + $ssl_opts{SSL_verifycn_scheme} = 'www'; + } + if ($ssl_opts{SSL_verify_mode}) { ++ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs'; + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + eval { + require Mozilla::CA; diff --git a/LWP-Protocol-https-6.03.tar.gz b/LWP-Protocol-https-6.03.tar.gz new file mode 100644 index 0000000..6b97ee1 --- /dev/null +++ b/LWP-Protocol-https-6.03.tar.gz @@ -0,0 +1,3 @@ +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 102daf8..2ac2739 100644 --- a/perl-LWP-Protocol-https.changes +++ b/perl-LWP-Protocol-https.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 21 11:26:38 UTC 2012 - coolo@suse.com + +- updated to 6.03 + * Skip test if offline [RT#74163] + * Typo fixes + * Restore perl-5.8.1 compatibility. + ------------------------------------------------------------------- Tue Mar 29 12:06:43 UTC 2011 - vcizek@novell.com diff --git a/perl-LWP-Protocol-https.spec b/perl-LWP-Protocol-https.spec index 14054cb..229af12 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) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,33 +16,34 @@ # - Name: perl-LWP-Protocol-https -Version: 6.02 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.03 +Release: 0 %define cpan_name LWP-Protocol-https Summary: Provide https support for LWP::UserAgent -Url: http://search.cpan.org/dist/LWP-Protocol-https/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/LWP-Protocol-https-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz -# patch for using system certificates -Patch0: %{cpan_name}-%{version}-systemca.diff -BuildRequires: perl(IO::Socket::SSL) >= 1.38 -BuildRequires: perl(LWP::UserAgent) >= 6.02 -BuildRequires: perl(Net::HTTPS) >= 6 +Url: http://search.cpan.org/dist/LWP-Protocol-https/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +# patch for using system certificates +Patch0: %{cpan_name}-6.03-systemca.diff +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -Requires: perl(IO::Socket::SSL) >= 1.38 -Requires: perl(LWP::UserAgent) >= 6.02 +BuildRequires: perl(IO::Socket::SSL) >= 1.54 +BuildRequires: perl(LWP::UserAgent) >= 6.04 +#BuildRequires: perl(Mozilla::CA) >= 20110101 +BuildRequires: perl(Net::HTTPS) >= 6 +#BuildRequires: perl(LWP::Protocol::http) +Requires: perl(IO::Socket::SSL) >= 1.54 +Requires: perl(LWP::UserAgent) >= 6.04 +#Requires: perl(Mozilla::CA) >= 20110101 Requires: perl(Net::HTTPS) >= 6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description -The LWP::Protocol::https module provide support for using https schemed +The LWP::Protocol::https module provides support for using https schemed URLs with LWP. This module is a plug-in to the LWP protocol handling, so you don't use it directly. Once the module is installed LWP is able to access sites using HTTP over SSL/TLS. @@ -68,19 +69,15 @@ what underlying modules to install. %{__make} %{?_smp_mflags} %check -# tests will fail without network -#%{__make} test +%{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog