network/nikto: Updated for version 2.1.4.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

5 files changed, 31 insertions, 33 deletions

diff --git a/network/nikto/README b/network/nikto/README
index 1717eb85e8449..dd6aab187d503 100644
--- a/network/nikto/README
+++ b/network/nikto/README
@@ -1,17 +1,17 @@
-Nikto is an Open Source (GPL) web server scanner which performs comprehensive
-tests against web servers for multiple items, including over 3500 potentially
-dangerous files/CGIs, versions on over 900 servers, and version specific
-problems on over 250 servers. Scan items and plugins are frequently updated and
-can be automatically updated (if desired).
+Nikto is an Open Source (GPL) web server scanner which performs
+comprehensive tests against web servers for multiple items, including
+over 3500 potentially dangerous files/CGIs, versions on over 900 servers,
+and version specific problems on over 250 servers. Scan items and plugins
+are frequently updated and can be automatically updated (if desired).
 
-Nikto requires libwhisker2 and Net-SSLeay perl modules, both of which are 
-available in the SlackBuilds.org repository.
+Nikto requires libwhisker2 and Net-SSLeay perl modules, both of which
+are available in the SlackBuilds.org repository.
 
-WARNING: if you're updating from 2.03 to 2.1.0 keep in mind that the
-configuration file have been changed from the old location
-/etc/nikto/config.txt (a debianism I introduced to work around the config.txt
-unspecified location) to the newer, official /etc/nikto.conf.
+WARNING: if you're updating from 2.03 to 2.1.0 keep in mind that
+the configuration file have been changed from the old location
+/etc/nikto/config.txt (a debianism I introduced to work around the
+config.txt unspecified location) to the newer, official /etc/nikto.conf.
 Speaking of debianism: I removed the symolic link /usr/bin/nikto creation,
-upgradepkg will not rm it but newer installs will not have it anymore. If you
-like the link and want to retain it in future updates, just uncomment the
-needed lines inside the SlackBuild.
+upgradepkg will not rm it but newer installs will not have it anymore. If
+you like the link and want to retain it in future updates, just uncomment
+the needed lines inside the SlackBuild.
diff --git a/network/nikto/nikto.SlackBuild b/network/nikto/nikto.SlackBuild
index a882d98f9cb96..6e66cb1cc1fc2 100644
--- a/network/nikto/nikto.SlackBuild
+++ b/network/nikto/nikto.SlackBuild
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nikto
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -106,10 +104,10 @@ rm -f $PKG/usr/lib$LIBDIRSUFFIX/nikto/plugins/LW2.pm
 # Copy over important docs and man page
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/man/man1/
-( cd docs
+cd docs
   cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
   gzip -9c nikto.1 > $PKG/usr/man/man1/nikto.1.gz
-)
+cd -
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/nikto/nikto.diff b/network/nikto/nikto.diff
index e1f14fb326d03..1c3774db92a59 100644
--- a/network/nikto/nikto.diff
+++ b/network/nikto/nikto.diff
@@ -1,6 +1,6 @@
-diff -Naur nikto-2.1.2.orig/nikto.pl nikto-2.1.2/nikto.pl
---- nikto-2.1.2.orig/nikto.pl	2010-07-12 02:27:03.000000000 +0200
-+++ nikto-2.1.2/nikto.pl	2010-07-12 16:54:23.081240167 +0200
+diff -Naur nikto-2.1.4.orig/nikto.pl nikto-2.1.4/nikto.pl
+--- nikto-2.1.4.orig/nikto.pl	2011-02-19 03:53:23.000000000 +0100
++++ nikto-2.1.4/nikto.pl	2011-02-21 17:50:11.978245864 +0100
 @@ -6,7 +6,7 @@
  use Getopt::Long;
  Getopt::Long::Configure('no_ignore_case');
@@ -10,12 +10,12 @@ diff -Naur nikto-2.1.2.orig/nikto.pl nikto-2.1.2/nikto.pl
  
  ###############################################################################
  #                               Nikto                                         #
-@@ -89,7 +89,7 @@
- require "$NIKTOCONFIG{'PLUGINDIR'}/nikto_core.plugin";
- nprint("T:$starttime: Starting", "d");
- require "$NIKTOCONFIG{'PLUGINDIR'}/nikto_single.plugin";
--require "$NIKTOCONFIG{'PLUGINDIR'}/LW2.pm";
-+#require "$NIKTOCONFIG{'PLUGINDIR'}/LW2.pm";
+@@ -85,7 +85,7 @@
+ require "$CONFIGFILE{'PLUGINDIR'}/nikto_core.plugin";
+ nprint("T:" . localtime($COUNTERS{'scan_start'}) . ": Starting", "d");
+ require "$CONFIGFILE{'PLUGINDIR'}/nikto_single.plugin";
+-require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
++#require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
  
  my ($a, $b) = split(/\./, $LW2::VERSION);
  die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);
diff --git a/network/nikto/nikto.info b/network/nikto/nikto.info
index 04d1fd1cc648b..cf962e173dd43 100644
--- a/network/nikto/nikto.info
+++ b/network/nikto/nikto.info
@@ -1,10 +1,10 @@
 PRGNAM="nikto"
-VERSION="2.1.2"
+VERSION="2.1.4"
 HOMEPAGE="http://cirt.net/nikto2"
-DOWNLOAD="http://cirt.net/nikto/nikto-2.1.2.tar.bz2"
-MD5SUM="42fd9748dc2d3949553a83660c36a503"
+DOWNLOAD="http://cirt.net/nikto/nikto-2.1.4.tar.bz2"
+MD5SUM="0d58d9ca27b9f387b60130e125db8687"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/network/nikto/slack-desc b/network/nikto/slack-desc
index db78484a11ef2..cbfbf94054121 100644
--- a/network/nikto/slack-desc
+++ b/network/nikto/slack-desc
@@ -11,7 +11,7 @@ nikto:
 nikto: Nikto is an Open Source (GPL) web server scanner which performs 
 nikto: comprehensive tests against web servers for multiple items, including 
 nikto: over 3500 potentially dangerous files/CGIs, versions on over 900 
-nikto: servers, and version specific problems on over 250 servers. Scan items 
+nikto: servers, and version specific problems on over 250 servers. Scan items
 nikto: and plugins are frequently updated and can be automatically updated 
 nikto: (if desired).
 nikto: