delete redundant files
This commit is contained in:
parent
3b09c9dcb4
commit
954a12a4cd
@ -1,73 +0,0 @@
|
|||||||
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 a88847b..6577ede 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 9faf720..a491813 100644
|
|
||||||
--- a/Makefile.PL
|
|
||||||
+++ b/Makefile.PL
|
|
||||||
@@ -40,3 +40,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 c2f35b5..46a1912 100644
|
|
||||||
--- a/lib/Mozilla/CA.pm
|
|
||||||
+++ b/lib/Mozilla/CA.pm
|
|
||||||
@@ -3,16 +3,10 @@ package Mozilla::CA;
|
|
||||||
use strict;
|
|
||||||
our $VERSION = '20180117';
|
|
||||||
|
|
||||||
-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.13.6
|
|
||||||
|
|
||||||
@ -1,13 +1,11 @@
|
|||||||
Name: perl-Mozilla-CA
|
Name: perl-Mozilla-CA
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 20180117
|
Version: 20180117
|
||||||
Release: 3
|
Release: 4
|
||||||
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/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
|
||||||
# See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more
|
|
||||||
Patch6000: Mozilla-CA-20180117-Redirect-to-ca-certificates-bundle.patch
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
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
|
||||||
@ -47,8 +45,10 @@ make test
|
|||||||
%files help
|
%files help
|
||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-4
|
||||||
|
- Delete redundant file
|
||||||
|
|
||||||
* Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-3
|
* Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:20180117-3
|
||||||
- Adjust requires
|
- Adjust requires
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user