summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authormarino <marino>2012-07-18 10:22:23 +0000
committermarino <marino>2012-07-18 10:22:23 +0000
commitec540f1facfed20c926752eaaa1f74e8adde2995 (patch)
tree9d0496c34499a742a4fb2fa7384792386f285f35 /net
parent4bca87ca20034b5b2d5ac4d4a463bdd14a59fe7c (diff)
downloadpkgsrc-ec540f1facfed20c926752eaaa1f74e8adde2995.tar.gz
net/net6: Fix regression due to upgrade to gnutils 3.0
GnuTLS deprecated gnutils_transport_set_lowat function in version 2.12.0 and finally removed it with version 3.0, breaking any packages that still reference it. The lowat feature is now disabled permanently I think. The patch uses the GNUTLS_VERSION_NUMBER macro to appropriately conceal the function reference. The same patch is widely seen on the 'net with other packages that use GnuTLS.
Diffstat (limited to 'net')
-rw-r--r--net/net6/Makefile4
-rw-r--r--net/net6/distinfo3
-rw-r--r--net/net6/patches/patch-encrypt.cpp17
3 files changed, 21 insertions, 3 deletions
diff --git a/net/net6/Makefile b/net/net6/Makefile
index f91b18d70bc..0de24e252a3 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/04/22 13:42:43 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/07/18 10:22:23 marino Exp $
#
DISTNAME= net6-1.3.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://releases.0x539.de/net6/
diff --git a/net/net6/distinfo b/net/net6/distinfo
index 7804d247204..e447ee2a14d 100644
--- a/net/net6/distinfo
+++ b/net/net6/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/10/27 19:08:30 drochner Exp $
+$NetBSD: distinfo,v 1.7 2012/07/18 10:22:23 marino Exp $
SHA1 (net6-1.3.10.tar.gz) = 880e00518296395705041dc7e64c2c82f7c53ddd
RMD160 (net6-1.3.10.tar.gz) = 9607fe1665aab0ed0354607f82ba4e3fe8733244
Size (net6-1.3.10.tar.gz) = 454813 bytes
+SHA1 (patch-encrypt.cpp) = 7ea196cac1fa7329fb8102b5d818ab63d8ffad41
diff --git a/net/net6/patches/patch-encrypt.cpp b/net/net6/patches/patch-encrypt.cpp
new file mode 100644
index 00000000000..9bfcad5eb29
--- /dev/null
+++ b/net/net6/patches/patch-encrypt.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-encrypt.cpp,v 1.1 2012/07/18 10:22:23 marino Exp $
+
+GnuTLS deprecated gnutls_transport_set_lowat in version 2.12.0 and removed it by version 3
+The lowat feature is always disabled now.
+
+--- src/encrypt.cpp.orig 2009-08-24 12:18:29.000000000 +0000
++++ src/encrypt.cpp
+@@ -202,7 +202,9 @@ net6::tcp_encrypted_socket_base::
+ );
+ #endif
+
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+ gnutls_transport_set_lowat(session, 0);
++#endif
+ }
+
+ net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base()