diff --git a/Mozilla-CA-20240313.tar.gz b/Mozilla-CA-20240313.tar.gz deleted file mode 100644 index ecdbf80..0000000 --- a/Mozilla-CA-20240313.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:624873939e309833894f881464a95dfe74ab77cab5d557308c010487161698e7 -size 149129 diff --git a/Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch b/Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch new file mode 100644 index 0000000..6212316 --- /dev/null +++ b/Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch @@ -0,0 +1,65 @@ +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ř + +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 +@@ -90,3 +90,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 = '20240730'; + + 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('/var/lib/ca-certificates/ca-bundle.pem'); + } + + 1; +-- +2.25.4 + diff --git a/Mozilla-CA-20240730.tar.gz b/Mozilla-CA-20240730.tar.gz new file mode 100644 index 0000000..7492d68 --- /dev/null +++ b/Mozilla-CA-20240730.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55bbee1875a905616e0c39457245f94f8173227fbe906f643673f5adadedf863 +size 148483 diff --git a/cpanspec.yml b/cpanspec.yml index 7bf840f..c419b09 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -4,11 +4,12 @@ #sources: # - source1 # - source2 -#patches: -# foo.patch: -p1 +patches: + Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch: -p1 PATCH-FIX-OPENSUSE https://bugzilla.suse.com/show_bug.cgi?id=1228762 # bar.patch: -#preamble: |- -# BuildRequires: gcc-c++ +preamble: |- + BuildRequires: ca-certificates-mozilla + Requires: ca-certificates-mozilla #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL diff --git a/perl-Mozilla-CA.changes b/perl-Mozilla-CA.changes index 1970685..3d908f3 100644 --- a/perl-Mozilla-CA.changes +++ b/perl-Mozilla-CA.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Sep 2 13:38:33 UTC 2024 - Tina Müller + +- Add ca-certificates-mozilla to runtime Requires as well + boo#1228762 + +------------------------------------------------------------------- +Mon Aug 26 20:29:40 UTC 2024 - Tina Müller + +- Add Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch, + https://bugzilla.suse.com/show_bug.cgi?id=1228762 + boo#1228762 + +------------------------------------------------------------------- +Wed Jul 31 05:28:27 UTC 2024 - Tina Müller + +- updated to 20240730.0.0 (20240730) + see /usr/share/doc/packages/perl-Mozilla-CA/Changes + + 20240730 + - Update from Mozilla repository to 2024-07-30 + - Added certificates: + - FIRMAPROFESIONAL CA ROOT-A WEB + sha256: bef256daf26e9c69bdec1602359798f3caf71821a03e018257c53c65617f3d4a + - Removed certificates: + - GLOBALTRUST 2020 + sha256: 9a296a5182d1d451a2e37f439b74daafa267523329f90f9a0d2007c334e23c9a + ------------------------------------------------------------------- Fri Mar 22 16:19:02 UTC 2024 - Tina Müller diff --git a/perl-Mozilla-CA.spec b/perl-Mozilla-CA.spec index 4bfd663..550f5b4 100644 --- a/perl-Mozilla-CA.spec +++ b/perl-Mozilla-CA.spec @@ -18,16 +18,18 @@ %define cpan_name Mozilla-CA Name: perl-Mozilla-CA -Version: 20240313.0.0 +Version: 20240730.0.0 Release: 0 -# 20240313 -> normalize -> 20240313.0.0 -%define cpan_version 20240313 +# 20240730 -> normalize -> 20240730.0.0 +%define cpan_version 20240730 #Upstream: SUSE-Public-Domain License: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later Summary: Mozilla's CA cert bundle in PEM format URL: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/L/LW/LWP/%{cpan_name}-%{cpan_version}.tar.gz Source1: cpanspec.yml +# PATCH-FIX-OPENSUSE https://bugzilla.suse.com/show_bug.cgi?id=1228762 +Patch0: Mozilla-CA-20240730-Redirect-to-ca-certificates-bundle.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -35,6 +37,10 @@ BuildRequires: perl(Test::More) >= 0.94 Provides: perl(Mozilla::CA) = %{version} %undefine __perllib_provides %{perl_requires} +# MANUAL BEGIN +BuildRequires: ca-certificates-mozilla +Requires: ca-certificates-mozilla +# MANUAL END %description Mozilla::CA provides a copy of Mozilla's bundle of Certificate Authority @@ -48,7 +54,7 @@ The module provide a single function: Returns the absolute path to the Mozilla's CA cert bundle PEM file. %prep -%autosetup -n %{cpan_name}-%{cpan_version} +%autosetup -n %{cpan_name}-%{cpan_version} -p1 find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -path "*/scripts/*" ! -name "configure" -print0 | xargs -0 chmod 644