backport patches from upstream related to bug#472056, should solve bug#472196

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

6 files changed, 165 insertions, 64 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index d921a3533fcd..958114266827 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.434 2013/06/02 20:43:15 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.435 2013/06/03 20:17:17 alonbl Exp $
+
+*gnutls-3.2.1-r1 (03 Jun 2013)
+
+  03 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnutls-3.2.1-build-gmp-1.patch, +files/gnutls-3.2.1-build-gmp-2.patch,
+  +files/gnutls-3.2.1-build-gmp-3.patch, +gnutls-3.2.1-r1.ebuild,
+  -files/gnutls-3.2.1-build-gmp.patch, -gnutls-3.2.1.ebuild:
+  backport patches from upstream related to bug#472056, should solve bug#472196
 
   02 Jun 2013; Richard Freeman <rich0@gentoo.org> gnutls-2.12.23-r1.ebuild:
   amd64 stable - 471788
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch
new file mode 100644
index 000000000000..cecb957efe66
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch
@@ -0,0 +1,78 @@
+From 02eb70d6d96f624ed6cc55dfa62734495dffbb44 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 2 Jun 2013 19:10:52 +0200
+Subject: [PATCH] Directly link to gmp library. Based on original patch by Alon Bar-Lev <alon.barlev@gmail.com>.
+
+---
+ lib/Makefile.am        |    2 +-
+ lib/gnutls.pc.in       |    2 +-
+ lib/nettle/Makefile.am |    5 ++++-
+ m4/hooks.m4            |   11 +++++++++++
+ 4 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index f1e672c..3beb7c7 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -140,7 +140,7 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
+ endif
+ 
+ if ENABLE_NETTLE
+-thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS)
++thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
+ libgnutls_la_LIBADD += nettle/libcrypto.la
+ endif
+ 
+diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
+index 13f2d3b..a25fcdf 100644
+--- a/lib/gnutls.pc.in
++++ b/lib/gnutls.pc.in
+@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@
++Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
+index e2b704e..0987c8e 100644
+--- a/lib/nettle/Makefile.am
++++ b/lib/nettle/Makefile.am
+@@ -25,7 +25,10 @@ AM_CPPFLAGS = \
+ 	-I$(srcdir)/../includes		\
+ 	-I$(builddir)/../includes	\
+ 	-I$(builddir)/../../gl          \
+-	-I$(srcdir)/..
++	-I$(srcdir)/..			\
++	$(NETTLE_CFLAGS)		\
++	$(HOGWEED_CFLAGS)		\
++	$(GMP_CFLAGS)
+ 
+ if ENABLE_MINITASN1
+ AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+diff --git a/m4/hooks.m4 b/m4/hooks.m4
+index 3439edb..cd9ef5c 100644
+--- a/m4/hooks.m4
++++ b/m4/hooks.m4
+@@ -82,6 +82,17 @@ AC_MSG_ERROR([[
+ 
+   GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
+ 
++  AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
++  AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
++  if test x$GMP_LIBS = x; then
++  	AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
++***
++*** gmp was not found.
++]])])
++  fi
++  AC_SUBST(GMP_CFLAGS)
++  AC_SUBST(GMP_LIBS)
++
+   AC_ARG_WITH(included-libtasn1,
+     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
+       included_libtasn1=$withval,
+-- 
+1.7.1
+
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch
new file mode 100644
index 000000000000..40aca4ace23e
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch
@@ -0,0 +1,36 @@
+From f3ef68f4f79434fadc3f28c649744e57f3eef99b Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Mon, 3 Jun 2013 21:21:44 +0200
+Subject: [PATCH] Add nettle dependencies to libcrypto.la
+
+---
+ lib/Makefile.am        |    1 -
+ lib/nettle/Makefile.am |    1 +
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 3beb7c7..006f695 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -140,7 +140,6 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
+ endif
+ 
+ if ENABLE_NETTLE
+-thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
+ libgnutls_la_LIBADD += nettle/libcrypto.la
+ endif
+ 
+diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
+index 3dcb928..7b3f4c0 100644
+--- a/lib/nettle/Makefile.am
++++ b/lib/nettle/Makefile.am
+@@ -37,5 +37,6 @@ endif
+ 
+ noinst_LTLIBRARIES = libcrypto.la
+ 
++libcrypto_la_LIBADD = $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
+ libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
+ 	gnettle.h 
+-- 
+1.7.1
+
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch
new file mode 100644
index 000000000000..2ad85039f712
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch
@@ -0,0 +1,40 @@
+From 8b64193ac7b30faa2213d5be6ee477db3a1f70a6 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Mon, 3 Jun 2013 21:17:39 +0200
+Subject: [PATCH] correctly place cflags
+
+---
+ lib/nettle/Makefile.am |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
+index 0987c8e..3dcb928 100644
+--- a/lib/nettle/Makefile.am
++++ b/lib/nettle/Makefile.am
+@@ -18,17 +18,18 @@
+ # You should have received a copy of the GNU Lesser General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>
+ 
+-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
++AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) \
++	$(NETTLE_CFLAGS)		\
++	$(HOGWEED_CFLAGS)		\
++	$(GMP_CFLAGS)
++
+ AM_CPPFLAGS = \
+ 	-I$(srcdir)/../../gl		\
+ 	-I$(builddir)/../../gl		\
+ 	-I$(srcdir)/../includes		\
+ 	-I$(builddir)/../includes	\
+ 	-I$(builddir)/../../gl          \
+-	-I$(srcdir)/..			\
+-	$(NETTLE_CFLAGS)		\
+-	$(HOGWEED_CFLAGS)		\
+-	$(GMP_CFLAGS)
++	-I$(srcdir)/..
+ 
+ if ENABLE_MINITASN1
+ AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+-- 
+1.7.1
+
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch
deleted file mode 100644
index 1efce4ff1741..000000000000
--- a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e6ee5b82b8141db62f12c509ef9c5f58bb683544 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 2 Jun 2013 15:22:07 +0300
-Subject: [PATCH] build: explicit linkage with gmp library
-
-gnutls uses gmp library explicitly so it needs to explicit link against
-it so that all symbols may be resolved.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lib/nettle/Makefile.am |  3 ++-
- m4/hooks.m4            | 12 +++++++++++-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
-index e2b704e..56d180a 100644
---- a/lib/nettle/Makefile.am
-+++ b/lib/nettle/Makefile.am
-@@ -18,7 +18,7 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>
- 
--AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
-+AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(GMP_CFLAGS)
- AM_CPPFLAGS = \
- 	-I$(srcdir)/../../gl		\
- 	-I$(builddir)/../../gl		\
-@@ -35,3 +35,4 @@ noinst_LTLIBRARIES = libcrypto.la
- 
- libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
- 	gnettle.h 
-+libcrypto_la_LIBADD = $(GMP_LIBS)
-diff --git a/m4/hooks.m4 b/m4/hooks.m4
-index 3439edb..ca71728 100644
---- a/m4/hooks.m4
-+++ b/m4/hooks.m4
-@@ -77,10 +77,20 @@ AC_MSG_ERROR([[
-   *** Libhogweed (nettle's companion library) was not found. Note that you must compile nettle with gmp support.
- ]])
-   ])
-+  AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
-+  AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
-+  if test x$GMP_LIBS = x; then
-+    AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
-+*** 
-+*** gmp was not found. while nettle was.
-+]])])
-+  fi
-+  AC_SUBST(GMP_CFLAGS)
-+  AC_SUBST(GMP_LIBS)
-   AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle")
-   AC_DEFINE([HAVE_LIBNETTLE], 1, [nettle is enabled])
- 
--  GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
-+  GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed, gmp"
- 
-   AC_ARG_WITH(included-libtasn1,
-     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
--- 
-1.8.1.5
-
diff --git a/net-libs/gnutls/gnutls-3.2.1.ebuild b/net-libs/gnutls/gnutls-3.2.1-r1.ebuild
index 48f4b8e097ea..1f133ce38d93 100644
--- a/net-libs/gnutls/gnutls-3.2.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1.ebuild,v 1.2 2013/06/02 12:30:18 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1-r1.ebuild,v 1.1 2013/06/03 20:17:17 alonbl Exp $
 
 EAPI=5
 
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build-gmp.patch"
+	epatch "${FILESDIR}/${P}-build-gmp-"*.patch
 
 	# tests/suite directory is not distributed
 	sed -i \