[Openvas-commits] r1570 - trunk/sladinstaller
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Oct 20 08:17:02 CEST 2008
Author: mwiegand
Date: 2008-10-20 08:17:00 +0200 (Mon, 20 Oct 2008)
New Revision: 1570
Removed:
trunk/sladinstaller/nessus-sladinstaller.patch
Modified:
trunk/sladinstaller/ChangeLog
Log:
Removed obsolete patch for Nessusclient.
* nessus-sladinstaller.patch: Removed.
Modified: trunk/sladinstaller/ChangeLog
===================================================================
--- trunk/sladinstaller/ChangeLog 2008-10-19 22:31:46 UTC (rev 1569)
+++ trunk/sladinstaller/ChangeLog 2008-10-20 06:17:00 UTC (rev 1570)
@@ -1,3 +1,9 @@
+2008-10-20 Michael Wiegand <michael.wiegand at intevation.de>
+
+ Removed obsolete patch for Nessusclient.
+
+ * nessus-sladinstaller.patch: Removed.
+
2008-10-16 Michael Wiegand <michael.wiegand at intevation.de>
Intergrated the OpenVAS patch into the sladinstaller trunk, fixed
Deleted: trunk/sladinstaller/nessus-sladinstaller.patch
===================================================================
--- trunk/sladinstaller/nessus-sladinstaller.patch 2008-10-19 22:31:46 UTC (rev 1569)
+++ trunk/sladinstaller/nessus-sladinstaller.patch 2008-10-20 06:17:00 UTC (rev 1570)
@@ -1,161 +0,0 @@
-Index: Makefile
-===================================================================
-RCS file: /usr/local/cvs/NessusClient/nessus/Makefile,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 Makefile
---- Makefile 5 Jul 2006 14:05:42 -0000 1.17
-+++ Makefile 5 Jul 2006 14:40:45 -0000
-@@ -73,7 +73,8 @@ OBJS = auth.o \
- nessus.o
-
- GTK_OBJS = prefs_comment.o prefs_context.o prefs_options.o prefs_report.o \
-- prefs_dialog_prefs.o prefs_scan_assistant.o pdf_output.o readonly.o
-+ prefs_dialog_prefs.o prefs_scan_assistant.o pdf_output.o readonly.o \
-+ prefs_slad_install.o
-
- all : cflags ${make_bindir}/$(NESSUSCLIENT)
-
-@@ -190,6 +191,9 @@ listnotebook.o : cflags prefs_dialog/lis
- readonly.o : cflags prefs_dialog/readonly.c \
- prefs_dialog/readonly.h
- $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c prefs_dialog/readonly.c
-+
-+prefs_slad_install.o : cflags prefs_dialog/prefs_slad_install.c
-+ $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c prefs_dialog/prefs_slad_install.c
-
- error_dialog.o : cflags error_dialog.c error_dialog.h globals.h
- $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c error_dialog.c
-Index: prefs_dialog/prefs_dialog.c
-===================================================================
-RCS file: /usr/local/cvs/NessusClient/nessus/prefs_dialog/prefs_dialog.c,v
-retrieving revision 1.18
-diff -u -3 -p -r1.18 prefs_dialog.c
---- prefs_dialog/prefs_dialog.c 5 Jul 2006 14:12:44 -0000 1.18
-+++ prefs_dialog/prefs_dialog.c 5 Jul 2006 14:40:45 -0000
-@@ -49,6 +49,7 @@
- #include "prefs_options.h"
- #include "prefs_report.h"
- #include "prefs_scan_assistant.h"
-+#include "prefs_slad_install.h"
- #include "prefs_comment.h"
-
- #ifdef ENABLE_SAVE_KB
-@@ -392,6 +393,10 @@ prefs_dialog_setup(context)
- gtk_widget_set_sensitive(menuitem, FALSE);
-
- menuitem_separator(submenu);
-+
-+ menuitem = gtk_image_menu_item_new_with_mnemonic(_("SLAD _Install"));
-+ menuitem_add(menuitem, submenu, NULL, "slad-install",
-+ GTK_SIGNAL_FUNC(prefs_slad_install));
-
- menuitem = gtk_image_menu_item_new_with_mnemonic(_("_Scan Assistant"));
- menuitem_add(menuitem, submenu, NULL, "gtk-help",
-Index: prefs_dialog/prefs_slad_install.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ prefs_dialog/prefs_slad_install.h 2005-11-21 18:55:11.000000000 +0100
-@@ -0,0 +1,26 @@
-+#ifndef PREFS_SLAD_INSTALL__H
-+#define PREFS_SLAD_INSTALL__H
-+
-+/* $Id: nessus-sladinstaller.patch,v 1.5 2006/07/07 21:21:27 dirk Exp $
-+ *
-+ * Copyright (C) 2005 by DN-Systems
-+ * Author(s):
-+ * Dirk Jagdmann <dirk at jagdmann.de>
-+ *
-+ * This program is free software under the GNU GPL (>=v2)
-+ * Read the file COPYING coming with the software for details.
-+ *
-+ * In addition, as a special exception, Intevation GmbH gives
-+ * permission to link the code of this program with the OpenSSL
-+ * library (or with modified versions of OpenSSL that use the same
-+ * license as OpenSSL), and distribute linked combinations including
-+ * the two. You must obey the GNU General Public License in all
-+ * respects for all of the code used other than OpenSSL. If you
-+ * modify this file, you may extend this exception to your version
-+ * of the file, but you are not obligated to do so. If you do not
-+ * wish to do so, delete this exception statement from your version.
-+ */
-+
-+void prefs_slad_install(GtkWidget *, gpointer);
-+
-+#endif
-Index: prefs_dialog/prefs_slad_install.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ prefs_dialog/prefs_slad_install.c 2005-11-21 18:55:11.000000000 +0100
-@@ -0,0 +1,72 @@
-+/* $Id: nessus-sladinstaller.patch,v 1.5 2006/07/07 21:21:27 dirk Exp $
-+ *
-+ * Copyright (C) 2005 by DN-Systems
-+ * Author(s):
-+ * Dirk Jagdmann <dirk at jagdmann.de>
-+ *
-+ * This program is free software under the GNU GPL (>=v2)
-+ * Read the file COPYING coming with the software for details.
-+ *
-+ * In addition, as a special exception, Intevation GmbH gives
-+ * permission to link the code of this program with the OpenSSL
-+ * library (or with modified versions of OpenSSL that use the same
-+ * license as OpenSSL), and distribute linked combinations including
-+ * the two. You must obey the GNU General Public License in all
-+ * respects for all of the code used other than OpenSSL. If you
-+ * modify this file, you may extend this exception to your version
-+ * of the file, but you are not obligated to do so. If you do not
-+ * wish to do so, delete this exception statement from your version.
-+ */
-+
-+#include <unistd.h>
-+#include <gtk/gtk.h>
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "nessus_i18n.h"
-+
-+static void ERROR(gchar *str)
-+{
-+ GtkWidget*m=gtk_message_dialog_new(GTK_WINDOW(NULL), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, str);
-+ gtk_dialog_run(GTK_DIALOG(m));
-+ gtk_object_destroy(GTK_OBJECT(m));
-+}
-+
-+#define SLADINSTALLER "sladinstaller"
-+
-+void prefs_slad_install(GtkWidget *w, gpointer data)
-+{
-+ char buf[1024];
-+ pid_t p;
-+ FILE *f;
-+
-+ // check if sladinstall is a working executable
-+ f=popen(SLADINSTALLER " --ping", "r");
-+ if(!f)
-+ {
-+ ERROR(_("Could not check SLAD installer."));
-+ return;
-+ }
-+ fgets(buf, sizeof(buf), f);
-+ pclose(f);
-+
-+ if(strcmp(buf, "pong\n"))
-+ {
-+ ERROR(_("Could not execute SLAD installer."));
-+ return;
-+ }
-+
-+ // start sladinstall
-+ p=fork();
-+ if(p<0)
-+ {
-+ ERROR(_("fork error. could not start SLAD install. This is a serious operating system error. Maybe a reboot will fix this."));
-+ }
-+ else if(p==0)
-+ {
-+ execlp(SLADINSTALLER, SLADINSTALLER, NULL);
-+ perror("could not run sladinstaller");
-+ exit(0);
-+ }
-+}
More information about the Openvas-commits
mailing list