|
 |
099c50 |
From 02db836ecf68b7554c7e3f496dbfa9ef1b432d76 Mon Sep 17 00:00:00 2001
|
|
|
099c50 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
099c50 |
Date: Fri, 16 Sep 2011 10:33:54 +0200
|
|
|
099c50 |
Subject: [PATCH] Redirect to ca-certificates bundle
|
|
|
099c50 |
|
|
|
099c50 |
This patch replaces Mozilla-CA certificate bundle with bundle
|
|
|
099c50 |
delivered by ca-certificates RPM package used as single source of
|
|
|
099c50 |
Mozilla certificate bundle.
|
|
|
099c50 |
|
|
|
099c50 |
See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more
|
|
|
099c50 |
details.
|
|
|
099c50 |
---
|
|
|
099c50 |
MANIFEST | 1 -
|
|
|
099c50 |
Makefile.PL | 8 ++++++++
|
|
|
099c50 |
lib/Mozilla/CA.pm | 8 +-------
|
|
|
099c50 |
3 files changed, 9 insertions(+), 8 deletions(-)
|
|
|
099c50 |
|
|
|
099c50 |
diff --git a/MANIFEST b/MANIFEST
|
|
|
099c50 |
index a88847b..6577ede 100644
|
|
|
099c50 |
--- a/MANIFEST
|
|
|
099c50 |
+++ b/MANIFEST
|
|
|
099c50 |
@@ -1,5 +1,4 @@
|
|
|
099c50 |
lib/Mozilla/CA.pm
|
|
|
099c50 |
-lib/Mozilla/CA/cacert.pem
|
|
|
099c50 |
Makefile.PL
|
|
|
099c50 |
MANIFEST This list of files
|
|
|
099c50 |
README
|
|
|
099c50 |
diff --git a/Makefile.PL b/Makefile.PL
|
|
|
099c50 |
index 2b10474..57f2f07 100644
|
|
|
099c50 |
--- a/Makefile.PL
|
|
|
099c50 |
+++ b/Makefile.PL
|
|
|
099c50 |
@@ -40,3 +40,11 @@ BEGIN {
|
|
|
099c50 |
ExtUtils::MakeMaker::WriteMakefile(%arg);
|
|
|
099c50 |
};
|
|
|
099c50 |
}
|
|
|
099c50 |
+
|
|
|
099c50 |
+package MY;
|
|
|
099c50 |
+sub MY::libscan {
|
|
|
099c50 |
+ my $name = shift->SUPER::libscan(@_);
|
|
|
099c50 |
+ # Remove private certificate bundle
|
|
|
099c50 |
+ if ($name =~ /cacert.pem\z/) { $name = '' };
|
|
|
099c50 |
+ return $name;
|
|
|
099c50 |
+}
|
|
|
099c50 |
diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm
|
|
|
099c50 |
index 95fc86d..71e4f91 100644
|
|
|
099c50 |
--- a/lib/Mozilla/CA.pm
|
|
|
099c50 |
+++ b/lib/Mozilla/CA.pm
|
|
|
099c50 |
@@ -3,16 +3,10 @@ package Mozilla::CA;
|
|
|
099c50 |
use strict;
|
|
|
099c50 |
our $VERSION = '20130114';
|
|
|
099c50 |
|
|
|
099c50 |
-use Cwd ();
|
|
|
099c50 |
use File::Spec ();
|
|
|
099c50 |
-use File::Basename qw(dirname);
|
|
|
099c50 |
|
|
|
099c50 |
sub SSL_ca_file {
|
|
|
099c50 |
- my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem");
|
|
|
099c50 |
- if (!File::Spec->file_name_is_absolute($file)) {
|
|
|
099c50 |
- $file = File::Spec->catfile(Cwd::cwd(), $file);
|
|
|
099c50 |
- }
|
|
|
099c50 |
- return $file;
|
|
|
099c50 |
+ return File::Spec->catfile('/etc/pki/tls/certs/ca-bundle.crt');
|
|
|
099c50 |
}
|
|
|
099c50 |
|
|
|
099c50 |
1;
|
|
|
099c50 |
--
|
|
|
099c50 |
1.7.11.4
|
|
|
099c50 |
|