Use certificates from app-misc/ca-certificates (#358081)

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

5 files changed, 45 insertions, 61 deletions

diff --git a/dev-perl/libwww-perl/ChangeLog b/dev-perl/libwww-perl/ChangeLog
index 1e37f995e15e..7a1c5c3bb87b 100644
--- a/dev-perl/libwww-perl/ChangeLog
+++ b/dev-perl/libwww-perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/libwww-perl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libwww-perl/ChangeLog,v 1.138 2011/03/11 07:01:11 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libwww-perl/ChangeLog,v 1.139 2011/03/17 07:23:22 tove Exp $
+
+  17 Mar 2011; Torsten Veller <tove@gentoo.org> -libwww-perl-6.0.0.ebuild,
+  libwww-perl-6.10.0.ebuild, +files/ca-certs.patch:
+  Use certificates from app-misc/ca-certificates (#358081)
 
 *libwww-perl-6.10.0 (11 Mar 2011)
 
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index 7a0200d40aa3..4d4cf9150689 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -1,10 +1,9 @@
+AUX ca-certs.patch 999 RMD160 02f52fefc4c7ab287457349b47130b8cbe84b28e SHA1 331753c54c7fe7e9a2da62891444145a1137f66d SHA256 dd2e5aa623fa1940070c262e9b31c620f61867b0c4658660f9c69d84c92f5e0f
 DIST libwww-perl-5.836.tar.gz 270101 RMD160 13cfeab7a4f142c2cf875ae74ed3b804b0189ce7 SHA1 db49fd767db9852848479899b4989611c12f8bcb SHA256 dbac3cec8b52a817cb12ec7c55bf36b62beafb495c5e0d53627861f8f0837068
 DIST libwww-perl-5.837.tar.gz 270223 RMD160 eed2d55409e0f712df188599abcb5ea237d93ac9 SHA1 43b4b0449d9432be29a136a10545c8d1162bcc88 SHA256 4f651e9241df8fccd2eeb125eb6a3bfddcfc65f49adb5469313fe4a95aaded45
-DIST libwww-perl-6.00.tar.gz 133075 RMD160 43ad55ea7a5cbddafaebe4445ee6a991ff3bd900 SHA1 693328fbef34c35fc30521609e37bfab2a5ebc8c SHA256 f0b3978836d4a083eba849e191b9e0d2672d79cb5be70d1c64aa505c1f89064a
 DIST libwww-perl-6.01.tar.gz 133094 RMD160 45492bcbe5be31e0f2aaa759b6379f89686aa553 SHA1 960e650d4da0d8685f4fb81f6790eff95e5eac25 SHA256 aceae1475c9a4765d9c2b7da5deed370779dbb402420253774dd06d423383159
 EBUILD libwww-perl-5.836.ebuild 1554 RMD160 cc9a084872e9e382d116e39b0e663c949396f841 SHA1 22512582fc45d5bc4729e3be4cb8fc525aa04532 SHA256 b96cfa7138ac308c7dff2afdb554f67379d0c6c71e8db27ca1c7bc99cec8d631
 EBUILD libwww-perl-5.837.ebuild 1564 RMD160 0fa6c34ffb0db309813ff900bf1f84cc19d0ea7a SHA1 3be1eb385889fae80cbbb09eea090bfee600f329 SHA256 88e8db409bc4e5d554d8ed03a514eb252d36b9bfed183a2fe1eed1d138e071b6
-EBUILD libwww-perl-6.0.0.ebuild 1806 RMD160 15c101a3c7c776b4d91bc1a4ae29b1398000f000 SHA1 72d78484afa11990812a65c9b70c0913c7a57663 SHA256 d1f8a3871e998b804c4b45789078eeef6c89d637292e0299bdb10573f876b952
-EBUILD libwww-perl-6.10.0.ebuild 1837 RMD160 441081707182df7102637f49513b70317f9974d4 SHA1 3ba07411a193004b54eb074fb296ecab89bcd503 SHA256 bca33c44492dd8e71f1d1e5d1399ddd5b75999691070b244d8ed94c221c1fb41
-MISC ChangeLog 18367 RMD160 e317a064584babc61aba7dcededfddf12b4c744b SHA1 bbcee7e8ed91681d07275562f577d97e45d5f1fe SHA256 f97a89cdc6879d2daa8f95e742c16692d91f22ed8f0931ffc870ab338f04e315
+EBUILD libwww-perl-6.10.0.ebuild 1909 RMD160 a4540639c4fdc2bdea1c77bcd42fb8927e6386d5 SHA1 6375c65f2708c0ccde55934e80d4e9832a32d622 SHA256 db376f20ea37ebd0971cb7484c77dc05c2c927985207906b5f31551cfa185edf
+MISC ChangeLog 18554 RMD160 d697b5ef93921d165e0652f1f8744bda19fb8cb3 SHA1 0d44631df5ea2d65ff371bb45a0874937f654756 SHA256 5e4b4f3a379162a41bcc3b41cd0837fdcc127da721cab7445091595b09a1468c
 MISC metadata.xml 237 RMD160 03d990c3a90bd97b031e90072d118708884d84a7 SHA1 cb356fe73f85a7b18504fd65891bb1ace4d6eb8f SHA256 e9ed842b87b125f71c28c1c3abb0b254875a80c21333a03968b07ff6104a4157
diff --git a/dev-perl/libwww-perl/files/ca-certs.patch b/dev-perl/libwww-perl/files/ca-certs.patch
new file mode 100644
index 000000000000..b0565f0fdba0
--- /dev/null
+++ b/dev-perl/libwww-perl/files/ca-certs.patch
@@ -0,0 +1,30 @@
+X-Bugs-Gentoo: https://bugs.gentoo.org/358081
+--- libwww-perl-6.01/lib/LWP/Protocol/https.pm
++++ libwww-perl-6.01/lib/LWP/Protocol/https.pm
+@@ -21,25 +21,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 knowning which Certificate Authorities to trust
+-
+-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
+-envirionment variable or by installing the Mozilla::CA module.
+-
+-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
+-envirionment 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_path} = '/etc/ssl/certs';
+ 	}
+     }
+     $self->{ssl_opts} = \%ssl_opts;
diff --git a/dev-perl/libwww-perl/libwww-perl-6.0.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.0.0.ebuild
deleted file mode 100644
index 0b238cd7d834..000000000000
--- a/dev-perl/libwww-perl/libwww-perl-6.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libwww-perl/libwww-perl-6.0.0.ebuild,v 1.1 2011/03/09 14:58:17 tove Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=GAAS
-MODULE_VERSION=6.00
-inherit perl-module
-
-DESCRIPTION="A collection of Perl Modules for the WWW"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl"
-
-RDEPEND="
-	>=dev-perl/File-Listing-6.0.0
-	>=dev-perl/HTTP-Cookies-6.0.0
-	>=dev-perl/HTTP-Date-6.0.0
-	>=dev-perl/HTTP-Negotiate-6.0.0
-	>=dev-perl/HTTP-Message-6.0.0
-	>=dev-perl/LWP-MediaTypes-6.0.0
-	>=dev-perl/Net-HTTP-6.0.0
-	>=dev-perl/WWW-RobotRules-6.0.0
-	>=virtual/perl-Digest-MD5-2.12
-	dev-perl/Encode-Locale
-	>=dev-perl/HTML-Parser-3.34
-	>=virtual/perl-MIME-Base64-2.12
-	virtual/perl-libnet
-	>=dev-perl/URI-1.10
-	ssl? ( dev-perl/Crypt-SSLeay )
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	perl-module_src_install
-
-	# Perform a check to see if the live filesystem is case-INsensitive
-	# or not.  If it is, the symlinks GET, POST and in particular HEAD
-	# will collide with e.g. head from coreutils.  While under Linux
-	# having a case-INsensitive filesystem is really unusual, most Mac
-	# OS X users are on it, and also Interix users deal with
-	# case-INsensitivity since Windows is underneath.
-
-	# bash should always be there, if we can find it in capitals, we're
-	# on a case-INsensitive filesystem.
-	if [[ ! -f ${EROOT}/BIN/BASH ]] ; then
-		dosym /usr/bin/lwp-request /usr/bin/GET
-		dosym /usr/bin/lwp-request /usr/bin/POST
-		dosym /usr/bin/lwp-request /usr/bin/HEAD
-	fi
-}
-#SRC_TEST=do
diff --git a/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild
index 3162fc6fa9e0..a279baa81272 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild,v 1.1 2011/03/11 07:01:11 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libwww-perl/libwww-perl-6.10.0.ebuild,v 1.2 2011/03/17 07:23:22 tove Exp $
 
 EAPI=3
 
@@ -30,10 +30,15 @@ RDEPEND="
 	>=virtual/perl-MIME-Base64-2.12
 	virtual/perl-libnet
 	>=dev-perl/URI-1.10
-	ssl? ( dev-perl/Crypt-SSLeay )
+	ssl? (
+		dev-perl/Crypt-SSLeay
+		app-misc/ca-certificates
+	)
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/ca-certs.patch )
+
 src_install() {
 	perl-module_src_install