From b4431d7108f670dadee399b68459e3aa5e475116 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus@seznam.cz>
Date: Apr 12 2011 00:25:35 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6/master


---

diff --git a/nikto.spec b/nikto.spec
index d72db8a..1a47b71 100644
--- a/nikto.spec
+++ b/nikto.spec
@@ -2,7 +2,7 @@ Name:           nikto
 #Handle the old versioning system 2.01, 2.02, 2.03 ...
 Epoch:          1
 Version:        2.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web server scanner 
 
 Group:          Applications/Internet
@@ -30,7 +30,7 @@ can be automatically updated (if desired).
 %patch0 -p1 -b .libwhisker
 
 #change configfile path
-sed -i "s:NIKTO{'configfile'} = \"/etc/nikto.conf\":NIKTO{'configfile'} = \"%{_sysconfdir}/nikto/config\":" nikto.pl
+sed -i "s:/etc/nikto.conf:%{_sysconfdir}/nikto/config:" nikto.pl
 
 #enable nmap by default and set plugindir path
 sed -i "s:# EXECDIR=/opt/nikto:EXECDIR=%{_datadir}/nikto:;
@@ -38,6 +38,9 @@ sed -i "s:# EXECDIR=/opt/nikto:EXECDIR=%{_datadir}/nikto:;
         s:# TEMPLATEDIR=/opt/nikto/templates:TEMPLATEDIR=%{_datadir}/nikto/templates:;
         s:# DOCDIR=/opt/nikto/docs:DOCDIR=%{_datadir}/nikto/docs:" nikto.conf
 
+#Disable RFIURL by default - let users configure it themselves to trustworthy source
+sed -i "s:^RFIURL=:#RFIURL=:" nikto.conf
+
 cp %{SOURCE1} docs/database-license.txt
 
 %build
@@ -71,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Apr 9 2011 Michal Ambroz <rebus AT seznam.cz> - 1:2.1.4-2
+- Fix the default config file
+
 * Sun Mar 28 2011 Michal Ambroz <rebus AT seznam.cz> - 1:2.1.4-1
 - Version bump