Version bump, bug#489262

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

4 files changed, 143 insertions, 6 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b6d4239d53a0..24899ec1877a 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.450 2013/10/22 18:41:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.451 2013/10/24 20:10:27 alonbl Exp $
+
+*gnutls-3.2.5 (24 Oct 2013)
+
+  24 Oct 2013; Alon Bar-Lev <alonbl@gentoo.org> +files/gnutls-3.2.5-build.patch,
+  +gnutls-3.2.5.ebuild:
+  Version bump, bug#489262
 
   22 Oct 2013; Fabian Groffen <grobian@gentoo.org> gnutls-3.2.4.ebuild:
   Add patch from upstream to fix compilation on Darwin, bug #488498
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2bcecec714ab..f010e4bf45ba 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,19 +7,22 @@ AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cff
 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-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
+AUX gnutls-3.2.5-build.patch 358 SHA256 a5719aefb78d8b6fbdd1176e604db7498cc930bb86a09105b0f32ad6a2d9d513 SHA512 6ec4b617829b6d0bf24b739d9965790cbbd0faa27aeb4ed1e00749117f1f2dc28ecbcff0aa0d32cb1b174d0d03e235ae36928104434a42937b8c2382661bc97a WHIRLPOOL 2c680688926200406ec65b276e31e00225bb594b2e72e78e007a587c4786a84c9ec2ae94c2d0a9ecd3bc73a4d496f67a6a360942aab5b5ab30bbf86a82021bfe
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.2.3.tar.xz 5119264 SHA256 0543ca13ce9ee1dea95a9349d319623b74d93b8a23935543197b1682bb7f2b5b SHA512 c00cc8a73e26c57050e124ed95f98681e41aee5b59a47c545555ba6571b08063152bf81903c3b7c97d3dcefb938ef3fbd5a76e5816a23fce64f799740d61c9bc WHIRLPOOL 5c61309651fa3eafe44b92a72583732756038ea036df530af1759bfe8d7c6b04a06c8ed081ccad1c5955ed8624e1aaf40f15bfc17eb7e7fe134569015a2cf07d
 DIST gnutls-3.2.4-no-error.patch 99348 SHA256 122ee40895b1693124cdbb190d4f07ee8274b287086c62cf728af30ef6140e09 SHA512 ac95c24e79431b47078b8389bfa9d2a08498e4af5936b1e16e21fd99613278df6d2fdc71c921b43360ac7f7545f9a7fc0a0aa23e796db5c7366fd226a653fbae WHIRLPOOL e74c1818337ba20fac66fddc2d06d9fb70fac3b99eed5233a27855f3d20201178824afbd8963ae81eced035d9a84519e05776d0ab1035919aa563124e2809707
 DIST gnutls-3.2.4.tar.xz 4959876 SHA256 119570af3eb83b411252bf617688b9b9143e4349f48657b7ebaea57d90ff707f SHA512 d0ae82e34421b74cca42f14e9564d52324c1becfeeef0fb3e301fe3919bff4186e13661c93156a3f0515be544be3a34db10887efef59c6a3c74512d2f14351a7 WHIRLPOOL 10124de2f568f05304a989511d6d8139be56de125412d8b66f3827de84c0538b3af00cd49457ca7a039d06dde7cc2bc80d3d03ff9b836c0ed3e27a184301ab6f
+DIST gnutls-3.2.5.tar.xz 4987156 SHA256 c6fbcdcd32b2f38cca3bbfa10759556d66f4795ac6e6e50503f2ee5c08c081b7 SHA512 87dc3ba29d2423769e6532d2f6175ddec4665d30b22f45907c30bee3b48468032790eb4dc49e7a1c0a13f523b44dd98be2c5ea062444885652b122cbcc26d69d WHIRLPOOL 8714e2c174978ec85edf54f8b2e50a94c8d2be2213cafade9d85c43d23cb20abf588328dbf436fea90ec0befc86a8518f8d29e7d1e7e09c8db6d0cc2f777b2c3
 EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 da49a8d4219dd293e6016b0f9896db1f36a20f44f89766cd502c034a0920b8a1 SHA512 5c4fc5eebdc5480c873e1ea081c6ff87dbc83405d366459186f6ea0ec1ba6e9152403ae50406a934e5dc7a82920cbd0ee964d44217e1ec2f97b3fd546c8d68aa WHIRLPOOL d1adb02419f85d30b7cdc235279bd56b82764f9a314b64353baf408dde99ab9ab9afa050433cfdb9bbaf1951403d24425c76a22b85d59a946c591298c6e054cf
 EBUILD gnutls-3.2.3.ebuild 3156 SHA256 cdbdb936c88d11af46ce617f37733901bc422ffafeaf9609b69b95455712b3db SHA512 cee68c3471ec6d8692d4b0361e841a34aea8078b606a31601f4123b631cf1365a04c778f41344714e1182a3128d2b9771075e9d0d83b44a99ee88c4e674f6bb3 WHIRLPOOL 6f10ed3bace9ea03ac407323c9074d141d617829ff695d02b994a05df1af53c1b640fa7de52741a915471ec7c56d8b9047e70ac015c68658693640c2cfc08d37
 EBUILD gnutls-3.2.4.ebuild 3336 SHA256 9b0bc7e36fa5a97dea90133362665eaa96c3a648d351a7f05f5088bf640ca404 SHA512 d12071cc3b5a1ad9660fb3fc1dffd6ac9dfe97ce65db9603cd308bd44ee0ab6b34d232fd1a2b785d5359aa3dadaf2c5cd0ccb827caac3229a6c161c04029a773 WHIRLPOOL de6bad7dcfeb93869786e6fa2bbf57f2cc960f07f570e18f0bf0cb8bc53b0019bc51bbdee7702165783b3b8f6ee1ee3933ee6a4b92f8a05df6b3077f637bb730
-MISC ChangeLog 67023 SHA256 4ebc6216ce979c9ad563a7a21c024cf03b22d664e973247f2c71abe4e6d4a030 SHA512 89910964bd905c1b3286cf74a3a8b331d57c423c750521f6048d998e6f8aec31799278a111db6151c4592f08a85192f5eeba004b0d186343b4de2ffa18682bbc WHIRLPOOL 84e6863734b5b9706f13e0143b407df4a22ea7dca8796e5058e0d061b7d6912bc3e2297ec412024a10dcc00588e66a2e5a2516d8d90ca3325c780a8c731ef6d9
+EBUILD gnutls-3.2.5.ebuild 3193 SHA256 78c5a17447bcec4dd2b9a20c28af11c225a516be7debda3822b74071963f3a2e SHA512 ea31aee54c0c1dd15477c05feb0f707b8de53cd89511f64cf15ae955b10739252a9d408edd50358cc0ac3e16b8a7e188539cbaee986e350082183750ba04c18f WHIRLPOOL 629cf98921ef5778f0ca6d0dcd0928ecd3edc37c8f1150633a2a94ecfaeda8d0df9dc6e322e236d91631d7aff24f27eddd978ea04c40cb998efc79de21ea2b16
+MISC ChangeLog 67184 SHA256 667648eff3b0d7c820a0d6cd9c34d4ff7a0e1726d6d4af4ca122cf2c0ab98c0f SHA512 9d47fb57af56a2a9b2e9d466355606833b4d2121b95fcfb07cc47b75ac2ef3c0ab5bdb3573fc9bbf34e8f684e2db637900e7f0ef57ed9245afc574eeced43881 WHIRLPOOL 1d7cc17877b45418e2b0183c074314a2e86654b311b9a8d86ed05219e19c17ea5e532e32b42554f330f716c60a5da4475e16654fa68158eac0a1f218c6c13d4c
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJmxtUACgkQX3X2B8XHTonIvACcDr+ODNUjgZZuPhGiloyxlenk
-GwoAnRuhTDpDMB0Gj1UvUWdR/UtJMgwA
-=opdt
+iF4EAREIAAYFAlJpfrcACgkQXYk9GL8g3FEDMwEAgzo0ncLF2mlGJlvNqsVpNkI6
+P3iAOxMhw5ECEurs6icA/0r+1g9FEFF5rIawVsKln6CoBUu1xmeRx1DHZi1AhsuU
+=3gsH
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.2.5-build.patch b/net-libs/gnutls/files/gnutls-3.2.5-build.patch
new file mode 100644
index 000000000000..7d0ae8bae8dd
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.5-build.patch
@@ -0,0 +1,11 @@
+diff -urNp gnutls-3.2.5.org/src/cli.c gnutls-3.2.5/src/cli.c
+--- gnutls-3.2.5.org/src/cli.c	2013-10-04 13:33:43.000000000 +0300
++++ gnutls-3.2.5/src/cli.c	2013-10-24 22:59:44.738968191 +0300
+@@ -34,6 +34,7 @@
+ #include <sys/select.h>
+ #include <unistd.h>
+ #include <stdint.h>
++#include <stdbool.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <ctype.h>
diff --git a/net-libs/gnutls/gnutls-3.2.5.ebuild b/net-libs/gnutls/gnutls-3.2.5.ebuild
new file mode 100644
index 000000000000..3ea6d81c4209
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.5.ebuild
@@ -0,0 +1,117 @@
+# 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.5.ebuild,v 1.1 2013/10/24 20:10:27 alonbl Exp $
+
+EAPI=5
+
+inherit autotools libtool eutils versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/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 ~hppa ~ia64 ~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 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-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] )
+	nls? ( virtual/libintl )
+	pkcs11? ( >=app-crypt/p11-kit-0.11 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+src_prepare() {
+	# tests/suite directory is not distributed
+	sed -i \
+		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
+		configure.ac || die
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	rm -f {m4,gl/m4}/{lt*,libtool.m4}
+	find . -name ltmain.sh -delete
+
+	# use system libopts
+	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || 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
+
+	epatch "${FILESDIR}/${P}-build.patch"
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm
+}
+
+src_test() {
+	# parallel testing often fails
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete
+
+	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
+}