rpms/nikto/F-12 nikto-2.1.1-libwhisker2.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 nikto.spec, 1.6, 1.7 sources, 1.3, 1.4

[Huzaifa Sidhpurwala]

Author: huzaifas

Update of /cvs/pkgs/rpms/nikto/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28771

Modified Files:
	.cvsignore nikto.spec sources 
Added Files:
	nikto-2.1.1-libwhisker2.patch 
Log Message:
new upstream

nikto-2.1.1-libwhisker2.patch:
 nikto.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE nikto-2.1.1-libwhisker2.patch ---
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";
 
-# 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);
 die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Apr 2009 01:27:23 -0000	1.3
+++ .cvsignore	22 Mar 2010 10:35:51 -0000	1.4
@@ -1 +1 @@
-nikto-2.03.tar.bz2
+nikto-2.1.1.tar.bz2


Index: nikto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/F-12/nikto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nikto.spec	8 Feb 2010 06:38:46 -0000	1.6
+++ nikto.spec	22 Mar 2010 10:35:51 -0000	1.7
@@ -1,15 +1,17 @@
 Name:           nikto
-Version:        2.03
-Release:        3%{?dist}
+#Handle the old versioning system 2.01, 2.02, 2.03 ...
+Epoch:          1
+Version:        2.1.1
+Release:        2%{?dist}
 Summary:        Web server scanner 
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.cirt.net/code/nikto.shtml
-Source0:        http://www.cirt.net/nikto2/%{name}-%{version}.tar.bz2
+Source0:        http://www.cirt.net/nikto/%{name}-%{version}.tar.bz2
 Source1:        nikto-database-license.txt
 #use system libwhisker2
-Patch0:         nikto-2.03-libwhisker2.patch
+Patch0:         nikto-2.1.1-libwhisker2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,41 +26,44 @@ on over 230 servers. Scan items and plug
 can be automatically updated (if desired).
 
 %prep
-%setup -qn %{name}
+%setup -q
 %patch0 -p1
 
 #change configfile path
-sed -i 's:$NIKTO{configfile} = "config.txt";:$NIKTO{configfile}="%{_sysconfdir}/nikto/config";:' nikto.pl
-sed -i 's:# EXECDIR=/usr/local/nikto:EXECDIR=%{_datadir}/nikto:' config.txt
+sed -i "s:NIKTO{'configfile'} = \"/etc/nikto.conf\":NIKTO{'configfile'} = \"%{_sysconfdir}/nikto/config\":" nikto.pl
+
 #enable nmap by default and set plugindir path
-sed -i "s:#NMAP=/usr/bin/nmap:NMAP=%{_bindir}/nmap:;
-        s:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=%{_datadir}/nikto/plugins:" config.txt
+sed -i "s:# EXECDIR=/opt/nikto:EXECDIR=%{_datadir}/nikto:;
+        s:# PLUGINDIR=/opt/nikto/plugins:PLUGINDIR=%{_datadir}/nikto/plugins:;
+        s:# TEMPLATEDIR=/opt/nikto/templates:TEMPLATEDIR=%{_datadir}/nikto/templates:;
+        s:# DOCDIR=/opt/nikto/docs:DOCDIR=%{_datadir}/nikto/docs:" nikto.conf
+
+cp %{SOURCE1} docs/database-license.txt
 
 %build
 #no build required
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}/database-license.txt
-install -pD nikto.pl $RPM_BUILD_ROOT%{_bindir}/nikto
-install -m 0644 -pD docs/nikto.1 $RPM_BUILD_ROOT%{_mandir}/man1/nikto.1
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
-install -m 0644 -p plugins/* $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
-install -m 0644 -p templates/* $RPM_BUILD_ROOT%{_datadir}/nikto/templates/
-install -m 0644 -pD config.txt $RPM_BUILD_ROOT%{_sysconfdir}/nikto/config
+rm -rf %{buildroot}
+install -pD nikto.pl %{buildroot}%{_bindir}/nikto
+install -m 0644 -pD docs/nikto.1 %{buildroot}%{_mandir}/man1/nikto.1
+mkdir -p %{buildroot}%{_datadir}/nikto/plugins/
+install -m 0644 -p plugins/* %{buildroot}%{_datadir}/nikto/plugins/
+mkdir -p %{buildroot}%{_datadir}/nikto/templates/
+install -m 0644 -p templates/* %{buildroot}%{_datadir}/nikto/templates/
+install -m 0644 -pD nikto.conf %{buildroot}%{_sysconfdir}/nikto/config
 
 #remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_datadir}/nikto/plugins/LW2.pm
+rm -f %{buildroot}%{_datadir}/nikto/plugins/LW2.pm
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc docs/CHANGES.txt docs/LICENSE.txt database-license.txt
+%doc docs/CHANGES.txt docs/LICENSE.txt docs/database-license.txt
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/nikto
 %{_datadir}/nikto
@@ -66,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 22 2010 Huzaifa Sidhpurwala <huzaifas at 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> 
+
 * Mon Feb 08 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 2.03-3
 - Resolve rhbz #515871
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nikto/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Apr 2009 01:27:23 -0000	1.3
+++ sources	22 Mar 2010 10:35:51 -0000	1.4
@@ -1 +1 @@
-8f286a7943b12a341088f005f832d087  nikto-2.03.tar.bz2
+4a7ca9634190eba8cac9847117a72446  nikto-2.1.1.tar.bz2