diff --git a/Mozilla-CA-20211001.tar.gz b/Mozilla-CA-20211001.tar.gz deleted file mode 100644 index fbe0fb9..0000000 Binary files a/Mozilla-CA-20211001.tar.gz and /dev/null differ diff --git a/Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch similarity index 66% rename from Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch rename to Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch index b11ddf7..4699f05 100644 --- a/Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch +++ b/Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch @@ -1,4 +1,4 @@ -From 96ff151cf584ccfcc31e37a83ba30a793b5922e9 Mon Sep 17 00:00:00 2001 +From af134e7e20799f8a0fcb08e6b2bbdb7a641fa003 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 @@ -17,27 +17,29 @@ Signed-off-by: Petr Písař --- MANIFEST | 1 - Makefile.PL | 8 ++++++++ - lib/Mozilla/CA.pm | 8 +------- - 3 files changed, 9 insertions(+), 8 deletions(-) + lib/Mozilla/CA.pm | 4 +--- + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MANIFEST b/MANIFEST -index 852e312..f10c380 100644 +index 828e132..2a33923 100644 --- a/MANIFEST +++ b/MANIFEST -@@ -1,5 +1,4 @@ +@@ -1,7 +1,6 @@ + .editorconfig + Changes lib/Mozilla/CA.pm -lib/Mozilla/CA/cacert.pem - Makefile.PL - MANIFEST This list of files - README + maint/cacert-diff + maint/get-tarball-name + maint/make-tarball diff --git a/Makefile.PL b/Makefile.PL -index 1fbe8c3..44290e1 100644 +index 65853e9..61991d1 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -53,3 +53,11 @@ BEGIN { - ExtUtils::MakeMaker::WriteMakefile(%arg); - }; - } +@@ -90,3 +90,11 @@ delete $MM_ARGS{CONFIGURE_REQUIRES} + + ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); + ## END BOILERPLATE ########################################################### + +package MY; +sub MY::libscan { @@ -46,28 +48,24 @@ index 1fbe8c3..44290e1 100644 + if ($name =~ /cacert.pem\z/) { $name = '' }; + return $name; +} +\ No newline at end of file diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm -index dbbc626..4657379 100644 +index 63bbc83..b9371f5 100644 --- a/lib/Mozilla/CA.pm +++ b/lib/Mozilla/CA.pm -@@ -3,16 +3,10 @@ package Mozilla::CA; - use strict; - our $VERSION = '20211001'; +@@ -5,11 +5,9 @@ use warnings; + our $VERSION = '20231213'; --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->rel2abs($file); + return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt'); } 1; -- -2.27.0 +2.33.0 diff --git a/Mozilla-CA-20231213.tar.gz b/Mozilla-CA-20231213.tar.gz new file mode 100644 index 0000000..394171b Binary files /dev/null and b/Mozilla-CA-20231213.tar.gz differ diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index 932fc6a..ad443ee 100644 --- a/perl-Mozilla-CA.spec +++ b/perl-Mozilla-CA.spec @@ -2,8 +2,8 @@ Name: perl-%{mod_name} Epoch: 1 -Version: 20211001 -Release: 2 +Version: 20231213 +Release: 1 Summary: Mozilla's CA cert bundle in PEM format License: MPLv2.0 URL: https://metacpan.org/release/%{mod_name} @@ -11,7 +11,7 @@ Source0: https://cpan.metacpan.org/authors/id/A/AB/ABH/%{mod_name}-%{vers BuildArch: noarch # For check failure -Patch0: Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch +Patch0: Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch BuildRequires: make coreutils perl perl-generators perl-PathTools perl-ExtUtils-MakeMaker Requires: perl perl-PathTools ca-certificates @@ -52,6 +52,12 @@ make test %{_mandir}/man3/* %changelog +* Tue Jan 30 2024 zhangyao - 1:20231213-1 +- Upgrade version to 20231213 +- Update certificates +- Stop installing mk-ca-bundle.pl script +- Switched tests from Test to Test::More + * Wed Oct 26 2022 wangyuhang - 1:20211001-2 - define mod_name to opitomize the specfile