[Openvas-commits] r5414 - in trunk/openvas-packaging/openvas-plugins/debian/trunk/debian: . old-config patches

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Oct 7 00:56:33 CEST 2009


Author: jfs
Date: 2009-10-07 00:56:33 +0200 (Wed, 07 Oct 2009)
New Revision: 5414

Added:
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.config
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.postinst
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.templates
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/po/
Removed:
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.config
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.postinst
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.templates
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/po/
Modified:
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/TODO
   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/copyright
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.dirs
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/patches/00list
   trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules
Log:

New package version (1.0.7) which tries to provide the openvas-nvt-sync 
script as well as some plugins.



Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/TODO
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/TODO	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/TODO	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,5 +1,6 @@
 
-- Update the debconf questions, they still talk about Nessus
-  --> update also the translations
+- Update the plugins to the latest SVN release and change the package
+  numbering to reflect dates
 
-- See if the debconf questions are still relevant for OpenVAS
+- Find scripts refering to the Nessus Sript License and modify them
+  to refer to the GPL instead

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/changelog	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,3 +1,50 @@
+openvas-plugins-dfsg (1.0.7-2) unstable; urgency=low
+
+  * Provide this package in Debian which includes the openvas-nvt-sync required
+    by openvas-server as well as some basic plugins (Closes: #532937, #534846)
+  * Restore audit, docs/, extras/ and scripts/ and review all components
+    to ensure they are free. The list of removed plugins is in
+    audit/removed-plugins, these include:
+       - NASL scripts without an explict license being refered in the header
+       - all of Gentoo plugins (glsa_2xxx) since the Gentoo advisories are
+         licensed under the Creative Commons by-sa version 2.0/version 2.5
+         which is DFSG incompatible (only 3.0 is compatible)
+  * Add a audit/REMOVED-PLUGINs file listing the plugins removed
+  * Describe the status of this package in a new 'README' debian file
+  * Move rsync to Depends: since it is required by the openvas-nvt-sync
+    script and the purpose of this package is to provide it.
+  * Move again snmp to Recommends: as most networks use SNMP for
+    network management
+  * Create audit/generate-license-list script in order to generate a
+    list of all scripts based on license and make it easier to find
+    those scripts that do not have any license reference.
+  * Update George A. Theall's script describe-nessus-plugins to version 2.24,
+    dated june 2009) and removed 'update-nessus-plugins' since it's not
+    any longer useful.
+  * Restore packages' preinst/postrm which were lost in previous version
+  * Move the old packages config/templates/po to a separate directory. They are
+    not need currently (but might be useful in the future)
+  * Add a debian/TODO
+  * Add a Conflicts: on openvas-server (2.0.3-2 and previous) due to the
+    openvas-nvt-sync script
+  * Write a manual page for the  openvas-nvt-sync script
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs at debian.org>  Sun, 20 Sep 2009 02:13:11 +0200
+
+openvas-plugins (1.0.7-1) unstable; urgency=low
+
+  * New version based on latest plugins
+  * Update debian/copyright
+  * Move snmp to Suggests
+  * Removed audit/, docs/, extras/ and scripts/
+  * Drop the following patches in debian/patches since they are already
+    included upstream: 
+        01_makefile_fix_distclean.dpatch
+        02_adjust_examples.dpatch
+        03_makefile_clean_space.dpatch
+
+ -- Jan Wagner <waja at cyconet.org>  Fri, 18 Sep 2009 13:05:59 +0200
+
 openvas-plugins-dfsg (1.0.5-0.1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/control	2009-10-06 22:56:33 UTC (rev 5414)
@@ -3,21 +3,29 @@
 Priority: optional
 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>, Joey Schulze <joey at infodrom.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch, libopenvas1-dev (>= 1.0), openvas-server-dev (>= 1.0), libopenvasnasl1-dev, libgmp3-dev, libz-dev, libpcap0.8-dev | libpcap-dev, nmap, libnet1-dev, libgnutls-dev
-Standards-Version: 3.8.0
-Vcs-Browser: http://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-plugins/packaging/debian/?root=openvas
-Vcs-Svn: https://svn.wald.intevation.org/svn/openvas/trunk/openvas-plugins/packaging/debian/
-Homepage: http://www.openvas.org
+Build-Depends: debhelper (>= 5), dpatch, libopenvas2-dev, openvas-server-dev (>= 1.0), libopenvasnasl2-dev, libgmp3-dev, libz-dev, libpcap-dev, libnet1-dev, libgnutls-dev, libglib2.0-dev
+Homepage: http://www.openvas.org/
+Vcs-Browser: https://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/?root=openvas
+Vcs-Svn: https://svn.wald.intevation.org/svn/openvas/trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/
+Standards-Version: 3.8.3
 
 Package: openvas-plugins-dfsg
 Section: net
 Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rsync
+Recommends: openvas-server (>= 1.0), nmap, smbclient, snmp
+Suggests: openvas-client, pnscan, strobe, ike-scan
 Provides: openvas-plugins
-Depends: ${shlibs:Depends}, debconf | debconf-2.0
-Recommends: wget, openvas-server (>= 1.0), nmap, snmp
-Description: OpenVAS vulnerability tests
- OpenVAS is a network security scanner. It makes possible to test the security
- of remote hosts in an attempt to find vulnerable spots that should be fixed.
+Conflicts: openvas-plugins, openvas-server (<= 2.0.3-2)
+Description: remote network security auditor - 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 OpenVAS plugins, a set of security tests as well
- as scripts to build additional plugins.
+ It is made up of two parts: a server, and a client. The server/daemon,
+ openvasd, is in charge of the attacks, whereas the client,
+ 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.

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/copyright
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/copyright	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/copyright	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,167 +1,128 @@
 This package is based on the nessus-plugins package, which was debianized by
 Josip Rodin <joy-packages at debian.org> on 2 Oct 1999.
 
-Original sources for this software can be found at: http://www.openvas.org/
+It was downloaded from http://www.openvas.org/
 
-This package is Copyright (C) 1998 - 2007 Renaud Deraison and others.
-[ For specific (c) statements see the individual files. ]
+Upstream Author: OpenVAS <openvas-devel at wald.intevation.org>
 
-This package also provides the update-nessus-plugins and 
-describe-nessus-plugin scripts (provided in the examples directory).
-These are copyright (c) 2003, George A. Theall <theall AT tifaware.com>
-and they were downloaded from 
-http://www.tifaware.com/perl/update-nessus-plugins/
-and
-http://www.tifaware.com/perl/describe-nessus-plugin/
+Copyright holders:
+     * Renaud Deraison <deraison at cvs.nessus.org>
+     * Per Bothner <per at bothner.com>
+     * Gordon Matzigkeit <gord at gnu.ai.mit.edu>
+     * Lukas Grunwald <l.grunwald at dn-systems.de>
+     * Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+     * Michel Arboi <mikhail at nessus.org> / <arboi at alussinan.org>
+     * Copyright (C) 1998 - 2006 Tenable Network Security, Inc.
+     * Copyright (C) 2007, DN-Systems Enterprise Internet Solutions GmbH
 
-These scripts are free software; you can redistribute it and/or modify it 
-under the same terms as Perl itself.
+     * For the describe-openvas-plugin
+        Copyright (c) 2003-2009, George A. Theall <theall AT tifaware.com>
+     For autoconfiguration files:
+	Copyright (C) 1992-2006 Free Software Foundation, Inc
 
-Files in this package come from many different authors:
+     The following list includes all of the plugins writers and copyright
+     holders of NASL scripts under
+     the 'scripts/' directory:
+        Noam Rathaus
+        Patrik Karlsson
+        Chris Gragsone
+        David Maciejak  <david dot maciejak at kyxar dot fr>
+        Ferdy Riphagen
+        Michael Meyer
+        Renaud Deraison
+        Charles Thier <cthier at thethiers.net>
+        Sebastian Andersson <sa at hogia.net>
+        Chris Foster
+        Josh Zlatin-Amishav
+        Lionel Cons <lionel.cons at cern.ch>
+        Matt Moore <matt.moore at westpoint.ltd.uk>
+        Georges Dagousset <georges.dagousset at alert4web.com>
+        deepquest <deepquest at code511.com
+        Drew Hintz
+        Andrew Hintz
+        Sarju Bhagat <sarju at westpoint.ltd.uk>
+        Charles Thier <cthier at thethiers.net>
+        Paul Ewing <ewing at ima.umn.edu>
+        George A. Theall, <theall at tifaware.com>
+        Vincent Renardias <vincent at strongholdnet.com>
+        John Lampe (j_lampe at bellsouth.net)
+        Gregory Duchemin <plugin at intranode.com>
+        Brian Smith-Sweeney (brian at smithsweeney.com)
+        fr0stman <fr0stman at sun-tzu-security.net>
+        Alexis de Bernis <alexisb at cvs.nessus.org>
+        Mathieu Perrin <mathieu at tpfh.org>
+        Matthew North < matthewnorth at yahoo.com >
+        Xue Yong Zhi <xueyong at udel.edu>
+        Javier Fernandez-Sanguino
+        Rick McCloskey <rpm.security at gmail.com>
+        Carsten Koch-Mauthe <c.koch-mauthe at dn-systems.de>
+        Chandan S <schandan at secpod.com>
+        Justin Seitz <jms at bughunter.ca>
+        H D Moore <hdmoore at digitaldefense.net>
+        Orlando Padilla <orlando.padilla at digitaldefense.net>
+        Erik Tayler <erik at digitaldefense.net>
+        Forrest Rae <forrest.rae at digitaldefense.net>
+        Copyright (c) 2007 E-Soft Inc. http://www.securityspace.com
+        Copyright (C) 2003 StrongHoldNet
+        Copyright (c) 2008 Tim Brown and Portcullis Computer Security Ltd
 
-    A. Tarasco <atarasco at sia.es> research.
-    Adam Baldwin <adamb at amerion.net>
-    Alexis de Bernis <alexisb at cvs.nessus.org>
-    Anthony R. Plastino III <tplastino at sses.net>
-    Astharot <astharot at zone-h.org>
-    Audun Larsen <larsen at xqus.com>
-    Axel Nennker <axel at nennker.de>
-    Bekrar Chaouki <bekrar at adconsulting.fr>
-    Brian Smith-Sweeney <brian at smithsweeney.com>
-    Chandan S <schandan at secpod.com>
-    Chaouki BEKRAR <bekrar at adconsulting.fr>
-    Charles Thier <cthier at thethiers.net>
-    Chris Sullo <sq at cirt.net>
-    Christoff Breytenbach <christoff at sensepost.com>
-    David Kyger <david_kyger at symantec.com>
-    Davy Van De Moere <davy at securax.be> 
-    Douglas Minderhout <dminderhout at layer3com.com>
-    Eli Kara <elik at beyondsecurity.com>
-    Erik Anderson <eanders at pobox.com>
-    Erik Stephens <erik at edgeos.com>
-    Erik Tayler <erik at digitaldefense.net>
-    Farhad Koosha <farhadkey at yahoo.com>
-    Felix Huber <huberfelix at webtopia.de>
-    Ferdy Riphagen <f.riphagen at nsec.nl>
-    Filipe Custodio <filipecustodio at yahoo.com>
-    Forrest Rae <forrest.rae at digitaldefense.net>
-    Frank Berger <dev.null at fm-berger.de>            
-    Geoff Humes <geoff.humes at digitaldefense.net>
-    Geoffroy Raimbault <graimbault at lynx-technologies.com>
-    George A. Theall <theall at tifaware.com>
-    Georges Dagousset <georges.dagousset at alert4web.com>
-    Giovanni Fiaschi <giovaf at sysoft.it>
-    Gregory Duchemin <plugin at intranode.com> 
-    H D Moore <hdm at digitaloffense.net>
-    Haroon Meer <haroon at sensepost.com>
-    Hendrik Scholz <hendrik at scholz.net> 
-    Holger Heimann <hh at it-sec.de>
-    Holm Diening <holm.diening at slite.de>
-    Immo Goltz <Immo.Goltz at gecits-eu.com>
-    Intranode <plugin at intranode.com>
-    James W. Abendschan <jwa at jammed.com> <GPL>
-    Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
-    Jasmin Amidzic <jasminsabina at yahoo.com>.
-    Jason Haar <Jason.Haar at trimble.co.nz>
-    Jason Lidow <jason at brandx.net>
-    Javier Fernandez-Sanguino Peña <jfs at computer.org>
-    Javier Munoz Mellid <jm at udc.es>
-    Javier Olascoaga <jolascoaga at sia.es>
-    Jeff Adams <jadams at netcentrics.com>
-    John Lampe <j_lampe at bellsouth.net>
-    Jon Passki <jon.passki at shavlik.com>
-    Joseph Mlodzianowski <joseph at rapter.net>
-    Josh Zlatin-Amishav <josh at tkos.co.il>
-    Julio César Hernández <jcesar at inf.uc3m.es>
-    Justin Seitz <jms at bughunter.ca>
-    Jøséph Mlødzianøwski <joseph at rapter.net>
-    K-Otik.com <ReYn0 at k-otik.com>
-    Keith Young <Keith.Young at co.mo.md.us>
-    Laurent Facq <@u-bordeaux.fr>
-    Laurent Kitzinger <lkitzinger at yahoo.fr>
-    Lionel Cons <lionel.cons at cern.ch>, CERN
-    Lukas Grunwald <l.grunwald at dn-systems.de>
-    Mathieu Meadele <mm at omnix.net>
-    Mathieu Perrin <mathieu at tpfh.org>
-    Matt Moore <matt at westpoint.ltd.uk> 
-    Matthew North < matthewnorth at yahoo.com >
-    Michael J. Richardson <michael.richardson at protiviti.com>
-    Michel Arboi <mikhail at nessus.org>
-    Nicolas Gregoire <ngregoire at exaprobe.com>
-    Noam Rathaus <noamr at securiteam.com>, Beyond Security Ltd.
-    Orlando Padilla <orlando.padilla at digitaldefense.net>
-    Pasi Eronen <pasi.eronen at nixu.com>
-    Patrik Karlsson <patrik.karlsson at ixsecurity.com>
-    Paul Ewing <ewing at ima.umn.edu>
-    Paul Johnston <paul at westpoint.ltd.uk>
-    Pavel Kankovsky <kan at dcit.cz>
-    Pedro Antonio Nieto Feijoo <pedron at cimex.com.cu>
-    Prizm <Prizm at RESENTMENT.org>
-    Randy Matz <rmatz at ctusa.net>
-    Renaud Deraison <deraison at nessus.org>
-    Rick McCloskey <rpm.security at gmail.com>
-    Roelof Temmingh <roelof at sensepost.com>
-    Rui Bernardino <rbernardino at oni.pt>
-    Scott Adkins <sadkins at cns.ohiou.edu>
-    Scott Shebby scotts at scanalert.com
-    Sebastian Andersson <sa at hogia.net>
-    Stefaan Van Dooren <stefaanv at kompas.be>
-    Sullo <sullo at cirt.net>
-    Sverre H. Huseby <shh at thathost.com>
-    Tarik El-Yassem <te at itsec.nl>
-    Thomas Reinke <reinke at securityspace.com>
-    Tim Brown <timb at nth-dimension.org.uk>
-    Tobias Glemser <tglemser at tele-consulting.com>
-    Tom Ferris <tommy at security-protocols.com>
-    Tomi Hanninen <Tomi.Hanninen at thermo.com>
-    Veerendra GG <veerendragg at secpod.com>
-    Victor Kirhenshtein <sauros at iname.com>
-    Vincent Renardias <vincent at strongholdnet.com>
-    Vlatko Kosturjak <kost at linux.hr>
-    Xue Yong Zhi <xueyong at udel.edu>
-    Yoav Goldberg <yoavg at securiteam.com>
-    Zorgon <zorgon at linuxstart.com>
-    altomo at digitalgangsters.net
-    chewkeong at security.org.sg
-    deepquest <deepquest at code511.com>
-    fr0stman <fr0stman at sun-tzu-security.net>
-    tony at libpcap.net
-    visigoth <visigoth at securitycentric.com>
+License:
 
+The GPL2 (or later) license applies to most of this package contents (but see
+below)
 
---------------------------------------------------------------------------
-                            NASL Scripts
---------------------------------------------------------------------------
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
 
-All NASL scripts included in this release (unless noted
-otherwise in the plugin itself, see below) are distributed
-under the GNU General Public License version 2:
+        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.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+        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
 
-  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.
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-2 file.
 
-  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
-  
-On Debian systems, full text of the GNU GPL can always be
-found in the /usr/share/common-licenses/GPL file.
 
+The following contents are available through only a GPL2 license (not later
+versions):
+
+  - configure.in
+  - openvas-nvt-sync.in
+  - plugins/3com_hub/3com_hub.c
+  - plugins/find_service/find_service.c
+  - plugins/openvas_tcp_scanner/openvas_tcp_scanner.c
+
+This package also provides the describe-nessus-plugin scripts (provided in the
+examples directory). This script is (c) 2003, George A. Theall and was
+downloaded from http://www.tifaware.com/perl/describe-nessus-plugin/.
+The license for this script is the following:
+
+    These scripts are free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
+
+--------------------------------------------------------------------------
+                                Plugins / Scripts 
+--------------------------------------------------------------------------
+
+All of the C and NASL scripts included in this release (unless noted otherwise
+in the plugin itself, see below) are distributed under the GNU General Public
+License version 2. Whenever a plugin refers to the "Nessus Script License" it
+refers to the GPL version 2 license.
+
 The NASL plugins might include text provided from vendor advisories
 that are distributed under different license contents. Most notably:
 
 Debian advisories
 -----------------
 
-Debian advisories are (c) 1997-2006 Software in the Public Interest, Inc.
-for more information see http://www.debian.org/license
+Debian advisories are (c) 1997-2005 Software in the Public Interest, Inc.
+for more information see http://www.debian.org/licens
 
 This material may be distributed only subject to the terms and conditions 
 set forth in the Open Publication License, Draft v1.0 or later 
@@ -285,3 +246,47 @@
    derivative of the work in any standard (paper) book form is prohibited
    unless prior permission is obtained from the copyright holder.' to the
    license reference or copy.
+
+
+Other plugins/scripts
+---------------------
+
+The following plugins hold other free software licenses:
+
+netware_post_perl.nasl is (c) 2002 visigoth <visigoth at securitycentric.com>
+
+  This script is distributed under a BSD style license
+  allowing free use and continued development provided
+  the above Copyright message remains.
+
+smtpscan.nasl is Copyright (c) 2002,2003 Julien Bordet 
+
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed and data gathered by
+#      Julien Bordet, Renaud Deraison and Michel Arboi, for smtpscan and 
+#      Nessus projects
+
+www_fingerprinting_hmap.nasl is (C) 2003 Michel Arboi <mikhail at nessus.org>
+
+#
+# Redistribution and use in source, with or without modification, are 
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#     This product includes software developed and data gathered by 
+#     Michel Arboi
+#
+

Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.config (from rev 5408, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.config)

Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.postinst (from rev 5408, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.postinst)

Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/openvas-plugins.templates (from rev 5408, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.templates)

Copied: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/old-config/po (from rev 5408, trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/po)

Deleted: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.config
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.config	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.config	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,60 +0,0 @@
-#!/bin/sh -e
-# Config script for openvas-plugins
-# (c) 2003-2007 Javier Fernández-Sanguino <jfs at debian.org>
-# Some ideas stolen from the geneweb package (and contributed by
-# Christian Perrier)
-
-. /usr/share/debconf/confmodule
-db_version 2.0 || [ $? -lt 30 ]
-db_title "OpenVAS plugins"
-
-
-find_updated_plugs () {
-  DIST_PLIST=`mktemp`
-  ORIG_PLIST=`mktemp`
-  cat $OPENVASPLIST | sort > $DIST_PLIST
-  find $PLUGINDIR -maxdepth 1 -type f | sort > $ORIG_PLIST
-  comm -13 $DIST_PLIST $ORIG_PLIST
-  rm -f $ORIG_PLIST $DIST_PLIST
-  return 0
-}
-
-PLUGINDIR=/var/lib/openvas/plugins/
-OPENVASPLIST=/var/lib/dpkg/info/openvas-plugins.list
-MAX_ENTRIES=5
-[ -d $PLUGINDIR ] && ( [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ) && {
-# We need to remove _all_ the plugins in the previous installation
-# otherwise there might be stuff which we do not want
-
-  newplugs="`find_updated_plugs`"
-  if [ -n "$newplugs" ] ; then
-	  countnewplugs="`echo $newplugs |wc -l`"
-  else
-	  countnewplugs=0
-  fi
-  if [ -n "$newplugs" ] || [ "$1" = "reconfigure" ] ; then
-
-# I'm not convinced that there is any need to list all the plugins
-# which are new here. This question could even be asked regardless
-# of wether there are new plugins or not... (jfs)
-#  	if [ $countnewplugs -gt $MAX_ENTRIES ] ; then
-	  # List should be limited to, say, 5 entries at most to avoid
-	  # filling up the screen
-#	  newplugs="`echo $newplugs |head -$MAX_ENTRIES`"
-#	  newplugs="$newplugs (...)"
-#	fi
-#	newplugs=`echo $newplugs | perl -pe 's/\n/, /g'` 
-#  	db_subst openvas-plugins/remove_unknown newplugs "$newplugs" || true
-
-# This will give an indication of the stuff that will be removed
-  	db_subst openvas-plugins/remove_unknown countnewplugs "$countnewplugs" || true
-# Ask the question
-  	db_input medium openvas-plugins/remove_unknown || true
-  fi
-}
-
-#DEBHELPER#
-
-db_go
-
-exit 0

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.dirs
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.dirs	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.dirs	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,3 +1,2 @@
-var/lib/openvas/.desc-plugins
 var/lib/openvas/plugins
 var/lib/openvas/plugins-factory

Deleted: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.postinst
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.postinst	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.postinst	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-# Postinst script for openvas-plugins
-# (c) 2003-2007 Javier Fernández-Sanguino <jfs at debian.org>
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-test $DEBIAN_SCRIPT_DEBUG && set -v -x
-
-
-# Note, This is far from optimal and might take some time to run.
-# (and we have to do it again since we cannot preserve it through
-# configure/postinst calls)
-find_updated_plugs () {
-  DIST_PLIST=`mktemp`
-  ORIG_PLIST=`mktemp` 
-  cat $OPENVASPLIST | sort > $DIST_PLIST
-  find $PLUGINDIR -maxdepth 1 -type f | sort > $ORIG_PLIST
-  comm -13 $DIST_PLIST $ORIG_PLIST
-  rm -f $ORIG_PLIST $DIST_PLIST 
-  return 0
-}
-
-PLUGINDIR=/var/lib/openvas/plugins/
-OPENVASPLIST=/var/lib/dpkg/info/openvas-plugins.list
-if [ "$1" = "configure" ] && [ -d $PLUGINDIR ]; then
-	db_get openvas-plugins/remove_unknown || true
-	REMOVE="$RET"
-	if [ "$REMOVE" = "true" ] ; then
-		newplugs="`find_updated_plugs`"
-		if [ -n "$newplugs" ] ; then
-			echo $newplugs | xargs -r rm -f
-		fi
-	fi
-fi
-
-# Revert the change introduced in 2.0.10a-4, since
-# now all plugins are in /var/
-if [ -d /var/lib/openvas/.desc-plugins ] && \
-   [ -d /var/lib/openvas/plugins ] ; then
-   	[ -L /var/lib/openvas/plugins/.desc ] && rm -f /var/lib/openvas/plugins/.desc
-   	if [ ! -e /var/lib/openvas/plugins/.desc ]; then
-		mv /var/lib/openvas/.desc-plugins /var/lib/openvas/plugins/.desc
-	fi
-fi
-
-#DEBHELPER#
-
-exit 0

Deleted: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.templates
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.templates	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/openvas-plugins.templates	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,12 +0,0 @@
-Template: openvas-plugins/remove_unknown
-Type: boolean
-Default: false
-_Description: Remove unknown OpenVAS plugins?
- The /var/lib/openvas/plugins directory includes some unknown plugins. This
- is probably because you downloaded additional plugins into it (e.g. by
- running openvas-update-plugins). You currently have ${countnewplugs}
- plugin(s) which are not provided by this package.
- .
- Note: This will apply to all your new installations/upgrades of this package
- until you reconfigure it. You should say 'No' if you plan to
- use openvas-update-plugins in the future.

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/patches/00list
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/patches/00list	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/patches/00list	2009-10-06 22:56:33 UTC (rev 5414)
@@ -1,4 +1 @@
-01_makefile_fix_distclean.dpatch
-02_adjust_examples.dpatch
-03_makefile_clean_space.dpatch
-
+10_fix_install_permissions.dpatch

Modified: trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules
===================================================================
--- trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules	2009-10-06 22:54:16 UTC (rev 5413)
+++ trunk/openvas-packaging/openvas-plugins/debian/trunk/debian/rules	2009-10-06 22:56:33 UTC (rev 5414)
@@ -2,7 +2,7 @@
 # Derived from dh_make example.
 
 #export DH_VERBOSE=1
-#export DH_COMPAT=4
+#export DH_COMPAT=5
 
 include /usr/share/dpatch/dpatch.make
 
@@ -18,7 +18,8 @@
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
-	$(MAKE) 
+	$(MAKE)
+	( cd audit &&  sh exclude-plugins >exclude-list )
 	touch $@
 
 config.status: configure patch
@@ -32,15 +33,23 @@
 	dh_testroot
 	touch openvas.tmpl
 	[ ! -f Makefile ] || $(MAKE) distclean
+	-rm -rf audit/exclude-list
 	dh_clean build-stamp
+	[ ! -f libtool ] || rm -f libtool
+	[ ! -d bin/ ] || rm -rf bin/
 
 install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	$(MAKE) install prefix=$(tmp)/usr sysconfdir=$(tmp)/etc localstatedir=$(tmp)/var/run libdir=$(tmp)/var/lib
-	rm -rf $(tmp)/var/run 
+# After we install we remove the plugins we want to exclude and 
+# audit the remaining plugins
+	( cd $(tmp)/var/lib/openvas/plugins ; cat $(CURDIR)/audit/exclude-list $(CURDIR)/audit/remove-list | xargs rm -f )
+	( cd audit &&  sh audit-plugins $(tmp)/var/lib/openvas/plugins )
+# If the audit passes we continue
 
+
 binary-indep:
 # Nothing to do, no arch-indep packages here.
 
@@ -49,9 +58,9 @@
 	dh_testroot
 	dh_installdebconf
 	dh_installdocs docs/plugins_api.txt
-	dh_installexamples extra/update-openvas-plugins \
-		extra/describe-openvas-plugin
-	dh_installchangelogs 
+	dh_installexamples  extra/describe-openvas-plugin
+	dh_installchangelogs
+	dh_link
 ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
 	dh_strip
 	strip --strip-unneeded --remove-section=.comment --remove-section=.note \
@@ -59,7 +68,6 @@
 endif
 	dh_compress
 	dh_fixperms
-	chmod -x $(tmp)/var/lib/openvas/plugins/*.nes
 	dh_installdeb
 	dpkg-shlibdeps -Tdebian/openvas-plugins.substvars \
           $(tmp)/var/lib/openvas/plugins/*.nes



More information about the Openvas-commits mailing list