diff --git a/security/nikto/Makefile b/security/nikto/Makefile index 2adc9fafcf8..4f3cb275be5 100644 --- a/security/nikto/Makefile +++ b/security/nikto/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/07 13:21:11 nigel Exp $ +# $OpenBSD: Makefile,v 1.21 2013/01/12 17:38:14 nigel Exp $ COMMENT = web and CGI vulnerability scanner with SSL support -DISTNAME = nikto-2.1.4 +DISTNAME = nikto-2.1.5 EPOCH = 0 -REVISION = 0 CATEGORIES = security www HOMEPAGE = http://www.cirt.net/nikto2 @@ -25,7 +24,6 @@ EXTRACT_SUFX = .tar.bz2 RUN_DEPENDS = security/p5-Net_SSLeay NO_BUILD = Yes -USE_GROFF = Yes NO_REGRESS = Yes PKG_ARCH = * @@ -34,8 +32,11 @@ pre-configure: ${WRKSRC}/nikto.conf perl -pi -e 's,# DOCDIR=.+,DOCDIR=${PREFIX}/share/doc/nikto,' \ ${WRKSRC}/nikto.conf + perl -pi -e 's,# DBDIR=.+,DBDIR=/var/db/nikto/databases,' \ + ${WRKSRC}/nikto.conf do-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/databases ${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/plugins ${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/templates ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nikto @@ -45,8 +46,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/nikto.conf \ ${PREFIX}/share/examples/nikto/nikto.conf - ${INSTALL_DATA} ${WRKSRC}/plugins/* ${PREFIX}/share/nikto/plugins - ${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/share/nikto/templates + ${INSTALL_DATA} ${WRKSRC}/databases/!(*.orig) ${PREFIX}/share/nikto/databases + ${INSTALL_DATA} ${WRKSRC}/plugins/!(*.orig) ${PREFIX}/share/nikto/plugins + ${INSTALL_DATA} ${WRKSRC}/templates/!(*.orig) ${PREFIX}/share/nikto/templates ${INSTALL_DATA} ${WRKSRC}/docs/nikto_manual.html ${PREFIX}/share/doc/nikto ${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/share/doc/nikto diff --git a/security/nikto/distinfo b/security/nikto/distinfo index 6b84a58ceb9..101d1adbd29 100644 --- a/security/nikto/distinfo +++ b/security/nikto/distinfo @@ -1,5 +1,2 @@ -MD5 (nikto-2.1.4.tar.bz2) = DVjZyie584e2ATDhJduGhw== -RMD160 (nikto-2.1.4.tar.bz2) = rbiEHSKlHX+fjwybjkOqlCVU2kM= -SHA1 (nikto-2.1.4.tar.bz2) = 0284XasENSM2wJt+V2SWproYSEo= -SHA256 (nikto-2.1.4.tar.bz2) = mvkw/qPxJOJi0OY5dyRLa9GeInSfTe+oGLtNmxB61gM= -SIZE (nikto-2.1.4.tar.bz2) = 288160 +SHA256 (nikto-2.1.5.tar.bz2) = ZbmcH97BTR1efLyWT3D84WLL7FCu6HjhUA4tIt8HmzQ= +SIZE (nikto-2.1.5.tar.bz2) = 311580 diff --git a/security/nikto/patches/patch-nikto_pl b/security/nikto/patches/patch-nikto_pl index 0fafa1122f4..9859197146c 100644 --- a/security/nikto/patches/patch-nikto_pl +++ b/security/nikto/patches/patch-nikto_pl @@ -1,12 +1,12 @@ -$OpenBSD: patch-nikto_pl,v 1.5 2011/03/27 16:41:37 jasper Exp $ ---- nikto.pl.orig Fri Feb 18 23:53:23 2011 -+++ nikto.pl Fri Mar 11 16:55:57 2011 -@@ -313,7 +313,7 @@ sub setup_dirs { +$OpenBSD: patch-nikto_pl,v 1.6 2013/01/12 17:38:14 nigel Exp $ +--- nikto.pl.orig Mon Sep 10 05:22:36 2012 ++++ nikto.pl Tue Sep 25 14:13:34 2012 +@@ -333,7 +333,7 @@ sub setup_dirs { $CONFIGFILE{'TEMPLATEDIR'} = "$CONFIGFILE{'EXECDIR'}/templates"; } unless (defined $CONFIGFILE{'DOCUMENTDIR'}) { - $CONFIGFILE{'DOCUMENTDIR'} = "$CONFIGFILE{'EXECDIR'}/docs"; + $CONFIGFILE{'DOCUMENTDIR'} = "$CONFIGFILE{'DOCDIR'}/docs"; } - return; - } + unless (defined $CONFIGFILE{'DBDIR'}) { + $CONFIGFILE{'DBDIR'} = "$CONFIGFILE{'EXECDIR'}/databases"; diff --git a/security/nikto/patches/patch-plugins_nikto_core_plugin b/security/nikto/patches/patch-plugins_nikto_core_plugin new file mode 100644 index 00000000000..f88571b08dc --- /dev/null +++ b/security/nikto/patches/patch-plugins_nikto_core_plugin @@ -0,0 +1,13 @@ +$OpenBSD: patch-plugins_nikto_core_plugin,v 1.1 2013/01/12 17:38:14 nigel Exp $ +--- plugins/nikto_core.plugin.orig Fri Sep 14 07:52:12 2012 ++++ plugins/nikto_core.plugin Thu Sep 27 16:24:36 2012 +@@ -1901,8 +1901,7 @@ sub check_updates { + if ($remotemsg ne "") { nprint("+ $server message: $remotemsg"); } + exit; + } +- push(@DBTOGET, $remotefile); +- if ($remotefile !~ /^db_/) { $code_updates = 1; } ++ if ($remotefile =~ /^db_/) { push(@DBTOGET, $remotefile); } + } + } + diff --git a/security/nikto/pkg/PLIST b/security/nikto/pkg/PLIST index 1bc9dd1a970..13bfd86bda2 100644 --- a/security/nikto/pkg/PLIST +++ b/security/nikto/pkg/PLIST @@ -1,8 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.12 2011/03/27 16:41:37 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.13 2013/01/12 17:38:14 nigel Exp $ +@newgroup _nikto:710 +@newuser _nikto:710:710:daemon:Nikto web scanner:/nonexistent:/sbin/nologin bin/nikto @man man/man1/nikto.1 share/doc/nikto/ -@comment no checksum share/doc/nikto/CHANGES.txt share/doc/nikto/nikto.dtd share/doc/nikto/nikto_manual.html @@ -10,118 +11,88 @@ share/examples/nikto/ share/examples/nikto/nikto.conf @sample ${SYSCONFDIR}/nikto.conf share/nikto/ +@sample /var/db/nikto/ +share/nikto/databases/ +@sample /var/db/nikto/databases/ +share/nikto/databases/db_404_strings +@sample /var/db/nikto/databases/db_404_strings +share/nikto/databases/db_content_search +@sample /var/db/nikto/databases/db_content_search +share/nikto/databases/db_dictionary +@sample /var/db/nikto/databases/db_dictionary +share/nikto/databases/db_embedded +@sample /var/db/nikto/databases/db_embedded +share/nikto/databases/db_favicon +@sample /var/db/nikto/databases/db_favicon +share/nikto/databases/db_headers +@sample /var/db/nikto/databases/db_headers +share/nikto/databases/db_httpoptions +@sample /var/db/nikto/databases/db_httpoptions +share/nikto/databases/db_multiple_index +@sample /var/db/nikto/databases/db_multiple_index +share/nikto/databases/db_outdated +@sample /var/db/nikto/databases/db_outdated +share/nikto/databases/db_parked_strings +@sample /var/db/nikto/databases/db_parked_strings +share/nikto/databases/db_realms +@sample /var/db/nikto/databases/db_realms +share/nikto/databases/db_server_msgs +@sample /var/db/nikto/databases/db_server_msgs +share/nikto/databases/db_subdomains +@sample /var/db/nikto/databases/db_subdomains +share/nikto/databases/db_tests +@sample /var/db/nikto/databases/db_tests +share/nikto/databases/db_variables +@sample /var/db/nikto/databases/db_variables +@exec chown -R _nikto:_nikto /var/db/nikto/databases +@exec chmod -R g+w /var/db/nikto/databases share/nikto/plugins/ +share/nikto/plugins/JSON-PP.pm share/nikto/plugins/LW2.pm -@comment no checksum -share/nikto/plugins/db_404_strings -@comment no checksum -share/nikto/plugins/db_content_search -@comment no checksum -share/nikto/plugins/db_embedded -@comment no checksum -share/nikto/plugins/db_favicon -@comment no checksum -share/nikto/plugins/db_headers -@comment no checksum -share/nikto/plugins/db_httpoptions -@comment no checksum -share/nikto/plugins/db_multiple_index -@comment no checksum -share/nikto/plugins/db_outdated -@comment no checksum -share/nikto/plugins/db_realms -@comment no checksum -share/nikto/plugins/db_server_msgs -@comment no checksum -share/nikto/plugins/db_subdomains -@comment no checksum -share/nikto/plugins/db_tests -@comment no checksum -share/nikto/plugins/db_variables -@comment no checksum share/nikto/plugins/nikto_apache_expect_xss.plugin -@comment no checksum share/nikto/plugins/nikto_apacheusers.plugin -@comment no checksum share/nikto/plugins/nikto_auth.plugin -@comment no checksum share/nikto/plugins/nikto_cgi.plugin -@comment no checksum +share/nikto/plugins/nikto_clientaccesspolicy.plugin share/nikto/plugins/nikto_content_search.plugin -@comment no checksum share/nikto/plugins/nikto_cookies.plugin -@comment no checksum share/nikto/plugins/nikto_core.plugin -@comment no checksum -share/nikto/plugins/nikto_core.plugin.debug -@comment no checksum share/nikto/plugins/nikto_dictionary_attack.plugin -@comment no checksum share/nikto/plugins/nikto_embedded.plugin -@comment no checksum share/nikto/plugins/nikto_favicon.plugin -@comment no checksum +share/nikto/plugins/nikto_fileops.plugin share/nikto/plugins/nikto_headers.plugin -@comment no checksum share/nikto/plugins/nikto_httpoptions.plugin -@comment no checksum share/nikto/plugins/nikto_msgs.plugin -@comment no checksum share/nikto/plugins/nikto_multiple_index.plugin -@comment no checksum share/nikto/plugins/nikto_outdated.plugin -@comment no checksum +share/nikto/plugins/nikto_parked.plugin +share/nikto/plugins/nikto_paths.plugin share/nikto/plugins/nikto_put_del_test.plugin -@comment no checksum share/nikto/plugins/nikto_report_csv.plugin -@comment no checksum share/nikto/plugins/nikto_report_html.plugin -@comment no checksum share/nikto/plugins/nikto_report_msf.plugin -@comment no checksum share/nikto/plugins/nikto_report_nbe.plugin -@comment no checksum share/nikto/plugins/nikto_report_text.plugin -@comment no checksum share/nikto/plugins/nikto_report_xml.plugin -@comment no checksum share/nikto/plugins/nikto_robots.plugin -@comment no checksum -share/nikto/plugins/nikto_single.plugin -@comment no checksum +share/nikto/plugins/nikto_siebel.plugin share/nikto/plugins/nikto_ssl.plugin -@comment no checksum share/nikto/plugins/nikto_subdomain.plugin -@comment no checksum share/nikto/plugins/nikto_tests.plugin share/nikto/templates/ -@comment no checksum share/nikto/templates/htm_close.tmpl -@comment no checksum share/nikto/templates/htm_end.tmpl -@comment no checksum share/nikto/templates/htm_host_head.tmpl -@comment no checksum share/nikto/templates/htm_host_im.tmpl -@comment no checksum share/nikto/templates/htm_host_item.tmpl -@comment no checksum share/nikto/templates/htm_start.tmpl -@comment no checksum share/nikto/templates/htm_stop.tmpl -@comment no checksum share/nikto/templates/htm_summary.tmpl -@comment no checksum share/nikto/templates/xml_close.tmpl -@comment no checksum share/nikto/templates/xml_end.tmpl -@comment no checksum share/nikto/templates/xml_host_head.tmpl -@comment no checksum share/nikto/templates/xml_host_im.tmpl -@comment no checksum share/nikto/templates/xml_host_item.tmpl -@comment no checksum share/nikto/templates/xml_start.tmpl -@comment no checksum share/nikto/templates/xml_summary.tmpl