diff options
5 files changed, 11 insertions, 41 deletions
diff --git a/network/openvas-administrator/README b/network/openvas-administrator/README index 80246917bb..7a0535f20a 100644 --- a/network/openvas-administrator/README +++ b/network/openvas-administrator/README @@ -18,5 +18,5 @@ 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 administrator together with an rc script to -start it at system startup. +This package provides the OpenVAS administrator together with an init script +to start it at system startup. diff --git a/network/openvas-administrator/doinst.sh b/network/openvas-administrator/doinst.sh index 7a0957856f..15a5b9b350 100644 --- a/network/openvas-administrator/doinst.sh +++ b/network/openvas-administrator/doinst.sh @@ -1,10 +1,10 @@ config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... diff --git a/network/openvas-administrator/openvas-administrator-0.7.0-format.patch b/network/openvas-administrator/openvas-administrator-0.7.0-format.patch deleted file mode 100644 index 2a0e0add11..0000000000 --- a/network/openvas-administrator/openvas-administrator-0.7.0-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: src/oap.c -=================================================================== ---- src/oap.c -+++ src/oap.c -@@ -633,7 +633,7 @@ - if (((buffer_size_t) TO_CLIENT_BUFFER_SIZE) - to_client_end - < strlen (msg)) - { -- tracef (" send_to_client out of space (%i < %i)\n", -+ tracef (" send_to_client out of space (%i < %zu)\n", - ((buffer_size_t) TO_CLIENT_BUFFER_SIZE) - to_client_end, - strlen (msg)); - return TRUE; -Index: src/oxpd.c -=================================================================== ---- src/oxpd.c -+++ src/oxpd.c -@@ -247,7 +247,8 @@ - tracef ("<= client Input may contain password, suppressed.\n"); - else - tracef ("<= client \"%.*s\"\n", -- count, -+ /* Cast is safe because count is bounded by from_client size. */ -+ (int) count, - from_client + from_client_end); - #else - tracef ("<= client %i bytes\n", count); diff --git a/network/openvas-administrator/openvas-administrator.SlackBuild b/network/openvas-administrator/openvas-administrator.SlackBuild index 00336e5f9b..e15c4f11be 100644 --- a/network/openvas-administrator/openvas-administrator.SlackBuild +++ b/network/openvas-administrator/openvas-administrator.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh # Slackware build script for OpenVAS administrator. -# -# 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,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openvas-administrator -VERSION=${VERSION:-0.7.0} +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +59,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# http://wald.intevation.org/tracker/?func=detail&atid=220&aid=1273&group_id=29 -patch -p0 < $CWD/openvas-administrator-0.7.0-format.patch - cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBDIR=/usr/lib \ diff --git a/network/openvas-administrator/openvas-administrator.info b/network/openvas-administrator/openvas-administrator.info index 22904743ab..2b8dbc3fd9 100644 --- a/network/openvas-administrator/openvas-administrator.info +++ b/network/openvas-administrator/openvas-administrator.info @@ -1,10 +1,10 @@ PRGNAM="openvas-administrator" -VERSION="0.7.0" +VERSION="1.0.1" HOMEPAGE="http://www.openvas.org/" -DOWNLOAD="http://wald.intevation.org/frs/download.php/707/openvas-administrator-0.7.0.tar.gz" -MD5SUM="3bcdb96c4de796916ea2d7ebd5352497" +DOWNLOAD="http://wald.intevation.org/frs/download.php/828/openvas-administrator-1.0.1.tar.gz" +MD5SUM="c17551450b03f530b948f724c6757bc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Marco Bonetti" EMAIL="sid77@slackware.it" -APPROVED="dsomero" +APPROVED="rworkman" |