network/nikto: Updated for version 2.1.6.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

8 files changed, 35 insertions, 59 deletions

diff --git a/network/nikto/patches/man_page.diff b/network/nikto/patches/man_page.diff
new file mode 100644
index 0000000000..a0ea52cc98
--- /dev/null
+++ b/network/nikto/patches/man_page.diff
@@ -0,0 +1,11 @@
+--- nikto-2.1.6.orig/documentation/nikto.1	2015-07-09 08:06:04.000000000 -0600
++++ nikto-2.1.6/documentation/nikto.1	2017-04-18 18:34:32.064524263 -0600
+@@ -14,7 +14,7 @@
+ nikto \- Scan web server for known vulnerabilities
+ .SH "SYNOPSIS"
+ .HP 21
+-\fB/usr/local/bin/nikto\fR [options...]
++\fB/usr/bin/nikto\fR [options...]
+ .SH "DESCRIPTION"
+ .PP
+ Examine a web server to find potential problems and security vulnerabilities, including:
\ No newline at end of file
diff --git a/network/nikto/patches/nikto-2.1.4/README b/network/nikto/patches/nikto-2.1.4/README
deleted file mode 100644
index 4f9c30e667..0000000000
--- a/network/nikto/patches/nikto-2.1.4/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory and its file is kept as a reference to 
-how the last maintainer patched nikto.pl.  Will be 
-deleted eventually.
diff --git a/network/nikto/patches/nikto-2.1.4/nikto.diff b/network/nikto/patches/nikto-2.1.4/nikto.diff
deleted file mode 100644
index 1c3774db92..0000000000
--- a/network/nikto/patches/nikto-2.1.4/nikto.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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');
- 
--# use LW2;                   ### Change this line to use a different installed version
-+use LW2;                   ### Change this line to use a different installed version
- 
- ###############################################################################
- #                               Nikto                                         #
-@@ -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/patches/nikto-2.1.5/nikto.conf.diff b/network/nikto/patches/nikto-2.1.5/nikto.conf.diff
deleted file mode 100644
index c07f565022..0000000000
--- a/network/nikto/patches/nikto-2.1.5/nikto.conf.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Set the EXECDIR for nikto to /usr/lib/nikto
-
---- nikto-2.1.5.orig/nikto.conf	2015-11-07 19:48:17.854292534 -0700
-+++ nikto-2.1.5/nikto.conf	2015-11-07 19:49:23.270289730 -0700
-@@ -61,7 +61,7 @@
- CHECKMETHODS=HEAD GET
- 
- # If you want to specify the location of any of the files, specify them here
--# EXECDIR=/opt/nikto				# Location of Nikto
-+EXECDIR=/usr/lib/nikto				# Location of Nikto
- # PLUGINDIR=/opt/nikto/plugins			# Location of plugin dir
- # DBDIR=/opt/nikto/databases			# Location of database dir
- # TEMPLATEDIR=/opt/nikto/templates		# Location of template dir
diff --git a/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff b/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff
deleted file mode 100644
index 35709331f6..0000000000
--- a/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Set the EXECDIR for nikto to /usr/lib64/nikto
-
---- nikto-2.1.5.orig/nikto.conf	2015-11-07 19:48:17.854292534 -0700
-+++ nikto-2.1.5/nikto.conf	2015-11-07 19:50:49.311286043 -0700
-@@ -61,7 +61,7 @@
- CHECKMETHODS=HEAD GET
- 
- # If you want to specify the location of any of the files, specify them here
--# EXECDIR=/opt/nikto				# Location of Nikto
-+EXECDIR=/usr/lib64/nikto				# Location of Nikto
- # PLUGINDIR=/opt/nikto/plugins			# Location of plugin dir
- # DBDIR=/opt/nikto/databases			# Location of database dir
- # TEMPLATEDIR=/opt/nikto/templates		# Location of template dir
diff --git a/network/nikto/patches/nikto-2.1.5/nikto.pl.diff b/network/nikto/patches/nikto.pl.diff
index 676ada3a9f..6f66dc3483 100644
--- a/network/nikto/patches/nikto-2.1.5/nikto.pl.diff
+++ b/network/nikto/patches/nikto.pl.diff
@@ -1,15 +1,11 @@
-
-Fix nikto.pl paths to use libwhisker2 from SBo.
-
---- nikto-2.1.5.orig/nikto.pl	2012-09-10 02:22:36.000000000 -0600
-+++ nikto-2.1.5/nikto.pl	2015-11-07 22:14:55.380915446 -0700
-@@ -56,14 +56,14 @@
+--- nikto-2.1.6.orig/program/nikto.pl	2015-07-09 08:06:04.000000000 -0600
++++ nikto-2.1.6/program/nikto.pl	2017-04-21 18:57:58.363647008 -0600
+@@ -54,13 +54,13 @@
  setup_dirs();
  require "$CONFIGFILE{'PLUGINDIR'}/nikto_core.plugin";
  nprint("T:" . localtime($COUNTERS{'scan_start'}) . ": Starting", "d");
 -require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
 +#require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
- require "$CONFIGFILE{'PLUGINDIR'}/JSON-PP.pm";
  $VARIABLES{'GMTOFFSET'} = gmt_offset();
  
 -# use LW2;                   ### Change this line to use a different installed version
diff --git a/network/nikto/patches/nikto_core.plugin.diff b/network/nikto/patches/nikto_core.plugin.diff
new file mode 100644
index 0000000000..ad7094101b
--- /dev/null
+++ b/network/nikto/patches/nikto_core.plugin.diff
@@ -0,0 +1,10 @@
+--- nikto-2.1.6.orig/program/plugins/nikto_core.plugin	2015-07-09 08:06:04.000000000 -0600
++++ nikto-2.1.6/program/plugins/nikto_core.plugin	2017-04-21 18:40:26.172718366 -0600
+@@ -2572,7 +2572,6 @@
+     if ($@) {
+         nprint("+ WARNING: Module JSON::PP missing. -Savedir and replay functionality cannot be used.");
+     }
+-    LW2::init_ssl_engine();
+     my ($avail, $lib, $ver) = LW2::ssl_is_available();
+     if (!$avail) {
+         nprint("+ WARNING: SSL: support not available.");
diff --git a/network/nikto/patches/replay.pl.diff b/network/nikto/patches/replay.pl.diff
new file mode 100644
index 0000000000..5c18b96853
--- /dev/null
+++ b/network/nikto/patches/replay.pl.diff
@@ -0,0 +1,11 @@
+--- nikto-2.1.6.orig/program/replay.pl	2015-07-09 08:06:04.000000000 -0600
++++ nikto-2.1.6/program/replay.pl	2017-04-21 17:57:45.292892040 -0600
+@@ -22,7 +22,7 @@
+ ###############################################################################
+ use Getopt::Long;
+ use JSON::PP;
+-require 'plugins/LW2.pm';
++use LW2;
+ my ($infile, $proxy, %request, $header, %result, $s_request);
+ LW2::http_init_request(\%request);
+ 
\ No newline at end of file