Compare commits
10 Commits
1da0048288
...
f25b4ee166
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f25b4ee166 | ||
|
|
2ca26b2247 | ||
|
|
89cbaa9f81 | ||
|
|
cc158de479 | ||
|
|
0bd9a4c092 | ||
|
|
5c5043d5bd | ||
|
|
8e4be72e19 | ||
|
|
12b07a952a | ||
|
|
25cd8df0b0 | ||
|
|
087491d160 |
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
From 96ff151cf584ccfcc31e37a83ba30a793b5922e9 Mon Sep 17 00:00:00 2001
|
From af134e7e20799f8a0fcb08e6b2bbdb7a641fa003 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
|
||||||
@ -17,27 +17,29 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|||||||
---
|
---
|
||||||
MANIFEST | 1 -
|
MANIFEST | 1 -
|
||||||
Makefile.PL | 8 ++++++++
|
Makefile.PL | 8 ++++++++
|
||||||
lib/Mozilla/CA.pm | 8 +-------
|
lib/Mozilla/CA.pm | 4 +---
|
||||||
3 files changed, 9 insertions(+), 8 deletions(-)
|
3 files changed, 9 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/MANIFEST b/MANIFEST
|
diff --git a/MANIFEST b/MANIFEST
|
||||||
index a88847b..6577ede 100644
|
index 828e132..2a33923 100644
|
||||||
--- a/MANIFEST
|
--- a/MANIFEST
|
||||||
+++ b/MANIFEST
|
+++ b/MANIFEST
|
||||||
@@ -1,5 +1,4 @@
|
@@ -1,7 +1,6 @@
|
||||||
|
.editorconfig
|
||||||
|
Changes
|
||||||
lib/Mozilla/CA.pm
|
lib/Mozilla/CA.pm
|
||||||
-lib/Mozilla/CA/cacert.pem
|
-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
|
diff --git a/Makefile.PL b/Makefile.PL
|
||||||
index 9faf720..a491813 100644
|
index 65853e9..61991d1 100644
|
||||||
--- a/Makefile.PL
|
--- a/Makefile.PL
|
||||||
+++ b/Makefile.PL
|
+++ b/Makefile.PL
|
||||||
@@ -40,3 +40,11 @@ BEGIN {
|
@@ -90,3 +90,11 @@ delete $MM_ARGS{CONFIGURE_REQUIRES}
|
||||||
ExtUtils::MakeMaker::WriteMakefile(%arg);
|
|
||||||
};
|
ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
|
||||||
}
|
## END BOILERPLATE ###########################################################
|
||||||
+
|
+
|
||||||
+package MY;
|
+package MY;
|
||||||
+sub MY::libscan {
|
+sub MY::libscan {
|
||||||
@ -46,28 +48,24 @@ index 9faf720..a491813 100644
|
|||||||
+ if ($name =~ /cacert.pem\z/) { $name = '' };
|
+ if ($name =~ /cacert.pem\z/) { $name = '' };
|
||||||
+ return $name;
|
+ return $name;
|
||||||
+}
|
+}
|
||||||
|
\ No newline at end of file
|
||||||
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 c2f35b5..46a1912 100644
|
index 63bbc83..b9371f5 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;
|
@@ -5,11 +5,9 @@ use warnings;
|
||||||
use strict;
|
our $VERSION = '20231213';
|
||||||
our $VERSION = '20180117';
|
|
||||||
|
|
||||||
-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");
|
||||||
- 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');
|
+ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt');
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
--
|
--
|
||||||
2.13.6
|
2.33.0
|
||||||
|
|
||||||
BIN
Mozilla-CA-20231213.tar.gz
Normal file
BIN
Mozilla-CA-20231213.tar.gz
Normal file
Binary file not shown.
@ -1,15 +1,17 @@
|
|||||||
Name: perl-Mozilla-CA
|
%define mod_name Mozilla-CA
|
||||||
|
|
||||||
|
Name: perl-%{mod_name}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 20180117
|
Version: 20231213
|
||||||
Release: 6
|
Release: 1
|
||||||
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
|
# For check failure
|
||||||
Patch0: Mozilla-CA-20180117-Redirect-to-ca-certificates-bundle.patch
|
Patch0: Mozilla-CA-20231213-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
|
||||||
@ -27,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
|
||||||
|
|
||||||
@ -50,6 +52,21 @@ make test
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 30 2024 zhangyao <zhangyao108@huawei.com> - 1:20231213-1
|
||||||
|
- Upgrade version to 20231213
|
||||||
|
- Update certificates
|
||||||
|
- Stop installing mk-ca-bundle.pl script
|
||||||
|
- Switched tests from Test to Test::More
|
||||||
|
|
||||||
|
* 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
|
* Tue Feb 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-6
|
||||||
- add patch for test failure
|
- add patch for test failure
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user