Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

2
.gitignore vendored

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

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

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

@ -2,30 +2,31 @@ Name: perl-Mozilla-CA
# You do not need to back-port a new version for updating a list of the # 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 # certificates. They are taken from ca-certificates package instead
# per bug #738383. # per bug #738383.
Version: 20231213 Version: 20200520
Release: 4%{?dist} Release: 6%{?dist}
Summary: Mozilla's CA certificate bundle in PEM format Summary: Mozilla's CA certificate bundle in PEM format
# README: MPL-2.0 # README: MPLv2.0
## Unbundled ## Unbundled
# mk-ca-bundle.pl: MIT # mk-ca-bundle.pl: MIT
# lib/Mozilla/CA/cacert.pem: MPL-2.0 # lib/Mozilla/CA/cacert.pem: MPLv2.0
License: MPL-2.0 License: MPLv2.0
URL: https://metacpan.org/release/Mozilla-CA URL: https://metacpan.org/release/Mozilla-CA
Source0: https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-%{version}.tar.gz 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 # Use a CA bundle from ca-certificates package, bug #738383
Patch0: Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch Patch0: Mozilla-CA-20200520-Redirect-to-ca-certificates-bundle.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: make BuildRequires: make
BuildRequires: perl-generators
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
# Run-time: # Run-time:
BuildRequires: ca-certificates BuildRequires: ca-certificates
BuildRequires: perl(strict) BuildRequires: perl(strict)
BuildRequires: perl(File::Spec) BuildRequires: perl(File::Spec)
# Tests: # Tests:
BuildRequires: perl(Test::More) BuildRequires: perl(Test)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: ca-certificates Requires: ca-certificates
%description %description
@ -33,25 +34,15 @@ 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 certificate authority certificates in a form that can be consumed by modules
and libraries based on OpenSSL. 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 %prep
%setup -q -n Mozilla-CA-%{version} %setup -q -n Mozilla-CA-%{version}
%patch -P0 -p1 %patch0 -p1
# Remove a bundled CA bundle for sure # Remove a bundled CA bundle for sure
rm lib/Mozilla/CA/cacert.pem rm lib/Mozilla/CA/cacert.pem
# Help generators to recognize Perl scripts # Do not distribute Mozilla downloader, we take certificates from
for F in t/*.t; do # ca-certificates package
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F" rm mk-ca-bundle.pl
chmod +x "$F" perl -i -ne 'print $_ unless m{^mk-ca-bundle\.pl$}' MANIFEST
done
%build %build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@ -59,15 +50,7 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
%install %install
%{make_install} %{make_install}
# Install tests %{_fixperms} $RPM_BUILD_ROOT/*
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 %check
make test make test
@ -77,63 +60,13 @@ make test
%{perl_vendorlib}/* %{perl_vendorlib}/*
%{_mandir}/man3/* %{_mandir}/man3/*
%files tests
%{_libexecdir}/%{name}
%changelog %changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20231213-4 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-6
- Bump release for June 2024 mass rebuild - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
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 May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 20200520-5 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-5
- Perl 5.34 rebuild - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save