From eadf95d7b06718769283ac63d12f6457ead66d33 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus@seznam.cz>
Date: Apr 07 2011 23:44:20 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6/master


Conflicts:
	.gitignore
	nikto-libwhisker2.patch
	nikto.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 833d627..88d3d76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+nikto-2.03.tar.bz2
 nikto-2.1.1.tar.bz2
+nikto-2.1.4.tar.bz2
diff --git a/nikto-libwhisker2.patch b/nikto-libwhisker2.patch
index a35806b..d83665d 100644
--- a/nikto-libwhisker2.patch
+++ b/nikto-libwhisker2.patch
@@ -1,15 +1,22 @@
-diff -ru nikto-2.1.1.orig/nikto.pl nikto-2.1.1/nikto.pl
---- nikto-2.1.1.orig/nikto.pl	2010-03-21 18:18:53.000000000 +0100
-+++ nikto-2.1.1/nikto.pl	2010-03-21 18:19:56.000000000 +0100
-@@ -85,9 +85,9 @@
- 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";
+Patch to use system-wide installed libwhisker2
+diff -ru nikto-2.1.4/nikto.pl nikto-2.1.4.new/nikto.pl
+--- nikto-2.1.4/nikto.pl	2011-03-28 02:36:38.000000000 +0200
++++ nikto-2.1.4.new/nikto.pl	2011-03-28 02:35:33.000000000 +0200
+@@ -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
  
- ($a, $b) = split(/\./, $LW2::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/nikto.spec b/nikto.spec
index 9a57d51..d72db8a 100644
--- a/nikto.spec
+++ b/nikto.spec
@@ -1,8 +1,8 @@
 Name:           nikto
 #Handle the old versioning system 2.01, 2.02, 2.03 ...
 Epoch:          1
-Version:        2.1.1
-Release:        2%{?dist}
+Version:        2.1.4
+Release:        1%{?dist}
 Summary:        Web server scanner 
 
 Group:          Applications/Internet
@@ -11,7 +11,7 @@ URL:            http://www.cirt.net/code/nikto.shtml
 Source0:        http://www.cirt.net/nikto/%{name}-%{version}.tar.bz2
 Source1:        nikto-database-license.txt
 #use system libwhisker2
-Patch0:         nikto-2.1.1-libwhisker2.patch
+Patch0:         nikto-libwhisker2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,7 +27,7 @@ can be automatically updated (if desired).
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .libwhisker
 
 #change configfile path
 sed -i "s:NIKTO{'configfile'} = \"/etc/nikto.conf\":NIKTO{'configfile'} = \"%{_sysconfdir}/nikto/config\":" nikto.pl
@@ -71,6 +71,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 28 2011 Michal Ambroz <rebus AT seznam.cz> - 1:2.1.4-1
+- Version bump
+
+* Sun Sep 12 2010 Michal Ambroz <rebus AT seznam.cz> - 1:2.1.3-1
+- Version bump
+
+* Mon Mar 22 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1:2.1.1-3
+- Add missing changelog
+- Version bump
+
 * Mon Mar 22 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1:2.1.1-2
 - Update version to 2.1.1 and fix version collisions, 
   based on SPEC provided by Michal Ambroz <rebus at, seznam.cz> 
diff --git a/sources b/sources
index 19eddab..8e03612 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a7ca9634190eba8cac9847117a72446  nikto-2.1.1.tar.bz2
+0d58d9ca27b9f387b60130e125db8687  nikto-2.1.4.tar.bz2