72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
From af134e7e20799f8a0fcb08e6b2bbdb7a641fa003 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 | 4 +---
|
|
3 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/MANIFEST b/MANIFEST
|
|
index 828e132..2a33923 100644
|
|
--- a/MANIFEST
|
|
+++ b/MANIFEST
|
|
@@ -1,7 +1,6 @@
|
|
.editorconfig
|
|
Changes
|
|
lib/Mozilla/CA.pm
|
|
-lib/Mozilla/CA/cacert.pem
|
|
maint/cacert-diff
|
|
maint/get-tarball-name
|
|
maint/make-tarball
|
|
diff --git a/Makefile.PL b/Makefile.PL
|
|
index 65853e9..61991d1 100644
|
|
--- a/Makefile.PL
|
|
+++ b/Makefile.PL
|
|
@@ -90,3 +90,11 @@ delete $MM_ARGS{CONFIGURE_REQUIRES}
|
|
|
|
ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
|
|
## END BOILERPLATE ###########################################################
|
|
+
|
|
+package MY;
|
|
+sub MY::libscan {
|
|
+ my $name = shift->SUPER::libscan(@_);
|
|
+ # Remove private certificate bundle
|
|
+ if ($name =~ /cacert.pem\z/) { $name = '' };
|
|
+ return $name;
|
|
+}
|
|
\ No newline at end of file
|
|
diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm
|
|
index 63bbc83..b9371f5 100644
|
|
--- a/lib/Mozilla/CA.pm
|
|
+++ b/lib/Mozilla/CA.pm
|
|
@@ -5,11 +5,9 @@ use warnings;
|
|
our $VERSION = '20231213';
|
|
|
|
use File::Spec ();
|
|
-use File::Basename qw(dirname);
|
|
|
|
sub SSL_ca_file {
|
|
- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem");
|
|
- return File::Spec->rel2abs($file);
|
|
+ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt');
|
|
}
|
|
|
|
1;
|
|
--
|
|
2.33.0
|
|
|