diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-08-06 13:45:17 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-08-06 13:45:17 +0000 |
| commit | 81bc2bc352c35f8242055b84f9ba09bbc8323569 (patch) | |
| tree | 8bf5596fdcd9f2723d30cca81dce4421cd6824a9 /net-misc | |
| parent | keyword ~amd64-fbsd, bug #428248 (diff) | |
| download | gentoo-2-81bc2bc352c35f8242055b84f9ba09bbc8323569.tar.gz gentoo-2-81bc2bc352c35f8242055b84f9ba09bbc8323569.tar.bz2 gentoo-2-81bc2bc352c35f8242055b84f9ba09bbc8323569.zip | |
Fix build with gnutls, bug #428592
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.27.0-r2.ebuild | 5 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch | 30 |
3 files changed, 38 insertions, 3 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index edd8702c0d37..09e2876e3142 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/curl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.238 2012/08/04 16:39:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.239 2012/08/06 13:45:17 blueness Exp $ + + 06 Aug 2012; Anthony G. Basile <blueness@gentoo.org> + +files/curl-7.20.0-fix-nettle-include.patch, curl-7.27.0-r2.ebuild: + Fix build with gnutls, bug #428592 04 Aug 2012; Jeroen Roovers <jer@gentoo.org> curl-7.27.0-r2.ebuild: Marked ~hppa (bug #428520). diff --git a/net-misc/curl/curl-7.27.0-r2.ebuild b/net-misc/curl/curl-7.27.0-r2.ebuild index 5da8e9ae5f86..74d28e5bfda6 100644 --- a/net-misc/curl/curl-7.27.0-r2.ebuild +++ b/net-misc/curl/curl-7.27.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.4 2012/08/04 16:39:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.5 2012/08/06 13:45:17 blueness Exp $ EAPI="4" @@ -87,7 +87,8 @@ src_prepare() { "${FILESDIR}"/${PN}-7.27.0-curl-config.patch \ "${FILESDIR}"/${PN}-7.27.0-prefix.patch \ "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \ + "${FILESDIR}"/${PN}-7.20.0-fix-nettle-include.patch sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 eprefixify curl-config.in diff --git a/net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch b/net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch new file mode 100644 index 000000000000..b0a81657fd89 --- /dev/null +++ b/net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch @@ -0,0 +1,30 @@ +From 986c7949c0638bebb99bd08d63216433254c2185 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 6 Aug 2012 15:04:25 +0200 +Subject: [PATCH] gtls: fix build failure by including nettle-specific headers + +Bug: http://curl.haxx.se/bug/view.cgi?id=3554668 +Reported by: Anthony G. Basile +--- + lib/gtls.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/gtls.c b/lib/gtls.c +index d981ef1..c750a6f 100644 +--- a/lib/gtls.c ++++ b/lib/gtls.c +@@ -34,7 +34,10 @@ + + #include <gnutls/gnutls.h> + #include <gnutls/x509.h> +-#ifndef USE_GNUTLS_NETTLE ++#ifdef USE_GNUTLS_NETTLE ++#include <gnutls/crypto.h> ++#include <nettle/md5.h> ++#else + #include <gcrypt.h> + #endif + +-- +1.7.10.4 + |