From nobody@FreeBSD.org  Thu Oct 22 14:49:41 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B196106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Oct 2009 14:49:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 397D68FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Oct 2009 14:49:41 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n9MEnehb039488
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Oct 2009 14:49:40 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n9MEnefW039487;
	Thu, 22 Oct 2009 14:49:40 GMT
	(envelope-from nobody)
Message-Id: <200910221449.n9MEnefW039487@www.freebsd.org>
Date: Thu, 22 Oct 2009 14:49:40 GMT
From: Niels Heinen <niels@heinen.ws>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Update of security/nikto to 2.1.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         139841
>Category:       ports
>Synopsis:       [PATCH] Update of security/nikto to 2.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 22 14:50:01 UTC 2009
>Closed-Date:    Tue Jan 12 17:54:20 UTC 2010
>Last-Modified:  Tue Jan 12 18:00:05 UTC 2010
>Originator:     Niels Heinen
>Release:        7.2-RELEASE
>Organization:
>Environment:
FreeBSD dis 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May  1 08:49:13 UTC 2009     root@walker.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:

Please find attached an update of the current nikto port from version 2.0.3 to version 2.1.0. (works for me, portlint seems to be ok with the changes)
>How-To-Repeat:

Please apply the patch and test the port.
>Fix:


Patch attached with submission follows:

diff -ur nikto.old/Makefile nikto/Makefile
--- nikto.old/Makefile	2009-10-22 15:01:51.000000000 +0200
+++ nikto/Makefile	2009-10-22 15:44:20.000000000 +0200
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	nikto
-PORTVERSION=	2.03
+PORTVERSION=	2.1.0
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/${PORTNAME}/ \
 		http://www.mirrors.wiretapped.net/security/vulnerability-assessment/${PORTNAME}/ \
@@ -17,11 +17,13 @@
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Web and CGI vulnerability scanner with SSL support
 
+MAN1=		nikto.1
+
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	CHANGES.txt LICENSE.txt nikto_manual.html
 
@@ -40,27 +42,28 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/bin/perl|${PERL}|" ${WRKSRC}/nikto.pl
-	@${REINPLACE_CMD} -Ee "s,(config.txt),${PREFIX}/etc/nikto.conf," ${WRKSRC}/nikto.pl
+	@${REINPLACE_CMD} -e "s|/etc/nikto.conf|${PREFIX}/etc/nikto.conf|" ${WRKSRC}/nikto.pl
 	@${REINPLACE_CMD} -Ee "s|/usr/bin/nmap|${LOCALBASE}/bin/nmap|g" \
 		-e "s|# (EXECDIR=)/usr/local/nikto|\1${DATADIR}|g" \
-		${WRKSRC}/config.txt
-	@${REINPLACE_CMD} "s/config.txt/nikto.conf/g" ${WRKSRC}/plugins/* ${WRKSRC}/docs/*
-	@${REINPLACE_CMD} -e 's:\$NIKTO{plugindir}/../docs/CHANGES.txt:\$NIKTO{plugindir}/../../doc/nikto/CHANGES.txt:' \
-		-e 's:\$NIKTO{plugindir}/../CHANGES.txt:\$NIKTO{plugindir}/../../doc/nikto/CHANGES.txt:' \
+		${WRKSRC}/nikto.conf
+	@${REINPLACE_CMD} -e 's:\$NIKTO{plugindir}/../docs/CHANGES.txt:\$NIKTO{plugindir}/../../docs/nikto/CHANGES.txt:' \
+		-e 's:\$NIKTO{plugindir}/../CHANGES.txt:\$NIKTO{plugindir}/../../docs/nikto/CHANGES.txt:' \
 		${WRKSRC}/plugins/nikto_core.plugin
+	@${RM} ${WRKSRC}/plugins/*.bak
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/etc/nikto.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/nikto.conf ${PREFIX}/etc/nikto.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/docs/nikto.1 ${PREFIX}/man/man1/
 	[ -f ${PREFIX}/etc/nikto.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/etc/nikto.conf
+		${INSTALL_DATA} ${WRKSRC}/nikto.conf ${PREFIX}/etc/nikto.conf
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/plugins
+	@${MKDIR} ${DATADIR}/templates
 	${INSTALL_DATA} ${WRKSRC}/plugins/LW2.pm ${DATADIR}/plugins
-	@${RM} ${WRKSRC}/plugins/db_*.bak
 	${INSTALL_DATA} ${WRKSRC}/plugins/db_* ${DATADIR}/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/nikto_plugin_order.txt ${DATADIR}/plugins
 	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/templates/*.tmpl ${DATADIR}/templates
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .	for i in ${PORTDOCS}
diff -ur nikto.old/distinfo nikto/distinfo
--- nikto.old/distinfo	2009-10-22 15:01:51.000000000 +0200
+++ nikto/distinfo	2009-10-22 15:05:08.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (nikto-2.03.tar.bz2) = 8f286a7943b12a341088f005f832d087
-SHA256 (nikto-2.03.tar.bz2) = 61b78434560c5c311f38c47e7e6816012c9c83a3cfdf4a978ceaaf34718a3b73
-SIZE (nikto-2.03.tar.bz2) = 399643
+MD5 (nikto-2.1.0.tar.bz2) = ce971262e14f5ac1ff634b86366bdaa8
+SHA256 (nikto-2.1.0.tar.bz2) = 8883cc91ed5831c05ac18929a7a93907229ab9836313c2bf9e47e33f3a4e45b5
+SIZE (nikto-2.1.0.tar.bz2) = 230536
diff -ur nikto.old/pkg-plist nikto/pkg-plist
--- nikto.old/pkg-plist	2009-10-22 15:01:51.000000000 +0200
+++ nikto/pkg-plist	2009-10-22 15:25:12.000000000 +0200
@@ -4,29 +4,56 @@
 @exec [ -f %B/nikto.conf ] || cp %B/%f %B/nikto.conf
 %%DATADIR%%/plugins/LW2.pm
 %%DATADIR%%/plugins/db_404_strings
+%%DATADIR%%/plugins/db_embedded
 %%DATADIR%%/plugins/db_favicon
+%%DATADIR%%/plugins/db_headers
+%%DATADIR%%/plugins/db_httpoptions
+%%DATADIR%%/plugins/db_multiple_index
 %%DATADIR%%/plugins/db_outdated
 %%DATADIR%%/plugins/db_realms
 %%DATADIR%%/plugins/db_server_msgs
+%%DATADIR%%/plugins/db_subdomains
 %%DATADIR%%/plugins/db_tests
 %%DATADIR%%/plugins/db_variables
 %%DATADIR%%/plugins/nikto_apache_expect_xss.plugin
 %%DATADIR%%/plugins/nikto_apacheusers.plugin
 %%DATADIR%%/plugins/nikto_cgi.plugin
 %%DATADIR%%/plugins/nikto_core.plugin
+%%DATADIR%%/plugins/nikto_dictionary_attack.plugin
+%%DATADIR%%/plugins/nikto_embedded.plugin
 %%DATADIR%%/plugins/nikto_favicon.plugin
 %%DATADIR%%/plugins/nikto_headers.plugin
 %%DATADIR%%/plugins/nikto_httpoptions.plugin
 %%DATADIR%%/plugins/nikto_msgs.plugin
+%%DATADIR%%/plugins/nikto_multiple_index.plugin
 %%DATADIR%%/plugins/nikto_mutate.plugin
 %%DATADIR%%/plugins/nikto_outdated.plugin
 %%DATADIR%%/plugins/nikto_passfiles.plugin
-%%DATADIR%%/plugins/nikto_plugin_order.txt
 %%DATADIR%%/plugins/nikto_put_del_test.plugin
-%%DATADIR%%/plugins/nikto_reports.plugin
+%%DATADIR%%/plugins/nikto_report_csv.plugin
+%%DATADIR%%/plugins/nikto_report_html.plugin
+%%DATADIR%%/plugins/nikto_report_text.plugin
+%%DATADIR%%/plugins/nikto_report_xml.plugin
 %%DATADIR%%/plugins/nikto_robots.plugin
 %%DATADIR%%/plugins/nikto_single.plugin
+%%DATADIR%%/plugins/nikto_subdomain.plugin
+%%DATADIR%%/plugins/nikto_tests.plugin
 %%DATADIR%%/plugins/nikto_user_enum_apache.plugin
-%%DATADIR%%/plugins/nikto_user_enum_cgiwrap.plugin
+%%DATADIR%%/templates/htm_close.tmpl
+%%DATADIR%%/templates/htm_end.tmpl
+%%DATADIR%%/templates/htm_host_head.tmpl
+%%DATADIR%%/templates/htm_host_im.tmpl
+%%DATADIR%%/templates/htm_host_item.tmpl
+%%DATADIR%%/templates/htm_start.tmpl
+%%DATADIR%%/templates/htm_stop.tmpl
+%%DATADIR%%/templates/htm_summary.tmpl
+%%DATADIR%%/templates/xml_close.tmpl
+%%DATADIR%%/templates/xml_end.tmpl
+%%DATADIR%%/templates/xml_host_head.tmpl
+%%DATADIR%%/templates/xml_host_im.tmpl
+%%DATADIR%%/templates/xml_host_item.tmpl
+%%DATADIR%%/templates/xml_start.tmpl
+%%DATADIR%%/templates/xml_summary.tmpl
+@dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Oct 22 14:50:11 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139841 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Tue Jan 12 17:54:19 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139841 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139841: commit references a PR
Date: Tue, 12 Jan 2010 17:54:16 +0000 (UTC)

 itetcu      2010-01-12 17:54:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/nikto       Makefile distinfo pkg-plist 
   Log:
   - update to 2.1.0
   - bumpo PORTEPOCH, sigh
   
   PR:             139841
   Submitted by:   Niels Heinen
   
   Revision  Changes    Path
   1.23      +14 -12    ports/security/nikto/Makefile
   1.12      +3 -3      ports/security/nikto/distinfo
   1.8       +30 -3     ports/security/nikto/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
