Package nikto 2.1.5

There were many releases since the last version packaged in pkgsrc. Please
refer to nikto's documentation for an exhaustive list.

5 files changed, 98 insertions, 66 deletions

diff --git a/security/nikto/MESSAGE b/security/nikto/MESSAGE
index 384960da411..9ec7a9bb43e 100644
--- a/security/nikto/MESSAGE
+++ b/security/nikto/MESSAGE
@@ -1,14 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/07/02 11:30:01 adrianp Exp $
+$NetBSD: MESSAGE,v 1.3 2016/11/18 16:40:19 khorben Exp $
 
-You may need to create your own config.txt file before running nikto.
-A sample file can be found in "${PREFIX}/share/nikto".
+You may need to create your own nikto.conf file before running nikto.
+A sample file can be found in "${PREFIX}/share/examples/nikto".
 
 Once you have customised this file for your environment it must be in
 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
+your nikto.conf file.  This will ensure you have the latest updates
 for the nikto scanner.
 ===========================================================================
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 9b581c7b1d2..dfa9b42cb70 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2016/07/09 06:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2016/11/18 16:40:19 khorben Exp $
 
-DISTNAME=	nikto-1.36
-PKGREVISION=	5
+DISTNAME=	nikto-2.1.5
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/nikto/
 
@@ -10,34 +9,47 @@ HOMEPAGE=	http://www.cirt.net/code/nikto.shtml
 COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
-DEPENDS+=	nmap>=2.00:../../net/nmap
 
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	nikto.pl
-NO_BUILD=	YES
+NO_BUILD=	yes
+AUTO_MKDIRS=	yes
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	config.txt
-SUBST_SED.conf=		-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_MESSAGE.conf=	Fixing PREFIX in files.
+SUBST_FILES.conf=	nikto.pl
+SUBST_SED.conf=		-e "s|/etc/nikto\.conf|${PKG_SYSCONFDIR}/nikto.conf|g"
+SUBST_MESSAGE.conf=	Fixing path to nikto.conf
 
-CONF_FILES=	${PREFIX}/share/examples/nikto/config.txt \
-			 ${PREFIX}/share/nikto/config.txt
+SUBST_CLASSES+=		execdir
+SUBST_STAGE.execdir=	post-patch
+SUBST_FILES.execdir=	nikto.conf
+SUBST_SED.execdir=	-e "s|^\# EXECDIR=/opt/nikto|EXECDIR=${PREFIX}/libdata/nikto|g"
+SUBST_MESSAGE.execdir=	Fixing path to EXECDIR
 
-INSTALLATION_DIRS=	bin libdata/nikto/docs libdata/nikto/plugins \
-			share/doc/nikto share/examples/nikto share/nikto
+SUBST_CLASSES+=		manual
+SUBST_STAGE.manual=	post-patch
+SUBST_FILES.manual=	docs/nikto.1
+SUBST_SED.manual=	-e "s|/usr/local/bin/nikto|nikto|g"
+SUBST_MESSAGE.manual=	Fixing path to nikto
+
+CONF_FILES=	${PREFIX}/share/examples/nikto/nikto.conf \
+			 ${PREFIX}/${PKG_SYSCONFDIR}/nikto.conf
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/nikto
 	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${DESTDIR}${PREFIX}/libdata/nikto/docs
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DESTDIR}${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt ${DESTDIR}${PREFIX}/share/examples/nikto
+	${INSTALL_DATA} ${WRKSRC}/docs/nikto.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/nikto.conf ${DESTDIR}${PREFIX}/share/examples/nikto
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${DESTDIR}${PREFIX}/bin/nikto
+	${INSTALL_DATA} ${WRKSRC}/databases/db_* \
+	    ${DESTDIR}${PREFIX}/libdata/nikto/databases
 	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin \
 	    ${DESTDIR}${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${DESTDIR}${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${DESTDIR}${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.txt ${DESTDIR}${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/templates/*.tmpl \
+	    ${DESTDIR}${PREFIX}/libdata/nikto/templates
+	${INSTALL_DATA} ${WRKSRC}/plugins/JSON-PP.pm ${DESTDIR}${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/LW2.pm ${DESTDIR}${PREFIX}/libdata/nikto/plugins
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nikto/PLIST b/security/nikto/PLIST
index fadb661f73e..23718a76b64 100644
--- a/security/nikto/PLIST
+++ b/security/nikto/PLIST
@@ -1,29 +1,71 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:21:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/11/18 16:40:19 khorben Exp $
 bin/nikto
-share/doc/nikto/CHANGES.txt
-share/doc/nikto/LICENSE.txt
-share/doc/nikto/README_plugins.txt
-share/doc/nikto/nikto_usage.html
-share/doc/nikto/nikto_usage.txt
-share/examples/nikto/config.txt
+libdata/nikto/databases/db_404_strings
+libdata/nikto/databases/db_content_search
+libdata/nikto/databases/db_dictionary
+libdata/nikto/databases/db_embedded
+libdata/nikto/databases/db_favicon
+libdata/nikto/databases/db_headers
+libdata/nikto/databases/db_httpoptions
+libdata/nikto/databases/db_multiple_index
+libdata/nikto/databases/db_outdated
+libdata/nikto/databases/db_parked_strings
+libdata/nikto/databases/db_realms
+libdata/nikto/databases/db_server_msgs
+libdata/nikto/databases/db_subdomains
+libdata/nikto/databases/db_tests
+libdata/nikto/databases/db_variables
 libdata/nikto/docs/CHANGES.txt
-libdata/nikto/plugins/LW.pm
+libdata/nikto/plugins/JSON-PP.pm
+libdata/nikto/plugins/LW2.pm
+libdata/nikto/plugins/nikto_apache_expect_xss.plugin
 libdata/nikto/plugins/nikto_apacheusers.plugin
+libdata/nikto/plugins/nikto_auth.plugin
+libdata/nikto/plugins/nikto_cgi.plugin
+libdata/nikto/plugins/nikto_clientaccesspolicy.plugin
+libdata/nikto/plugins/nikto_content_search.plugin
+libdata/nikto/plugins/nikto_cookies.plugin
 libdata/nikto/plugins/nikto_core.plugin
+libdata/nikto/plugins/nikto_dictionary_attack.plugin
+libdata/nikto/plugins/nikto_embedded.plugin
+libdata/nikto/plugins/nikto_favicon.plugin
+libdata/nikto/plugins/nikto_fileops.plugin
 libdata/nikto/plugins/nikto_headers.plugin
 libdata/nikto/plugins/nikto_httpoptions.plugin
 libdata/nikto/plugins/nikto_msgs.plugin
-libdata/nikto/plugins/nikto_mutate.plugin
+libdata/nikto/plugins/nikto_multiple_index.plugin
 libdata/nikto/plugins/nikto_outdated.plugin
-libdata/nikto/plugins/nikto_passfiles.plugin
-libdata/nikto/plugins/nikto_plugin_order.txt
+libdata/nikto/plugins/nikto_parked.plugin
+libdata/nikto/plugins/nikto_paths.plugin
 libdata/nikto/plugins/nikto_put_del_test.plugin
-libdata/nikto/plugins/nikto_realms.plugin
+libdata/nikto/plugins/nikto_report_csv.plugin
+libdata/nikto/plugins/nikto_report_html.plugin
+libdata/nikto/plugins/nikto_report_msf.plugin
+libdata/nikto/plugins/nikto_report_nbe.plugin
+libdata/nikto/plugins/nikto_report_text.plugin
+libdata/nikto/plugins/nikto_report_xml.plugin
 libdata/nikto/plugins/nikto_robots.plugin
-libdata/nikto/plugins/nikto_user_enum_apache.plugin
-libdata/nikto/plugins/nikto_user_enum_cgiwrap.plugin
-libdata/nikto/plugins/outdated.db
-libdata/nikto/plugins/realms.db
-libdata/nikto/plugins/scan_database.db
-libdata/nikto/plugins/server_msgs.db
-libdata/nikto/plugins/servers.db
+libdata/nikto/plugins/nikto_siebel.plugin
+libdata/nikto/plugins/nikto_ssl.plugin
+libdata/nikto/plugins/nikto_subdomain.plugin
+libdata/nikto/plugins/nikto_tests.plugin
+libdata/nikto/templates/htm_close.tmpl
+libdata/nikto/templates/htm_end.tmpl
+libdata/nikto/templates/htm_host_head.tmpl
+libdata/nikto/templates/htm_host_im.tmpl
+libdata/nikto/templates/htm_host_item.tmpl
+libdata/nikto/templates/htm_start.tmpl
+libdata/nikto/templates/htm_stop.tmpl
+libdata/nikto/templates/htm_summary.tmpl
+libdata/nikto/templates/xml_close.tmpl
+libdata/nikto/templates/xml_end.tmpl
+libdata/nikto/templates/xml_host_head.tmpl
+libdata/nikto/templates/xml_host_im.tmpl
+libdata/nikto/templates/xml_host_item.tmpl
+libdata/nikto/templates/xml_start.tmpl
+libdata/nikto/templates/xml_summary.tmpl
+man/man1/nikto.1
+share/doc/nikto/CHANGES.txt
+share/doc/nikto/LICENSE.txt
+share/doc/nikto/nikto_manual.html
+share/examples/nikto/nikto.conf
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index 81f17f9f4c7..430d87e3dbe 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:17:51 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/18 16:40:19 khorben Exp $
 
-SHA1 (nikto-1.36.tar.gz) = b568f2625e3842e31af08546303951a57e03565d
-RMD160 (nikto-1.36.tar.gz) = efcda5273851e92256a6a507d123ec4b65556bb3
-SHA512 (nikto-1.36.tar.gz) = 884d655089675db38f895922d2d39e19104dc9a7a871b00ee7cec8a759725647ace93e208b70ff4abe80bd8139b15fbaef80f7a378ccc9ecb941b0455671078a
-Size (nikto-1.36.tar.gz) = 209571 bytes
-SHA1 (patch-ab) = 5e6b5d3533dbe7076d555efd2f56da6bf8881bae
+SHA1 (nikto-2.1.5.tar.gz) = 95d24bead999509cb70e8d586b2dcbf366d0d0e8
+RMD160 (nikto-2.1.5.tar.gz) = 428c3cd6dcda3651263de971d3568df72a63a05a
+SHA512 (nikto-2.1.5.tar.gz) = b6a1e7277a501055a4693d2e7179801bda0566350f3718cd169c3baf61003a936b14e9a4ba59f3597a83be8ef509953fdae546ec57e487a33b2b3efbabe84b67
+Size (nikto-2.1.5.tar.gz) = 371663 bytes
diff --git a/security/nikto/patches/patch-ab b/security/nikto/patches/patch-ab
deleted file mode 100644
index 61591696d90..00000000000
--- a/security/nikto/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/09/06 21:11:57 adrianp 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@/libdata/nikto/plugins
- 
- # the default HTTP version to try... can/will be changed as necessary
- DEFAULTHTTPVER=1.1