[openvas-libraries] Update to version 4.0.5

[rebus]

commit 840c999f8dd0381986854fa86d9fe22af6c7a755
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sat Jun 11 02:01:32 2011 +0200

    Update to version 4.0.5

 .gitignore                      |    1 +
 openvas-libraries-notused.patch |   60 ---------------------------------------
 openvas-libraries.spec          |   11 ++++++-
 sources                         |    2 +-
 4 files changed, 11 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19d178b..0549537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /openvas-libraries-3.1.4.tar.gz
 /openvas-libraries-4.0.3.tar.gz
 /openvas-libraries-4.0.4.tar.gz
+/openvas-libraries-4.0.5.tar.gz
diff --git a/openvas-libraries-notused.patch b/openvas-libraries-notused.patch
index 0a76c59..2b9929a 100644
--- a/openvas-libraries-notused.patch
+++ b/openvas-libraries-notused.patch
@@ -2,40 +2,6 @@ New version of gcc used for fedora 15 is reporting errors with -Werror also for
 variables set, but never used.
 Where it was obvious I fixed the code. In other cases avoid this error by
 (void) variable
-diff -ru openvas-libraries-4.0.3.old/misc/network.c openvas-libraries-4.0.3.new/misc/network.c
---- openvas-libraries-4.0.3.old/misc/network.c	2011-03-03 09:44:22.000000000 +0100
-+++ openvas-libraries-4.0.3.new/misc/network.c	2011-03-22 23:58:10.000000000 +0100
-@@ -137,6 +137,9 @@
-       // @todo: Check value if renice_result to see if it was successful.
-       // Keep in mind that even -1 can mean success here; see man page of nice
-       // for details.
-+      
-+      // renice set but not used - workaround
-+      (void) renice_result;
-     }
- }
- 
-diff -ru openvas-libraries-4.0.3.old/misc/plugutils.c openvas-libraries-4.0.3.new/misc/plugutils.c
---- openvas-libraries-4.0.3.old/misc/plugutils.c	2011-03-03 09:44:22.000000000 +0100
-+++ openvas-libraries-4.0.3.new/misc/plugutils.c	2011-03-23 00:16:53.000000000 +0100
-@@ -1550,7 +1550,7 @@
-       socketpair (AF_UNIX, SOCK_STREAM, 0, sockpair);
-       if ((pid = fork ()) == 0)
-         {
--          int tictac = 0;
-+          int tictac = 120;
-           int old, soc;
-           struct arglist *globals, *preferences = NULL;
- 
-@@ -1578,7 +1578,7 @@
- 
-           sig_term (_exit);
-           sig_alarm (_exit);
--          alarm (120);
-+          alarm (tictac);
- 
- 
-           if (res->type == KB_TYPE_INT)
 diff -ru openvas-libraries-4.0.3.old/nasl/charcnv.c openvas-libraries-4.0.3.new/nasl/charcnv.c
 --- openvas-libraries-4.0.3.old/nasl/charcnv.c	2011-03-03 09:44:22.000000000 +0100
 +++ openvas-libraries-4.0.3.new/nasl/charcnv.c	2011-03-23 00:24:39.000000000 +0100
@@ -338,29 +304,3 @@ diff -ru openvas-libraries-4.0.3.old/nasl/smb_crypt.c openvas-libraries-4.0.3.ne
    SMBencrypt_hash_ntlmssp(lm_hash, c8, p24);
  }
  
-diff -ru openvas-libraries-4.0.3.old/omp/omp.c openvas-libraries-4.0.3.new/omp/omp.c
---- openvas-libraries-4.0.3.old/omp/omp.c	2011-03-03 09:44:22.000000000 +0100
-+++ openvas-libraries-4.0.3.new/omp/omp.c	2011-03-23 01:59:06.000000000 +0100
-@@ -2274,8 +2274,11 @@
- int
- omp_get_system_reports (gnutls_session_t* session, const char* name, int brief,
-                         entity_t *reports)
--{
-+{ 
-+  /* variable ret set but never used 
-   int ret;
-+  */
-+
-   const char *status_code;
- 
-   if (name)
-@@ -2312,7 +2315,9 @@
-       return -1;
-     }
-   if (status_code[0] == '2') return 0;
-+  /* variable ret set but never used 
-   ret = (int) strtol (status_code, NULL, 10);
-+  */
-   free_entity (*reports);
-   if (errno == ERANGE) return -1;
-   return 1;
diff --git a/openvas-libraries.spec b/openvas-libraries.spec
index f3da9c5..450ab31 100644
--- a/openvas-libraries.spec
+++ b/openvas-libraries.spec
@@ -3,10 +3,14 @@ Summary:	Support libraries for Open Vulnerability Assessment (OpenVAS) Scanner
 URL:		http://www.openvas.org
 License:	LGPLv2
 Group:		System Environment/Libraries
-Version:	4.0.4
+Version:	4.0.5
 Release:	1%{?dist}
-Source0:	http://wald.intevation.org/frs/download.php/864/%{name}-%{version}.tar.gz
+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
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes:	openvas-libnasl
 BuildRequires:	glib2-devel
@@ -86,6 +90,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libopenvas.pc
 
 %changelog
+* Fri Jun 10 2011 Michal Ambroz <rebus at, seznam.cz> - 4.0.5-1
+- bump to 4.0.5
+
 * Fri May 06 2011 Michal Ambroz <rebus at, seznam.cz> - 4.0.4-1
 - bump to 4.0.4
 
diff --git a/sources b/sources
index 7e0d7da..56b684c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fd509a73ff2d0c5e193ed989d186dad  openvas-libraries-4.0.4.tar.gz
+88152081a0a0d2e8dfd63538999f56ef  openvas-libraries-4.0.5.tar.gz