[Openvas-commits] r5419 - in trunk/openvas-packaging/openvas-plugins/debian/trunk/debian: . configuration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Oct 7 01:16:32 CEST 2009
Author: jfs
Date: 2009-10-07 01:16:31 +0200 (Wed, 07 Oct 2009)
New Revision: 5419
Added:
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/configuration/
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/configuration/openvas-plugins-dfsg.templates.NEW
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.install
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.manpages
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.install
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.lintian-overrides
Removed:
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/manpages
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/
Modified:
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-nvt-sync.8
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.dirs
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.postrm
trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules
Log:
New debian package (1.0.7-4+svn20090920) dividing the sync script and the
DFSG plugins into different packages (-base and -dfsg)
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog 2009-10-06 23:16:31 UTC (rev 5419)
@@ -1,5 +1,21 @@
-openvas-plugins-dfsg (1.0.7-3) unstable; urgency=low
+openvas-plugins-dfsg (1.0.7-4+svn20090920) unstable; urgency=low
+ * Create a new openvas-plugins-base binary package that provides the
+ .nes files as well as the openvas-nvt-sync script and manpage.
+ * Adjust dependencies of the packages accordingly, openvas-plugins-base
+ depends on rsync and openvas-plugins-dfsg depends on -base
+ * Add a lintian override for the errors related to using 'read' in
+ postrm. Debconf is not an option here since it might not be available.
+ * debian/rules improvements:
+ - Add dh_installmanpages to install the new manpage
+ - Add dh_installdirs in the install target
+ - Change dh_clean -k to dh_prep in the install target
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs at debian.org> Wed, 23 Sep 2009 00:08:26 +0200
+
+openvas-plugins-dfsg (1.0.7-3+svn20090920) unstable; urgency=low
+
+ * Update the plugins with their latest SVN versions
* Add slad_run.nasl to audit/remove-list since it ellicits an error
when starting openvasd
* Update the manual page to include a reference to RSYNC_PROXY, useful
@@ -7,6 +23,13 @@
* Fix bug in grep call of audit/generate-license-list
* Rename openvas-plugins.* files to openvas-plugins-dfsg.* under debian/ so
that they are shipped as part of the package.
+ * Create usr/lib and move the .nes files so dependencies get calculated
+ properly
+ * debian/rules improvements:
+ - make config.status depend on patch-stamp so that the configure
+ script does not get rerun when running the install target
+ - do not generate the audit exclude-list if already present
+ - separate exclude-file generation to its own target
-- Javier Fernandez-Sanguino Pen~a <jfs at debian.org> Sun, 20 Sep 2009 10:44:53 +0200
Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/configuration (from rev 5414, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config)
Added: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/configuration/openvas-plugins-dfsg.templates.NEW
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins-dfsg.templates.NEW 2009-10-06 22:56:33 UTC (rev 5414)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/configuration/openvas-plugins-dfsg.templates.NEW 2009-10-06 23:16:31 UTC (rev 5419)
@@ -0,0 +1,10 @@
+Template: openvas-plugins/remove_plugins_dir
+Type: boolean
+Default: true
+_Description: Remove all the files in the OpenVAS plugins directory?
+ The /var/lib/openvas/plugins directory contains plugins besides
+ the ones distributed by the package. This might happen if you
+ have downloaded additional plugins (using openvas-nvt-sync)
+ .
+ You currently have ${countnewplugs} plugin(s) which have not been
+ provided by this package.
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control 2009-10-06 23:16:31 UTC (rev 5419)
@@ -12,7 +12,7 @@
Package: openvas-plugins-dfsg
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rsync
+Depends: ${misc:Depends}, openvas-plugins-base
Recommends: openvas-server (>= 1.0), nmap, smbclient, snmp
Suggests: openvas-client, pnscan, strobe, ike-scan
Provides: openvas-plugins
@@ -27,5 +27,19 @@
OpenVAS-Client, provides an X11/GTK+ user interface.
.
This package contains the DFSG-free OpenVAS plugins, a set of security tests
- as well as scripts to build additional plugins. It also provides the
- infrastructure for downloading updated plugins from OpenVAS.
+ as well as scripts to build additional plugins.
+
+Package: openvas-plugins-base
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rsync
+Recommends: openvas-server (>= 1.0), openvas-plugins-dfsg
+Conflicts: openvas-server (<= 2.0.3-2)
+Description: remote network security auditor - basic plugins
+ The Open Vulnerability Assessment System is a modular security auditing
+ tool, used for testing remote systems for vulnerabilities that should be
+ fixed.
+ .
+ This package contains the basic plugins: find_service, openvas_tcp_scanner,
+ ssl_ciphers and synscan. As well as the script needed for downloading updated
+ plugins from OpenVAS.
Deleted: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/manpages
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/manpages 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/manpages 2009-10-06 23:16:31 UTC (rev 5419)
@@ -1 +0,0 @@
-debian/openvas-nvt-sync.8
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-nvt-sync.8
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-nvt-sync.8 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-nvt-sync.8 2009-10-06 23:16:31 UTC (rev 5419)
@@ -31,8 +31,8 @@
.B openvas-nvt-sync
uses rsync(1) to retrieve the archive of the new plugins. The scripts
provided by the OpenVAS project might
-.B not be signed
-\. Consequently, if somewhere where to poison your DNS server and force this
+.B not be signed.
+Consequently, if somewhere where to poison your DNS server and force this
script to retrieve NASL plugins on another site he would force
your OpenVAS server to execute NASL scripts when running security tests.
Even if this might not do much harm (see the NASL reference guide
Added: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.install
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.install 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.install 2009-10-06 23:16:31 UTC (rev 5419)
@@ -0,0 +1,3 @@
+usr/lib/openvas/plugins
+usr/sbin
+usr/share/man
Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-base.manpages (from rev 5416, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/manpages)
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.dirs
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.dirs 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.dirs 2009-10-06 23:16:31 UTC (rev 5419)
@@ -1,2 +1,3 @@
var/lib/openvas/plugins
var/lib/openvas/plugins-factory
+usr/share/lintian/overrides
Added: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.install
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.install 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.install 2009-10-06 23:16:31 UTC (rev 5419)
@@ -0,0 +1 @@
+var/lib/openvas/plugins
Added: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.lintian-overrides
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.lintian-overrides 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.lintian-overrides 2009-10-06 23:16:31 UTC (rev 5419)
@@ -0,0 +1,4 @@
+# We need to use read in the maintainer script
+# in order to remove properly the files on purge.
+# Debconf is not an option here since it might not be available:
+openvas-plugins-dfsg binary: read-in-maintainer-script
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.postrm
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.postrm 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins-dfsg.postrm 2009-10-06 23:16:31 UTC (rev 5419)
@@ -4,8 +4,8 @@
echo ""
echo "The /usr/lib/openvas/plugins directory still exists."
echo "This might be because you downloaded additional plugins into it"
- echo "when using a previous Nessus version."
- echo -n "Do you want to remove the full directory now? "
+ echo "when using a previous OpenVAS version."
+ echo -n "Do you want to remove the full directory now? (yes/no) "
read ANSWER
case $ANSWER in
[yY]*) rm -rf /usr/lib/openvas/plugins ;;
@@ -17,10 +17,10 @@
echo "The /var/lib/openvas/plugins directory still exists."
echo "This might be because you downloaded additional plugins into it."
if [ -d /var/lib/openvas/plugins/.desc ]; then
- echo "Or because the openvasd package was not fully purged."
+ echo "Or because the openvas-server package was not fully purged."
fi
echo ""
- echo -n "Do you want to remove the full directory now? "
+ echo -n "Do you want to remove the full directory now? (yes/no) "
read ANSWER
case $ANSWER in
[yY]*) rm -rf /var/lib/openvas/plugins ;;
Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules 2009-10-06 23:04:00 UTC (rev 5418)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules 2009-10-06 23:16:31 UTC (rev 5419)
@@ -6,7 +6,7 @@
include /usr/share/dpatch/dpatch.make
-tmp := $(CURDIR)/debian/openvas-plugins-dfsg
+tmp := $(CURDIR)/debian/tmp
CFLAGS := -g -Wall
ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
@@ -16,13 +16,15 @@
endif
build: build-stamp
-build-stamp: config.status
+build-stamp: config.status audit/exclude-list
dh_testdir
$(MAKE)
- ( cd audit && sh exclude-plugins >exclude-list )
touch $@
-config.status: configure patch
+audit/exclude-list:
+ ( cd audit && test -f exclude-list || sh exclude-plugins >exclude-list )
+
+config.status: configure patch-stamp
CFLAGS="$(CFLAGS)" ./configure --sysconfdir=/etc --prefix=/usr \
--mandir='$${prefix}/share/man' --localstatedir=/var/run \
--with-fetchcmd=wget --libdir=/var/lib
@@ -34,43 +36,60 @@
touch openvas.tmpl
[ ! -f Makefile ] || $(MAKE) distclean
-rm -rf audit/exclude-list
- dh_clean build-stamp
+ dh_clean build-stamp patched
[ ! -f libtool ] || rm -f libtool
[ ! -d bin/ ] || rm -rf bin/
-install: build-stamp
+install: build-stamp audit/exclude-list
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
+ dh_installdirs
$(MAKE) install prefix=$(tmp)/usr sysconfdir=$(tmp)/etc localstatedir=$(tmp)/var/run libdir=$(tmp)/var/lib
-# After we install we remove the plugins we want to exclude and
-# audit the remaining plugins
+# After we install we remove the plugins we want to exclude from the
+# package
( cd $(tmp)/var/lib/openvas/plugins ; cat $(CURDIR)/audit/exclude-list $(CURDIR)/audit/remove-list | xargs rm -f )
+# Move the libraries to /usr/lib
+ mkdir -p $(tmp)/usr/lib/openvas/plugins
+ mv $(tmp)/var/lib/openvas/plugins/*nes $(tmp)/usr/lib/openvas/plugins
+ cp debian/openvas-plugins-dfsg.lintian-overrides \
+ debian/openvas-plugins-dfsg/usr/share/lintian/overrides/openvas-plugins-dfsg
+
+
+audit-plugins: audit-plugins-stamp
+audit-plugins-stamp:
+# Audit the plugins installed in the package
( cd audit && sh audit-plugins $(tmp)/var/lib/openvas/plugins )
+ touch $@
# If the audit passes we continue
binary-indep:
# Nothing to do, no arch-indep packages here.
-binary-arch: install
+binary-arch: install audit-plugins
dh_testdir
dh_testroot
- dh_installdebconf
+# Move the files to the openvas-plugins-base package
+ dh_install --sourcedir=$(tmp)
dh_installdocs docs/plugins_api.txt
+ dh_installchangelogs
+ dh_installman -popenvas-plugins-base
dh_installexamples extra/describe-openvas-plugin
- dh_installchangelogs
+ dh_installdebconf
dh_link
ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
dh_strip
strip --strip-unneeded --remove-section=.comment --remove-section=.note \
- $(tmp)/var/lib/openvas/plugins/*.nes
+ debian/openvas-plugins-base/usr/lib/openvas/plugins/*.nes
endif
dh_compress
dh_fixperms
+ dh_makeshlibs
dh_installdeb
- dpkg-shlibdeps -Tdebian/openvas-plugins.substvars \
- $(tmp)/var/lib/openvas/plugins/*.nes
+# dh_shlibdeps
+ dpkg-shlibdeps -Tdebian/openvas-plugins-base.substvars \
+ debian/openvas-plugins-base/usr/lib/openvas/plugins/*.nes
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Openvas-commits
mailing list