diff --git a/.gitignore b/.gitignore index 3ac0618..d5a07fa 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /Mozilla-CA-20211001.tar.gz /Mozilla-CA-20221114.tar.gz /Mozilla-CA-20230801.tar.gz +/Mozilla-CA-20230807.tar.gz diff --git a/Mozilla-CA-20230801-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20230801-Redirect-to-ca-certificates-bundle.patch deleted file mode 100644 index 7b39fb5..0000000 --- a/Mozilla-CA-20230801-Redirect-to-ca-certificates-bundle.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ab01996d4d539cada0013b837b782f27db6b96ff 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 a bundle -delivered by ca-certificates RPM package used as a single source of -the 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,6 +1,5 @@ - Changes - lib/Mozilla/CA.pm --lib/Mozilla/CA/cacert.pem - maint/mk-ca-bundle.pl - maint/update-cacert-file - maint/update-mk-ca-bundle -diff --git a/Makefile.PL b/Makefile.PL -index 9faf720..a491813 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -53,3 +53,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 e4a6c56..fdb3c75 100644 ---- a/lib/Mozilla/CA.pm -+++ b/lib/Mozilla/CA.pm -@@ -5,11 +5,9 @@ - our $VERSION = '20230801'; - - use File::Spec (); --use File::Basename qw(dirname); - - sub SSL_ca_file { -- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem"); -- return File::Spec->rel2abs($file); -+ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt'); - } - - 1; --- -2.25.4 - diff --git a/Mozilla-CA-20230807-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20230807-Redirect-to-ca-certificates-bundle.patch new file mode 100644 index 0000000..32e069f --- /dev/null +++ b/Mozilla-CA-20230807-Redirect-to-ca-certificates-bundle.patch @@ -0,0 +1,70 @@ +From ab01996d4d539cada0013b837b782f27db6b96ff 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 a bundle +delivered by ca-certificates RPM package used as a single source of +the 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,7 +1,6 @@ + .editorconfig + Changes + lib/Mozilla/CA.pm +-lib/Mozilla/CA/cacert.pem + maint/cacert-diff + maint/get-tarball-name + maint/make-tarball +diff --git a/Makefile.PL b/Makefile.PL +index 9faf720..a491813 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -88,3 +88,11 @@ + + ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); + ## END BOILERPLATE ########################################################### ++ ++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 e4a6c56..fdb3c75 100644 +--- a/lib/Mozilla/CA.pm ++++ b/lib/Mozilla/CA.pm +@@ -5,11 +5,9 @@ + our $VERSION = '20230807'; + + use File::Spec (); +-use File::Basename qw(dirname); + + sub SSL_ca_file { +- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem"); +- return File::Spec->rel2abs($file); ++ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt'); + } + + 1; +-- +2.25.4 + diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index 1c12582..8fcee84 100644 --- a/perl-Mozilla-CA.spec +++ b/perl-Mozilla-CA.spec @@ -2,7 +2,7 @@ Name: perl-Mozilla-CA # You do not need to back-port a new version for updating a list of the # certificates. They are taken from ca-certificates package instead # per bug #738383. -Version: 20230801 +Version: 20230807 Release: 1%{?dist} Summary: Mozilla's CA certificate bundle in PEM format # README: MPL-2.0 @@ -13,7 +13,7 @@ License: MPL-2.0 URL: https://metacpan.org/release/Mozilla-CA Source0: https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-%{version}.tar.gz # Use a CA bundle from ca-certificates package, bug #738383 -Patch0: Mozilla-CA-20230801-Redirect-to-ca-certificates-bundle.patch +Patch0: Mozilla-CA-20230807-Redirect-to-ca-certificates-bundle.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -81,6 +81,9 @@ make test %{_libexecdir}/%{name} %changelog +* Tue Aug 15 2023 Michal Josef Špaček - 20230807-1 +- 20230807 bump + * Thu Aug 03 2023 Michal Josef Špaček - 20230801-1 - 20230801 bump - Fix %patch macro usage diff --git a/sources b/sources index bb67480..d8906ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Mozilla-CA-20230801.tar.gz) = cbd148507f5880825645a46735f2a19378015f5c83b4f90e8aa98256e520251e11662d0a2f7fea5405a22270f7b3421e18d3c73bb7cb03f5a5a6dfc049807e05 +SHA512 (Mozilla-CA-20230807.tar.gz) = 23689a96ef35660a476e82799d596fe7af36f432b865867c66dcd220d4dec63ee5c6991fe84e07ba15703fd891ce2b2bd077578a0be8480ccc2a7736d7e93689