Version bump, bug#520784, cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 96 insertions, 3 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index afe5078f4cfb..43d18b7764c6 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # 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.510 2014/08/08 08:40:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.511 2014/08/24 19:09:45 alonbl Exp $
+
+*gnutls-3.2.17 (24 Aug 2014)
+*gnutls-3.3.7 (24 Aug 2014)
+
+  24 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> +files/gnutls-3.3.7-build.patch,
+  +gnutls-3.2.17.ebuild, +gnutls-3.3.7.ebuild, -gnutls-3.2.15.ebuild,
+  -gnutls-3.3.4-r1.ebuild:
+  Version bump, bug#520784, cleanup
 
 *gnutls-3.2.16 (08 Aug 2014)
 *gnutls-3.3.6 (08 Aug 2014)
diff --git a/net-libs/gnutls/files/gnutls-3.3.7-build.patch b/net-libs/gnutls/files/gnutls-3.3.7-build.patch
new file mode 100644
index 000000000000..cd9673d7fbe4
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.3.7-build.patch
@@ -0,0 +1,83 @@
+From 580c82cbe8629b0848b30a4a4ed659c558dc42c7 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 24 Aug 2014 21:19:26 +0300
+Subject: [PATCH] build: condition pkcs11 block
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lib/gnutls_privkey.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
+index 24ed6f2..647777e 100644
+--- a/lib/gnutls_privkey.c
++++ b/lib/gnutls_privkey.c
+@@ -198,6 +198,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
+ 	case GNUTLS_PRIVKEY_X509:
+ 		ret = _gnutls_pk_params_copy(params, &key->key.x509->params);
+ 		break;
++#ifdef ENABLE_PKCS11
+ 	case GNUTLS_PRIVKEY_PKCS11: {
+ 		gnutls_pubkey_t pubkey;
+ 
+@@ -210,6 +211,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
+ 
+ 		break;
+ 		}
++#endif
+ 	default:
+ 		gnutls_assert();
+ 		return GNUTLS_E_INVALID_REQUEST;
+-- 
+1.8.5.5
+
+From 95cf32756f65d945dff17458a89a0bdf7fc81f41 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 24 Aug 2014 21:49:55 +0300
+Subject: [PATCH] build: tests: x509cert-tl: support separate builddir
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tests/Makefile.am   | 1 +
+ tests/x509cert-tl.c | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6638fce..3ad6c67 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -128,6 +128,7 @@ TESTS_ENVIRONMENT =						\
+ 	PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12	\
+ 	PKCS12PASSWORD_2=""					\
+ 	PKCS12PATH=$(srcdir)/pkcs12-decode/			\
++	X509CERTDIR=$(srcdir)/x509cert-dir/			\
+ 	EXEEXT=$(EXEEXT)					\
+ 	top_builddir="$(top_builddir)"				\
+ 	srcdir="$(srcdir)"
+diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c
+index dad7860..5ecc03e 100644
+--- a/tests/x509cert-tl.c
++++ b/tests/x509cert-tl.c
+@@ -189,6 +189,7 @@ static time_t mytime(time_t * t)
+ void doit(void)
+ {
+ 	int ret;
++	const char *path;
+ 	gnutls_datum_t data;
+ 	gnutls_x509_crt_t server_crt, ca_crt2;
+ 	gnutls_x509_trust_list_t tl;
+@@ -209,7 +210,10 @@ void doit(void)
+ 	gnutls_x509_crt_init(&server_crt);
+ 	gnutls_x509_crt_init(&ca_crt2);
+ 
+-	ret = gnutls_x509_trust_list_add_trust_dir(tl, "./x509cert-dir", NULL, GNUTLS_X509_FMT_PEM, 0, 0);
++	path = getenv("X509CERTDIR");
++	if (!path)
++		path = "./x509cert-dir";
++	ret = gnutls_x509_trust_list_add_trust_dir(tl, path, NULL, GNUTLS_X509_FMT_PEM, 0, 0);
+ 	if (ret != 1)
+ 		fail("gnutls_x509_trust_list_add_trust_dir: %d\n", ret);
+ 
+-- 
+1.8.5.5
+
diff --git a/net-libs/gnutls/gnutls-3.2.15.ebuild b/net-libs/gnutls/gnutls-3.2.17.ebuild
index f0268fdcd82e..d67d3f322a22 100644
--- a/net-libs/gnutls/gnutls-3.2.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.17.ebuild
@@ -1,6 +1,6 @@
 # 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.2.15.ebuild,v 1.3 2014/06/10 00:42:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.17.ebuild,v 1.1 2014/08/24 19:09:45 alonbl Exp $
 
 EAPI=5
 
diff --git a/net-libs/gnutls/gnutls-3.3.4-r1.ebuild b/net-libs/gnutls/gnutls-3.3.7.ebuild
index 2ed905f3162c..206fcb74640b 100644
--- a/net-libs/gnutls/gnutls-3.3.4-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.7.ebuild,v 1.1 2014/08/24 19:09:45 alonbl Exp $
 
 EAPI=5
 
@@ -57,6 +57,8 @@ src_prepare() {
 		rm src/$(basename ${file} .c).{c,h} || die
 	done
 
+	epatch "${FILESDIR}/${P}-build.patch"
+
 	# support user patches
 	epatch_user