packages/perl-Mozilla-CA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade version to 20231213

Browse Source
This commit is contained in:
zhangyao 2024-01-26 19:32:00 +08:00
parent 89cbaa9f81
commit 2ca26b2247
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mozilla-CA-20211001.tar.gz
View File

Binary file not shown.

44
Mozilla-CA-20211001-Redirect-to-ca-certificates-bundle.patch → Mozilla-CA-20231213-Redirect-to-ca-certificates-bundle.patch
View File

@ -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 852e312..f10c380 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 1fbe8c3..44290e1 100644 index 65853e9..61991d1 100644
--- a/Makefile.PL --- a/Makefile.PL
+++ b/Makefile.PL +++ b/Makefile.PL
@@ -53,3 +53,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 1fbe8c3..44290e1 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 dbbc626..4657379 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 = '20211001';
-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.27.0 2.33.0

BIN
Mozilla-CA-20231213.tar.gz Normal file
View File

Binary file not shown.

12
perl-Mozilla-CA.spec
View File

@ -2,8 +2,8 @@
Name: perl-%{mod_name} Name: perl-%{mod_name}
Epoch: 1 Epoch: 1
Version: 20211001 Version: 20231213
Release: 2 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/%{mod_name} URL: https://metacpan.org/release/%{mod_name}
@ -11,7 +11,7 @@ Source0: https://cpan.metacpan.org/authors/id/A/AB/ABH/%{mod_name}-%{vers
BuildArch: noarch BuildArch: noarch
# For check failure # For check failure
Patch0: Mozilla-CA-20211001-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
@ -52,6 +52,12 @@ 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 * Wed Oct 26 2022 wangyuhang <wangyuhang27@huawei.com> - 1:20211001-2
- define mod_name to opitomize the specfile - define mod_name to opitomize the specfile