projects / packages / perl-Mozilla-CA.git / blame
| Commit | Line | Data |
|---|---|---|
| 9a3b0fe8 ER |
1 | PLD Linux change (Elan Ruusamäe <glen@pld-linux.org>): |
| 2 | use /etc/certs/ca-certificates.crt instead of /etc/pki/tls/certs/ca-bundle.crt | |
| 3 | ||
| 4 | From ae8af24d6d935b2824ad955aa9ea8cc557089c77 Mon Sep 17 00:00:00 2001 | |
| 5 | From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> | |
| 6 | Date: Fri, 16 Sep 2011 10:33:54 +0200 | |
| 7 | Subject: [PATCH] Redirect to ca-certificates bundle | |
| 8 | MIME-Version: 1.0 | |
| 9 | Content-Type: text/plain; charset=UTF-8 | |
| 10 | Content-Transfer-Encoding: 8bit | |
| 11 | ||
| 12 | This patch replaces Mozilla-CA certificate bundle with bundle | |
| 13 | delivered by ca-certificates RPM package used as single source of | |
| 14 | Mozilla certificate bundle. | |
| 15 | ||
| 16 | See <https://bugzilla.redhat.com/show_bug.cgi?id=738383> for more | |
| 17 | details. | |
| 18 | ||
| 19 | Signed-off-by: Petr Písař <ppisar@redhat.com> | |
| 20 | --- | |
| 21 | MANIFEST | 1 - | |
| 22 | Makefile.PL | 8 ++++++++ | |
| 23 | lib/Mozilla/CA.pm | 8 +------- | |
| 24 | 3 files changed, 9 insertions(+), 8 deletions(-) | |
| 25 | ||
| 26 | diff --git a/MANIFEST b/MANIFEST | |
| 27 | index a88847b..6577ede 100644 | |
| 28 | --- a/MANIFEST | |
| 29 | +++ b/MANIFEST | |
| 30 | @@ -1,5 +1,4 @@ | |
| 31 | lib/Mozilla/CA.pm | |
| 32 | -lib/Mozilla/CA/cacert.pem | |
| 33 | Makefile.PL | |
| 34 | MANIFEST This list of files | |
| 35 | README | |
| 36 | diff --git a/Makefile.PL b/Makefile.PL | |
| 37 | index 2b10474..57f2f07 100644 | |
| 38 | --- a/Makefile.PL | |
| 39 | +++ b/Makefile.PL | |
| 40 | @@ -40,3 +40,11 @@ BEGIN { | |
| 41 | ExtUtils::MakeMaker::WriteMakefile(%arg); | |
| 42 | }; | |
| 43 | } | |
| 44 | + | |
| 45 | +package MY; | |
| 46 | +sub MY::libscan { | |
| 47 | + my $name = shift->SUPER::libscan(@_); | |
| 48 | + # Remove private certificate bundle | |
| 49 | + if ($name =~ /cacert.pem\z/) { $name = '' }; | |
| 50 | + return $name; | |
| 51 | +} | |
| 52 | diff --git a/lib/Mozilla/CA.pm b/lib/Mozilla/CA.pm | |
| 53 | index 050a494..c9f7dc8 100644 | |
| 54 | --- a/lib/Mozilla/CA.pm | |
| 55 | +++ b/lib/Mozilla/CA.pm | |
| 56 | @@ -3,16 +3,10 @@ package Mozilla::CA; | |
| 57 | use strict; | |
| 58 | our $VERSION = '20141217'; | |
| 59 | ||
| 60 | -use Cwd (); | |
| 61 | use File::Spec (); | |
| 62 | -use File::Basename qw(dirname); | |
| 63 | ||
| 64 | sub SSL_ca_file { | |
| 65 | - my $file = File::Spec->catfile(dirname(__FILE__), "CA", "cacert.pem"); | |
| 66 | - if (!File::Spec->file_name_is_absolute($file)) { | |
| 67 | - $file = File::Spec->catfile(Cwd::cwd(), $file); | |
| 68 | - } | |
| 69 | - return $file; | |
| 70 | + return File::Spec->catfile('/etc/certs/ca-certificates.crt'); | |
| 71 | } | |
| 72 | ||
| 73 | 1; | |
| 74 | -- | |
| 75 | 1.9.3 | |
| 76 |