[openvas-libraries] gnutls 2.12.0 deprecated gnutls_transport_set_lowat, this makes compile time issues in devel/F-16

[rebus]

commit dead67b4bb4ea789882197b7418504965ffb74d8
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sat Jul 30 23:32:23 2011 +0200

    gnutls 2.12.0 deprecated gnutls_transport_set_lowat, this makes compile time issues in devel/F-16

 openvas-libraries-lowat.patch |   15 +++++++++++++++
 openvas-libraries.spec        |   10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/openvas-libraries-lowat.patch b/openvas-libraries-lowat.patch
new file mode 100644
index 0000000..0de009e
--- /dev/null
+++ b/openvas-libraries-lowat.patch
@@ -0,0 +1,15 @@
+diff -ru openvas-libraries-4.0.5.old/misc/network.c openvas-libraries-4.0.5/misc/network.c
+--- openvas-libraries-4.0.5.old/misc/network.c	2011-07-30 22:07:44.000000000 +0200
++++ openvas-libraries-4.0.5/misc/network.c	2011-07-30 22:28:42.000000000 +0200
+@@ -781,8 +781,10 @@
+     }
+ 
+   unblock_socket (fp->fd);
++
++  /* since gnutls 2.12.0 call to gnutls_transport_set_lowat is deprecated */
+   /* for non-blocking sockets, gnutls requires a 0 lowat value */
+-  gnutls_transport_set_lowat (fp->tls_session, 0);
++  /* gnutls_transport_set_lowat (fp->tls_session, 0); */
+ 
+   gnutls_transport_set_ptr (fp->tls_session,
+                             (gnutls_transport_ptr_t) GSIZE_TO_POINTER (fp->fd));
diff --git a/openvas-libraries.spec b/openvas-libraries.spec
index 7b85ba9..2dd5de9 100644
--- a/openvas-libraries.spec
+++ b/openvas-libraries.spec
@@ -4,20 +4,23 @@ URL:		http://www.openvas.org
 License:	LGPLv2
 Group:		System Environment/Libraries
 Version:	4.0.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source0:	http://wald.intevation.org/frs/download.php/872/%{name}-%{version}.tar.gz
 
 #Reported as bug 1942	Fix compile time errors - variable 'xxx' set but not used
 #http://wald.intevation.org/tracker/index.php?func=detail&aid=1942&group_id=29&atid=220
 Patch0:		openvas-libraries-notused.patch
 
+#Reported as bug 2526	Fix compile time errors - gnutsl deprecated functions
+#http://wald.intevation.org/tracker/index.php?func=detail&aid=2526&group_id=29&atid=220
 Patch1:		openvas-libraries-gnutls.patch
+Patch2:		openvas-libraries-lowat.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes:	openvas-libnasl
 BuildRequires:	glib2-devel
 BuildRequires:	libgcrypt-devel
-BuildRequires:	gnutls-devel
+BuildRequires:	gnutls-devel >= 2.12.0
 BuildRequires:	libpcap-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	gpgme-devel
@@ -93,6 +96,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libopenvas.pc
 
 %changelog
+* Sat Jul 30 2011 Michal Ambroz <rebus at, seznam.cz> - 4.0.5-3
+- gnutls > 2.12.0 has deprecated gnutls_transport_set_lowat
+
 * Sun Jul 3 2011 Michal Ambroz <rebus at, seznam.cz> - 4.0.5-2
 - change from deprecated gnutls_*_set_priority to gnutls_priority_set_direct