[openvas-libraries] Removing the patch for the private key as gnutls-2.12.10+ is reverting back the old behaviour to cop

[rebus]

commit cc55fa6242d6aa4dae79383c6c6f2cd4fb9f6351
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Fri Jan 20 07:39:45 2012 +0100

    Removing the patch for the private key as gnutls-2.12.10+ is reverting back the
    old behaviour to copy the private key to the cert structure.

 openvas-libraries.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/openvas-libraries.spec b/openvas-libraries.spec
index 5ba6f17..8e469ea 100644
--- a/openvas-libraries.spec
+++ b/openvas-libraries.spec
@@ -4,7 +4,7 @@ URL:		http://www.openvas.org
 License:	LGPLv2
 Group:		System Environment/Libraries
 Version:	4.0.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source0:	http://wald.intevation.org/frs/download.php/979/%{name}-%{version}.tar.gz
 
 #Reported as bug 1942	Fix compile time errors - variable 'xxx' set but not used
@@ -27,14 +27,16 @@ Patch3:		openvas-libraries-nowerror.patch
 #SIGSEGV situation when the key material is used later on in _gnutls_pkcs1_rsa_decrypt.
 #Due to reuse of released memory and wrong boundary checking in the _gnutls_pkcs1_rsa_decrypt
 #overwrites whole stack and causes crash.
-Patch4:		openvas-libraries-key.patch
+#Relevant only to gnutls-2.12.0 - 2.12.10
+#Not needed anymore as gnutls in Fedora 16 is being pushed to version 2.12.14
+#Patch4:		openvas-libraries-key.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes:	openvas-libnasl
 BuildRequires:	glib2-devel
 BuildRequires:	libgcrypt-devel
-BuildRequires:	gnutls-devel >= 2.12.0
+BuildRequires:	gnutls-devel >= 2.12.10
 BuildRequires:	libpcap-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	gpgme-devel
@@ -67,7 +69,7 @@ Development libraries and headers for use with openvas-libraries.
 %patch3 -p 1 -b .nowerror.patch
 
 #Avoid SIGSEG in gnutls.
-%patch4 -p 1 -b .key.patch
+#patch4 -p 1 -b .key.patch
 
 
 #Fix FSF address in source files
@@ -132,8 +134,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libopenvas.pc
 
 %changelog
+* Sun Jan 15 2012 Michal Ambroz <rebus at, seznam.cz> - 4.0.6-3
+- removed pach openvas-libraries-key.patch again as gnutls will be
+  upgraded to 2.2.14 in Fedora 16 soon
+
 * Mon Jan 09 2012 Michal Ambroz <rebus at, seznam.cz> - 4.0.6-2
-- added openvas-libraries-4.0.6-key.patch to fix use-after-free issue causing
+- added openvas-libraries-key.patch to fix use-after-free issue causing
   SIGSEGV fault in gnutls code
 
 * Fri Nov 04 2011 Michal Ambroz <rebus at, seznam.cz> - 4.0.6-1