Compare commits

...

No commits in common. 'c8-stream-6.34' and 'c9' have entirely different histories.

2
.gitignore vendored

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

@ -1 +1 @@
3f251d0eeb8e8bb3ab1c6baafe7b40245d12a9b3 SOURCES/Mozilla-CA-20160104.tar.gz 74f34d452b328338d0b28256a960ea22e1bad774 SOURCES/Mozilla-CA-20200520.tar.gz

@ -1,4 +1,4 @@
From 04cbb3144a8ffe1f70149f4b51c1668b0ddc5dc0 Mon Sep 17 00:00:00 2001 From ab01996d4d539cada0013b837b782f27db6b96ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 16 Sep 2011 10:33:54 +0200 Date: Fri, 16 Sep 2011 10:33:54 +0200
Subject: [PATCH] Redirect to ca-certificates bundle Subject: [PATCH] Redirect to ca-certificates bundle
@ -6,9 +6,9 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
This patch replaces Mozilla-CA certificate bundle with bundle This patch replaces Mozilla-CA certificate bundle with a bundle
delivered by ca-certificates RPM package used as single source of delivered by ca-certificates RPM package used as a single source of
Mozilla certificate bundle. the Mozilla certificate bundle.
See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more
details. details.
@ -47,12 +47,12 @@ index 9faf720..a491813 100644
+ return $name; + return $name;
+} +}
diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm
index 3947c90..6c3a506 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
@@ -3,16 +3,10 @@ package Mozilla::CA; @@ -3,16 +3,10 @@ package Mozilla::CA;
use strict; use strict;
our $VERSION = '20160104'; our $VERSION = '20200520';
-use Cwd (); -use Cwd ();
use File::Spec (); use File::Spec ();
@ -69,5 +69,5 @@ index 3947c90..6c3a506 100644
1; 1;
-- --
2.5.0 2.25.4

@ -1,23 +1,25 @@
Name: perl-Mozilla-CA Name: perl-Mozilla-CA
# You do not need to back-port new version for list of certificates solely. # You do not need to back-port a new version for updating a list of the
# They are taken from ca-certificates package instead per bug #738383. # certificates. They are taken from ca-certificates package instead
Version: 20160104 # per bug #738383.
Release: 7%{?dist} Version: 20200520
Summary: Mozilla's CA cert bundle in PEM format Release: 6%{?dist}
Summary: Mozilla's CA certificate bundle in PEM format
# README: MPLv2.0
## Unbundled
# mk-ca-bundle.pl: MIT
# lib/Mozilla/CA/cacert.pem: MPLv2.0
License: MPLv2.0 License: MPLv2.0
Group: Development/Libraries URL: https://metacpan.org/release/Mozilla-CA
URL: http://search.cpan.org/dist/Mozilla-CA/ Source0: https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-%{version}.tar.gz
Source0: http://www.cpan.org/authors/id/A/AB/ABH/Mozilla-CA-%{version}.tar.gz # Use a CA bundle from ca-certificates package, bug #738383
# Use CA bundle from ca-certificates package, bug #738383 Patch0: Mozilla-CA-20200520-Redirect-to-ca-certificates-bundle.patch
Patch0: Mozilla-CA-20160104-Redirect-to-ca-certificates-bundle.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: make BuildRequires: make
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: sed
# Run-time: # Run-time:
BuildRequires: ca-certificates BuildRequires: ca-certificates
BuildRequires: perl(strict) BuildRequires: perl(strict)
@ -35,20 +37,19 @@ and libraries based on OpenSSL.
%prep %prep
%setup -q -n Mozilla-CA-%{version} %setup -q -n Mozilla-CA-%{version}
%patch0 -p1 %patch0 -p1
# Remove bundled CA bundle for sure # Remove a bundled CA bundle for sure
rm lib/Mozilla/CA/cacert.pem rm lib/Mozilla/CA/cacert.pem
# Do not distribute Mozilla downloader, we take certificates from # Do not distribute Mozilla downloader, we take certificates from
# ca-certificates package # ca-certificates package
rm mk-ca-bundle.pl rm mk-ca-bundle.pl
sed -i '/^mk-ca-bundle.pl$/d' MANIFEST perl -i -ne 'print $_ unless m{^mk-ca-bundle\.pl$}' MANIFEST
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
make %{?_smp_mflags} %{make_build}
%install %install
make pure_install DESTDIR=$RPM_BUILD_ROOT %{make_install}
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
@ -60,6 +61,46 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200520-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200520-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 20200520-2
- Perl 5.32 rebuild
* Wed May 20 2020 Petr Pisar <ppisar@redhat.com> - 20200520-1
- 20200520 bump
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20180117-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180117-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 20180117-5
- Perl 5.30 rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180117-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180117-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 20180117-2
- Perl 5.28 rebuild
* Fri Mar 02 2018 Petr Pisar <ppisar@redhat.com> - 20180117-1
- 20180117 bump
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20160104-7 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20160104-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save