[pkgsrc/trunk]: pkgsrc/net/net6 Fix net/net6 build against new GnuTLS

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3c8bde96ca5
branches:  trunk
changeset: 353062:a3c8bde96ca5
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Mon Sep 26 01:08:42 2016 +0000

description:
Fix net/net6 build against new GnuTLS

Patch inspired by net/vino/patches/patch-server_libvncserver_auth.c (r.1.1)

Bump PKGREVISION to 3.

diffstat:

 net/net6/Makefile                      |   4 ++--
 net/net6/distinfo                      |   3 ++-
 net/net6/patches/patch-src_encrypt.cpp |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 228528da7d08 -r a3c8bde96ca5 net/net6/Makefile
--- a/net/net6/Makefile Sun Sep 25 23:19:12 2016 +0000
+++ b/net/net6/Makefile Mon Sep 26 01:08:42 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/26 01:08:42 kamil Exp $
 #
 
 DISTNAME=      net6-1.3.14
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  http://releases.0x539.de/net6/
 
diff -r 228528da7d08 -r a3c8bde96ca5 net/net6/distinfo
--- a/net/net6/distinfo Sun Sep 25 23:19:12 2016 +0000
+++ b/net/net6/distinfo Mon Sep 26 01:08:42 2016 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/09/26 01:08:42 kamil Exp $
 
 SHA1 (net6-1.3.14.tar.gz) = 7523a604e6b7f723cdd7f457f8f7c8c9cf48dae1
 RMD160 (net6-1.3.14.tar.gz) = c1445cdf2e7a34d0639d7bb410404d83ab972d27
 SHA512 (net6-1.3.14.tar.gz) = 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
 Size (net6-1.3.14.tar.gz) = 483549 bytes
+SHA1 (patch-src_encrypt.cpp) = 809a4e54c34835058466ab767ac17d8196fd331a
 SHA1 (patch-src_select.cpp) = 802bced5dc405ad1b3e59fd26d70d45da776c227
diff -r 228528da7d08 -r a3c8bde96ca5 net/net6/patches/patch-src_encrypt.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/net6/patches/patch-src_encrypt.cpp    Mon Sep 26 01:08:42 2016 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_encrypt.cpp,v 1.1 2016/09/26 01:08:42 kamil Exp $
+
+Do not use deprecated GnuTLS functions
+
+--- src/encrypt.cpp.orig       2011-09-28 11:15:10.000000000 +0000
++++ src/encrypt.cpp
+@@ -175,10 +175,10 @@ 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 };
++      static const char kx_prio[] = "NORMAL:+ANON-DH";
+ 
+       gnutls_set_default_priority(session);
+-      gnutls_kx_set_priority(session, kx_prio);
++      gnutls_priority_set_direct(session, kx_prio, NULL);
+ 
+       gnutls_transport_set_ptr(
+               session,