Updating CBL-Mariner import Fedora 41 (Version 20200520 -> 20240730).

- Added "License verified" statement to the changelog.

SPECS-EXTENDED/perl-Mozilla-CA/Mozilla-CA-20200520-Redirect-to-ca-certificates-bundle.patch → SPECS-EXTENDED/perl-Mozilla-CA/Mozilla-CA-20240730-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ř <[email protected]>
----
- 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
- 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 9faf720..a491813 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -40,3 +40,11 @@ BEGIN {
-         ExtUtils::MakeMaker::WriteMakefile(%arg);
-     };
- }
+@@ -90,3 +90,11 @@
+
+ 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;
- use strict;
- our $VERSION = '20200520';
+@@ -5,11 +5,9 @@
+ our $VERSION = '20240730';
 
--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');
  }
 

SPECS-EXTENDED/perl-Mozilla-CA/perl-Mozilla-CA.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "perl-Mozilla-CA-20200520.tar.gz": "b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726"
+  "Mozilla-CA-20240730.tar.gz": "55bbee1875a905616e0c39457245f94f8173227fbe906f643673f5adadedf863"
  }
-}
+}

SPECS-EXTENDED/perl-Mozilla-CA/perl-Mozilla-CA.spec

@@ -4,55 +4,72 @@ 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:        20240730
 Release:        2%{?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
-License:        MPLv2.0
+# lib/Mozilla/CA/cacert.pem:    MPL-2.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#/perl-Mozilla-CA-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/authors/id/L/LW/LWP/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-20240730-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)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+BuildRequires:  perl(Test::More)
 Requires:       ca-certificates
 
 %description
 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}
-%patch 0 -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
-# ca-certificates package
-rm mk-ca-bundle.pl
-perl -i -ne 'print $_ unless m{^mk-ca-bundle\.pl$}' MANIFEST
+# Help generators to recognize Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 %{make_build}
 
 %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
@@ -62,7 +79,14 @@ make test
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Mon Dec 16 2024 Sreenivasulu Malavathula <[email protected]> - 20240730-2
+- Initial CBL-Mariner import from Fedora 41 (license: MPL-2.0).
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 20200520-2
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

cgmanifest.json

@@ -18553,8 +18553,8 @@
         "type": "other",
         "other": {
           "name": "perl-Mozilla-CA",
-          "version": "20200520",
-          "downloadUrl": "https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz"
+          "version": "20240730",
+          "downloadUrl": "https://cpan.metacpan.org/authors/id/L/LW/LWP/Mozilla-CA-20240730.tar.gz"
         }
       }
     },