[Openvas-commits] r173 - trunk/openvas-libraries
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Apr 24 17:05:08 CEST 2007
Author: jan
Date: 2007-04-24 17:05:07 +0200 (Tue, 24 Apr 2007)
New Revision: 173
Removed:
trunk/openvas-libraries/uninstall-nessus.in
Modified:
trunk/openvas-libraries/INSTALL_README
trunk/openvas-libraries/Makefile
trunk/openvas-libraries/configure.in
Log:
* configure.in, Makefile, INSTALL_README: Removed handling of "uninstall-nessus".
* uninstall-nessus.in: Removed.
Modified: trunk/openvas-libraries/INSTALL_README
===================================================================
--- trunk/openvas-libraries/INSTALL_README 2007-04-19 09:12:16 UTC (rev 172)
+++ trunk/openvas-libraries/INSTALL_README 2007-04-24 15:05:07 UTC (rev 173)
@@ -8,9 +8,9 @@
0. Pre-installation requirements
- If you have another version of Nessus, then use the script
- 'uninstall-nessus' before you type make.
-
+ You first may want to remove older installations of OpenVAS
+ to avoid conflicts.
+
Make sure that you have bison and flex installed. If you only
have yacc and lex, you *may* run into problems.
Modified: trunk/openvas-libraries/Makefile
===================================================================
--- trunk/openvas-libraries/Makefile 2007-04-19 09:12:16 UTC (rev 172)
+++ trunk/openvas-libraries/Makefile 2007-04-24 15:05:07 UTC (rev 173)
@@ -86,7 +86,6 @@
test -d $(DESTDIR)${bindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${bindir}
test -d $(DESTDIR)${sbindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${sbindir}
$(INSTALL) -m 0755 nessus-config $(DESTDIR)${bindir}/nessus-config
- $(INSTALL) -m 0755 uninstall-nessus $(DESTDIR)${sbindir}/uninstall-nessus
test -d $(DESTDIR)${mandir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}
test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1
@@ -109,4 +108,4 @@
config.status config.log ${rootdir}/include/libvers.h
-cd libopenvas && ${MAKE} distclean
-cd libhosts_gatherer && ${MAKE} distclean
- rm -f openvas-libraries.tmpl nessus-config nessus-config.pre uninstall-nessus
+ rm -f openvas-libraries.tmpl nessus-config nessus-config.pre
Modified: trunk/openvas-libraries/configure.in
===================================================================
--- trunk/openvas-libraries/configure.in 2007-04-19 09:12:16 UTC (rev 172)
+++ trunk/openvas-libraries/configure.in 2007-04-24 15:05:07 UTC (rev 173)
@@ -753,10 +753,8 @@
AC_SUBST(ac_configure_args)
dnl And we put everything in THREE files
-AC_OUTPUT(openvas-libraries.tmpl nessus-config.pre include/libvers.h uninstall-nessus)
+AC_OUTPUT(openvas-libraries.tmpl nessus-config.pre include/libvers.h)
-chmod +x uninstall-nessus
-
test "$use_cipher" = "yes" -a -z "$with_ssl" &&
{
AC_MSG_WARN([*** As SSL support is disabled, the communication between the server and the client will not be ciphered])
@@ -765,10 +763,9 @@
AC_MSG_RESULT([
-If you installed an older version of Nessus in the past you should run
-./uninstall-nessus as root first.
-This script will remove the old libraries and binaries left by the older
-version but will keep your configuration untouched])
+Note: If you installed an older version of OpenVAS you may want
+to remove it first.
+])
Deleted: trunk/openvas-libraries/uninstall-nessus.in
===================================================================
--- trunk/openvas-libraries/uninstall-nessus.in 2007-04-19 09:12:16 UTC (rev 172)
+++ trunk/openvas-libraries/uninstall-nessus.in 2007-04-24 15:05:07 UTC (rev 173)
@@ -1,173 +0,0 @@
-#!/bin/sh
-#
-# OpenVAS
-# $Id$
-# Description: Removes the previous configuration of OpenVAS
-#
-# Authors:
-# Renaud Deraison <deraison at nessus.org> (Original pre-fork development)
-#
-# Copyright:
-# Any after-fork changes Copyright (C) 2007 Software in the Public Interest, Inc.
-# Based on work Copyright (C) 1998 - 2007 Tenable Network Security, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2,
-# as published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-sharedstatedir=@sharedstatedir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-includedir=@includedir@
-oldincludedir=@oldincludedir@
-infodir=@infodir@
-mandir=@mandir@
-
-test "$1" = "-q" && quiet=yes
-
-
-# check whether we have echo -n, depending
-# on the current shell, used
-case `echo -n` in
-\-n) Xn= ; Xc='\c' ;;
-*) Xn=-n ; Xc=
-esac
-
-
-# make sure that we are root, if there is no id command,
-# you loose, anyway
-case `id 2>/dev/null` in
-uid=0*)
- ;;
-*)
- echo "only root should use uninstall-nessus"
- exit 1
-esac
-
-
-test -z "$quiet" &&
-{
-clear
-
-echo "--------------------------------------------------------------------------------"
-echo " UN-INSTALLATION OF NESSUS"
-echo "--------------------------------------------------------------------------------"
-
-echo
-echo
-echo "This script will de-install older versions Nessus from this system"
-echo
-echo
-
-
-
-echo $Xn "Do you want to also delete your configuration files and keys ? (y/n) [n] " $Xc
-read answer < /dev/tty
-}
-
-
-test -z "$answer" && answer=n
-
-test "$answer" = "y" && {
- deleteall=y
- echo "Do you want to delete the configurations of ALL nessus users on this "
- echo $Xn "host ? (y/n) [y] " $Xc
- read answer < /dev/tty
- test "$answer" = "y" &&
- {
- deleteconfs=y
- }
-}
-
-
-test -z "$quiet" &&
-{
-clear
-echo "--------------------------------------------------------------------------------"
-echo " UN-INSTALLATION OF NESSUS"
-echo "--------------------------------------------------------------------------------"
-
-echo
-echo
-echo "We are now ready to uninstall Nessus from this system"
-test -n "$deleteall" && echo "All configuration files will be destroyed"
-
-echo "Press a key to continue"
-read nothing < /dev/tty
-}
-
-#
-# Step 2 - delete files
-#
-set -x
-rm -f $bindir/nasl
-rm -f $bindir/nasl-config
-rm -f $bindir/nessus
-rm -f $bindir/nessus-config
-rm -f $bindir/nessus-build
-rm -f $bindir/nessus-mkrand
-rm -f $bindir/nessus-mkcert-client
-
-rm -f $sbindir/nessus-adduser
-rm -f $sbindir/nessus-rmuser
-rm -f $sbindir/nessusd
-rm -f $sbindir/nessus-update-plugins
-rm -f $sbindir/nessus-mkcert
-rm -f $sbindir/nessus-check-signature
-
-rm -rf $includedir/nessus
-
-rm -f $libdir/libhosts_gatherer.*
-rm -f $libdir/libnasl.*
-rm -f $libdir/libopenvas.*
-rm -f $libdir/libpcap-nessus.*
-
-rm -rf $libdir/nessus
-rm -f $mandir/man1/nasl-config.1
-rm -f $mandir/man1/nasl.1
-rm -f $mandir/man1/nessus-build.1
-rm -f $mandir/man1/nessus-config.1
-rm -f $mandir/man1/nessus.1
-rm -f $mandir/man1/nessus-mkrand.1
-rm -f $mandir/man1/nessus-mkcert-client.1
-rm -f $mandir/man8/nessus-mkcert.8
-
-
-rm -f $mandir/man8/nessus-adduser.8
-rm -f $mandir/man8/nessus-rmuser.8
-rm -f $mandir/man8/nessus-update-plugins.8
-rm -f $mandir/man8/nessusd.8
-
-test -n "$deleteall" && {
- rm -rf $localstatedir/nessus
- rm -rf $sysconfdir/nessus
- test -n "$deleteconfs" &&
- {
- for i in `cat /etc/passwd | sed 's/.*:.*:.*:.*:.*:\(.*\):.*/\1/g'|sort|uniq`
- do
- test -f $i/.nessusrc && rm -f $i/.nessusrc
- done
- }
-}
-
-set +x
-
-
-echo "Finished"
-rm -f $sbindir/uninstall-nessus
More information about the Openvas-commits
mailing list