[patch] Complete ebuild patch

0001-Update-the-ebuild-to-work-with-gnutls-nettle.patch (text/plain), 3.66 KB, created by Michał Górny on 2010-09-20 23:43:23 UTC

From 87f915f52c45c810e6cbbdc4e1e07097afddbefe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Tue, 21 Sep 2010 01:41:25 +0200
Subject: [PATCH] Update the ebuild to work with gnutls[nettle].

This patch updates the curl-7.21.1 ebuild to work with gnutls[nettle]
through making the use of libgcrypt explicit.
---
 curl-7.21.1.ebuild                                 |   10 ++--
 ...onfigure-check-for-gcrypt-if-using-GnuTLS.patch |   51 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 files/0001-configure-check-for-gcrypt-if-using-GnuTLS.patch

diff --git a/curl-7.21.1.ebuild b/curl-7.21.1.ebuild
index 6f7cfc7..fcf1895 100644
--- a/curl-7.21.1.ebuild
+++ b/curl-7.21.1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=3
 
-inherit multilib eutils libtool prefix
+inherit autotools multilib eutils prefix
 
 #MY_P=${P/_pre/-}
 DESCRIPTION="A Client that groks URLs"
@@ -21,7 +21,7 @@ IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads"
 
 RDEPEND="ldap? ( net-nds/openldap )
 	ssl? (
-		gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
 		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
 		!gnutls? ( !nss? ( dev-libs/openssl ) )
 	)
@@ -55,11 +55,11 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
 		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch
+		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
+		"${FILESDIR}"/0001-configure-check-for-gcrypt-if-using-GnuTLS.patch
 
 	eprefixify curl-config.in
-	# for FreeMiNT
-	elibtoolize
+	eautoreconf
 }
 
 src_configure() {
diff --git a/files/0001-configure-check-for-gcrypt-if-using-GnuTLS.patch b/files/0001-configure-check-for-gcrypt-if-using-GnuTLS.patch
new file mode 100644
index 0000000..024193c
--- /dev/null
+++ b/files/0001-configure-check-for-gcrypt-if-using-GnuTLS.patch
@@ -0,0 +1,51 @@
+From f3df524b625c1492a9d72ec5d36cb08471296e47 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[e-mail]>
+Date: Mon, 20 Sep 2010 23:05:23 +0200
+Subject: [PATCH 1/5] configure: check for gcrypt if using GnuTLS
+
+1 - libcurl assumes that there are gcrypt functions available when
+GnuTLS is.
+
+2 - GnuTLS can be built to use libnettle instead as crypto library,
+which breaks assumption (1)
+
+This change makes configure make sure that if GnuTLS is requested and
+detected, it also makes sure that gcrypt is present or it errors
+out. This is mostly a way to make the user more aware of this flaw, the
+correct fix would be to detect which crypto layer that is in use and
+adapt our code to use that instead of blindly assuming gcrypt.
+
+Reported by: Michal Gorny
+Bug: http://curl.haxx.se/bug/view.cgi?id=3071038
+---
+ configure.ac |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ada4718..eaf57f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1734,6 +1734,20 @@ if test "$OPENSSL_ENABLED" != "1"; then
+ 
+ fi dnl OPENSSL != 1
+ 
++dnl ---
++dnl If GnuTLS is enabled, we MUST verify that it uses libgcrypt since
++dnl curl code relies on that but recent GnuTLS versions can in fact build
++dnl with different crypto libraries which curl right now cannot handle
++dnl ---
++
++if test "$GNUTLS_ENABLED" = "1"; then
++  AC_CHECK_LIB(gcrypt,
++               gcry_control, ,
++    [
++      AC_MSG_ERROR([need GnuTLS built with gcrypt to function with GnuTLS])
++    ])
++fi
++
+ dnl ----------------------------------------------------
+ dnl check for PolarSSL
+ dnl ----------------------------------------------------
+-- 
+1.7.3
+
-- 
1.7.3