[gentoo-commits] gentoo-x86 commit in net-libs/net6/files: net6-1.3.13-gnutls3.patch

[Kacper Kowalik (xarthisius)]

xarthisius    11/10/30 09:06:01

  Added:                net6-1.3.13-gnutls3.patch
  Log:
  Backport upstream patch to fix building with gnutls-3. Fixes bug #388897 by Lars Wendler <polynomial-c@g.o>
  
  (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/net6/files/net6-1.3.13-gnutls3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/net6/files/net6-1.3.13-gnutls3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/net6/files/net6-1.3.13-gnutls3.patch?rev=1.1&content-type=text/plain

Index: net6-1.3.13-gnutls3.patch
===================================================================
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()