[openvas-client] Bump to OpenVAS 4
rebus
rebus at fedoraproject.org
Sat Mar 26 02:11:30 UTC 2011
commit ee39cd8bc403c90450a831b7b09faff18eb1db1e
Author: Michal Ambroz <rebus at seznam.cz>
Date: Sat Mar 26 03:06:50 2011 +0100
Bump to OpenVAS 4
.gitignore | 1 +
openvas-client-lib4.patch | 171 +++++++++++++++++++++++++++++++++++++++++++
openvas-client-ports4.patch | 45 +++++++++++
openvas-client.spec | 25 +++++--
sources | 2 +-
5 files changed, 237 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39098aa..5e5fcdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
openvas-client-3.0.0.tar.gz
/openvas-client-3.0.2.tar.gz
+/openvas-client-3.0.3.tar.gz
diff --git a/openvas-client-lib4.patch b/openvas-client-lib4.patch
new file mode 100644
index 0000000..768c3a3
--- /dev/null
+++ b/openvas-client-lib4.patch
@@ -0,0 +1,171 @@
+In some headers there was conditional include for OLD and NEW path for library includes
+This patch is adding the same to missing locations to make it possible to compile with
+OpenVAS 4 libraries
+diff -ru openvas-client-3.0.3/openvas/attack.c openvas-client-3.0.3.new/openvas/attack.c
+--- openvas-client-3.0.3/openvas/attack.c 2010-11-11 15:45:28.000000000 +0100
++++ openvas-client-3.0.3.new/openvas/attack.c 2011-03-20 00:16:37.000000000 +0100
+@@ -17,7 +17,11 @@
+
+ #include <includes.h>
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/network.h>
++#else
++#include <openvas/misc/network.h>
++#endif
+
+ #include "openvas_plugin.h"
+ #include "comm.h"
+diff -ru openvas-client-3.0.3/openvas/auth.c openvas-client-3.0.3.new/openvas/auth.c
+--- openvas-client-3.0.3/openvas/auth.c 2009-10-15 19:58:35.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/auth.c 2011-03-20 00:21:06.000000000 +0100
+@@ -23,7 +23,12 @@
+ #include <includes.h>
+ #include <stdarg.h>
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/network.h>
++#else
++#include <openvas/misc/network.h>
++#endif
++
+ #include "comm.h"
+ #include "auth.h"
+ #include "sighand.h"
+diff -ru openvas-client-3.0.3/openvas/backend.c openvas-client-3.0.3.new/openvas/backend.c
+--- openvas-client-3.0.3/openvas/backend.c 2009-10-15 19:58:35.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/backend.c 2011-03-20 00:27:20.000000000 +0100
+@@ -28,7 +28,12 @@
+ #include <includes.h>
+ #include <openvas/base/hash_table_util.h> /* for keys_as_string_list */
+ #include <openvas/base/severity_filter.h> /* for severity_filter_apply */
++
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/plugutils.h> /* for addslashes */
++#else
++#include <openvas/misc/plugutils.h> /* for addslashes */
++#endif
+
+ #include "context.h"
+ #include "openvas_i18n.h"
+diff -ru openvas-client-3.0.3/openvas/Makefile openvas-client-3.0.3.new/openvas/Makefile
+--- openvas-client-3.0.3/openvas/Makefile 2010-02-25 09:34:57.000000000 +0100
++++ openvas-client-3.0.3.new/openvas/Makefile 2011-03-19 20:05:34.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ GTKLIBS= $(GTKCONFIG_LIBS)
+ INCLUDE = ${OTP_FLAGS} ${OMP_FLAGS} ${include} $(GTKCONFIG_CFLAGS) $(GLIB_CFLAGS) \
+- -I../src/gui -I../src/util $(LIBOPENVAS_CFLAGS)
++ -I../src/gui -I../src/util -I../include $(LIBOPENVAS_CFLAGS)
+ LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) $(GLIB_LIBS) $(GDC_LIB) \
+ $(RUN_LIBS) $(C_R_LIB) -lm \
+ $(DL_LIB) -lz $(SOCKET_LIB) $(LIBOPENVAS_LIBS)
+diff -ru openvas-client-3.0.3/openvas/monitor_dialog.c openvas-client-3.0.3.new/openvas/monitor_dialog.c
+--- openvas-client-3.0.3/openvas/monitor_dialog.c 2010-11-19 09:46:56.000000000 +0100
++++ openvas-client-3.0.3.new/openvas/monitor_dialog.c 2011-03-20 00:17:43.000000000 +0100
+@@ -31,7 +31,7 @@
+ #ifdef USE_GTK
+ #include <gtk/gtk.h>
+ #ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+-#include <network.h>
++#include <openvas/network.h>
+ #else
+ #include <openvas/misc/network.h>
+ #endif
+diff -ru openvas-client-3.0.3/openvas/parser.c openvas-client-3.0.3.new/openvas/parser.c
+--- openvas-client-3.0.3/openvas/parser.c 2009-10-15 18:43:34.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/parser.c 2011-03-20 00:32:57.000000000 +0100
+@@ -23,7 +23,11 @@
+ #include <includes.h>
+ #include "openvas_i18n.h"
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/plugutils.h> /* for addslashes */
++#else
++#include <openvas/misc/plugutils.h> /* for addslashes */
++#endif
+
+ #include "auth.h"
+ #include "error_dlg.h"
+diff -ru openvas-client-3.0.3/openvas/prefs_dialog/prefs_dialog_auth.c openvas-client-3.0.3.new/openvas/prefs_dialog/prefs_dialog_auth.c
+--- openvas-client-3.0.3/openvas/prefs_dialog/prefs_dialog_auth.c 2009-10-20 09:42:26.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/prefs_dialog/prefs_dialog_auth.c 2011-03-20 00:18:59.000000000 +0100
+@@ -9,10 +9,19 @@
+ */
+
+ /* for close_stream_connection() */
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/network.h>
++#else
++#include <openvas/misc/network.h>
++#endif
+
+ /* for emalloc, efree, estrdup */
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/system.h>
++#else
++#include <openvas/misc/system.h>
++#endif
++
+
+ #include "openvas_i18n.h"
+
+diff -ru openvas-client-3.0.3/openvas/sighand.c openvas-client-3.0.3.new/openvas/sighand.c
+--- openvas-client-3.0.3/openvas/sighand.c 2009-10-15 18:43:34.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/sighand.c 2011-03-20 00:20:33.000000000 +0100
+@@ -23,7 +23,12 @@
+
+ #include <includes.h>
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/network.h> /* for close_stream_connection */
++#else
++#include <openvas/misc/network.h> /* for close_stream_connection */
++#endif
++
+
+ #include "openvas_i18n.h"
+ #include "error_dlg.h"
+diff -ru openvas-client-3.0.3/openvas/subset.c openvas-client-3.0.3.new/openvas/subset.c
+--- openvas-client-3.0.3/openvas/subset.c 2009-10-15 18:43:34.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/subset.c 2011-03-20 00:35:03.000000000 +0100
+@@ -38,7 +38,11 @@
+ #include <includes.h>
+ #include <stdarg.h>
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/plugutils.h> /* for addslashes */
++#else
++#include <openvas/misc/plugutils.h> /* for addslashes */
++#endif
+
+ #include "subset.h"
+
+Only in openvas-client-3.0.3.new: openvas.tmpl
+diff -ru openvas-client-3.0.3/src/gui/Makefile openvas-client-3.0.3.new/src/gui/Makefile
+--- openvas-client-3.0.3/src/gui/Makefile 2009-09-22 21:26:36.000000000 +0200
++++ openvas-client-3.0.3.new/src/gui/Makefile 2011-03-19 20:13:56.000000000 +0100
+@@ -28,7 +28,7 @@
+ GTKLIBS= $(GTKCONFIG_LIBS)
+ INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../openvas -I.. \
+ -I../../openvas/prefs_dialog \
+- -I../util $(LIBOPENVAS_CFLAGS)
++ -I../util -I../../include $(LIBOPENVAS_CFLAGS)
+
+ OPENVAS_INCLUDE=`sh ./cflags`
+ CFLAGS+=-Wall
+diff -ru openvas-client-3.0.3/src/gui/nvt_pref_sshlogin.c openvas-client-3.0.3.new/src/gui/nvt_pref_sshlogin.c
+--- openvas-client-3.0.3/src/gui/nvt_pref_sshlogin.c 2010-11-11 15:45:28.000000000 +0100
++++ openvas-client-3.0.3.new/src/gui/nvt_pref_sshlogin.c 2011-03-19 23:51:09.000000000 +0100
+@@ -34,7 +34,11 @@
+ #include <gtk/gtk.h>
+ #include "glib.h"
+
++#ifdef LIBOPENVAS_OLD_INCLUDE_PATH
+ #include <openvas/system.h> /* for efree, estrdup */
++#else
++#include <openvas/misc/system.h> /* for efree, estrdup */
++#endif
+
+ #include "nvt_pref_sshlogin.h"
+
diff --git a/openvas-client-ports4.patch b/openvas-client-ports4.patch
new file mode 100644
index 0000000..13dd59a
--- /dev/null
+++ b/openvas-client-ports4.patch
@@ -0,0 +1,45 @@
+diff -ru openvas-client-3.0.3/include/config.h.in openvas-client-3.0.3.new/include/config.h.in
+--- openvas-client-3.0.3/include/config.h.in 2010-03-23 20:46:23.000000000 +0100
++++ openvas-client-3.0.3.new/include/config.h.in 2011-03-22 00:36:49.000000000 +0100
+@@ -34,6 +34,12 @@
+ http://www.iana.org/assignments/port-numbers */
+ #define OPENVAS_IANA_OTP_PORT 9390
+
++/* Ports as used by OpenVAS 4 */
++#define OPENVAS_MANAGER_PORT 9390
++#define OPENVAS_SCANNER_PORT 9391
++#define OPENVAS_GSA_PORT 9392
++#define OPENVAS_ADMINISTRATOR_PORT 9393
++
+ /*
+ * How much time before closing
+ * the connection if nothing comes
+diff -ru openvas-client-3.0.3/openvas/openvas-client.h openvas-client-3.0.3.new/openvas/openvas-client.h
+--- openvas-client-3.0.3/openvas/openvas-client.h 2009-11-24 08:09:29.000000000 +0100
++++ openvas-client-3.0.3.new/openvas/openvas-client.h 2011-03-22 00:41:43.000000000 +0100
+@@ -23,6 +23,13 @@
+ #ifdef _WIN32
+ #ifndef OPENVAS_IANA_OTP_PORT
+ #define OPENVAS_IANA_OTP_PORT 9390
++
++/* Ports as used by OpenVAS 4 */
++#define OPENVAS_MANAGER_PORT 9390
++#define OPENVAS_SCANNER_PORT 9391
++#define OPENVAS_GSA_PORT 9392
++#define OPENVAS_ADMINISTRATOR_PORT 9393
++
+ #endif
+ #endif
+
+diff -ru openvas-client-3.0.3/openvas/preferences.c openvas-client-3.0.3.new/openvas/preferences.c
+--- openvas-client-3.0.3/openvas/preferences.c 2010-07-19 14:34:39.000000000 +0200
++++ openvas-client-3.0.3.new/openvas/preferences.c 2011-03-22 00:31:05.000000000 +0100
+@@ -653,7 +653,7 @@
+ else if (!strcmp(name, "nessusd_user"))
+ return (void *)g_get_user_name();
+ else if (!strcmp(name, "nessusd_port"))
+- return (void *)OPENVAS_IANA_OTP_PORT;
++ return (void *)OPENVAS_SCANNER_PORT;
+ else if (!strcmp(name, "ssl_version"))
+ return SSL_VER_DEF_NAME;
+ else if (!strcmp(name, "openvas_dir"))
diff --git a/openvas-client.spec b/openvas-client.spec
index ddc7617..b99d375 100644
--- a/openvas-client.spec
+++ b/openvas-client.spec
@@ -1,15 +1,23 @@
Name: openvas-client
Summary: Client component of Open Vulnerability Assessment (OpenVAS) Scanner
-Version: 3.0.2
-Release: 2%{?dist}
-Source0: http://wald.intevation.org/frs/download.php/802/openvas-client-3.0.2.tar.gz
+Version: 3.0.3
+Release: 1%{?dist}
+URL: http://www.openvas.org
+License: GPLv2 and GPLv2+
+Group: Applications/System
+
+Source0: http://wald.intevation.org/frs/download.php/845/openvas-client-%{version}.tar.gz
Source1: openvas-client.desktop
+
#file with cflags is not referenced in Makefile correctly for build
#Patch reported to upstream
#http://wald.intevation.org/tracker/index.php?func=detail&aid=1489&group_id=29&atid=220
-URL: http://www.openvas.org
-License: GPLv2 and GPLv2+
-Group: Applications/System
+Patch0: openvas-client-lib4.patch
+
+#Set for the openvas-client the default port of openvas-scanner instead of
+#openvas manager, untill manager is available for Fedora/RedHat
+Patch1: openvas-client-ports4.patch
+
Requires: htmldoc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: openvas-libraries-devel >= 3.0
@@ -39,6 +47,8 @@ provided by the server component.
%prep
%setup -q
+%patch0 -p 1 -b .lib4
+%patch1 -p 1 -b .ports4
for i in CHANGES ChangeLog TODO; do
iconv -f iso8859-1 -t utf-8 $i > $i.utf8 && \
@@ -86,6 +96,9 @@ rm -rf %{buildroot}
%{_datadir}/applications/*
%changelog
+* Fri Mar 18 2011 Michal Ambroz <rebus at, seznam.cz> - 3.0.3-1
+- Bump to latest stable release 4
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 3d08186..3782bb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9049251276fbd05a1e2e0de11967bb3d openvas-client-3.0.2.tar.gz
+a334d37db0b2a617be2ae4b94a7a7bd0 openvas-client-3.0.3.tar.gz
More information about the scm-commits
mailing list