.gitignore

@@ -1 +1 @@
-SOURCES/Mozilla-CA-20200520.tar.gz
+SOURCES/Mozilla-CA-20231213.tar.gz

.perl-Mozilla-CA.metadata

@@ -1 +1 @@
-74f34d452b328338d0b28256a960ea22e1bad774 SOURCES/Mozilla-CA-20200520.tar.gz
+b4873254b7eed8f2b5d7a8b18bc9dfc0494ac979 SOURCES/Mozilla-CA-20231213.tar.gz

SOURCES/Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch

@@ -14,30 +14,27 @@ See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more
 details.
 
 Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- 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 @@
+@@ -1,7 +1,6 @@
+ .editorconfig
+ Changes
  lib/Mozilla/CA.pm
 -lib/Mozilla/CA/cacert.pem
- Makefile.PL
+ maint/cacert-diff
- MANIFEST			This list of files
+ maint/get-tarball-name
- README
+ maint/make-tarball
 diff --git a/Makefile.PL b/Makefile.PL
 index 9faf720..a491813 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -40,3 +40,11 @@ BEGIN {
+@@ -90,3 +90,11 @@
-         ExtUtils::MakeMaker::WriteMakefile(%arg);
+ 
-     };
+ ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
- }
+ ## END BOILERPLATE ###########################################################
 +
 +package MY;
 +sub MY::libscan {
@@ -50,20 +47,15 @@ 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
-@@ -3,16 +3,10 @@ package Mozilla::CA;
+@@ -5,11 +5,9 @@
- use strict;
+ our $VERSION = '20231213';
- our $VERSION = '20200520';
  
--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)) {
+-    return File::Spec->rel2abs($file);
--	$file = File::Spec->catfile(Cwd::cwd(), $file);
--    }
--    return $file;
 +    return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt');
  }
  

SPECS/perl-Mozilla-CA.spec

@@ -2,31 +2,30 @@ 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:        20200520
+Version:        20231213
-Release:        6%{?dist}
+Release:        4%{?dist}
 Summary:        Mozilla's CA certificate bundle in PEM format
-# README:                       MPLv2.0
+# README:                       MPL-2.0
 ## Unbundled
 # mk-ca-bundle.pl:              MIT
-# lib/Mozilla/CA/cacert.pem:    MPLv2.0
+# lib/Mozilla/CA/cacert.pem:    MPL-2.0
-License:        MPLv2.0
+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-20200520-Redirect-to-ca-certificates-bundle.patch
+Patch0:         Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 # Run-time:
 BuildRequires:  ca-certificates
 BuildRequires:  perl(strict)
 BuildRequires:  perl(File::Spec)
 # Tests:
-BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       ca-certificates
 
 %description
@@ -34,15 +33,25 @@ Mozilla::CA provides a path to ca-certificates copy of Mozilla's bundle of
 certificate authority certificates in a form that can be consumed by modules
 and libraries based on OpenSSL.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Mozilla-CA-%{version}
-%patch0 -p1
+%patch -P0 -p1
 # Remove a bundled CA bundle for sure
 rm lib/Mozilla/CA/cacert.pem
-# Do not distribute Mozilla downloader, we take certificates from
+# Help generators to recognize Perl scripts
-# ca-certificates package
+for F in t/*.t; do
-rm mk-ca-bundle.pl
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
-perl -i -ne 'print $_ unless m{^mk-ca-bundle\.pl$}' MANIFEST
+    chmod +x "$F"
+done
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -50,7 +59,15 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 
 %install
 %{make_install}
-%{_fixperms} $RPM_BUILD_ROOT/*
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -60,13 +77,63 @@ make test
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-6
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20231213-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20231213-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20231213-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Dec 14 2023 Michal Josef Špaček <mspacek@redhat.com> - 20231213-1
+- 20231213 bump
+
+* Fri Aug 25 2023 Michal Josef Špaček <mspacek@redhat.com> - 20230821-1
+- 20230821 bump
+
+* Tue Aug 15 2023 Michal Josef Špaček <mspacek@redhat.com> - 20230807-1
+- 20230807 bump
+
+* Thu Aug 03 2023 Michal Josef Špaček <mspacek@redhat.com> - 20230801-1
+- 20230801 bump
+- Fix %patch macro usage
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20221114-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20221114-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Nov 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 20221114-1
+- 20221114 bump
+
+* Mon Nov 07 2022 Michal Josef Špaček <mspacek@redhat.com> - 20211001-5
+- Package tests
+- Unify variable to macro
+- Update license to SPDX format
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211001-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 20211001-3
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211001-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 02 2021 Jitka Plesnikova <jplesnik@redhat.com> - 20211001-1
+- 20211001 bump
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-5
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 20200520-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Perl 5.34 rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild