Backport upstream patch to fix building with gnutls-3. Fixes bug #388897 by Lars Wendler <polynomial-c@gentoo.org>

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

3 files changed, 56 insertions, 8 deletions

diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index b4160477286f..ba90786769dc 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX net6-1.3.13-gnutls3.patch 962 RMD160 4c1fa37b55371fb80483d17d7dc88fc913f3b54e SHA1 042438471848f029dc42ea35b90f47b5e499cf92 SHA256 2d708e7e7ac9e916bff5b1ab7446b16b8ba01935e92b151fc6d5337162d37979
 AUX net6-1.3.9-libgnutls.patch 738 RMD160 61adf918c10596cd66b3d75a950b190eeb76f71e SHA1 3b35519e3ff2cd2bddfb45fbf945bfafa35e116b SHA256 984b603d8b0e3e2ca2a5e62316dcc7a246e3f9d2346a592b9b82cb6f3e888cc5
 DIST net6-1.3.13.tar.gz 465003 RMD160 d86dae018b8443ff4af0a531f3ba78c5a41c5c46 SHA1 48b77f6d67fa17447cd5100320dc773d927fb02e SHA256 b2513810d42dbf89f0e98ed5c1702cbfb4f9c7f04c66b6c70fa7d5c3a284d80c
 DIST net6-1.3.9.tar.gz 449368 RMD160 178c0093edfc9edc3f11afed06c4743ef86052e8 SHA1 86c15f3b3bcd89bfa8da9cef68518b32349ba36f SHA256 46af4422e453836038c2b19b25ae60b27d028b8f7c645b71b20dc0069383f202
-EBUILD net6-1.3.13.ebuild 830 RMD160 6ad89ce579e04490d9131ef765382dded8ca12af SHA1 118cba23b4615feabd0613ddeef00ea8cf708d23 SHA256 d3b5e0fc8998ac920edf675789ce3dc727e235709b65653bedb3f15ea94e48c5
+EBUILD net6-1.3.13.ebuild 897 RMD160 0050497d8de2c5c18d4b556612cdeee93a134c11 SHA1 c6b7cd5d8474e6fa84b1e23316f44514f678b6c4 SHA256 d1a938196ee5408e75418666a09fd681f2f47bfe065dce4d465733c1d6144669
 EBUILD net6-1.3.9.ebuild 930 RMD160 119672f14ba0694dd6a659cca5415b2edb219421 SHA1 5a29cbe33ebbc2ae85b59141ca728635f252c4f6 SHA256 fd6349c0a150c5368dc9677e289eada557fe8fd4cf439ef035005d6938891c1c
 MISC ChangeLog 5843 RMD160 6df7ba5ab60972c542fd4c27e54cb8ea22e8f881 SHA1 f220ec9f8645b621f2c065e4fe01919054c4a1da SHA256 0091a3f8810f1bff5db5fb8188e3cd6f4ee18092483f6526aca70b3412008ca4
 MISC metadata.xml 458 RMD160 420550d887fc3c2813427e052d48ed4cb29da559 SHA1 03b7a099986673f01eb96361dd76c16e5b971e20 SHA256 73017b840e664a764f316751b00480347fd28ffce91df371b9e5e23edcd2684e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rU4ACgkQfXuS5UK5QB1FIgP6AnhBmla/jG7uQOLHhnydZl6K
-36UhfaokgMejfORIZvit4XevvpA1G10gCW5dOi38b3+g+p9lETc9QuYUY4I/qEh8
-5aMzsRpaM12eNZsCDSnRugaPRwof2w7k7G+aJMeoLBKUBfq84MA/piXDgta3NP8v
-DxDs2B9RlV3Y4J8jdno=
-=ba47
+iQIcBAEBCAAGBQJOrROCAAoJEF0huFKJUZL5pw0P/0nFrz4YFS8Qa9eo0mgWBmeI
+97LU3KmRB4fT1jD8Rj4hJcWWpk3oMn1F3wjbGp5hLerOd63xrvnXbs6wDjZHWnV0
+7cdUtv0KOZXxZNauu5jV+P2qjD2pyklYPdxkdcgasrRezo+G7kosJmUFzCSLFu7b
+H3GeuYDNhoEb/Zy53tNB+tH8/PQGQ9e0n6b4M6uwCLSjNlMffxQpZmr9DgZN2Rhr
+VBNWXFZN8n6RSvDMoDh7QmV34LpWODWnfNJj+aGtzzq5MAUdop/4rIkPYPuyHPKi
+XJhTR7JEqP82z2WKi3Ns5zkD4lJ64NTQ/s5VfSf8sj2N6glETAZlVaf93he+gvzU
+dBOQrBCC1caOeghuK2pgS+Hc9hzII+7d96zb56/2ZOUa59yxjdZHG8+CPKvm6QCS
+INWTm7kldN7GUYx45+M4VwVt37Ds5SGHxEjjt8zPnN7YWaWIueHxgWZKYGiWnWve
+EQVV6Ta2DttYYrYGi7nmhyRXeYVVjMwraMN8vpmn6CGHYDnWiNahyp0nzdLg4LoB
+foauP9cdmZqjuyaN7oQWpqPcJan312KyrA+AD1F7duM8bgyAnYitHT3u+Js0eA3w
+fdlm6gLtUa8W8M6xPTPDa/vDtsh4cOuSuIi0OdDJiAxl2H8dsKZib4+mrS2yeibq
+KYWwydZhqnmr+bsMEAoE
+=1ieB
 -----END PGP SIGNATURE-----
diff --git a/net-libs/net6/files/net6-1.3.13-gnutls3.patch b/net-libs/net6/files/net6-1.3.13-gnutls3.patch
new file mode 100644
index 000000000000..4e2757b339bc
--- /dev/null
+++ b/net-libs/net6/files/net6-1.3.13-gnutls3.patch
@@ -0,0 +1,35 @@
+Backporting upstream patch to fix build failure with gnutls-3
+
+https://bugs.gentoo.org/show_bug.cgi?id=388897
+
+--- a/inc/encrypt.hpp
++++ b/inc/encrypt.hpp
+@@ -34,7 +34,6 @@
+ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
+ typedef gnutls_transport_ptr gnutls_transport_ptr_t;
+ typedef gnutls_dh_params gnutls_dh_params_t;
+-typedef gnutls_connection_end gnutls_connection_end_t;
+ 
+ class dh_params: private net6::non_copyable
+ {
+--- a/src/encrypt.cpp
++++ b/src/encrypt.cpp
+@@ -25,7 +25,7 @@
+ {
+ 	const unsigned int DH_BITS = 1024;
+ 
+-	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
++	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
+ 	{
+ 		net6::gnutls_session_t session;
+ 		gnutls_init(&session, end);
+@@ -202,7 +202,9 @@
+ 	);
+ #endif
+ 
++#if GNUTLS_VERSION_NUMBER < 0x030003
+ 	gnutls_transport_set_lowat(session, 0);
++#endif
+ }
+ 
+ net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base()
diff --git a/net-libs/net6/net6-1.3.13.ebuild b/net-libs/net6/net6-1.3.13.ebuild
index 1d28a6d8360a..2a36b2e16704 100644
--- a/net-libs/net6/net6-1.3.13.ebuild
+++ b/net-libs/net6/net6-1.3.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.13.ebuild,v 1.2 2011/09/22 16:52:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.13.ebuild,v 1.3 2011/10/30 09:06:00 xarthisius Exp $
 
 EAPI=4
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
 HOMEPAGE="http://gobby.0x539.de/"
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gnutls3.patch
+}
+
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_enable static-libs static)