[Openvas-commits] r1521 - in trunk/openvas-server: . packaging/debian

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Sun Oct 12 22:37:58 CEST 2008


Author: timb
Date: 2008-10-12 22:37:58 +0200 (Sun, 12 Oct 2008)
New Revision: 1521

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/packaging/debian/README.Debian
   trunk/openvas-server/packaging/debian/changelog
   trunk/openvas-server/packaging/debian/control
   trunk/openvas-server/packaging/debian/copyright
   trunk/openvas-server/packaging/debian/openvas-server.default
   trunk/openvas-server/packaging/debian/openvas-server.dirs
   trunk/openvas-server/packaging/debian/rules
Log:
Cleaned up the rules
Removed no longer required patches
Updated copyright with details of translators
Updated standards version. Adjusted dependencies to use libopenvas2-dev and libopenvasnasl2-dev
Changed defaults so that it listens on 1241 on 127.0.0.1 by default


Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/ChangeLog	2008-10-12 20:37:58 UTC (rev 1521)
@@ -7,6 +7,20 @@
 
 	* Makefile: Now makes $localstatedir/openvas/private/CA
 
+	* packaging/debian/changelog: Updated.
+
+	* packaging/debian/copyright: Updated with details of translators.
+
+	* packaging/debian/rules: Cleaned up.
+
+	* packaging/debian/README.Debian: Updated.
+
+	* packaging/debian/control: Updated standards version. Adjusted
+	dependencies to use libopenvas2-dev and libopenvasnasl2-dev.
+
+	* packaging/debian/openvas-server.default: Changed defaults so that it
+	listens on 1241 on 127.0.0.1 by default.
+
 2008-10-01  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* openvasd/oval_plugins.c: Changed to set OIDs exclusively; setting IDs

Modified: trunk/openvas-server/packaging/debian/README.Debian
===================================================================
--- trunk/openvas-server/packaging/debian/README.Debian	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/README.Debian	2008-10-12 20:37:58 UTC (rev 1521)
@@ -1,6 +1,6 @@
 
                               OpenVAS in Debian
-                              +--------------+
+                              +---------------+
 
 How to use OpenVAS?
 -------------------
@@ -59,7 +59,7 @@
 to stop openvasd when the system stops (to prevent it from being killed and 
 give it a chance to stop graciously)
 
-If you want to use that init script to start up ness you just have to 
+If you want to use that init script to start up openvasd you just have to 
 execute '/etc/init.d/openvas-server start' and you are done.
 
 If you want to have the init-scripts run on system startup then either run:
@@ -90,18 +90,19 @@
 connected to. If you have local security checks it's equivalente to granting 
 them SSH access to the remote hosts you have configured (if any)
 
-2.- The default configuration does _not_ allow plugin uploads
-
-3.- The openvas-plugins package does _not_ automatically run 
+2.- The openvas-plugins package does _not_ automatically run 
 openvas-update-plugins, you have to do this manually. Review the plugins
 retrieved by this before you run your OpenVAS server
 
-5- Be careful when setting up remote SSH access so that OpenVAS can run
+3.- Be careful when setting up remote SSH access so that OpenVAS can run
 local security checks since you are (effectively) given console access
 to remote servers. Always use a non-root account for this.
 
+4.- Also be aware that by default openvasd only listens on port 1241 on
+127.0.0.1. If you wish to change this, then check out /etc/default/openvas-server.
+
 -------------------------------
-Fri, 22 Aug 2008 03:18:34 +0200
+Sun, 12 Oct 2008 12:54:51 +0100
 
-Javier Fernandez-Sanguino <jfs_AT_debian.org>
+Tim Brown <timb at nth-dimension.org.uk>
 

Modified: trunk/openvas-server/packaging/debian/changelog
===================================================================
--- trunk/openvas-server/packaging/debian/changelog	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/changelog	2008-10-12 20:37:58 UTC (rev 1521)
@@ -1,3 +1,15 @@
+openvas-server (2.0.0.beta1-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated copyright with details of translators
+  * Adjusted dependencies to use libopenvas2-dev and libopenvasnasl2-dev
+  * Updated standards version
+  * Changed defaults so that it listens on 1241 on 127.0.0.1 by default
+  * Updated README.Debian
+  * Cleaned up the rules
+
+ -- Tim Brown <timb at nth-dimension.org.uk>  Sun, 12 Oct 2008 12:50:27 +0100
+
 openvas-server (1.0.1-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/openvas-server/packaging/debian/control
===================================================================
--- trunk/openvas-server/packaging/debian/control	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/control	2008-10-12 20:37:58 UTC (rev 1521)
@@ -1,16 +1,18 @@
 Source: openvas-server
 Section: admin
 Priority: optional
-Maintainer: Tim Brown <timb at nth-dimension.org.uk>
-Uploaders: Javier Fernandez-Sanguino Pen~a <jfs at debian.org>
-Build-Depends: debhelper (>= 6), autotools-dev, libgcrypt11-dev, libgnutls-dev, libopenvas1-dev (>= 1.0.2), libopenvasnasl1-dev (>= 1.0.1), libpcap0.8-dev, libwrap0-dev, po-debconf
-Standards-Version: 3.7.3
+Maintainer: Debian OpenVAS Maintainers <openvas-distro-deb at wald.intevation.org>
+Uploaders: Tim Brown <timb at nth-dimension.org.uk>, Javier Fernandez-Sanguino Pen~a <jfs at debian.org>, Jan Wagner <waja at cyconet.org>
+Build-Depends: debhelper (>= 6), autotools-dev, libgcrypt11-dev, libgnutls-dev, libopenvas2-dev (>= 2.0.0), libopenvasnasl2-dev (>= 2.0.0), libpcap0.8-dev, libwrap0-dev, po-debconf
 Homepage: http://www.openvas.org/
+Vcs-Browser: http://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-server/packaging/debian/?root=openvas
+Vcs-Svn: https://svn.wald.intevation.org/svn/openvas/trunk/openvas-server/packaging/debian/
+Standards-Version: 3.8.0
 
-Package: openvas-server-dev
+Package: openvas-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenVAS server static libraries and headers
+Description: Remote network security auditor, the server
  The OpenVAS Security Scanner is a security auditing tool. It makes
  possible to test security modules in an attempt to find vulnerable
  spots that should be fixed.
@@ -19,12 +21,12 @@
  openvasd, is in charge of the attacks, whereas the client,
  OpenVAS-Client, provides the user a nice X11/GTK+ interface.
  .
- This package contains the required static libraries, headers of the server.
+ This package contains the server.
 
-Package: openvas-server
+Package: openvas-server-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Remote network security auditor, the server
+Depends: openvas-server (= ${binary:Version}) ${shlibs:Depends}, ${misc:Depends}
+Description: OpenVAS server static libraries and headers
  The OpenVAS Security Scanner is a security auditing tool. It makes
  possible to test security modules in an attempt to find vulnerable
  spots that should be fixed.
@@ -33,4 +35,4 @@
  openvasd, is in charge of the attacks, whereas the client,
  OpenVAS-Client, provides the user a nice X11/GTK+ interface.
  .
- This package contains the server.
+ This package contains the required static libraries, headers of the server.

Modified: trunk/openvas-server/packaging/debian/copyright
===================================================================
--- trunk/openvas-server/packaging/debian/copyright	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/copyright	2008-10-12 20:37:58 UTC (rev 1521)
@@ -21,6 +21,13 @@
      * Portions Copyright (C) 2006 Software in the Public Interest, Inc.
      * Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc.
 
+  - Translations:
+     * Copyright (C) 2006 Matthias Julius [de]
+     * Copyright (C) 1998 - 2005 Renaud Deraison [fr]
+     * Copyright (C) 2005 Software in the Public Interest, SPI Inc [es]
+     * Copyright (C) 2007 Pedro Ribeiro <p.m42.ribeiro at gmail.com> [pt]
+     * Copyright (C) 1998 - 2006 Tenable Network Security, Inc [cs, pt_BR, sv]
+
 Other copyrights:
 
  - Autoconf:
@@ -37,6 +44,7 @@
      * Axel Nennker
      * Beirne Kornarksi
      * Benoit Brodard
+     * Bernhard Herzog
      * Boris Wolf
      * Brian
      * Christoph Puppe
@@ -51,11 +59,12 @@
      * H D Moore
      * Iouri Pletnev
      * Isaac Dawson
+     * Jan Wagner
+     * Jan-Oliver Wagner
      * Javier Fernandez-Sanguino
      * Jay
      * Jenni Scott
      * Jordan Hrycaj
-     * Jordan Hrycaj
      * Julien Bordet
      * Laurent FACQ
      * Loren Bandiera
@@ -63,6 +72,7 @@
      * Michael Slifcak
      * Michel Arboi
      * Michel Scheidell
+     * Michael Wiegand
      * Nicolas Dubee
      * Nicolas Pouvesle
      * Pasi Eronen
@@ -73,6 +83,7 @@
      * Rodolfo Baader
      * Simon Law
      * Stephen Friedl
+     * Tim Brown
      * Xueyong Zhi
      * Zorgon
 

Modified: trunk/openvas-server/packaging/debian/openvas-server.default
===================================================================
--- trunk/openvas-server/packaging/debian/openvas-server.default	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/openvas-server.default	2008-10-12 20:37:58 UTC (rev 1521)
@@ -1,6 +1,6 @@
 # Additional options for the daemon
 # -q prevents OpenVAS server from listing all the plugins it loads
-# DAEMONOPTS="-q"
+DAEMONOPTS="-q -p 1241 -a 127.0.0.1"
 
 # Time to wait for the daemon to die before restarting it
 # (in seconds)

Modified: trunk/openvas-server/packaging/debian/openvas-server.dirs
===================================================================
--- trunk/openvas-server/packaging/debian/openvas-server.dirs	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/openvas-server.dirs	2008-10-12 20:37:58 UTC (rev 1521)
@@ -1,8 +1,11 @@
 usr/bin
 usr/sbin
+usr/share/man
+usr/share/man/man1
+usr/share/man/man8
+var/run
 var/lib/openvas
 var/lib/openvas/CA
 var/lib/openvas/private/CA
 var/log/openvas
-var/openvas
 etc/openvas

Modified: trunk/openvas-server/packaging/debian/rules
===================================================================
--- trunk/openvas-server/packaging/debian/rules	2008-10-12 19:01:10 UTC (rev 1520)
+++ trunk/openvas-server/packaging/debian/rules	2008-10-12 20:37:58 UTC (rev 1521)
@@ -31,7 +31,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sharedstatedir=/var --libdir=\$${localstatedir}/lib --enable-tcpwrappers --enable-save-sessions --enable-save-kb CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure $(CROSS) --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-tcpwrappers --enable-save-sessions --enable-save-kb CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp
@@ -51,6 +51,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
+	touch openvas.tmpl
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
 
@@ -62,13 +63,10 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/openvas-server.
-	$(MAKE) prefix=$(CURDIR)/debian/openvas-server/usr sysconfdir=$(CURDIR)/debian/openvas-server/etc localstatedir=$(CURDIR)/debian/openvas-server/var sharedstatedir=$(CURDIR)/debian/openvas-server/var install
-	install -m 640 debian/openvasd.conf debian/openvas-server/etc/openvas
-	mv $(CURDIR)/debian/openvas-server/usr/include/openvas/* $(CURDIR)/debian/openvas-server-dev/usr/include/openvas/
-	mv $(CURDIR)/debian/openvas-server/usr/bin/openvasd-config $(CURDIR)/debian/openvas-server-dev/usr/bin/
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc localstatedir=$(CURDIR)/debian/tmp/var install
+	install -m 640 debian/openvasd.conf debian/tmp/etc/openvas
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -79,12 +77,12 @@
 	dh_testroot
 	dh_installchangelogs CHANGES
 	dh_installdocs
-	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
+	( cd debian/openvas-server-dev/usr/share/doc/ ; rm -rf openvas-server-dev; ln -s openvas-server openvas-server-dev; )
 	dh_installdebconf	
 	dh_installlogrotate
 	dh_installinit -n -r -u stop 20 0 6 .
-	dh_installman
+	dh_installman --sourcedir=debian/tmp
 	dh_link
 	dh_strip
 	dh_compress



More information about the Openvas-commits mailing list