summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2017-03-03 18:09:11 +0200
committerAlon Bar-Lev <alonbl@gentoo.org>2017-03-03 22:54:56 +0200
commitfc34c7250eef6b08068be471eedb6437d0f8e022 (patch)
treef4a1e48f5ad316dee1c63d0dc8be13468f090525 /net-libs/net6/files
parentprofiles/default/linux/sparc/13.0: fix LIBDIR_*, #609178 (diff)
downloadgentoo-fc34c7250eef6b08068be471eedb6437d0f8e022.tar.gz
gentoo-fc34c7250eef6b08068be471eedb6437d0f8e022.tar.bz2
gentoo-fc34c7250eef6b08068be471eedb6437d0f8e022.zip
net-libs/net6: gnutls-3.4 + eapi bump
Bug: 582812 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-libs/net6/files')
-rw-r--r--net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch b/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch
new file mode 100644
index 000000000000..0eb431676324
--- /dev/null
+++ b/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch
@@ -0,0 +1,27 @@
+From 90154df3f1d504f0ebb3d70b889c1f0e30990588 Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clopez@igalia.com>
+Date: Thu, 28 Jul 2016 14:43:38 +0200
+Subject: [PATCH] Fix build with GnuTLS >= 3.4.0
+
+ * gnutls_kx_set_priority() has been removed in 3.4.0 and
+ gnutls_priority_set_direct() should be used instead.
+---
+ src/encrypt.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/encrypt.cpp b/src/encrypt.cpp
+index 30f83a6..9223c35 100644
+--- a/src/encrypt.cpp
++++ b/src/encrypt.cpp
+@@ -175,10 +175,8 @@ net6::tcp_encrypted_socket_base::
+ gnutls_session_t sess):
+ tcp_client_socket(cobj), session(sess), state(DEFAULT)
+ {
+- const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
+-
+ gnutls_set_default_priority(session);
+- gnutls_kx_set_priority(session, kx_prio);
++ gnutls_priority_set_direct(session, "NORMAL:+ANON-DH", NULL);
+
+ gnutls_transport_set_ptr(
+ session,