Sophie: openvas-client-3.0.3-2.fc15 src

openvas-client-3.0.3-2.fc15.src.rpm

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"