Pullup ticket 735 - requested by Adrian Portelli

security update for nikto

Revisions pulled up:
- pkgsrc/security/nikto/MESSAGE			1.2
- pkgsrc/security/nikto/Makefile		1.6, 1.8
- pkgsrc/security/nikto/distinfo		1.4, 1.5
- pkgsrc/security/nikto/patches/patch-aa	removed
- pkgsrc/security/nikto/patches/patch-ab	1.3

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Jul  2 11:30:01 UTC 2005

   Modified Files:
   	pkgsrc/security/nikto: MESSAGE Makefile distinfo
   Added Files:
   	pkgsrc/security/nikto/patches: patch-ab
   Removed Files:
   	pkgsrc/security/nikto/patches: patch-aa

   Log Message:
   - Update to 1.35
   - Change MESSAGE based on new -config directive
   - Remove outdated patch for bug that's no longer there in CHANGES.txt
   - Set plugings directory in the default config.txt
   - Point users to the installed customised config.txt instead of the sample
     one
   - From the CHANGELOG.txt
     05.20.2005
     Database Updates
      - Multiple msgs updates from david.maciejak@kyxar.fr
      - Multiple test updates from burak.dayioglu@pro-g.com.tr
     nikto_core.plugin 1.31
      - Bugfix: fingerprint was not including leading /. Thanks Axel
        Meerschaert for the report.
      - Bugfix: NMAPOPTS was not being used, thanks to David Rhoades
        for patching.
      - Added additional content checking to reduce false positives, thanks
        to Pavel Kankovsky
     nikto.pl 1.14
      - Added -config option to specify a config file, thanks to Pavel
        Kankovsky
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  3 11:01:35 UTC 2005

   Modified Files:
   	pkgsrc/security/nikto: Makefile distinfo

   Log Message:
   Update to include security warning for:
   	http://secunia.com/advisories/16669/

5 files changed, 37 insertions, 27 deletions

diff --git a/security/nikto/MESSAGE b/security/nikto/MESSAGE
index afccc665f60..40792d6524a 100644
--- a/security/nikto/MESSAGE
+++ b/security/nikto/MESSAGE
@@ -1,14 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/12/05 17:45:23 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.1.1.1.12.1 2005/09/03 13:33:46 salo Exp $
 
-You will need to create your own config.txt file before running nikto.
-A sample file can be found in "${PREFIX}/share/examples/nikto".
+You may need to create your own config.txt file before running nikto.
+A sample file can be found in "${PREFIX}/share/nikto".
 
 Once you have customised this file for your environment it must be in
-your current working directory when nikto is run.
+your current working directory when nikto is run.  Alternatively you can use
+the new ./nikto -config <filename> directive to specify a config file.
 
 You may want to run "nikto -update" as root once you have customised
 your config.txt file.  This will ensure you have the latest updates
 for the nikto scanner.
-
 ===========================================================================
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index fc5eac5e0b7..d1f6dea94d7 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2005/09/03 13:33:46 salo Exp $
 
-DISTNAME=	nikto-1.34
+DISTNAME=	nikto-1.35
+PKGREVISION=	1
+DIST_SUBDIR=    ${PKGNAME}
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/nikto/
 
@@ -19,8 +21,8 @@ USE_PKGINSTALL=	YES
 SUBST_CLASSES=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	config.txt
-SUBST_SED.conf=		-e "s|\#NMAP=/usr|NMAP=${PREFIX}|g" 
-SUBST_MESSAGE.conf=	"Fixing configuration files."
+SUBST_SED.conf=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_MESSAGE.conf=	"Fixing PREFIX in files."
 
 CONF_FILES=	${PREFIX}/share/examples/nikto/config.txt \
 			 ${PREFIX}/share/nikto/config.txt
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index 4c3315b94db..0dc13452caf 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.3.4.1 2005/09/03 13:33:46 salo Exp $
 
-SHA1 (nikto-1.34.tar.gz) = 7e932bef107f3162d30425f698df652f522f653a
-RMD160 (nikto-1.34.tar.gz) = 433e1f51164fd8b3145d667d4507147a00bfad39
-Size (nikto-1.34.tar.gz) = 184320 bytes
-SHA1 (patch-aa) = 2fe6b18a1e66b1ecc865aa50feb5fc166bc0e853
+SHA1 (nikto-1.35nb1/nikto-1.35.tar.gz) = b77154ee5974149d6e7777aa912036fb53e7cdbe
+RMD160 (nikto-1.35nb1/nikto-1.35.tar.gz) = d15079d704cde511adf6ac0f944c19dea9f3edd1
+Size (nikto-1.35nb1/nikto-1.35.tar.gz) = 192642 bytes
+SHA1 (patch-ab) = 06b45968587994a9faad881859c78f77f34ffcc1
diff --git a/security/nikto/patches/patch-aa b/security/nikto/patches/patch-aa
deleted file mode 100644
index 0196bc21341..00000000000
--- a/security/nikto/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/05 17:45:24 xtraeme Exp $
-
---- plugins/nikto_core.plugin.orig	Mon Sep 15 00:09:43 2003
-+++ plugins/nikto_core.plugin	Mon Sep 15 00:10:51 2003
-@@ -859,7 +859,7 @@
-   print "+ Retrieving 'CHANGES.txt'\n";
-   (my $RES, $CONTENT) = fetch("$serverdir/CHANGES.txt","GET");
-   if (($CONTENT ne "") && ($RES eq 200)) {
--   open(OUT,">$NIKTO{plugindir}/../docs/CHANGES.txt") || die print "+ ERROR: Unable to open '$NIKTO{plugindir}/../CHANGES.txt' for write: $@\n";
-+   open(OUT,">$NIKTO{plugindir}/../docs/CHANGES.txt") || die print "+ ERROR: Unable to open '$NIKTO{plugindir}/../docs/CHANGES.txt' for write: $@\n";
-    print OUT $CONTENT;
-    close(OUT); 
-   }
diff --git a/security/nikto/patches/patch-ab b/security/nikto/patches/patch-ab
new file mode 100644
index 00000000000..10086f28178
--- /dev/null
+++ b/security/nikto/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.2.6.1 2005/09/03 13:33:46 salo Exp $
+
+--- config.txt.orig	2005-07-02 11:42:30.000000000 +0100
++++ config.txt
+@@ -7,14 +7,14 @@
+ 
+ # location of nmap to use with port scanning (rather than Nikto internals)
+ # and any options to pass to it
+-#NMAP=/usr/bin/nmap
++NMAP=@PREFIX@/bin/nmap
+ #NMAPOPTS=
+ 
+ # ports never to scan
+ SKIPPORTS=21 111
+ 
+ # if Nikto is having difficulty finding 'plugins', set the full path here
+-# PLUGINDIR=/usr/local/nikto/plugins
++PLUGINDIR=@PREFIX@/share/nikto/plugins
+ 
+ # the default HTTP version to try... can/will be changed as necessary
+ DEFAULTHTTPVER=1.1