From e6a3028c1db5b68676b477cf4957ae5772c8db6e Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Jan 05 2016 08:29:00 +0000 Subject: 20160104 bump --- diff --git a/.gitignore b/.gitignore index 28dbcdb..f9c601c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /Mozilla-CA-20130114.tar.gz /Mozilla-CA-20141217.tar.gz /Mozilla-CA-20150826.tar.gz +/Mozilla-CA-20160104.tar.gz diff --git a/Mozilla-CA-20150826-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20150826-Redirect-to-ca-certificates-bundle.patch deleted file mode 100644 index 65003d0..0000000 --- a/Mozilla-CA-20150826-Redirect-to-ca-certificates-bundle.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 3d5dd834b7d735e19c2d84829b8bf5b018eae8e3 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 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -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. - -Signed-off-by: Petr Písař ---- - 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 9faf720..a491813 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 e59c94d..2fbac31 100644 ---- a/lib/Mozilla/CA.pm -+++ b/lib/Mozilla/CA.pm -@@ -3,16 +3,10 @@ package Mozilla::CA; - use strict; - our $VERSION = '20150826'; - --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; --- -2.4.3 - diff --git a/Mozilla-CA-20160104-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20160104-Redirect-to-ca-certificates-bundle.patch new file mode 100644 index 0000000..1ffaf2b --- /dev/null +++ b/Mozilla-CA-20160104-Redirect-to-ca-certificates-bundle.patch @@ -0,0 +1,73 @@ +From 04cbb3144a8ffe1f70149f4b51c1668b0ddc5dc0 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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. + +Signed-off-by: Petr Písař +--- + 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 9faf720..a491813 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 3947c90..6c3a506 100644 +--- a/lib/Mozilla/CA.pm ++++ b/lib/Mozilla/CA.pm +@@ -3,16 +3,10 @@ package Mozilla::CA; + use strict; + our $VERSION = '20160104'; + +-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; +-- +2.5.0 + diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index cd39488..b6e4ead 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: 20150826 +Version: 20160104 Release: 1%{?dist} Summary: Mozilla's CA cert bundle in PEM format License: MPLv2.0 @@ -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 # Use CA bundle from ca-certificates package, bug #738383 -Patch0: Mozilla-CA-20150826-Redirect-to-ca-certificates-bundle.patch +Patch0: Mozilla-CA-20160104-Redirect-to-ca-certificates-bundle.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils @@ -59,6 +59,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Jan 05 2016 Petr Pisar - 20160104-1 +- 20160104 bump + * Wed Aug 26 2015 Petr Pisar - 20150826-1 - 20150826 bump - License changed from (MPLv1.1 or LGPLv2+ or GPLv2+) to (MPLv2.0) diff --git a/sources b/sources index cbda73b..c050eef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52de059194004192345687f7a2f88224 Mozilla-CA-20150826.tar.gz +1b91edb15953a8188f011ab5ff433300 Mozilla-CA-20160104.tar.gz