[Openvas-commits] r5478 - in trunk/openvas-packaging/openvas-server/debian/2-0/debian: . patches

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Sun Oct 11 21:08:41 CEST 2009


Author: waja
Date: 2009-10-11 21:08:38 +0200 (Sun, 11 Oct 2009)
New Revision: 5478

Removed:
   trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/11_openvas-nvt-sync.dpatch
   trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/12_openvas_nvt-sync-var.dpatch
Modified:
   trunk/openvas-packaging/openvas-server/debian/2-0/debian/changelog
   trunk/openvas-packaging/openvas-server/debian/2-0/debian/control
   trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/00list
Log:
remove openvas-nvt-sync

Modified: trunk/openvas-packaging/openvas-server/debian/2-0/debian/changelog
===================================================================
--- trunk/openvas-packaging/openvas-server/debian/2-0/debian/changelog	2009-10-11 18:29:19 UTC (rev 5477)
+++ trunk/openvas-packaging/openvas-server/debian/2-0/debian/changelog	2009-10-11 19:08:38 UTC (rev 5478)
@@ -3,10 +3,14 @@
   * Add README.source
   * Raise build-dep of libopenvas2-dev to (>= 2.0.4-2), which should fix build
     issues on mips
-  * Fix plugindir in 12_openvas_nvt-sync-var.dpatch, thanks Andreas Putzo
-    (Closes: #546746)
   * Fix 10_bashism.dpatch, which broke the scripts
   * Fix Vcs location
+  * Remove openvas-nvt-sync (Closes: #546746)
+    - Drop 11_openvas-nvt-sync.dpatch and 12_openvas_nvt-sync-var.dpatch
+    - Remove Recommands: rsync, nmap, smbclient
+    - Remove Suggests: snmp, pnscan, strobe, ike-scan
+  * Add Recommands: openvas-plugins-base
+  * Add Suggests: openvas-plugins-dfsg
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 27 Aug 2009 16:58:32 +0200
 

Modified: trunk/openvas-packaging/openvas-server/debian/2-0/debian/control
===================================================================
--- trunk/openvas-packaging/openvas-server/debian/2-0/debian/control	2009-10-11 18:29:19 UTC (rev 5477)
+++ trunk/openvas-packaging/openvas-server/debian/2-0/debian/control	2009-10-11 19:08:38 UTC (rev 5478)
@@ -13,8 +13,8 @@
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, openssl
-Recommends: rsync, nmap, smbclient
-Suggests: openvas-client, snmp, pnscan, strobe, ike-scan
+Recommends: openvas-plugins-base
+Suggests: openvas-plugins-dfsg, openvas-client
 Description: remote network security auditor - server
  The Open Vulnerability Assessment System is a modular security auditing
  tool, used for testing remote systems for vulnerabilities that should be

Modified: trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/00list
===================================================================
--- trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/00list	2009-10-11 18:29:19 UTC (rev 5477)
+++ trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/00list	2009-10-11 19:08:38 UTC (rev 5478)
@@ -1,3 +1 @@
 10_bashism.dpatch
-11_openvas-nvt-sync.dpatch
-12_openvas_nvt-sync-var.dpatch

Deleted: trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/11_openvas-nvt-sync.dpatch
===================================================================
--- trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/11_openvas-nvt-sync.dpatch	2009-10-11 18:29:19 UTC (rev 5477)
+++ trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/11_openvas-nvt-sync.dpatch	2009-10-11 19:08:38 UTC (rev 5478)
@@ -1,200 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_openvas-nvt-sync.dpatch by Javier Fernandez-Sanguino <jfs at debian.org>
-##
-## DP: add openvas-nvt-sync to the package
-
-
- at DPATCH@
-diff -urNad openvas-server-2.0.3~/MANIFEST openvas-server-2.0.3/MANIFEST
---- openvas-server-2.0.3~/MANIFEST	2009-08-07 12:23:40.000000000 +0200
-+++ openvas-server-2.0.3/MANIFEST	2009-08-27 15:08:49.000000000 +0200
-@@ -94,6 +94,7 @@
- openvasd/utils.h
- openvas-mkcert-client.in
- openvas-mkcert.in
-+openvas-nvt-sync.in
- openvas-rmuser.in
- openvas.tmpl.in
- packaging/debian/
-diff -urNad openvas-server-2.0.3~/Makefile openvas-server-2.0.3/Makefile
---- openvas-server-2.0.3~/Makefile	2009-08-07 12:23:40.000000000 +0200
-+++ openvas-server-2.0.3/Makefile	2009-08-27 15:08:49.000000000 +0200
-@@ -69,6 +69,7 @@
- 	@test -d $(DESTDIR)${includedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${includedir}
- 	@test -d $(DESTDIR)${includedir}/openvas || $(INSTALL_DIR) -m 755 $(DESTDIR)${includedir}/openvas
- 	@test -d $(DESTDIR)${OPENVASD_CACHE} || $(INSTALL_DIR) -m 755 $(DESTDIR)${OPENVASD_CACHE}
-+	$(INSTALL) -m 755 openvas-nvt-sync $(DESTDIR)${sbindir}
- 	$(INSTALL) -m 755 openvas-mkcert-client $(DESTDIR)${bindir}/openvas-mkcert-client
- 	$(INSTALL) -m 755 openvasd-config $(DESTDIR)${bindir}/openvasd-config
- 	$(INSTALL) -m 755 ssl/openvas-mkrand $(DESTDIR)${bindir}/openvas-mkrand
-@@ -123,6 +124,7 @@
- 	rm -f openvas.tmpl doc/openvas.1.cat doc/openvasd.8.cat
- 	[ -z "${make_bindir}" ] || rm -f $(make_bindir)/openvas* 
- 	rm -f config.cache config.status config.log 
-+	rm -f openvas-nvt-sync
- 	rm -f openvas-adduser
- 	rm -f openvas-rmuser
- 	rm -f openvas-mkcert
-diff -urNad openvas-server-2.0.3~/configure openvas-server-2.0.3/configure
---- openvas-server-2.0.3~/configure	2009-08-19 10:00:18.000000000 +0200
-+++ openvas-server-2.0.3/configure	2009-08-27 15:08:49.000000000 +0200
-@@ -12939,7 +12939,7 @@
- 
- 
- 
--ac_config_files="$ac_config_files openvas.tmpl include/corevers.h openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client openvasd-config"
-+ac_config_files="$ac_config_files openvas.tmpl include/corevers.h openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client openvasd-config openvas-nvt-sync"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -13502,6 +13502,7 @@
-     "openvas-mkcert") CONFIG_FILES="$CONFIG_FILES openvas-mkcert" ;;
-     "openvas-mkcert-client") CONFIG_FILES="$CONFIG_FILES openvas-mkcert-client" ;;
-     "openvasd-config") CONFIG_FILES="$CONFIG_FILES openvasd-config" ;;
-+    "openvas-nvt-sync") CONFIG_FILES="$CONFIG_FILES openvas-nvt-sync" ;;
- 
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -14155,6 +14156,6 @@
- 
- 
- 
--chmod +x openvas-adduser openvas-mkcert openvas-mkcert-client openvasd-config
-+chmod +x openvas-adduser openvas-mkcert openvas-mkcert-client openvasd-config openvas-nvt-sync
- 
- exit 0
-diff -urNad openvas-server-2.0.3~/configure.in openvas-server-2.0.3/configure.in
---- openvas-server-2.0.3~/configure.in	2009-08-19 10:47:47.000000000 +0200
-+++ openvas-server-2.0.3/configure.in	2009-08-27 15:08:49.000000000 +0200
-@@ -785,9 +785,9 @@
- 
- 
- dnl And we put everything in the appropriate files
--AC_OUTPUT(openvas.tmpl include/corevers.h openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client openvasd-config)
-+AC_OUTPUT(openvas.tmpl include/corevers.h openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client openvasd-config openvas-nvt-sync)
- 
- 
--chmod +x openvas-adduser openvas-mkcert openvas-mkcert-client openvasd-config
-+chmod +x openvas-adduser openvas-mkcert openvas-mkcert-client openvasd-config openvas-nvt-sync
- 
- exit 0
-diff -urNad openvas-server-2.0.3~/openvas-nvt-sync.in openvas-server-2.0.3/openvas-nvt-sync.in
---- openvas-server-2.0.3~/openvas-nvt-sync.in	1970-01-01 01:00:00.000000000 +0100
-+++ openvas-server-2.0.3/openvas-nvt-sync.in	2009-08-27 15:08:49.000000000 +0200
-@@ -0,0 +1,116 @@
-+#!/bin/bash
-+#
-+# OpenVAS
-+# $Id$
-+# Description: Synchronize with with NVT feed.
-+# This shell script synchronizes the local set of
-+# OpenVAS Network Vulerability Tests (NVTs) and
-+# associated includefiles with a given upstream
-+# feed of updated or new files.
-+#
-+# Authors:
-+# Lukas Grunwald <l.grunwald at dn-systems.de>
-+# Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
-+#
-+# Copyright DN-Systems Enterprise Internet Solutions GmbH 2007
-+#
-+# 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@
-+sysconfdir=@sysconfdir@
-+libdir=@libdir@
-+localstatedir=@localstatedir@
-+
-+# these locations should be correct if standard ./configure had
-+# been applied.
-+NVT_DIR="$libdir/openvas/plugins"
-+
-+# The URL of the plugin feed
-+FEED=rsync://rsync.openvas.org:/nvt-feed
-+# An alternative syntax which might work if the above doesn't:
-+#FEED=rsync at rsync.openvas.org::nvt-feed
-+
-+findcmd()
-+{
-+  CMD=$1
-+  SRCH=/usr/bin:/usr/ucb:/usr/sbin
-+  SAVEIFS=$IFS
-+  IFS=:
-+  set $SRCH
-+  IFS=$SAVEIFS
-+  for dir
-+    do
-+      [ -x $dir/$CMD ] && {
-+                echo $dir/$CMD
-+                return
-+                }
-+   done
-+}
-+
-+chk_system_tools(){
-+echo "Searching for required system tools ..."
-+
-+RSYNC=`findcmd rsync`
-+MD5SUM=`findcmd md5sum`
-+
-+if [ -z "$RSYNC" ]; then
-+  echo "Error: RSYNC not found";
-+  exit -1
-+fi
-+
-+if [ -z "$MD5SUM" ]; then
-+  echo "Error: MD5SUM not found";
-+  exit -1
-+fi
-+}
-+
-+sync_nvts (){
-+  echo "Synchonizing NVTs via RSYNC ..."
-+
-+  mkdir -p "$NVT_DIR"
-+  eval "rsync -ltvrP \"$FEED\" \"$NVT_DIR\""
-+  if [ $? -ne 0 ] ; then
-+    echo "Error: rsync failed. Your NVT collection might be broken now."
-+    exit 1
-+  fi
-+  eval "cd \"$NVT_DIR\" ; md5sum -c --status \"$NVT_DIR/md5sums\""
-+  if [ $? -ne 0 ] ; then
-+    echo "Error: md5sums not correct. Your NVT collection might be broken now."
-+    echo "Please try this for details: cd \"$NVT_DIR\" ; md5sum -c \"$NVT_DIR/md5sums\" | less"
-+    exit 1
-+  fi
-+
-+  echo "Synchronization successful."
-+}
-+
-+# TODO: This does only sometimes work (if proper start/stop daemon was used)
-+# It should be made verbose and robust so that the user will know whether
-+# openvasd was restarted successfully or whether a failure occured.
-+restart_openvasd (){
-+  test -f @localstatedir@/run/openvasd.pid && {
-+    pid=`cat @localstatedir@/run/openvasd.pid`
-+    kill -1 $pid 2>/dev/null
-+  }
-+}
-+
-+echo "OpenVAS NVT Sync $Release$"
-+echo " "
-+echo "Configured NVT Feed: $FEED"
-+echo "Synchronized into: $NVT_DIR"
-+echo " "
-+
-+chk_system_tools
-+sync_nvts
-+restart_openvasd

Deleted: trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/12_openvas_nvt-sync-var.dpatch
===================================================================
--- trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/12_openvas_nvt-sync-var.dpatch	2009-10-11 18:29:19 UTC (rev 5477)
+++ trunk/openvas-packaging/openvas-server/debian/2-0/debian/patches/12_openvas_nvt-sync-var.dpatch	2009-10-11 19:08:38 UTC (rev 5478)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_openvas_nvt-sync-var.dpatch by Javier Fernandez-Sanguino <jfs at debian.org>
-##
-## DP: plugins should be in /var
-
- at DPATCH@
-diff -urNad openvas-server-2.0.2~/openvas-nvt-sync.in openvas-server-2.0.2/openvas-nvt-sync.in
---- openvas-server-2.0.2~/openvas-nvt-sync.in	2009-07-27 21:05:58.000000000 +0000
-+++ openvas-server-2.0.2/openvas-nvt-sync.in	2009-07-27 21:06:12.000000000 +0000
-@@ -35,7 +35,7 @@
- 
- # these locations should be correct if standard ./configure had
- # been applied.
--NVT_DIR="$libdir/openvas/plugins"
-+NVT_DIR="$localstatedir/lib/openvas/plugins"
- 
- # The URL of the plugin feed
- FEED=rsync://rsync.openvas.org:/nvt-feed



More information about the Openvas-commits mailing list