Merge pull request #1381 from ertugerata/master

add patch
This commit is contained in:
Ertuğrul Erata
2016-03-27 13:36:16 +03:00
2 changed files with 39 additions and 7 deletions
-7
View File
@@ -3,7 +3,6 @@
* working on http://ciftlik.pisilinux.org/2.0-Beta/pisi-index.xml.xz
* Packages missing in http://ciftlik.pisilinux.org/2.0-Beta/pisi-index.xml.xz
desktop/font/dejavu-fonts
desktop/gnome2/librsvg
desktop/kde/application/kdepim
desktop/kde/application/kholidays
@@ -48,7 +47,6 @@
multimedia/editor/blender
multimedia/graphics/hugin
multimedia/graphics/librecad
multimedia/misc/DirectFB
multimedia/sound/lash
multimedia/sound/sayonara
multimedia/sound/speech-dispatcher
@@ -62,7 +60,6 @@
network/misc/webkit-gtk2
network/web/chromium-browser
office/libreoffice/libreoffice
programming/build/llvm
programming/language/java/eclipse-ecj
programming/language/java/rhino
programming/language/perl/perl-Error
@@ -76,7 +73,6 @@
programming/language/perl/perl-HTTP-Body
programming/language/perl/perl-HTTP-Server-Simple
programming/language/perl/perl-LWP-Protocol-https
programming/language/perl/perl-WWW-Robotrules
programming/language/perl/perl-libwww
programming/language/python/python-pyblock
programming/language/python/python-sphinx
@@ -84,15 +80,12 @@
programming/library/libaccounts-qt5
programming/library/libsignon-glib
programming/misc/dbus-c++
programming/misc/unixODBC
programming/misc/vigra
programming/profiler/valgrind
science/misc/libindi
server/openldap
system/boot/efibootmgr
system/boot/efivar
util/crypt/skey
x11/driver/xorg-input-aiptek
x11/driver/xorg-video-geode
x11/library/mesa
@@ -0,0 +1,39 @@
--- Makefile.PL.old 2016-01-04 11:31:52.349484123 +0800
+++ Makefile.PL 2016-01-04 11:32:07.432992090 +0800
@@ -15,7 +15,6 @@
'LWP::UserAgent' => '6.06',
'Net::HTTPS' => 6,
'IO::Socket::SSL' => "1.54",
- 'Mozilla::CA' => "20110101",
},
META_MERGE => {
resources => {
--- lib/LWP/Protocol/https.pm.old 2016-01-04 11:33:19.003810886 +0800
+++ lib/LWP/Protocol/https.pm 2016-01-04 11:34:42.358079461 +0800
@@ -25,25 +25,7 @@
}
if ($ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
- eval {
- require Mozilla::CA;
- };
- if ($@) {
- if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
- $@ = <<'EOT';
-Can't verify SSL peers without knowing which Certificate Authorities to trust
-
-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
-environment variable or by installing the Mozilla::CA module.
-
-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
-environment variable to 0. If you do this you can't be sure that you
-communicate with the expected peer.
-EOT
- }
- die $@;
- }
- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
+ $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt';
}
}
$self->{ssl_opts} = \%ssl_opts;