network/openvas-manager: Updated for version 1.0.4.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 20 insertions, 18 deletions

diff --git a/network/openvas-manager/README b/network/openvas-manager/README
index 811cae719e47..f01e6b20a2ba 100644
--- a/network/openvas-manager/README
+++ b/network/openvas-manager/README
@@ -18,7 +18,10 @@ there are some new optional modules:
  2. openvas-administrator for User-, Feed- and Settings-Management
  3. greenbone-security-assistant for a web-based Vulnerability Management
 
-This package provides the OpenVAS manager, it will also install an rc script
-to start the manager at system startup, however read carefully the README
-provided in the package doc folder as it outlines some important configuration
+This package provides the OpenVAS manager.  It will also install an init script
+to start the manager at system startup; however, read carefully the README
+provided in the package doc folder, as it outlines some important configuration
 prerequisites.
+
+Remember to rebuild OpenVAS Manager cache at least one time, running either
+"openvasmd --rebuild" or "/etc/rc.d/rc.openvasmd rebuild".
diff --git a/network/openvas-manager/openvas-manager.SlackBuild b/network/openvas-manager/openvas-manager.SlackBuild
index df350e673d6c..bb16e1af6135 100644
--- a/network/openvas-manager/openvas-manager.SlackBuild
+++ b/network/openvas-manager/openvas-manager.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for OpenVAS manager.
-#
-# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+
+# Copyright 2011-2012 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvas-manager
-VERSION=${VERSION:-1.0.0_beta5}
-SRCVER=$(echo $VERSION | tr _ -)
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,19 +42,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="COPYING README"
+DOCS="COPYING README doc/omp.html"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
-# Fix LDFLAG
-cat $CWD/LDFLAG.diff | patch -p1 --verbose
+# Fix failure to link libdl.so (the usual sqlite problem)
+patch -p1 < $CWD/LDFLAG.diff
 
 chown -R root:root .
 find . \
diff --git a/network/openvas-manager/openvas-manager.info b/network/openvas-manager/openvas-manager.info
index 4a262cefce33..a734fd3b5175 100644
--- a/network/openvas-manager/openvas-manager.info
+++ b/network/openvas-manager/openvas-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="openvas-manager"
-VERSION="1.0.0_beta5"
+VERSION="1.0.4"
 HOMEPAGE="http://www.openvas.org/"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/718/openvas-manager-1.0.0-beta5.tar.gz"
-MD5SUM="32b0f30913538f3c991478e5b0cc9e94"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/829/openvas-manager-1.0.4.tar.gz"
+MD5SUM="2eba5b7c9ccb7c36be206235afae68bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/openvas-manager/rc.openvasmd b/network/openvas-manager/rc.openvasmd
index 0a89f4e1b7c6..9a97889cabf8 100644
--- a/network/openvas-manager/rc.openvasmd
+++ b/network/openvas-manager/rc.openvasmd
@@ -12,7 +12,7 @@ start() {
 
 stop() {
   echo "Stopping OpenVAS manager..."
-  kill `cat $PIDFILE`
+  kill $(cat $PIDFILE)
 }
 
 update() {