From: Anthony G. Basile <blueness@gentoo.org>
Date: Wed, 4 Mar 2015 14:45:14 +0000 (+0000)
Subject: ca-bundle and ca-path are no longer mutually exclusive.  Bug #539260.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ed3b9b2e81bc44ff630e6384c9b4d5ff007f6569;p=gentoo.git

ca-bundle and ca-path are no longer mutually exclusive.  Bug #539260.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
---

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 87a89145185f..d2dd20013b6b 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.390 2015/02/25 12:24:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.391 2015/03/04 14:44:59 blueness Exp $
+
+  04 Mar 2015; Anthony G. Basile <blueness@gentoo.org> curl-7.41.0.ebuild:
+  ca-bundle and ca-path are no longer mutually exclusive.  Bug #539260.
 
   25 Feb 2015; Anthony G. Basile <blueness@gentoo.org> -curl-7.36.0.ebuild,
   -curl-7.37.1.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f14993ff0ede..9fac79e32c29 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -13,23 +13,23 @@ DIST curl-7.40.0.tar.bz2 3266944 SHA256 899109eb3900fa6b8a2f995df7f449964292776a
 DIST curl-7.41.0.tar.bz2 3304508 SHA256 9f8b546bdc5c57d959151acae7ce6610fe929d82b8d0fc5b25a3a2296e5f8bea SHA512 fc4d14a51740d1752c653d2e48c6721b1ba1cc9959d7b9d1f77fd534d4db90d93fd4d0ad05adfdac082593b5886f5d662b7e4541f5f226514c59f643348287ff WHIRLPOOL b12eb86c6b82b77430ee2169d6021c2401d5712a1e998d096f833f79237810d1a4ae4dbc3815dcdbb3ea9217004930c3a600c2550516b73f1f3411c2720a1d3d
 EBUILD curl-7.39.0.ebuild 7315 SHA256 0a1c49652d6d65d672b0a6b5fcdcd1446e9665443460566d09d2e1e9426fb894 SHA512 48d6b89855d43359f166493dbcb08157bdc7dc63105190791dc8350567a9685071a5fe9761b124d6d43012c941ccf8f394e9ba9eecc1f20f673587650c4a2ae8 WHIRLPOOL e4f6f349a0ddc117bfe6c6d020482cfd9474b27312edcfb27c0af4783175f646cd0e2e3c29f306b266838f7f38511fec6dfd3cafcf973a4d4d4ae117a407bc16
 EBUILD curl-7.40.0.ebuild 7363 SHA256 1f4c57807c01eee23c15917c8686d8eef54f1cb3fdb5bbc69027d9620147aebe SHA512 1e5b8b35d1c63783b2f4fbc0d94783251fca08dd9409c58353e8e75cac0f5a68f1245ea459d0133929d26adb59791a260af9d2e1c9bf826078d9de4a74308575 WHIRLPOOL ad25ce9e3ec4854222412c0f3104c4f6b3ae5c1a58cf6a532335745b7719d6425c3f489b98f0da7ddf4de7cc0e304ccdb98a02eeb0e579eece1279b38a785e04
-EBUILD curl-7.41.0.ebuild 7363 SHA256 7d0afda6d1fb31442e6f0d073020c82bc232df62f554b84bff641e3955f7e8ba SHA512 62ab4e987dcfa4eff5efe9733f7f037eec92db324fd79f26d4953be173dc23137e220a6c7cb6258f0796f3b965b11d9be6b0ba6f004da2807200e02815443dbe WHIRLPOOL b79bec79e1c23d45fc32e2ceea2abcac732a49cfd019300a9a6d331da736437ae431e6045f4f29cd7fa8fce91c2532a31730ae47ec32f357d2a722a6965b3c00
-MISC ChangeLog 57660 SHA256 390423af67b387f45983c556026c071a888bb4f74d34bb1db43a1fb6216853bc SHA512 8dda955cb96239ce674975fb5c793f2815ffbb3a8b25e1610366101e8fa3e4f99f5a5eca6d3ff6816f8b6a402316cdca0a2a071008b565d6e3ae4ec795d0a400 WHIRLPOOL b54b3a6c668c44ca5a3d18c88971c509f0e45448aeff33c983e7ab06c965cd47d327cae00f6e33736cd1dac7f219cdf114c57011e04384a8110b38596cc03ce5
+EBUILD curl-7.41.0.ebuild 7343 SHA256 25c5cad3460289b51990515adbcca54d17deaf1209a823dcb67aa08e10035f17 SHA512 08e08fd22883642300266a3e0a411bf6cf40f3f3a03b0c4ae5b658da80a1cd0a6e43a8c498fa0e666b9f0810a5e4a2d6d5dfaf5b578b71a665d76e7752bd7fc1 WHIRLPOOL 65667a09e14c49c575ac50d35d443f3ecdb9aa564d9a3fd39f32366c343e439c4081ee09cc667fe59ff9419ff90075f68f496990e1c7f2456d3e72539ae03e36
+MISC ChangeLog 57808 SHA256 7b37075cf76af067c27c5437bec7284480fb48e87e087c5470db94069ae376ad SHA512 975081bf1787cd9040c3fa146941409912c0748669c52a7c4fabb16affe89b5fdd6355ca27bec6b500306e4e3d9b12e3fbd2f73844af973c697faa9ed227db66 WHIRLPOOL d60a57f86cf172ced670245f62537ef2a713a55815187529e7eb1ccc64370b8afb28dd0534ca9286a6fc5c7fa46a0f2d02f7fed3fdbc2ce61cb85eae2bd63711
 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU7b9tAAoJEJOE+m71LUu6hQYP/3lP0N4NB2QAZbdxoKdWRlN8
-Bgr5yzQSPYzbWJGxiIoFF52Svm/U0E6NzY/slew2RUwE3zsrduUBnqzSleV/iSHh
-SGm5IVj5iHBXgUHFiC0m+eUpc7QkV23ciaFXoizoqqzqluBOes4e4nXzN5f4WQ2k
-JsZfMeDGSqm9S+xJYh84fxcNBCk3QpCw475OLHSMQUUetV2zd0H0RgUpB5pMlq6b
-q/3CSILzz6NKN8PRXlSyRLTKmTy2RljJ33mqxG/7RyCeDiDrji96kLa3a8NvEgCL
-ArgUPNGhzuO9WBtzCMPR1DqiG/pOnXF/qe9XBovXlzv7YrGFtugVGlqaKnv7FyPG
-/O4BytFGujD/A7vtriQjlT+sWQKzBn+1GpJGvWN37a58POaRncR3OJRWadfZa9ZQ
-d8B++dox/G0QhOyPs0OeLPtjDWTebpeqTd9e7W6BStFXL3rBVHsA/Fax0DcN+XCx
-PyZKh+DyfsoWGflAipMeiltM40bA2ZQ+W9pZfpKgGYVsCZPz/x+cg7sNFq+YL4BL
-1wHOodTELsa7dob9Z6QsJhCJOf9ppOKPYeLLXqCHLDaGpYTSigttZIoh82t5oC+0
-zFs796tD3LF3KA9PWQk9Pyr+a+FCQkGTujKjAj/KKtfKNDuNipYvNbEvIPf9tHr1
-3Y1gxBq6y96YyDVYT2ao
-=WV7B
+iQIcBAEBCAAGBQJU9xrzAAoJEJOE+m71LUu6i2AP/RlfE02e46FyOq8vnDT8nIbZ
+h1qWTn2JZRReJpy7pO7eHxUOFuoDywy9zJzokfrmgxIUlhgMtpAZBb9W2mrmLMGo
+qIvR+3drIWZhJ/C1+gqnWCDjA3KZGiqjui7OoYruWbSXeku1YyUj3/tceexh66mW
+/Xo4tOHcKdaLcLtD51VzdicdVLFgKoE4lygVIIFRdvHPt5vtf+9nNfmung7882IF
+sV+FwtWvah4c55vVhd5TQpXLn1gs7BB/BtEpiuhJd5DlNVTZxep/7jqa72grkUw3
+k4IuX8ITYMynPK2j34B6XnJBakp4QEakHDhheig0rMPTzhH+ZeJTyhuULcw5Ll05
+9Nuh2PqmeNzFppgbFX3rqvrawxey+Q22XhSfUQ4T1Kl+JG8fvD2JXXoskwTubCXz
+fGdMtDo+mddE+Zavlk6BJicEOPv4BNguJt+rnH7DU5oa4OfQIuOAtmjd4CT2lPQv
+m3tzjOc/mrJHS9TX3QYis3uGGMWGwMoToBKZc9cfjIQLaQosQxq2FcYFdhP4SP0u
+eJchqcGpVVJKwpr912oUoS+WZGhnwFoZPAVINWGc6P7tRBowChQCATEEBGHbQe7F
+9DTMi+VuF8TA6wZq7zRWEVni2aKUC6Svelu0Cy5gsTvnWC5q8a1uKAXQQ/luOPIP
+WAW04P8HuSpk6krlZubW
+=GnAf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.41.0.ebuild b/net-misc/curl/curl-7.41.0.ebuild
index d6f07c20693f..fbf5ed6fcf07 100644
--- a/net-misc/curl/curl-7.41.0.ebuild
+++ b/net-misc/curl/curl-7.41.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.41.0.ebuild,v 1.1 2015/02/25 12:16:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.41.0.ebuild,v 1.2 2015/03/04 14:44:59 blueness Exp $
 
 EAPI="5"
 
@@ -163,7 +163,7 @@ multilib_src_configure() {
 		fi
 		if use curl_ssl_openssl; then
 			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
 		fi
 		if use curl_ssl_winssl; then
 			einfo "SSL provided by Windows"