commit e6aee658d21d4e0662036ecaba6b7c995bae30fd Author: Petr Písař <ppisar@xxxxxxxxxx> Date: Thu Aug 23 12:04:17 2012 +0200 20120823 bump .gitignore | 1 + ...120823-Redirect-to-ca-certificates-bundle.patch | 34 ++++++------------- perl-Mozilla-CA.spec | 7 +++- sources | 2 +- 4 files changed, 18 insertions(+), 26 deletions(-) --- diff --git a/.gitignore b/.gitignore index 552bcd8..cb18d38 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /Mozilla-CA-20120118.tar.gz /Mozilla-CA-20120309.tar.gz /Mozilla-CA-20120822.tar.gz +/Mozilla-CA-20120823.tar.gz diff --git a/perl-Mozilla-CA-20110914-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch similarity index 67% rename from perl-Mozilla-CA-20110914-Redirect-to-ca-certificates-bundle.patch rename to Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch index d2846ac..c91fc51 100644 --- a/perl-Mozilla-CA-20110914-Redirect-to-ca-certificates-bundle.patch +++ b/Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch @@ -1,4 +1,4 @@ -From e6aa17c2d3aa33d164d215b7b4491b31deda73f8 Mon Sep 17 00:00:00 2001 +From 02db836ecf68b7554c7e3f496dbfa9ef1b432d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> Date: Fri, 16 Sep 2011 10:33:54 +0200 Subject: [PATCH] Redirect to ca-certificates bundle @@ -10,14 +10,13 @@ Mozilla certificate bundle. See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more details. --- - MANIFEST | 1 - - Makefile.PL | 8 ++++++++ - lib/Mozilla/CA.pm | 8 +------- - t/locate-file.t | 2 +- - 4 files changed, 10 insertions(+), 9 deletions(-) + MANIFEST | 1 - + Makefile.PL | 8 ++++++++ + lib/Mozilla/CA.pm | 8 +------- + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MANIFEST b/MANIFEST -index a6f0a9c..096dd68 100644 +index a88847b..6577ede 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,5 +1,4 @@ @@ -43,10 +42,12 @@ index 2b10474..57f2f07 100644 + return $name; +} diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm -index 71e4b8b..71ada3a 100644 +index 95fc86d..71e4f91 100644 --- a/lib/Mozilla/CA.pm +++ b/lib/Mozilla/CA.pm -@@ -5,14 +5,8 @@ package Mozilla::CA; +@@ -3,16 +3,10 @@ package Mozilla::CA; + use strict; + our $VERSION = '20120823'; -use Cwd (); use File::Spec (); @@ -62,19 +63,6 @@ index 71e4b8b..71ada3a 100644 } 1; -diff --git a/t/locate-file.t b/t/locate-file.t -index a9acb34..b936059 100644 ---- a/t/locate-file.t -+++ b/t/locate-file.t -@@ -11,7 +11,7 @@ print "# $ca_file\n"; - ok($ca_file); - ok(open(my $fh, "<", $ca_file)); - while (<$fh>) { -- if (/\*\* BEGIN LICENSE BLOCK \*\*/) { -+ if (/-----BEGIN CERTIFICATE-----/) { - ok(1); - last; - } -- -1.7.6.2 +1.7.11.4 diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index 4388dbd..b0858ca 100644 --- a/perl-Mozilla-CA.spec +++ b/perl-Mozilla-CA.spec @@ -1,7 +1,7 @@ Name: perl-Mozilla-CA # You do not need to back-port new version for list of certificates solely. # They are taken from ca-certificates package instead per bug #738383. -Version: 20120822 +Version: 20120823 Release: 1%{?dist} Summary: Mozilla's CA cert bundle in PEM format License: MPLv1.1 or LGPLv2+ or GPLv2+ @@ -9,7 +9,7 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/Mozilla-CA/ Source0: http://www.cpan.org/authors/id/A/AB/ABH/Mozilla-CA-%{version}.tar.gz # Bug #738383 -Patch0: %{name}-20110914-Redirect-to-ca-certificates-bundle.patch +Patch0: Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Tests: @@ -50,6 +50,9 @@ make test %{_mandir}/man3/* %changelog +* Thu Aug 23 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 20120823-1 +- 20120823 bump + * Wed Aug 22 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 20120822-1 - 20120822 bump diff --git a/sources b/sources index e01b479..c57e828 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7bf1b88cbdc5c00d8f168b4875d2c4f Mozilla-CA-20120822.tar.gz +86c4949fa7c15d24a06af662ee94865c Mozilla-CA-20120823.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel