[patch] curl-ssl.patch

curl-ssl.patch (text/plain), 3.17 KB, created by SpanKY on 2010-03-15 22:55:14 UTC

Index: curl-7.20.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.20.0.ebuild,v
retrieving revision 1.1
diff -u -p -r1.1 curl-7.20.0.ebuild
--- curl-7.20.0.ebuild	11 Mar 2010 18:01:15 -0000	1.1
+++ curl-7.20.0.ebuild	15 Mar 2010 22:53:11 -0000
@@ -16,12 +16,14 @@ SRC_URI="http://curl.haxx.se/download/${
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="openssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
+IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test"
 
-RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
-	nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-	openssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
-	ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+		!gnutls? ( !nss? ( dev-libs/openssl ) )
+	)
 	idn? ( net-dns/libidn )
 	ares? ( >=net-dns/c-ares-1.4.0 )
 	kerberos? ( virtual/krb5 )
@@ -71,15 +73,17 @@ src_compile() {
 		--without-krb4
 		--without-spnego"
 
-	if use gnutls; then
-		myconf="${myconf} --without-ssl --with-gnutls --without-nss"
-		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
-	elif use nss; then
-		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
-	elif use openssl; then
-		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-		myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+	if use ssl ; then
+		if use gnutls; then
+			myconf="${myconf} --without-ssl --with-gnutls --without-nss"
+			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+		elif use nss; then
+			myconf="${myconf} --without-ssl --without-gnutls --with-nss"
+			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+		else
+			myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+			myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+		fi
 	else
 		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
 	fi
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/metadata.xml,v
retrieving revision 1.5
diff -u -p -r1.5 metadata.xml
--- metadata.xml	5 Nov 2009 05:19:17 -0000	1.5
+++ metadata.xml	15 Mar 2010 22:53:11 -0000
@@ -8,8 +8,9 @@
   <use>
     <flag name="ares">Enabled c-ares dns support</flag>
     <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
+    <flag name="gnutls">Prefer gnutls over nss and openssl as the crypto engine</flag>
+    <flag name="nss">Prefer NSS over openssl as the crypto engine</flag>
     <flag name="openssl">Use openssl as the crypto engine</flag>
-    <flag name="gnutls">Use gnutls as the crypto engine</flag>
-    <flag name="nss">Use NSS as the crypto engine</flag>
+    <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
   </use>
 </pkgmetadata>