From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SHHyh-0008S9-Fs for garchives@archives.gentoo.org; Mon, 09 Apr 2012 17:02:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EED64E09C8; Mon, 9 Apr 2012 17:01:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B0327E09C8 for ; Mon, 9 Apr 2012 17:01:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C09671B40A0 for ; Mon, 9 Apr 2012 17:01:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 81D0AE5402 for ; Mon, 9 Apr 2012 17:01:54 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1333988649.fae65d5222ff6887a26862665469db1c16e54ed7.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/curl/ X-VCS-Repository: dev/blueness X-VCS-Files: net-misc/curl/ChangeLog net-misc/curl/Manifest net-misc/curl/curl-7.25.0-r1.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: fae65d5222ff6887a26862665469db1c16e54ed7 X-VCS-Branch: master Date: Mon, 9 Apr 2012 17:01:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 21f748c4-6ae2-4271-93c2-95621d0a382a X-Archives-Hash: 235da04b668872c875053df62e63fcb5 commit: fae65d5222ff6887a26862665469db1c16e54ed7 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Apr 9 16:24:09 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Apr 9 16:24:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3Dfae65d52 net-misc/curl: economize on ssl provider configuration (Portage version: 2.1.10.49/git/Linux x86_64, RepoMan options: --force, s= igned Manifest commit with key 0xD0455535) --- net-misc/curl/ChangeLog | 3 +++ net-misc/curl/Manifest | 14 ++++++++++++-- net-misc/curl/curl-7.25.0-r1.ebuild | 35 ++++++++++++++++-------------= ------ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 2ffaa2a..583dfef 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 09 Apr 2012; Anthony G. Basile curl-7.25.0-r1.eb= uild: + Economize ssl provider configuration + *curl-7.25.0-r1 (04 Apr 2012) =20 04 Apr 2012; Anthony G. Basile diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index e859ec2..0842153 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8= f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9= 175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2= a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b= 5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450 AUX curl-fix-gnutls-nettle.patch 1186 RMD160 548495bb07bf24031bb3309509d= c80c10d67e129 SHA1 e0ebd17ba1c1f1e1d32724cfb50fdac7b8122465 SHA256 d7a0f1= ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 AUX curl-respect-cflags-3.patch 406 RMD160 4c569104bf7025676275f8df4b4c0= 337435145ef SHA1 569295c4a7ed58c790dea64fc3412f814924cee5 SHA256 b87bf2c4= 91b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d DIST curl-7.25.0.tar.bz2 2418060 RMD160 e35b46a17fc2fc2a23fd12ed9488cc75= 3bd941c5 SHA1 f6016a24051d98806ca3ddf754592701cb66e00c SHA256 cfb29139dfe= b2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491 -EBUILD curl-7.25.0-r1.ebuild 5993 RMD160 8484eb46cc08f00a9ab484ebf0ab85c= 0a1fab4dd SHA1 5f69f5bee1432085010bba3f5148328dc1d93717 SHA256 3545c99f7b= 64b82f33f1f130bac195d72115cef4c3f1cc7b6a2c630a5637f8eb -MISC ChangeLog 430 RMD160 bebe3ad7fc9cb42001caa8f431532e7a4ed13b5c SHA1 = 4916227f3470a17cf929e7eb64ea01d57c7f8531 SHA256 9d51430449fed031e0402eee6= 18f1be9e01aeb894e7378e89c2182f0b6b2e148 +EBUILD curl-7.25.0-r1.ebuild 5424 RMD160 9df714e04ab4aa38c1dc6fa852bb149= 20a73d473 SHA1 131214b5cebdecfd659de9e4c035585f52893f35 SHA256 6dd4ffd415= 4c4f3441d3682fc03b662d1221c6039a34092176202ed05ffd4756 +MISC ChangeLog 548 RMD160 6a3bef5fffc244edbed68a81989851dea2f64243 SHA1 = 46c2297b16182700f89f43516b650dc6243e0ea8 SHA256 506e7f81bd775b57e9c40128f= d21ba5f4e1fa612be088ee36dc75d500250bda9 MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SH= A1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e= 06a461d6ac107222399b02367d8c2ba59f549de8c7 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREIAAYFAk+DDSkACgkQl5yvQNBFVTWPHwCfZ0SGoXZLZJDP0Vw5I1+7jr0P +VrYAn29oC253U4tRresdx0CqfZ0pH68y +=3D0ztI +-----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.2= 5.0-r1.ebuild index f958f6f..8d02545 100644 --- a/net-misc/curl/curl-7.25.0-r1.ebuild +++ b/net-misc/curl/curl-7.25.0-r1.ebuild @@ -81,45 +81,43 @@ src_prepare() { } =20 src_configure() { - local myconf=3D() - einfo "\033[1;32m**************************************************\033= [00m" + + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + local myconf=3D() + myconf+=3D( --without-axtls --without-cyassl --without-gnutls --without= -nss --without-polarssl --without-ssl ) + myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certificat= es.crt ) if use ssl ; then if use curl_ssl_axtls; then einfo "SSL provided by axTLS" - myconf+=3D( --with-axtls --without-ssl --without-gnutls --without-nss= --without-polarssl ) - myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certific= ates.crt ) + myconf+=3D( --with-axtls ) fi + #cyassl will go here if use curl_ssl_gnutls; then einfo "SSL provided by gnutls" if has_version net-libs/gnutls[nettle] ; then einfo "gnutls compiled with dev-libs/nettle" - myconf+=3D( --without-axtls --without-ssl --with-gnutls --with-nettl= e --without-nss --without-polarssl ) - myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certifi= cates.crt ) + myconf+=3D( --with-gnutls --with-nettle ) else einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=3D( --without-axtls --without-ssl --with-gnutls --without-ne= ttle --without-nss --without-polarssl ) - myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certifi= cates.crt ) + myconf+=3D( --with-gnutls --without-nettle ) fi fi if use curl_ssl_nss; then einfo "SSL provided by nss" - myconf+=3D( --without-axtls --without-ssl --without-gnutls --with-nss= --without-polarssl ) - myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certific= ates.crt ) - fi - if use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=3D( --without-axtls --with-ssl --without-gnutls --without-nss= --without-polarssl ) - myconf+=3D( --without-ca-bundle --with-ca-path=3D"${EPREFIX}"/etc/ssl= /certs ) + myconf+=3D( --with-nss ) fi if use curl_ssl_polarssl; then einfo "SSL provided by polarssl" - myconf+=3D( --with-axtls --without-ssl --without-gnutls --without-nss= --with-polarssl ) - myconf+=3D( --with-ca-bundle=3D"${EPREFIX}"/etc/ssl/certs/ca-certific= ates.crt ) + myconf+=3D( --with-polarssl ) + fi + if use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=3D( --with-ssl --without-ca-bundle --with-ca-path=3D"${EPREFI= X}"/etc/ssl/certs ) fi else einfo "SSL disabled" - myconf+=3D( --without-axtls --without-ssl --without-gnutls --without-n= ss --without-polarssl ) fi einfo "\033[1;32m**************************************************\033= [00m" =20 @@ -161,7 +159,6 @@ src_configure() { $(use_enable static-libs static) \ $(use_enable threads threaded-resolver) \ --disable-versioned-symbols \ - --without-cyassl \ $(use_with idn libidn) \ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ --without-krb4 \