link explicitly against gmp, bug#472056

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 76 insertions, 7 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7a29d54dd92d..8098391be0ab 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # 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.432 2013/06/01 19:59:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.433 2013/06/02 12:30:18 alonbl Exp $
+
+  02 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnutls-3.2.1-build-gmp.patch, gnutls-3.2.1.ebuild:
+  link explicitly against gmp, bug#472056
 
 *gnutls-3.2.1 (01 Jun 2013)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 397b0148a077..5d88378057c1 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -6,6 +6,7 @@ AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207
 AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d6b6d62ef243491e85164ff513ac SHA512 a0552276b356fd63e802a886e1243ef6341c6b8d1857814a0b2a686fd605d7c03316965cdfcdb70162547033efe9f2d1c17e442a30925d97ef691c2d573eba68 WHIRLPOOL 4ed528cb20705d91db05f0c533cbfd0356fa3292393eba75b45a22457cb23da80639ef739d889af4f64038a97553f3f990cc08f5e31608b1dc83c74b0e1c46d3
 AUX gnutls-2.12.23-CVE-2013-2116.patch 855 SHA256 473663119e3c0c91677becc2982f6bddcbe44000f9530515ad2051982c8a7e57 SHA512 463add69c9db348e1e7b93ba2e7bff3ce62abc96731485955e36e6855e3e2a1fb53f082238cada537487285e15d94296cf3fd3d408a013c307ff195685896fc5 WHIRLPOOL 10576ef2591f8bf47148a37bc5690abca474691edab802cf46967b8695c838d1e477a5731f677c8951b0652981ba338c42e14479e33e8dfccfa7952ab56f04a9
+AUX gnutls-3.2.1-build-gmp.patch 2168 SHA256 8ef4be41944fcc9a019b9718c58c77fe768e9df908427de581fbd97626aaa57d SHA512 d6521ba07059ec6aaa8b4225aafee0b62715702cd81f69ff7faa60b10a1630033b9efea032e7ad6716f01e3e0be23f6e8a51344e2b97095f86a8103b80cf3d2d WHIRLPOOL 417315ba34e5d144e7886876dbeac39fb24ec4bd8dfa2a8ccc0ef773c37abbcd192c5c1c8ef34d15787291163547e806dd227ffcd27ef220a156dad4aeba4c12
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.1.10.tar.xz 5084932 SHA256 535373f59c88c171429ed3c4777dc7126681b597e3adca95aa88ecbb69e7c646 SHA512 cfe381825b9d9a6e040a2eccd1adb0927c058c3c512298525ad39e584796e4de5b1972301cd2f024ac071eb328e783a0cbc5e4474154e106227cd197eddc35d2 WHIRLPOOL 44d4a6745179431f63c8b1335f46be6f264553a8d4fc693b2615c01fcc229ece5af01dfce05b2825bc0d456aaedee4e2c1d05eaf55086941c819ed9708023b91
@@ -16,13 +17,13 @@ EBUILD gnutls-2.12.23-r1.ebuild 3315 SHA256 12c5789907fd6c1c7e4f25e33f95ca1873f6
 EBUILD gnutls-2.12.23.ebuild 3399 SHA256 0e8b84dd493bd28b51bd537752c617eab98c594e977d54f90335f9245b9eb12c SHA512 0f04211be9c0c2e300e5fa9f38e929b431f4e2c8bd01fc9084ab663b83df5c0e6ad887486fbed8c58ab1796c9dad4ab11b2cfaa9461130f74b8ac79fda0c03d3 WHIRLPOOL 4a65b2be4be506aeb5e3c70ce58b6261ce2c90192f49bc98dfa15fae0a047ceb63b6df2587c6a1c337c5a072eaf2daadd4aca7a5dd6b0af1ead6512c9538c444
 EBUILD gnutls-3.1.10.ebuild 3143 SHA256 c92de271426a888c6494466bf61560b686fa85a136fc4e928bdb4a8f02438466 SHA512 86b508b2948d06bf4d45ad1ad04ae54a607f86d9143c7249388a3b97b64c6724de4105275ec12cc1df5235969bb4b358a4b8d860e658908a56ca89ae8654fd19 WHIRLPOOL 899242afea605e03f0f577eeeb65693be1496e2be0fe09a8dce8505ea6e4d9b352dc81d66417524e4230a4e856e0933f93e2d120e137983fc9870b5ddd06d28c
 EBUILD gnutls-3.1.11.ebuild 3143 SHA256 d35cff2e64300399eac31fd52c9ee1c331c2eed344a4a45ce19a64894b00c192 SHA512 339444967b8623a7214ece9a70ad7073b77185e6ee0ae409ca1788443e826cb30697d27ef93103835dea0cb32505d6a0f28fbe49eed8b411e0eb58e2222ed5cb WHIRLPOOL 7e925c27affaf1bfe2881b3bb6f4c1af21c32a596faf1df2a206ccaecf412dca93078e9e4a4f86c640a22804fd3ed65b6291ed10e2a896ffcaab6493ca97413d
-EBUILD gnutls-3.2.1.ebuild 3139 SHA256 aaa0dc93ef1e8afb82b42ef17c1626b0d94a08b74278aff296cebc717ef7152a SHA512 d9f0b7c08474fda20e266bde0ca028f95e88eb0a4c2bd85d8d779b45263af5094fb3cc2987992b7aab15e16e1455e3f2a22fd5267e6dca580db5ea24b7aebf7d WHIRLPOOL ef1ef267f570b5b71200166a0800223f213a0d48e8afce5a4e8115084026b2c9397a9eb5adae8f6f890f2da27ac5200a56d611464853522192ac6b461ba5a9aa
-MISC ChangeLog 64457 SHA256 b9ec52b9b5b661d3777159d66ec1f10faa8030ba9037bad1cb454dbab80aac8e SHA512 7ebaed5a0387e4c7fb55ee0f71b003f8c448bfd8e25cb0a6385d73656012c6d6e63ec9ab4eea318eb8785ac9d5793a2f584284ff6c863458cb4b66db5bb6c227 WHIRLPOOL 62140860ab849b4de5b91e51bf27126cee2c7bc7d5d7100e85168dd7e0498ce13d015a32af1a1d00ad47484d3433f9ab59bbfc2f5e73ea3441c0272eb6524bb0
+EBUILD gnutls-3.2.1.ebuild 3197 SHA256 e0c918de7961bd9e5520efe74cb82545048ee90bfe56a7eed5c20eca43538dec SHA512 e5107a092ac03ed0fb3a4ec49805b90b8415298391f87847a127a26fb173a1b179b93ea6935e9b61418d5274e9bb4a7cd6fbb92831a8d282216b87dc25823a3c WHIRLPOOL e91bc677b003350e8b8e3739bd20637c51f37fa9d37817fe7b651cf2e89c3e3c30358d031cf43a815eb3f7c4fa88347b200f8764f910b78364b5c7f45e2a11ac
+MISC ChangeLog 64608 SHA256 0570508bf41841e322454108694676a04f2512743f698c7f313d374050c6ff05 SHA512 299a1f5d077e7923a9fccf3911c3349724ebae6a1754c87c7cf3066847e98a14f672bff8e097736f921a7ea8d390e399f46bdb1365497d40f53b551d550bb8db WHIRLPOOL 183cb67a0e8fe69b1c58d4475b5937e4d3c62094ad15dae91b60b046f152da1865d326bd4ed83cd65ddda00e5ce8481e0dfa37d0f0597f4eac42e6ebc6d1b51e
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGqUrEACgkQXYk9GL8g3FHJTwD+MQXibjQRaqvM5O643VX3oTJp
-L0tIvUF4wiCMI0pnNrQA/j/Z2J6s1lWvnc7qFp5UAVDWFivC7evwMQRmO8KxSIlU
-=uuiv
+iF4EAREIAAYFAlGrOt8ACgkQXYk9GL8g3FF7uAD+Mm2hN0qiWODVG0I0tpo8qcuH
+Vt7chgSFoLpbKF4nUxUA/A/YL2RQj1tR9ARnjHmWaB4EoOpU43T3zNmz/LCZKF4O
+=rnbh
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..1efce4ff1741
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch
@@ -0,0 +1,61 @@
+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.ebuild
index 192c1f6662a2..48f4b8e097ea 100644
--- a/net-libs/gnutls/gnutls-3.2.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.1.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.1 2013/06/01 19:59:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1.ebuild,v 1.2 2013/06/02 12:30:18 alonbl Exp $
 
 EAPI=5
 
@@ -23,6 +23,7 @@ IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGU
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-2.14
 	>=dev-libs/nettle-2.7[gmp]
+	dev-libs/gmp
 	sys-devel/autogen
 	dane? ( net-dns/unbound )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
@@ -39,6 +40,8 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-build-gmp.patch"
+
 	# tests/suite directory is not distributed
 	sed -i \
 		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \