Fix dane roots issue, bug#443104, thanks to Rafał Mużyło

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 165 insertions, 17 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 3cc969cadc42..960fcc4b0a30 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.508 2014/06/18 20:35:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.509 2014/07/06 21:15:48 alonbl Exp $
+
+*gnutls-3.3.4-r1 (06 Jul 2014)
+
+  06 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.4-r1.ebuild:
+  Fix dane roots issue, bug#443104, thanks to Rafał Mużyło
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> gnutls-3.3.4.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 9bd27aebe6b0..048e590c1f4e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -19,25 +19,14 @@ DIST gnutls-3.2.15.tar.xz 5140200 SHA256 30bdc7b34b220258f714602cdf0afa1abf0883b
 DIST gnutls-3.3.4.tar.xz 5326368 SHA256 04a53b2bbb936b02cdc62f68144f9706e256cc85cc530b81266a24d80b824357 SHA512 601ce227b5a529d60e19543347f78aaca81fb4051ab73d560a57d5b3f4f20fcbb52bbcecf3da2780f55c303c510b365a027b1758674e5d86fc2b9d2b06fac431 WHIRLPOOL 5dfaecaf6c5e769a8e6ac85d603c98b27b760b9c90dcb4ded0484b060d85e71c54ba31279b0d0fa185cf965e3baff315663ea81922f34b0557e70818d6bcaad1
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.2.15.ebuild 3486 SHA256 0a5488f83afe14accb38455e96bc4812f0ea735c191333c22e7316c4324e4bbc SHA512 fb4018f0311a913df557825379cfc4bd96b74671b51c8373320fd85cad642b254b00b60305e6a4d90d0ed4c2f60596226cad4e159d457f4168b126c1163048ae WHIRLPOOL d31d6460722a4ab4714cec75af36c79b1dbdd1ac9a47781a0fa9ce4183d1c1d5b0494e9819382755cccc557e1f3376db13ecd9c5cdd61c9eb91adc40bbc19f63
+EBUILD gnutls-3.3.4-r1.ebuild 4472 SHA256 40cb082dd53d3c84018e53740c10607632ce64f967b2d58c98523edf31624754 SHA512 c7cd2043d72a4e769572be25b7db1dac85d09ead07e91ff6b3f8a99e9300139c66e529023e9754de30c08c815c02f1b375dd458c6307c7b10aa7467f6bfdcd5f WHIRLPOOL 89dac29f8d876483fbf07e356d9348dd40f14226b9d48f25bb1fbc0fc5f5a9bcc82df8af2edc9843372cbb0af8932d64ff2188c63c6018279d1a95525c42efa1
 EBUILD gnutls-3.3.4.ebuild 4407 SHA256 d73edc0f1c99a5775bd867241e71614a35461142d33d9583b53b32d515c3d82b SHA512 eb55615a3c9b07eb3f97904c95ee29e27936fd200647e96a39d79392cfd42a81bc2115d39e4a99caf518d1de1e55b94924112e76487111f34787b2c067b85aa3 WHIRLPOOL 41b9855b958246bc4c0667cd83046a962fe8a372f2a634984ce90c05631abaeaa3e17eb78f7f365b8c504fbc8642fb6a4727dbd090c6925af636cc976ca5bc10
-MISC ChangeLog 75715 SHA256 c6d64845b54df9b20ee05af28c8bbfe8219c0610e2cf84fefdabe561e730227d SHA512 d555dbc4a97d1d019ff0e8c00bdb9d762d0bf03816246419ea3e2bb8d50e04c8229b4710678df713ebfa62ae0f5759f2d3300ff310be73ffe6546183cb1e4fc7 WHIRLPOOL b86e306f15a216b1a76c5a04c395900dd184b0d68f94dcb35f3dfbf43a983c6c9e2b4b2685e411c7a34f648d7535710de2d90a3990e150de817a032797e8a212
+MISC ChangeLog 75883 SHA256 7a736910c677fbfd71c8b4bfd33040752ac40e3bc69942ed0df6cd05f7cccc55 SHA512 36140405622197c89f24a2772cf4dd9a1fd8e354c97d7ba375e0cffc2046782b7a2d11d5b8d287ee22714feed11171529813a5a4545f7abf26e060b816a58501 WHIRLPOOL 4f3df2d97f979b9758382edfb93b05fdd63df58797156ea70f4a19ab400300b0afb904857a5aeffb1b93154e954d1c1b187e621cff84a7811a95884caf6ffde7
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTofggXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORwUQAMaPo/PgP3/jxgIg+xYfRu6C
-KD+4NouWdE7pne9w8BwZ/iJ3Zinr6rWU3tkunsCO6hSFwKrX2sWPuE1sCWUf+2d6
-0qJXMj7f/G9yRpyRV1WZ5cx2+qeQ14Zo6/Op+gkXFJ9LUXxEFTHJeO1h13+HWF/5
-Z9rLEXA1DaEDwT/jG7gFPVn2cnrnuK0OH4rb6d6y+1366d7FEXFXSYk10u57uFIN
-Q7AtKBPFB55HATkq/pbw5lu8/GOvoDIYbBemy5ioRNtNp+apPN5XPVbVXuLOCYx/
-cESthK3+Q4w6IgdLlsyJCWbYgTSoQjMAvL3tg8VVqngAxvjHE5mnSCea6QWRjMPl
-ioKGYyVssSxsuwQzXhwWeww4rQG//4DgEYO0ZCD/RYLsLmcW8VIqq/bsn8wGjmKt
-SBgPbaZbsR1yaBkgdQrFukRsd6/Gu/+z8wEV510a2cE8+AQ2bCrn2UJPSjE1/7MW
-0se1FMHPD262pOJJw8TLmLBweVMaT4ovqQKNrQ790LmIvsDd7q6sjDDf0iJwbtox
-uk1gDIJDYevrZp9NN/yYBu/0ge2MVh/PMWShTneCWSEAWzAhe67+qxKrzwu+2Hj+
-NNSNPKxlpTCFd9BWQJdL00Ie0yefgA+6B5iRPoTnL4reoxdldBlyXm47Qd221eSH
-QdNsmT+/OXd7YMgi6Mti
-=n9rs
+iF4EAREIAAYFAlO5vJAACgkQXYk9GL8g3FFHIgD/Xp3TCSwz0destrn9TgtXFJA2
+4Ryvx71bBlP2tgFgD6AA/0Sb7pIUKHrHk0vsqlLWEpXJSgCHonymSOTgNfZz2ovf
+=hFOu
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.4-r1.ebuild b/net-libs/gnutls/gnutls-3.3.4-r1.ebuild
new file mode 100644
index 000000000000..2ed905f3162c
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.4-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.4-r1.ebuild,v 1.1 2014/07/06 21:15:48 alonbl Exp $
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.19.3[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_prepare() {
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc gtk-doc-pdf) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		# symlink certtool for use in other ABIs
+		if use test; then
+			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+		fi
+	else
+		emake -C gl
+		emake -C lib
+		emake -C extra
+		use dane && emake -C libdane
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		# parallel testing often fails
+		emake -j1 check
+	else
+		# use native ABI tools
+		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+			"${BUILD_DIR}"/src/ || die
+
+		emake -C gl -j1 check
+		emake -C tests -j1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C extra DESTDIR="${D}" install
+		use dane && emake -C libdane DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dodoc doc/gnutls.pdf
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}