svn commit: r325091 - in head/security/nmap: . files

Wed Aug 21 04:57:15 UTC 2013

Author: ohauer
Date: Wed Aug 21 04:57:14 2013
New Revision: 325091
URL: http://svnweb.freebsd.org/changeset/ports/325091

Log:
  - update to 6.4.0
  - remove patches for EOL FreeBSD releases
  - convert to OPTIONS
  
  Changelog:
  http://nmap.org/changelog.html

Deleted:
  head/security/nmap/files/patch-liblua__liolib.c
  head/security/nmap/files/patch-libnetutil__netutil.cc
Modified:
  head/security/nmap/Makefile
  head/security/nmap/distinfo
  head/security/nmap/pkg-plist

Modified: head/security/nmap/Makefile
==============================================================================

--- head/security/nmap/Makefile	Wed Aug 21 03:47:57 2013	(r325090)
+++ head/security/nmap/Makefile	Wed Aug 21 04:57:14 2013	(r325091)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	6.25
-PORTREVISION=	1
+DISTVERSION=	6.40
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -12,21 +11,42 @@ MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	Port scanning utility for large networks
 
 # http://nmap.org/book/man-legal.html
+# Install the nmap modified license because of
+# http://insecure.org/news/download-com-fiasco.html
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_LUA=	5.1
+USE_LUA=	5.1 5.2
 LUA_COMPS=	lua
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-localdirs \
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DOCS IPV6 SSL
+OPTIONS_DEFAULT=IPV6 SSL
+
+SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+SSL_CONFIGURE_OFF=	--without-openssl
+SSL_CFLAGS=		-I${OPENSSLINC}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL=	yes
+.else
+PKGNAMESUFFIX=	-nossl
+.endif
+
+CONFIGURE_ARGS+=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=${LOCALBASE} \
 		--without-nmap-update
+
 CONFIGURE_ENV=	LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"
 
 # fix for gcc from ports
@@ -36,69 +56,37 @@ CONFIGURE_ARGS+=LDFLAGS="-L$$(${GCCLIBDI
 NDCC=	true
 .endif
 
-MANLANG=	"" de es fr hr hu it jp pl pt_BR pt_PT ro ru sk zh
+PORTDOCS=	CHANGELOG HACKING
+MANLANG=	"" de es fr hr hu it ja pl pt_BR pt_PT ro ru sk zh
 MAN1=		nmap.1
 MAN1_EN=	ncat.1 nping.1
 
-.ifndef WITHOUT_SSL
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-CFLAGS+=		-I${OPENSSLINC}
-PLIST_SUB+=		WITHSSL=""
-.else
-PKGNAMESUFFIX=		-nossl
-CONFIGURE_ARGS+=	--without-openssl
-PLIST_SUB+=		WITHSSL="@comment "
-.endif
-
-# XXX: Workaround if OS is build with WITHOUT_INET6
-#  PR: ports/159376
-#
-# Note: If this option is specified in src.conf it has to
-#  be defined as param -DWITHOUT_INET6 during build time
-#  since the port system has no access to src.conf
-.if defined(WITHOUT_INET6)
-LIB_DEPENDS+=		pcap:${PORTSDIR}/net/libpcap
+# PR: ports/159376  Workaround if OS is build with WITHOUT_INET6
+.if ! ${PORT_OPTIONS:MIPV6}
+LIB_DEPENDS+=		libpcap.so:${PORTSDIR}/net/libpcap
 CONFIGURE_ARGS+=	--with-libpcap=${LOCALBASE}
 .endif
 
-PORTDOCS=	CHANGELOG HACKING
-EXAMPLES=	docs/sample-script.nse
-PORTEXAMPLES=	${EXAMPLES:T}
-
 # XXX limit results if we do a grep in the sources!
 post-extract:
 	@${RM} -rf ${WRKSRC}/mswin32
 
 # reflect new mailing addreses
 pre-patch:
-	@for f in $$(${GREP} -Rl "nmap-dev at insecure.org" ${WRKSRC}); do\
-		${SED} -i '' -e 's|nmap-dev at insecure.org|dev at nmap.org|g' $${f} ;\
-	done
-	@for f in $$(${GREP} -Rl "http://cgi.insecure.org/mailman" ${WRKSRC}); do\
-		${SED} -i '' -e 's|http://cgi.insecure.org/mailman/listinfo/nmap-dev|http://nmap.org/mailman/listinfo/dev|g' $${f} ;\
-	done
-
-post-patch:
-# fix from r30346
-	@${REINPLACE_CMD} -e 's|~0L;|0xffffffffL;|' ${WRKSRC}/nbase/nbase_misc.c
+	${SED} -i '' -e 's|nmap-dev at insecure.org|dev at nmap.org|g' \
+	    ${WRKSRC}/nsock/src/nsock_core.c \
+	    ${WRKSRC}/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
 
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
 post-install:
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.	for i in ${PORTDOCS}
-		@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.	endfor
-.endif
-.ifndef NOPORTEXAMPLES
-	@${MKDIR} ${EXAMPLESDIR}
-.	for i in ${EXAMPLES}
-		@${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}
-.	endfor
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
+
+# gcc from ports is in use
 .if defined(NDCC)
 	@${ECHO_MSG} do not forget to adjust libnmap.conf
 .endif

Modified: head/security/nmap/distinfo
==============================================================================
--- head/security/nmap/distinfo	Wed Aug 21 03:47:57 2013	(r325090)
+++ head/security/nmap/distinfo	Wed Aug 21 04:57:14 2013	(r325091)
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.25.tar.bz2) = 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
-SIZE (nmap-6.25.tar.bz2) = 7668639
+SHA256 (nmap-6.40.tar.bz2) = 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401
+SIZE (nmap-6.40.tar.bz2) = 7871636

Modified: head/security/nmap/pkg-plist
==============================================================================
--- head/security/nmap/pkg-plist	Wed Aug 21 03:47:57 2013	(r325090)
+++ head/security/nmap/pkg-plist	Wed Aug 21 04:57:14 2013	(r325091)
@@ -1,7 +1,7 @@
 bin/ncat
 bin/nmap
 bin/nping
-%%WITHSSL%%share/ncat/ca-bundle.crt
+%%SSL%%share/ncat/ca-bundle.crt
 %%DATADIR%%/nmap-mac-prefixes
 %%DATADIR%%/nmap-os-db
 %%DATADIR%%/nmap-payloads
@@ -34,16 +34,19 @@ bin/nping
 %%DATADIR%%/nselib/data/http-folders.txt
 %%DATADIR%%/nselib/data/http-sql-errors.lst
 %%DATADIR%%/nselib/data/http-web-files-extensions.lst
+%%DATADIR%%/nselib/data/ike-fingerprints.lua
 %%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.class
 %%DATADIR%%/nselib/data/jdwp-class/JDWPExecCmd.java
 %%DATADIR%%/nselib/data/jdwp-class/JDWPSystemInfo.class
 %%DATADIR%%/nselib/data/jdwp-class/JDWPSystemInfo.java
 %%DATADIR%%/nselib/data/jdwp-class/README.txt
+%%DATADIR%%/nselib/data/mgroupnames.db
 %%DATADIR%%/nselib/data/mysql-cis.audit
 %%DATADIR%%/nselib/data/oracle-default-accounts.lst
 %%DATADIR%%/nselib/data/oracle-sids
 %%DATADIR%%/nselib/data/packetdecoders.lua
 %%DATADIR%%/nselib/data/passwords.lst
+%%DATADIR%%/nselib/data/pixel.gif
 %%DATADIR%%/nselib/data/psexec/README
 %%DATADIR%%/nselib/data/psexec/backdoor.lua
 %%DATADIR%%/nselib/data/psexec/default.lua
@@ -78,6 +81,7 @@ bin/nping
 %%DATADIR%%/nselib/http.lua
 %%DATADIR%%/nselib/httpspider.lua
 %%DATADIR%%/nselib/iax2.lua
+%%DATADIR%%/nselib/ike.lua
 %%DATADIR%%/nselib/imap.lua
 %%DATADIR%%/nselib/informix.lua
 %%DATADIR%%/nselib/ipOps.lua
@@ -276,7 +280,9 @@ bin/nping
 %%DATADIR%%/scripts/hbase-region-info.nse
 %%DATADIR%%/scripts/hddtemp-info.nse
 %%DATADIR%%/scripts/hostmap-bfk.nse
+%%DATADIR%%/scripts/hostmap-ip2hosts.nse
 %%DATADIR%%/scripts/hostmap-robtex.nse
+%%DATADIR%%/scripts/http-adobe-coldfusion-apsa1301.nse
 %%DATADIR%%/scripts/http-affiliate-id.nse
 %%DATADIR%%/scripts/http-apache-negotiation.nse
 %%DATADIR%%/scripts/http-auth-finder.nse
@@ -288,6 +294,8 @@ bin/nping
 %%DATADIR%%/scripts/http-brute.nse
 %%DATADIR%%/scripts/http-cakephp-version.nse
 %%DATADIR%%/scripts/http-chrono.nse
+%%DATADIR%%/scripts/http-coldfusion-subzero.nse
+%%DATADIR%%/scripts/http-comments-displayer.nse
 %%DATADIR%%/scripts/http-config-backup.nse
 %%DATADIR%%/scripts/http-cors.nse
 %%DATADIR%%/scripts/http-date.nse
@@ -299,6 +307,7 @@ bin/nping
 %%DATADIR%%/scripts/http-enum.nse
 %%DATADIR%%/scripts/http-exif-spider.nse
 %%DATADIR%%/scripts/http-favicon.nse
+%%DATADIR%%/scripts/http-fileupload-exploiter.nse
 %%DATADIR%%/scripts/http-form-brute.nse
 %%DATADIR%%/scripts/http-form-fuzzer.nse
 %%DATADIR%%/scripts/http-frontpage-login.nse
@@ -322,6 +331,7 @@ bin/nping
 %%DATADIR%%/scripts/http-open-redirect.nse
 %%DATADIR%%/scripts/http-passwd.nse
 %%DATADIR%%/scripts/http-php-version.nse
+%%DATADIR%%/scripts/http-phpmyadmin-dir-traversal.nse
 %%DATADIR%%/scripts/http-phpself-xss.nse
 %%DATADIR%%/scripts/http-proxy-brute.nse
 %%DATADIR%%/scripts/http-put.nse
@@ -334,6 +344,7 @@ bin/nping
 %%DATADIR%%/scripts/http-slowloris-check.nse
 %%DATADIR%%/scripts/http-slowloris.nse
 %%DATADIR%%/scripts/http-sql-injection.nse
+%%DATADIR%%/scripts/http-stored-xss.nse
 %%DATADIR%%/scripts/http-title.nse
 %%DATADIR%%/scripts/http-tplink-dir-traversal.nse
 %%DATADIR%%/scripts/http-trace.nse
@@ -350,6 +361,7 @@ bin/nping
 %%DATADIR%%/scripts/http-vuln-cve2011-3192.nse
 %%DATADIR%%/scripts/http-vuln-cve2011-3368.nse
 %%DATADIR%%/scripts/http-vuln-cve2012-1823.nse
+%%DATADIR%%/scripts/http-vuln-cve2013-0156.nse
 %%DATADIR%%/scripts/http-waf-detect.nse
 %%DATADIR%%/scripts/http-waf-fingerprint.nse
 %%DATADIR%%/scripts/http-wordpress-brute.nse
@@ -358,6 +370,7 @@ bin/nping
 %%DATADIR%%/scripts/iax2-brute.nse
 %%DATADIR%%/scripts/iax2-version.nse
 %%DATADIR%%/scripts/icap-info.nse
+%%DATADIR%%/scripts/ike-version.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/informix-brute.nse
@@ -418,11 +431,13 @@ bin/nping
 %%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse
 %%DATADIR%%/scripts/msrpc-enum.nse
 %%DATADIR%%/scripts/mtrace.nse
+%%DATADIR%%/scripts/murmur-version.nse
 %%DATADIR%%/scripts/mysql-audit.nse
 %%DATADIR%%/scripts/mysql-brute.nse
 %%DATADIR%%/scripts/mysql-databases.nse
 %%DATADIR%%/scripts/mysql-dump-hashes.nse
 %%DATADIR%%/scripts/mysql-empty-password.nse
+%%DATADIR%%/scripts/mysql-enum.nse
 %%DATADIR%%/scripts/mysql-info.nse
 %%DATADIR%%/scripts/mysql-query.nse
 %%DATADIR%%/scripts/mysql-users.nse
@@ -560,6 +575,7 @@ bin/nping
 %%DATADIR%%/scripts/targets-ipv6-multicast-slaac.nse
 %%DATADIR%%/scripts/targets-sniffer.nse
 %%DATADIR%%/scripts/targets-traceroute.nse
+%%DATADIR%%/scripts/teamspeak2-version.nse
 %%DATADIR%%/scripts/telnet-brute.nse
 %%DATADIR%%/scripts/telnet-encryption.nse
 %%DATADIR%%/scripts/tftp-enum.nse
@@ -568,6 +584,7 @@ bin/nping
 %%DATADIR%%/scripts/unusual-port.nse
 %%DATADIR%%/scripts/upnp-info.nse
 %%DATADIR%%/scripts/url-snarf.nse
+%%DATADIR%%/scripts/ventrilo-info.nse
 %%DATADIR%%/scripts/versant-info.nse
 %%DATADIR%%/scripts/vmauthd-brute.nse
 %%DATADIR%%/scripts/vnc-brute.nse
@@ -587,7 +604,7 @@ bin/nping
 @dirrm %%DATADIR%%/nselib/data
 @dirrm %%DATADIR%%/nselib
 @dirrm %%DATADIR%%
-%%WITHSSL%%@dirrm share/ncat
+%%SSL%%@dirrm share/ncat
 @dirrmtry man/zh/man1
 @dirrmtry man/zh
 @dirrmtry man/sk/man1
@@ -602,8 +619,8 @@ bin/nping
 @dirrmtry man/pt_BR
 @dirrmtry man/pl/man1
 @dirrmtry man/pl
- at dirrmtry man/jp/man1
- at dirrmtry man/jp
+ at dirrmtry man/ja/man1
+ at dirrmtry man/ja
 @dirrmtry man/it/man1
 @dirrmtry man/it
 @dirrmtry man/hu/man1
