Compare commits
10 Commits
bb8fd7534d
...
a6e6e96ca2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6e6e96ca2 | ||
|
|
1b5febd7a6 | ||
|
|
a03e0817d0 | ||
|
|
d8c69a1d8c | ||
|
|
25cd8df0b0 | ||
|
|
087491d160 | ||
|
|
1da0048288 | ||
|
|
404a1c8b75 | ||
|
|
1082fc3d7d | ||
|
|
a26f51969d |
Binary file not shown.
73
Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch
Normal file
73
Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
From 96ff151cf584ccfcc31e37a83ba30a793b5922e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||||
|
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 bundle
|
||||||
|
delivered by ca-certificates RPM package used as single source of
|
||||||
|
Mozilla certificate bundle.
|
||||||
|
|
||||||
|
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 852e312..f10c380 100644
|
||||||
|
--- a/MANIFEST
|
||||||
|
+++ b/MANIFEST
|
||||||
|
@@ -1,5 +1,4 @@
|
||||||
|
lib/Mozilla/CA.pm
|
||||||
|
-lib/Mozilla/CA/cacert.pem
|
||||||
|
Makefile.PL
|
||||||
|
MANIFEST This list of files
|
||||||
|
README
|
||||||
|
diff --git a/Makefile.PL b/Makefile.PL
|
||||||
|
index 1fbe8c3..44290e1 100644
|
||||||
|
--- a/Makefile.PL
|
||||||
|
+++ b/Makefile.PL
|
||||||
|
@@ -53,3 +53,11 @@ BEGIN {
|
||||||
|
ExtUtils::MakeMaker::WriteMakefile(%arg);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+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 dbbc626..4657379 100644
|
||||||
|
--- a/lib/Mozilla/CA.pm
|
||||||
|
+++ b/lib/Mozilla/CA.pm
|
||||||
|
@@ -3,16 +3,10 @@ package Mozilla::CA;
|
||||||
|
use strict;
|
||||||
|
our $VERSION = '20211001';
|
||||||
|
|
||||||
|
-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->catfile('/etc/pki/tls/certs/ca-bundle.crt');
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
BIN
Mozilla-CA-20211001.tar.gz
Normal file
BIN
Mozilla-CA-20211001.tar.gz
Normal file
Binary file not shown.
@ -1,12 +1,18 @@
|
|||||||
Name: perl-Mozilla-CA
|
%define mod_name Mozilla-CA
|
||||||
|
|
||||||
|
Name: perl-%{mod_name}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 20180117
|
Version: 20211001
|
||||||
Release: 5
|
Release: 2
|
||||||
Summary: Mozilla's CA cert bundle in PEM format
|
Summary: Mozilla's CA cert bundle in PEM format
|
||||||
License: MPLv2.0
|
License: MPLv2.0
|
||||||
URL: https://metacpan.org/release/Mozilla-CA
|
URL: https://metacpan.org/release/%{mod_name}
|
||||||
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/%{mod_name}-%{version}.tar.gz
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# For check failure
|
||||||
|
Patch0: Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch
|
||||||
|
|
||||||
BuildRequires: make coreutils perl perl-generators perl-PathTools perl-ExtUtils-MakeMaker
|
BuildRequires: make coreutils perl perl-generators perl-PathTools perl-ExtUtils-MakeMaker
|
||||||
Requires: perl perl-PathTools ca-certificates
|
Requires: perl perl-PathTools ca-certificates
|
||||||
|
|
||||||
@ -23,7 +29,7 @@ BuildArch: noarch
|
|||||||
This package provide %{summary}.
|
This package provide %{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n Mozilla-CA-%{version} -p1
|
%autosetup -n %{mod_name}-%{version} -p1
|
||||||
rm -vf lib/Mozilla/CA/cacert.pem mk-ca-bundle.pl
|
rm -vf lib/Mozilla/CA/cacert.pem mk-ca-bundle.pl
|
||||||
sed -i '/^mk-ca-bundle.pl$/d' MANIFEST
|
sed -i '/^mk-ca-bundle.pl$/d' MANIFEST
|
||||||
|
|
||||||
@ -35,7 +41,7 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PERLLOCAL=1 NO_PACKLIST=1
|
|||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
#make test
|
make test
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -46,6 +52,18 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PERLLOCAL=1 NO_PACKLIST=1
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 26 2022 wangyuhang <wangyuhang27@huawei.com> - 1:20211001-2
|
||||||
|
- define mod_name to opitomize the specfile
|
||||||
|
|
||||||
|
* Tue Dec 21 2021 shangyibin <shangyibin1@huawei.com> - 1:20211001-1
|
||||||
|
- update to 20211001-1
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 shixuantong <shixuantong@huawei.com> - 1:20200520-1
|
||||||
|
- update to 20200520-1
|
||||||
|
|
||||||
|
* Tue Feb 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-6
|
||||||
|
- add patch for test failure
|
||||||
|
|
||||||
* Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-5
|
* Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-5
|
||||||
- cancel make check
|
- cancel make check
|
||||||
|
|
||||||
|
|||||||
4
perl-Mozilla-CA.yaml
Normal file
4
perl-Mozilla-CA.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: metacpan
|
||||||
|
src_repo: Mozilla-CA
|
||||||
|
tag_prefix: ^v
|
||||||
|
seperator: "."
|
||||||
Loading…
x
Reference in New Issue
Block a user