CVS commit: pkgsrc/net/net6

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Mon Sep 26 01:08:42 UTC 2016

Modified Files:
        pkgsrc/net/net6: Makefile distinfo
Added Files:
        pkgsrc/net/net6/patches: patch-src_encrypt.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/net6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/net6/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/net6/patches/patch-src_encrypt.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/net6/Makefile
diff -u pkgsrc/net/net6/Makefile:1.15 pkgsrc/net/net6/Makefile:1.16
--- pkgsrc/net/net6/Makefile:1.15       Mon Sep 19 13:04:18 2016
+++ pkgsrc/net/net6/Makefile    Mon Sep 26 01:08:42 2016
@@ -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/
 

Index: pkgsrc/net/net6/distinfo
diff -u pkgsrc/net/net6/distinfo:1.10 pkgsrc/net/net6/distinfo:1.11
--- pkgsrc/net/net6/distinfo:1.10       Wed Nov  4 00:35:15 2015
+++ pkgsrc/net/net6/distinfo    Mon Sep 26 01:08:42 2016
@@ -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

Added files:

Index: pkgsrc/net/net6/patches/patch-src_encrypt.cpp
diff -u /dev/null pkgsrc/net/net6/patches/patch-src_encrypt.cpp:1.1
--- /dev/null   Mon Sep 26 01:08:42 2016
+++ pkgsrc/net/net6/patches/patch-src_encrypt.cpp       Mon Sep 26 01:08:42 2016
@@ -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,