From f4df03d587f51ebc5a94f0daf94f3ab001793af6 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Jan 15 2013 13:36:54 +0000 Subject: 20130114 bump --- diff --git a/.gitignore b/.gitignore index cb18d38..0d1305f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Mozilla-CA-20120309.tar.gz /Mozilla-CA-20120822.tar.gz /Mozilla-CA-20120823.tar.gz +/Mozilla-CA-20130114.tar.gz diff --git a/Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch deleted file mode 100644 index c91fc51..0000000 --- a/Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 02db836ecf68b7554c7e3f496dbfa9ef1b432d76 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 16 Sep 2011 10:33:54 +0200 -Subject: [PATCH] Redirect to ca-certificates bundle - -This patch replaces Mozilla-CA certificate bundle with bundle -delivered by ca-certificates RPM package used as single source of -Mozilla certificate bundle. - -See for more -details. ---- - MANIFEST | 1 - - Makefile.PL | 8 ++++++++ - lib/Mozilla/CA.pm | 8 +------- - 3 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/MANIFEST b/MANIFEST -index a88847b..6577ede 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -1,5 +1,4 @@ - lib/Mozilla/CA.pm --lib/Mozilla/CA/cacert.pem - Makefile.PL - MANIFEST This list of files - README -diff --git a/Makefile.PL b/Makefile.PL -index 2b10474..57f2f07 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -40,3 +40,11 @@ BEGIN { - ExtUtils::MakeMaker::WriteMakefile(%arg); - }; - } -+ -+package MY; -+sub MY::libscan { -+ my $name = shift->SUPER::libscan(@_); -+ # Remove private certificate bundle -+ if ($name =~ /cacert.pem\z/) { $name = '' }; -+ return $name; -+} -diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm -index 95fc86d..71e4f91 100644 ---- a/lib/Mozilla/CA.pm -+++ b/lib/Mozilla/CA.pm -@@ -3,16 +3,10 @@ package Mozilla::CA; - use strict; - our $VERSION = '20120823'; - --use Cwd (); - use File::Spec (); --use File::Basename qw(dirname); - - sub SSL_ca_file { -- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem"); -- if (!File::Spec->file_name_is_absolute($file)) { -- $file = File::Spec->catfile(Cwd::cwd(), $file); -- } -- return $file; -+ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt'); - } - - 1; --- -1.7.11.4 - diff --git a/Mozilla-CA-20130114-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20130114-Redirect-to-ca-certificates-bundle.patch new file mode 100644 index 0000000..45d622c --- /dev/null +++ b/Mozilla-CA-20130114-Redirect-to-ca-certificates-bundle.patch @@ -0,0 +1,68 @@ +From 02db836ecf68b7554c7e3f496dbfa9ef1b432d76 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 16 Sep 2011 10:33:54 +0200 +Subject: [PATCH] Redirect to ca-certificates bundle + +This patch replaces Mozilla-CA certificate bundle with bundle +delivered by ca-certificates RPM package used as single source of +Mozilla certificate bundle. + +See for more +details. +--- + MANIFEST | 1 - + Makefile.PL | 8 ++++++++ + lib/Mozilla/CA.pm | 8 +------- + 3 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/MANIFEST b/MANIFEST +index a88847b..6577ede 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -1,5 +1,4 @@ + lib/Mozilla/CA.pm +-lib/Mozilla/CA/cacert.pem + Makefile.PL + MANIFEST This list of files + README +diff --git a/Makefile.PL b/Makefile.PL +index 2b10474..57f2f07 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -40,3 +40,11 @@ BEGIN { + ExtUtils::MakeMaker::WriteMakefile(%arg); + }; + } ++ ++package MY; ++sub MY::libscan { ++ my $name = shift->SUPER::libscan(@_); ++ # Remove private certificate bundle ++ if ($name =~ /cacert.pem\z/) { $name = '' }; ++ return $name; ++} +diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm +index 95fc86d..71e4f91 100644 +--- a/lib/Mozilla/CA.pm ++++ b/lib/Mozilla/CA.pm +@@ -3,16 +3,10 @@ package Mozilla::CA; + use strict; + our $VERSION = '20130114'; + +-use Cwd (); + use File::Spec (); +-use File::Basename qw(dirname); + + sub SSL_ca_file { +- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem"); +- if (!File::Spec->file_name_is_absolute($file)) { +- $file = File::Spec->catfile(Cwd::cwd(), $file); +- } +- return $file; ++ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt'); + } + + 1; +-- +1.7.11.4 + diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index b0858ca..c311079 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: 20120823 +Version: 20130114 Release: 1%{?dist} Summary: Mozilla's CA cert bundle in PEM format License: MPLv1.1 or LGPLv2+ or GPLv2+ @@ -9,14 +9,14 @@ 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: Mozilla-CA-20120823-Redirect-to-ca-certificates-bundle.patch +Patch0: Mozilla-CA-20130114-Redirect-to-ca-certificates-bundle.patch BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # Tests: BuildRequires: ca-certificates BuildRequires: perl(File::Spec) BuildRequires: perl(Test) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: ca-certificates %description @@ -33,7 +33,7 @@ rm mk-ca-bundle.pl sed -i '/^mk-ca-bundle.pl$/d' MANIFEST %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install @@ -50,6 +50,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Jan 15 2013 Petr Pisar - 20130114-1 +- 20130114 bump + * Thu Aug 23 2012 Petr Pisar - 20120823-1 - 20120823 bump diff --git a/sources b/sources index c57e828..3d094b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86c4949fa7c15d24a06af662ee94865c Mozilla-CA-20120823.tar.gz +45a42082dbd68cf25869ceb2aa49d5b2 Mozilla-CA-20130114.tar.gz