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 1SGNNd-0006wS-K3 for garchives@archives.gentoo.org; Sat, 07 Apr 2012 04:36:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA83FE0CDC; Sat, 7 Apr 2012 04:35:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 871C1E0CDC for ; Sat, 7 Apr 2012 04:35:53 +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 C15111B4021 for ; Sat, 7 Apr 2012 04:35:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8AEFDE5403 for ; Sat, 7 Apr 2012 04:35:50 +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: <1333773342.29afcf6d7baae950770d3468961da30b8d453913.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/curl/ X-VCS-Repository: dev/blueness X-VCS-Files: 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: 29afcf6d7baae950770d3468961da30b8d453913 X-VCS-Branch: master Date: Sat, 7 Apr 2012 04:35:50 +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: 4fac3e2a-9246-44f8-83a0-5d5e84013087 X-Archives-Hash: 94b3a9763a62d8fbce4299b3ea03c6b6 commit: 29afcf6d7baae950770d3468961da30b8d453913 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Apr 7 04:35:42 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 7 04:35:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D29afcf6d net-misc/curl: add axTLS and polarssl backends --- net-misc/curl/Manifest | 2 +- net-misc/curl/curl-7.25.0-r1.ebuild | 38 ++++++++++++++++++++++++-----= ----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index e329458..e859ec2 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,6 +3,6 @@ AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12c= a89dcc358fa1be2a1cc6c47 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 5230 RMD160 cb76b95ac71283a37b57800869494b5= 0e1d02bbf SHA1 43163c3d6070f3216068a924e521522270dbe293 SHA256 ab27c592a4= 29f9a9474611b44e4b8fd863ed877b6d26a24ad833f37c57617761 +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 MISC metadata.xml 488 RMD160 5b3487cf3f62c93923b0ba919fa22be6b7b1c1d3 SH= A1 8d45b1b5f04c4c4f7cc146acf4a6770cd8fc9222 SHA256 e7f92e874709df69db561e= 06a461d6ac107222399b02367d8c2ba59f549de8c7 diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.2= 5.0-r1.ebuild index d6985b9..f958f6f 100644 --- a/net-misc/curl/curl-7.25.0-r1.ebuild +++ b/net-misc/curl/curl-7.25.0-r1.ebuild @@ -14,10 +14,11 @@ LICENSE=3D"MIT" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa= -hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac= os ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x8= 6-solaris" IUSE=3D"ares idn ipv6 kerberos ldap ssh ssl static-libs test threads" -IUSE=3D"${IUSE} curl_ssl_gnutls curl_ssl_nss curl_ssl_openssl" +IUSE=3D"${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_ope= nssl curl_ssl_polarssl" =20 RDEPEND=3D"ldap? ( net-nds/openldap ) ssl? ( + curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( <=3Dnet-libs/gnutls-2.10.5 dev-libs/libgcrypt app-misc/ca-certific= ates ) @@ -27,6 +28,7 @@ RDEPEND=3D"ldap? ( net-nds/openldap ) ) curl_ssl_openssl? ( dev-libs/openssl ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) + curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn ) ares? ( net-dns/c-ares ) @@ -35,10 +37,8 @@ RDEPEND=3D"ldap? ( net-nds/openldap ) sys-libs/zlib" =20 # ssl providers to be added: -# axtls $(use_with axtls) # cyassl $(use_with cyassl) # fbopenssl $(use_with spnego) -# polarssl $(use_with polarssl) =20 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html @@ -55,7 +55,15 @@ DEPEND=3D"${RDEPEND} # ares must be disabled for threads # only one ssl provider can be enabled REQUIRED_USE=3D"threads? ( !ares ) - ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss ) )" + ssl? ( + ^^ ( + curl_ssl_axtls + curl_ssl_gnutls + curl_ssl_openssl + curl_ssl_nss + curl_ssl_polarssl + ) + )" =20 DOCS=3D( CHANGES README docs/FEATURES docs/INTERNALS \ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) @@ -77,31 +85,41 @@ src_configure() { =20 einfo "\033[1;32m**************************************************\033= [00m" 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 ) + fi 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-ssl --with-gnutls --with-nettle --without-nss = ) + 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 ) else einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=3D( --without-ssl --with-gnutls --without-nettle --without-= nss ) + 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 ) fi fi if use curl_ssl_nss; then einfo "SSL provided by nss" - myconf+=3D( --without-ssl --without-gnutls --with-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( --with-ssl --without-gnutls --without-nss ) + 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 ) 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 ) + fi else einfo "SSL disabled" - myconf+=3D( --without-ssl --without-gnutls --without-nss ) + myconf+=3D( --without-axtls --without-ssl --without-gnutls --without-n= ss --without-polarssl ) fi einfo "\033[1;32m**************************************************\033= [00m" =20 @@ -143,12 +161,10 @@ src_configure() { $(use_enable static-libs static) \ $(use_enable threads threaded-resolver) \ --disable-versioned-symbols \ - --without-axtls \ --without-cyassl \ $(use_with idn libidn) \ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ --without-krb4 \ - --without-polarssl \ --without-spnego \ --with-zlib \ "${myconf[@]}"