5 files changed, 36 insertions, 8 deletions
diff --git a/network/openvas-scanner/README b/network/openvas-scanner/README
index d974f3e880..b176e350fb 100644
--- a/network/openvas-scanner/README
+++ b/network/openvas-scanner/README
@@ -14,7 +14,7 @@ following sequence:
 
 The openvas-client GUI is needed to interact with the OpenVAS scanner, however
 there are some new optional modules:
- 1. openvas-scanner for storing and organizing scans on a central server in a
+ 1. openvas-manager for storing and organizing scans on a central server in a
  SQL database
  2. openvas-administrator for User-, Feed- and Settings-Management
  3. greenbone-security-assistant for a web-based Vulnerability Management
@@ -28,3 +28,6 @@ openvas-server has been replaced by the openvas-scanner package and there are
 the new optional modules. A straight upgradepkg (with removal of deprecated
 packages) *SHOULD* work but also consider to backup your old configuration and
 starting over from a fresh OpenVAS installation.
+
+This package will also ships the /etc/rc.d/rc.openvas.conf file, used to store
+your whole system OpenVAS configuration in a single file.
diff --git a/network/openvas-scanner/doinst.sh b/network/openvas-scanner/doinst.sh
index 77dd8c45f0..ca2e484cfc 100644
--- a/network/openvas-scanner/doinst.sh
+++ b/network/openvas-scanner/doinst.sh
@@ -18,4 +18,5 @@ if [ -e etc/rc.d/rc.openvassd ]; then
 fi
 
 config etc/rc.d/rc.openvassd.new
+config etc/rc.d/rc.openvas.conf.new
 
diff --git a/network/openvas-scanner/openvas-scanner.SlackBuild b/network/openvas-scanner/openvas-scanner.SlackBuild
index 1420f4ebcc..9b194801b3 100644
--- a/network/openvas-scanner/openvas-scanner.SlackBuild
+++ b/network/openvas-scanner/openvas-scanner.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=openvas-scanner
 VERSION=${VERSION:-3.0.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -54,10 +54,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.openvassd > $PKG/etc/rc.d/rc.openvassd.new
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -82,7 +78,7 @@ make install DESTDIR=$PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( cd $PKG/usr/man
@@ -90,6 +86,11 @@ make install DESTDIR=$PKG
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
+# install rc script and config file.
+install -D -m0755 -oroot -groot $CWD/rc.openvassd $PKG/etc/rc.d/rc.openvassd.new
+cat $CWD/rc.openvas.conf > $PKG/etc/rc.d/rc.openvas.conf.new
+
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/openvas-scanner/rc.openvas.conf b/network/openvas-scanner/rc.openvas.conf
new file mode 100644
index 0000000000..1323b94377
--- /dev/null
+++ b/network/openvas-scanner/rc.openvas.conf
@@ -0,0 +1,20 @@
+# OpenVAS centralized configuration file: the _PORT options are used to share
+# the common configurations between daemons, the _OPTIONS one are used to pass
+# extra parameters. Running each daemon from the command line with the --help
+# option will give you extra configuration options.
+
+# OpenVAS Scanner (openvassd)
+SCA_PORT="9390"
+SCA_OPTIONS=""
+
+# OpenVAS Manager (openvasmd)
+MAN_PORT="9391"
+MAN_OPTIONS=""
+
+# OpenVAS Administrator (openvasad)
+ADM_PORT="9393"
+ADM_OPTIONS=""
+
+# Greenbone Security Assistant (gsad)
+GSA_PORT="443"
+GSA_OPTIONS=""
diff --git a/network/openvas-scanner/rc.openvassd b/network/openvas-scanner/rc.openvassd
index 4ae0183cce..1e13df9951 100644
--- a/network/openvas-scanner/rc.openvassd
+++ b/network/openvas-scanner/rc.openvassd
@@ -1,10 +1,13 @@
 #!/bin/sh
 
+# Get OpenVAS options
+. /etc/rc.d/rc.openvas.conf
+
 PIDFILE="/var/run/openvassd.pid"
 
 start() {
   echo "Starting OpenVAS scanner..."
-  openvassd
+  openvassd --port=${SCA_PORT} ${SCA_OPTIONS}
 }
 
 stop() {