Commit 70204beb authored by Javier Fernandez-Sanguino Pen~a's avatar Javier Fernandez-Sanguino Pen~a Committed by Lock Lin

Import Debian patch 3.2.3-2

parent 0a98088c
- Log directory in /var/log/openvas/ is also used by other packages
(openvas-manager) we should not remove it on postrm
- Openvas-manager uses /var/lib/openvas/mgr/ we should not remove this
content if we find it
- Just in case, if upgrading from openvas-server, copy over the contents
from old configuration files:
......
openvas-scanner (3.2.3-2) experimental; urgency=low
* Change variables defined for Cmake in debian/rules for a proper
installation.
* debian/openvas-manager.default: Change the port number used for
incoming connections from 9390 to 9391 as this is the one
defined in http://www.openvas.org/about-software.html.
* debian/openvas-scanner.postrm: Do not remove blindly /var/log/openvas,
/etc/openvas and /var/lib/openvas as this location is also used by
other packages (openvas-manager) to store files. Instead, remove
the files we create and leave the directories so that dpkg purges
them if they remain empty after purging the package.
-- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Sat, 30 Apr 2011 17:13:03 +0200
openvas-scanner (3.2.3-1) experimental; urgency=low
* New upstream version (Closes: #598466)
......
# Additional options for the daemon
# -q prevents OpenVAS scanner from listing all the plugins it loads
DAEMONOPTS="-q -p 9390"
DAEMONOPTS="-q -p 9391"
# Time to wait for the daemon to die before restarting it
# (in seconds)
......
......@@ -2,13 +2,25 @@
set -e
if [ "$1" = "purge" ]; then
for DIR in /etc/openvas /var/log/openvas /var/lib/openvas \
/usr/lib/openvas/plugins/.desc/ /var/cache/openvas
do
if [ -d $DIR ] ; then
find $DIR -type f -o -type l | xargs rm -f
fi
done
# Remove logs
if [ -e /var/log/openvassd.messages ] ; then
echo -e "Removing the OpenVAS Scanner logs"
rm -f /var/log/openvasmd.log* /var/log/openvassd.dump*
if [ $? -eq 0 ] ; then
echo "..done"
else
echo "..ERROR"
fi
fi
# Remove configuration files
echo -e "Removing the OpenVAS Scanner configuration files"
rm -f /etc/openvas/openvassd.conf /etc/openvas/openvassd.rules
if [ $? -eq 0 ] ; then
echo "..done"
else
echo "..ERROR"
fi
# Remove certificates
OPENVASPRIV="/var/lib/openvas/private/CA"
OPENVASPUB="/var/lib/openvas/CA"
......@@ -21,6 +33,15 @@ if [ "$1" = "purge" ]; then
[ -e "$file" ] && rm -f $file
done
# Remove the rest of the directories that we create
for DIR in /var/lib/openvas/plugins /var/lib/openvas/users \
/usr/lib/openvas/plugins/.desc/
do
if [ -d $DIR ] ; then
find $DIR -type f -o -type l | xargs rm -f
fi
done
update-rc.d openvas-scanner remove >/dev/null
fi
......
......@@ -30,8 +30,9 @@ build-stamp: patch-stamp
dh_testdir
# Create a build directory
mkdir BUILD_DIR && tar -c --exclude='debian/*' --exclude='BUILD_DIR/*' --exclude=debian --exclude=BUILD_DIR -f - * | tar -C BUILD_DIR -xf -
cd BUILD_DIR && cmake -DCMAKE_INSTALL_PREFIX= -DEXEC_PREFIX=usr -DDATADIR=var/share -DMANDIR=usr/share/man/man8 .
cd BUILD_DIR && cmake -DCMAKE_INSTALL_PREFIX=/ -DSYSCONFDIR=etc -DEXEC_PREFIX=usr -DDATADIR=var/share -DMANDIR=usr/share/man/man8 -DLIBDIR=var/lib -DLOCALSTATEDIR=var -DCPACK_SET_DESTDIR=ON .
cd BUILD_DIR && $(MAKE)
cd BUILD_DIR && $(MAKE) doc
# For the time being we do not build the documentation with Doxygen since it does not add too much value. If added it
# needs a Build-Dep on doxygen
# cd BUILD_DIR && $(MAKE) doc-full
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment