- update nmap to version 6.25

- fix build with clang and stdlib=libc++ [1]

Nmap 6.25 [2012-11-29]
o [NSE]	Added CPE to smb-os-discovery output.

o [Ncat] Fixed the printing of warning messages	for large arguments to
  the -i and -w	options. [Michal Hlavinka]

o [Ncat] Shut down the write part of connected sockets in listen mode
  when stdin hits EOF, just as was already done	in connect mode.
  [Michal Hlavinka]

o [NSE]	Added new fingerprints for http-enum: Sitecore,	Moodle,	typo3,
  SquirrelMail,	RoundCube. [Jesper Kückelhahn]

o Added	some new checks	for failed library calls. [Bill	Parker]

PR:		172358
		174817

Submitted by:	arrowdodger <6yearold@gmail.com> [1]
		Anders N. <wicked@baot.se> (general update request)

6 files changed, 161 insertions, 13 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 6bfd1dd7d830..15796d456524 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -1,13 +1,8 @@
-# Ports collection makefile for:  nmap
-# Date created:			  Tue Aug 04, 1998
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
+# Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
-#
 
 PORTNAME=	nmap
-DISTVERSION=	6.01
-PORTREVISION=	1
+DISTVERSION=	6.25
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -18,7 +13,7 @@ COMMENT=	Port scanning utility for large networks
 # http://nmap.org/book/man-legal.html
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 USE_LUA=	5.1
 LUA_COMPS=	lua
@@ -34,7 +29,7 @@ CONFIGURE_ARGS=	--without-localdirs \
 CONFIGURE_ENV=	LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"
 
 # fix for gcc from ports
-.if ${CC} != "cc"
+.if ${CC} != "cc" && ${CC} !="clang"
 GCCLIBDIR_CMDS=	${CC} -print-file-name=libstdc++.so | ${SED} -e 's/libstdc++.so//'
 CONFIGURE_ARGS+=LDFLAGS="-L$$(${GCCLIBDIR_CMDS})"
 NDCC=	true
@@ -74,6 +69,19 @@ PORTEXAMPLES=	${EXAMPLES:T}
 post-extract:
 	@${RM} -rf ${WRKSRC}/mswin32
 
+# reflect new mailing addreses
+pre-patch:
+	@for f in $$(${GREP} -Rl "nmap-dev@insecure.org" ${WRKSRC}); do\
+		${SED} -i '' -e 's|nmap-dev@insecure.org|dev@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
+
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index b36229b8d496..d8a65768cb67 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.01.tar.bz2) = 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a
-SIZE (nmap-6.01.tar.bz2) = 21640157
+SHA256 (nmap-6.25.tar.bz2) = 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
+SIZE (nmap-6.25.tar.bz2) = 7668639
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index af5c99e6ef48..b64921477b93 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -7,4 +7,4 @@
 +#include <sys/param.h>
  #include <sstream>
  
- /* Workaround for lack of namespace std on HP-UX 11.00 */
+ extern NmapOps o;
diff --git a/security/nmap/files/patch-scan_engine.cc b/security/nmap/files/patch-scan_engine.cc
new file mode 100644
index 000000000000..5f8f117793f0
--- /dev/null
+++ b/security/nmap/files/patch-scan_engine.cc
@@ -0,0 +1,11 @@
+--- ./scan_engine.cc.orig	2013-01-06 16:38:44.000000000 +0100
++++ ./scan_engine.cc	2013-01-06 16:38:44.000000000 +0100
+@@ -2999,7 +2999,7 @@
+   }
+   if (o.spoofsource && !bind_failed) {
+     o.SourceSockAddr(&ss, &sslen);
+-    if (bind(sd, (struct sockaddr*)&ss, sslen) != 0) {
++    if (::bind(sd, (struct sockaddr*)&ss, sslen) != 0) {
+       error("%s: Problem binding source address (%s), errno: %d", __func__, inet_socktop(&ss), socket_errno());
+       perror("bind");
+       bind_failed = 1;
diff --git a/security/nmap/files/patch-traceroute.cc b/security/nmap/files/patch-traceroute.cc
new file mode 100644
index 000000000000..45efde4213ba
--- /dev/null
+++ b/security/nmap/files/patch-traceroute.cc
@@ -0,0 +1,21 @@
+--- ./traceroute.cc.orig	2013-01-06 16:38:44.000000000 +0100
++++ ./traceroute.cc	2013-01-06 16:38:44.000000000 +0100
+@@ -190,8 +190,6 @@
+ /* A global random token used to distinguish this traceroute's probes from
+    those of other traceroutes possibly running on the same machine. */
+ static u16 global_id;
+-/* A global cache of known hops, indexed by TTL and address. */
+-static std::map<struct HopIdent, Hop *> hop_cache;
+ /* A list of timedout hops, which are not kept in hop_cache, so we can delete
+    all hops on occasion. */
+ static std::list<Hop *> timedout_hops;
+@@ -204,6 +202,9 @@
+ static struct timeval get_now(struct timeval *now = NULL);
+ static const char *ss_to_string(const struct sockaddr_storage *ss);
+ 
++/* A global cache of known hops, indexed by TTL and address. */
++static std::map<struct HopIdent, Hop *> hop_cache;
++
+ struct Hop {
+   Hop *parent;
+   struct sockaddr_storage tag;
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index efebef65ad50..0da837cbb0da 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -13,20 +13,32 @@ bin/nping
 %%DATADIR%%/nmap.xsl
 %%DATADIR%%/nse_main.lua
 %%DATADIR%%/nselib/afp.lua
+%%DATADIR%%/nselib/ajp.lua
 %%DATADIR%%/nselib/amqp.lua
 %%DATADIR%%/nselib/asn1.lua
+%%DATADIR%%/nselib/base32.lua
 %%DATADIR%%/nselib/base64.lua
 %%DATADIR%%/nselib/bitcoin.lua
 %%DATADIR%%/nselib/bittorrent.lua
+%%DATADIR%%/nselib/bjnp.lua
 %%DATADIR%%/nselib/brute.lua
+%%DATADIR%%/nselib/cassandra.lua
 %%DATADIR%%/nselib/citrixxml.lua
 %%DATADIR%%/nselib/comm.lua
 %%DATADIR%%/nselib/creds.lua
 %%DATADIR%%/nselib/cvs.lua
+%%DATADIR%%/nselib/data/drupal-modules.lst
 %%DATADIR%%/nselib/data/favicon-db
 %%DATADIR%%/nselib/data/http-default-accounts-fingerprints.lua
 %%DATADIR%%/nselib/data/http-fingerprints.lua
 %%DATADIR%%/nselib/data/http-folders.txt
+%%DATADIR%%/nselib/data/http-sql-errors.lst
+%%DATADIR%%/nselib/data/http-web-files-extensions.lst
+%%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/mysql-cis.audit
 %%DATADIR%%/nselib/data/oracle-default-accounts.lst
 %%DATADIR%%/nselib/data/oracle-sids
@@ -48,6 +60,8 @@ bin/nping
 %%DATADIR%%/nselib/data/ssl-fingerprints
 %%DATADIR%%/nselib/data/tftplist.txt
 %%DATADIR%%/nselib/data/usernames.lst
+%%DATADIR%%/nselib/data/vhosts-default.lst
+%%DATADIR%%/nselib/data/vhosts-full.lst
 %%DATADIR%%/nselib/data/wp-plugins.lst
 %%DATADIR%%/nselib/datafiles.lua
 %%DATADIR%%/nselib/dhcp.lua
@@ -57,20 +71,26 @@ bin/nping
 %%DATADIR%%/nselib/dnssd.lua
 %%DATADIR%%/nselib/drda.lua
 %%DATADIR%%/nselib/eap.lua
+%%DATADIR%%/nselib/eigrp.lua
 %%DATADIR%%/nselib/ftp.lua
 %%DATADIR%%/nselib/giop.lua
+%%DATADIR%%/nselib/gps.lua
 %%DATADIR%%/nselib/http.lua
 %%DATADIR%%/nselib/httpspider.lua
 %%DATADIR%%/nselib/iax2.lua
 %%DATADIR%%/nselib/imap.lua
 %%DATADIR%%/nselib/informix.lua
 %%DATADIR%%/nselib/ipOps.lua
+%%DATADIR%%/nselib/ipp.lua
 %%DATADIR%%/nselib/iscsi.lua
+%%DATADIR%%/nselib/isns.lua
+%%DATADIR%%/nselib/jdwp.lua
 %%DATADIR%%/nselib/json.lua
 %%DATADIR%%/nselib/ldap.lua
 %%DATADIR%%/nselib/listop.lua
 %%DATADIR%%/nselib/match.lua
 %%DATADIR%%/nselib/membase.lua
+%%DATADIR%%/nselib/mobileme.lua
 %%DATADIR%%/nselib/mongodb.lua
 %%DATADIR%%/nselib/msrpc.lua
 %%DATADIR%%/nselib/msrpcperformance.lua
@@ -84,11 +104,13 @@ bin/nping
 %%DATADIR%%/nselib/nrpc.lua
 %%DATADIR%%/nselib/nsedebug.lua
 %%DATADIR%%/nselib/omp2.lua
+%%DATADIR%%/nselib/ospf.lua
 %%DATADIR%%/nselib/packet.lua
 %%DATADIR%%/nselib/pgsql.lua
 %%DATADIR%%/nselib/pop3.lua
 %%DATADIR%%/nselib/pppoe.lua
 %%DATADIR%%/nselib/proxy.lua
+%%DATADIR%%/nselib/rdp.lua
 %%DATADIR%%/nselib/redis.lua
 %%DATADIR%%/nselib/rmi.lua
 %%DATADIR%%/nselib/rpc.lua
@@ -132,6 +154,11 @@ bin/nping
 %%DATADIR%%/scripts/afp-path-vuln.nse
 %%DATADIR%%/scripts/afp-serverinfo.nse
 %%DATADIR%%/scripts/afp-showmount.nse
+%%DATADIR%%/scripts/ajp-auth.nse
+%%DATADIR%%/scripts/ajp-brute.nse
+%%DATADIR%%/scripts/ajp-headers.nse
+%%DATADIR%%/scripts/ajp-methods.nse
+%%DATADIR%%/scripts/ajp-request.nse
 %%DATADIR%%/scripts/amqp-info.nse
 %%DATADIR%%/scripts/asn-query.nse
 %%DATADIR%%/scripts/auth-owners.nse
@@ -143,12 +170,17 @@ bin/nping
 %%DATADIR%%/scripts/bitcoin-info.nse
 %%DATADIR%%/scripts/bitcoinrpc-info.nse
 %%DATADIR%%/scripts/bittorrent-discovery.nse
+%%DATADIR%%/scripts/bjnp-discover.nse
+%%DATADIR%%/scripts/broadcast-ataoe-discover.nse
 %%DATADIR%%/scripts/broadcast-avahi-dos.nse
+%%DATADIR%%/scripts/broadcast-bjnp-discover.nse
 %%DATADIR%%/scripts/broadcast-db2-discover.nse
 %%DATADIR%%/scripts/broadcast-dhcp-discover.nse
 %%DATADIR%%/scripts/broadcast-dhcp6-discover.nse
 %%DATADIR%%/scripts/broadcast-dns-service-discovery.nse
 %%DATADIR%%/scripts/broadcast-dropbox-listener.nse
+%%DATADIR%%/scripts/broadcast-eigrp-discovery.nse
+%%DATADIR%%/scripts/broadcast-igmp-discovery.nse
 %%DATADIR%%/scripts/broadcast-listener.nse
 %%DATADIR%%/scripts/broadcast-ms-sql-discover.nse
 %%DATADIR%%/scripts/broadcast-netbios-master-browser.nse
@@ -156,17 +188,21 @@ bin/nping
 %%DATADIR%%/scripts/broadcast-novell-locate.nse
 %%DATADIR%%/scripts/broadcast-pc-anywhere.nse
 %%DATADIR%%/scripts/broadcast-pc-duo.nse
+%%DATADIR%%/scripts/broadcast-pim-discovery.nse
 %%DATADIR%%/scripts/broadcast-ping.nse
 %%DATADIR%%/scripts/broadcast-pppoe-discover.nse
 %%DATADIR%%/scripts/broadcast-rip-discover.nse
 %%DATADIR%%/scripts/broadcast-ripng-discover.nse
 %%DATADIR%%/scripts/broadcast-sybase-asa-discover.nse
+%%DATADIR%%/scripts/broadcast-tellstick-discover.nse
 %%DATADIR%%/scripts/broadcast-upnp-info.nse
 %%DATADIR%%/scripts/broadcast-versant-locate.nse
 %%DATADIR%%/scripts/broadcast-wake-on-lan.nse
 %%DATADIR%%/scripts/broadcast-wpad-discover.nse
 %%DATADIR%%/scripts/broadcast-wsdd-discover.nse
 %%DATADIR%%/scripts/broadcast-xdmcp-discover.nse
+%%DATADIR%%/scripts/cassandra-brute.nse
+%%DATADIR%%/scripts/cassandra-info.nse
 %%DATADIR%%/scripts/cccam-version.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps-xml.nse
@@ -176,6 +212,8 @@ bin/nping
 %%DATADIR%%/scripts/couchdb-databases.nse
 %%DATADIR%%/scripts/couchdb-stats.nse
 %%DATADIR%%/scripts/creds-summary.nse
+%%DATADIR%%/scripts/cups-info.nse
+%%DATADIR%%/scripts/cups-queue-info.nse
 %%DATADIR%%/scripts/cvs-brute-repository.nse
 %%DATADIR%%/scripts/cvs-brute.nse
 %%DATADIR%%/scripts/daap-get-library.nse
@@ -183,12 +221,17 @@ bin/nping
 %%DATADIR%%/scripts/db2-das-info.nse
 %%DATADIR%%/scripts/db2-discover.nse
 %%DATADIR%%/scripts/dhcp-discover.nse
+%%DATADIR%%/scripts/dict-info.nse
+%%DATADIR%%/scripts/distcc-cve2004-2687.nse
 %%DATADIR%%/scripts/dns-blacklist.nse
 %%DATADIR%%/scripts/dns-brute.nse
 %%DATADIR%%/scripts/dns-cache-snoop.nse
+%%DATADIR%%/scripts/dns-check-zone.nse
 %%DATADIR%%/scripts/dns-client-subnet-scan.nse
 %%DATADIR%%/scripts/dns-fuzz.nse
+%%DATADIR%%/scripts/dns-ip6-arpa-scan.nse
 %%DATADIR%%/scripts/dns-nsec-enum.nse
+%%DATADIR%%/scripts/dns-nsec3-enum.nse
 %%DATADIR%%/scripts/dns-nsid.nse
 %%DATADIR%%/scripts/dns-random-srcport.nse
 %%DATADIR%%/scripts/dns-random-txid.nse
@@ -207,8 +250,11 @@ bin/nping
 %%DATADIR%%/scripts/duplicates.nse
 %%DATADIR%%/scripts/eap-info.nse
 %%DATADIR%%/scripts/epmd-info.nse
+%%DATADIR%%/scripts/eppc-enum-processes.nse
 %%DATADIR%%/scripts/finger.nse
 %%DATADIR%%/scripts/firewalk.nse
+%%DATADIR%%/scripts/firewall-bypass.nse
+%%DATADIR%%/scripts/flume-master-info.nse
 %%DATADIR%%/scripts/ftp-anon.nse
 %%DATADIR%%/scripts/ftp-bounce.nse
 %%DATADIR%%/scripts/ftp-brute.nse
@@ -218,7 +264,9 @@ bin/nping
 %%DATADIR%%/scripts/ftp-vuln-cve2010-4221.nse
 %%DATADIR%%/scripts/ganglia-info.nse
 %%DATADIR%%/scripts/giop-info.nse
+%%DATADIR%%/scripts/gkrellm-info.nse
 %%DATADIR%%/scripts/gopher-ls.nse
+%%DATADIR%%/scripts/gpsd-info.nse
 %%DATADIR%%/scripts/hadoop-datanode-info.nse
 %%DATADIR%%/scripts/hadoop-jobtracker-info.nse
 %%DATADIR%%/scripts/hadoop-namenode-info.nse
@@ -228,6 +276,7 @@ bin/nping
 %%DATADIR%%/scripts/hbase-region-info.nse
 %%DATADIR%%/scripts/hddtemp-info.nse
 %%DATADIR%%/scripts/hostmap-bfk.nse
+%%DATADIR%%/scripts/hostmap-robtex.nse
 %%DATADIR%%/scripts/http-affiliate-id.nse
 %%DATADIR%%/scripts/http-apache-negotiation.nse
 %%DATADIR%%/scripts/http-auth-finder.nse
@@ -244,14 +293,24 @@ bin/nping
 %%DATADIR%%/scripts/http-date.nse
 %%DATADIR%%/scripts/http-default-accounts.nse
 %%DATADIR%%/scripts/http-domino-enum-passwords.nse
+%%DATADIR%%/scripts/http-drupal-enum-users.nse
+%%DATADIR%%/scripts/http-drupal-modules.nse
 %%DATADIR%%/scripts/http-email-harvest.nse
 %%DATADIR%%/scripts/http-enum.nse
+%%DATADIR%%/scripts/http-exif-spider.nse
 %%DATADIR%%/scripts/http-favicon.nse
 %%DATADIR%%/scripts/http-form-brute.nse
+%%DATADIR%%/scripts/http-form-fuzzer.nse
+%%DATADIR%%/scripts/http-frontpage-login.nse
 %%DATADIR%%/scripts/http-generator.nse
+%%DATADIR%%/scripts/http-git.nse
+%%DATADIR%%/scripts/http-gitweb-projects-enum.nse
 %%DATADIR%%/scripts/http-google-malware.nse
 %%DATADIR%%/scripts/http-grep.nse
 %%DATADIR%%/scripts/http-headers.nse
+%%DATADIR%%/scripts/http-huawei-hg5xx-vuln.nse
+%%DATADIR%%/scripts/http-icloud-findmyiphone.nse
+%%DATADIR%%/scripts/http-icloud-sendmsg.nse
 %%DATADIR%%/scripts/http-iis-webdav-vuln.nse
 %%DATADIR%%/scripts/http-joomla-brute.nse
 %%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse
@@ -263,45 +322,66 @@ bin/nping
 %%DATADIR%%/scripts/http-open-redirect.nse
 %%DATADIR%%/scripts/http-passwd.nse
 %%DATADIR%%/scripts/http-php-version.nse
+%%DATADIR%%/scripts/http-phpself-xss.nse
 %%DATADIR%%/scripts/http-proxy-brute.nse
 %%DATADIR%%/scripts/http-put.nse
 %%DATADIR%%/scripts/http-qnap-nas-info.nse
+%%DATADIR%%/scripts/http-rfi-spider.nse
 %%DATADIR%%/scripts/http-robots.txt.nse
 %%DATADIR%%/scripts/http-robtex-reverse-ip.nse
+%%DATADIR%%/scripts/http-robtex-shared-ns.nse
+%%DATADIR%%/scripts/http-sitemap-generator.nse
+%%DATADIR%%/scripts/http-slowloris-check.nse
+%%DATADIR%%/scripts/http-slowloris.nse
+%%DATADIR%%/scripts/http-sql-injection.nse
 %%DATADIR%%/scripts/http-title.nse
+%%DATADIR%%/scripts/http-tplink-dir-traversal.nse
 %%DATADIR%%/scripts/http-trace.nse
+%%DATADIR%%/scripts/http-traceroute.nse
 %%DATADIR%%/scripts/http-unsafe-output-escaping.nse
 %%DATADIR%%/scripts/http-userdir-enum.nse
 %%DATADIR%%/scripts/http-vhosts.nse
+%%DATADIR%%/scripts/http-virustotal.nse
+%%DATADIR%%/scripts/http-vlcstreamer-ls.nse
 %%DATADIR%%/scripts/http-vmware-path-vuln.nse
 %%DATADIR%%/scripts/http-vuln-cve2009-3960.nse
+%%DATADIR%%/scripts/http-vuln-cve2010-0738.nse
 %%DATADIR%%/scripts/http-vuln-cve2010-2861.nse
 %%DATADIR%%/scripts/http-vuln-cve2011-3192.nse
 %%DATADIR%%/scripts/http-vuln-cve2011-3368.nse
 %%DATADIR%%/scripts/http-vuln-cve2012-1823.nse
 %%DATADIR%%/scripts/http-waf-detect.nse
+%%DATADIR%%/scripts/http-waf-fingerprint.nse
 %%DATADIR%%/scripts/http-wordpress-brute.nse
 %%DATADIR%%/scripts/http-wordpress-enum.nse
 %%DATADIR%%/scripts/http-wordpress-plugins.nse
 %%DATADIR%%/scripts/iax2-brute.nse
 %%DATADIR%%/scripts/iax2-version.nse
+%%DATADIR%%/scripts/icap-info.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
 %%DATADIR%%/scripts/informix-tables.nse
+%%DATADIR%%/scripts/ip-forwarding.nse
 %%DATADIR%%/scripts/ip-geolocation-geobytes.nse
 %%DATADIR%%/scripts/ip-geolocation-geoplugin.nse
 %%DATADIR%%/scripts/ip-geolocation-ipinfodb.nse
 %%DATADIR%%/scripts/ip-geolocation-maxmind.nse
 %%DATADIR%%/scripts/ipidseq.nse
 %%DATADIR%%/scripts/ipv6-node-info.nse
+%%DATADIR%%/scripts/ipv6-ra-flood.nse
 %%DATADIR%%/scripts/irc-botnet-channels.nse
 %%DATADIR%%/scripts/irc-brute.nse
 %%DATADIR%%/scripts/irc-info.nse
+%%DATADIR%%/scripts/irc-sasl-brute.nse
 %%DATADIR%%/scripts/irc-unrealircd-backdoor.nse
 %%DATADIR%%/scripts/iscsi-brute.nse
 %%DATADIR%%/scripts/iscsi-info.nse
+%%DATADIR%%/scripts/isns-info.nse
+%%DATADIR%%/scripts/jdwp-exec.nse
+%%DATADIR%%/scripts/jdwp-info.nse
+%%DATADIR%%/scripts/jdwp-inject.nse
 %%DATADIR%%/scripts/jdwp-version.nse
 %%DATADIR%%/scripts/krb5-enum-users.nse
 %%DATADIR%%/scripts/ldap-brute.nse
@@ -309,18 +389,26 @@ bin/nping
 %%DATADIR%%/scripts/ldap-rootdse.nse
 %%DATADIR%%/scripts/ldap-search.nse
 %%DATADIR%%/scripts/lexmark-config.nse
+%%DATADIR%%/scripts/llmnr-resolve.nse
 %%DATADIR%%/scripts/lltd-discovery.nse
 %%DATADIR%%/scripts/maxdb-info.nse
+%%DATADIR%%/scripts/mcafee-epo-agent.nse
 %%DATADIR%%/scripts/membase-brute.nse
 %%DATADIR%%/scripts/membase-http-info.nse
 %%DATADIR%%/scripts/memcached-info.nse
+%%DATADIR%%/scripts/metasploit-info.nse
+%%DATADIR%%/scripts/metasploit-msgrpc-brute.nse
 %%DATADIR%%/scripts/metasploit-xmlrpc-brute.nse
+%%DATADIR%%/scripts/mmouse-brute.nse
+%%DATADIR%%/scripts/mmouse-exec.nse
 %%DATADIR%%/scripts/modbus-discover.nse
 %%DATADIR%%/scripts/mongodb-brute.nse
 %%DATADIR%%/scripts/mongodb-databases.nse
 %%DATADIR%%/scripts/mongodb-info.nse
+%%DATADIR%%/scripts/mrinfo.nse
 %%DATADIR%%/scripts/ms-sql-brute.nse
 %%DATADIR%%/scripts/ms-sql-config.nse
+%%DATADIR%%/scripts/ms-sql-dac.nse
 %%DATADIR%%/scripts/ms-sql-dump-hashes.nse
 %%DATADIR%%/scripts/ms-sql-empty-password.nse
 %%DATADIR%%/scripts/ms-sql-hasdbaccess.nse
@@ -328,13 +416,18 @@ bin/nping
 %%DATADIR%%/scripts/ms-sql-query.nse
 %%DATADIR%%/scripts/ms-sql-tables.nse
 %%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse
+%%DATADIR%%/scripts/msrpc-enum.nse
+%%DATADIR%%/scripts/mtrace.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-info.nse
+%%DATADIR%%/scripts/mysql-query.nse
 %%DATADIR%%/scripts/mysql-users.nse
 %%DATADIR%%/scripts/mysql-variables.nse
+%%DATADIR%%/scripts/mysql-vuln-cve2012-2122.nse
 %%DATADIR%%/scripts/nat-pmp-info.nse
 %%DATADIR%%/scripts/nat-pmp-mapport.nse
 %%DATADIR%%/scripts/nbstat.nse
@@ -360,12 +453,14 @@ bin/nping
 %%DATADIR%%/scripts/omp2-enum-targets.nse
 %%DATADIR%%/scripts/openlookup-info.nse
 %%DATADIR%%/scripts/openvas-otp-brute.nse
+%%DATADIR%%/scripts/oracle-brute-stealth.nse
 %%DATADIR%%/scripts/oracle-brute.nse
 %%DATADIR%%/scripts/oracle-enum-users.nse
 %%DATADIR%%/scripts/oracle-sid-brute.nse
 %%DATADIR%%/scripts/ovs-agent-version.nse
 %%DATADIR%%/scripts/p2p-conficker.nse
 %%DATADIR%%/scripts/path-mtu.nse
+%%DATADIR%%/scripts/pcanywhere-brute.nse
 %%DATADIR%%/scripts/pgsql-brute.nse
 %%DATADIR%%/scripts/pjl-ready-message.nse
 %%DATADIR%%/scripts/pop3-brute.nse
@@ -374,6 +469,7 @@ bin/nping
 %%DATADIR%%/scripts/qscan.nse
 %%DATADIR%%/scripts/quake3-info.nse
 %%DATADIR%%/scripts/quake3-master-getservers.nse
+%%DATADIR%%/scripts/rdp-enum-encryption.nse
 %%DATADIR%%/scripts/rdp-vuln-ms12-020.nse
 %%DATADIR%%/scripts/realvnc-auth-bypass.nse
 %%DATADIR%%/scripts/redis-brute.nse
@@ -384,6 +480,8 @@ bin/nping
 %%DATADIR%%/scripts/riak-http-info.nse
 %%DATADIR%%/scripts/rlogin-brute.nse
 %%DATADIR%%/scripts/rmi-dumpregistry.nse
+%%DATADIR%%/scripts/rmi-vuln-classloader.nse
+%%DATADIR%%/scripts/rpc-grind.nse
 %%DATADIR%%/scripts/rpcap-brute.nse
 %%DATADIR%%/scripts/rpcap-info.nse
 %%DATADIR%%/scripts/rpcinfo.nse
@@ -395,7 +493,9 @@ bin/nping
 %%DATADIR%%/scripts/script.db
 %%DATADIR%%/scripts/servicetags.nse
 %%DATADIR%%/scripts/sip-brute.nse
+%%DATADIR%%/scripts/sip-call-spoof.nse
 %%DATADIR%%/scripts/sip-enum-users.nse
+%%DATADIR%%/scripts/sip-methods.nse
 %%DATADIR%%/scripts/skypev2-version.nse
 %%DATADIR%%/scripts/smb-brute.nse
 %%DATADIR%%/scripts/smb-check-vulns.nse
@@ -406,12 +506,16 @@ bin/nping
 %%DATADIR%%/scripts/smb-enum-shares.nse
 %%DATADIR%%/scripts/smb-enum-users.nse
 %%DATADIR%%/scripts/smb-flood.nse
+%%DATADIR%%/scripts/smb-ls.nse
 %%DATADIR%%/scripts/smb-mbenum.nse
 %%DATADIR%%/scripts/smb-os-discovery.nse
+%%DATADIR%%/scripts/smb-print-text.nse
 %%DATADIR%%/scripts/smb-psexec.nse
 %%DATADIR%%/scripts/smb-security-mode.nse
 %%DATADIR%%/scripts/smb-server-stats.nse
 %%DATADIR%%/scripts/smb-system-info.nse
+%%DATADIR%%/scripts/smb-vuln-ms10-054.nse
+%%DATADIR%%/scripts/smb-vuln-ms10-061.nse
 %%DATADIR%%/scripts/smbv2-enabled.nse
 %%DATADIR%%/scripts/smtp-brute.nse
 %%DATADIR%%/scripts/smtp-commands.nse
@@ -423,6 +527,7 @@ bin/nping
 %%DATADIR%%/scripts/smtp-vuln-cve2011-1764.nse
 %%DATADIR%%/scripts/sniffer-detect.nse
 %%DATADIR%%/scripts/snmp-brute.nse
+%%DATADIR%%/scripts/snmp-hh3c-logins.nse
 %%DATADIR%%/scripts/snmp-interfaces.nse
 %%DATADIR%%/scripts/snmp-ios-config.nse
 %%DATADIR%%/scripts/snmp-netstat.nse
@@ -435,11 +540,11 @@ bin/nping
 %%DATADIR%%/scripts/socks-auth-info.nse
 %%DATADIR%%/scripts/socks-brute.nse
 %%DATADIR%%/scripts/socks-open-proxy.nse
-%%DATADIR%%/scripts/sql-injection.nse
 %%DATADIR%%/scripts/ssh-hostkey.nse
 %%DATADIR%%/scripts/ssh2-enum-algos.nse
 %%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-cert.nse
+%%DATADIR%%/scripts/ssl-date.nse
 %%DATADIR%%/scripts/ssl-enum-ciphers.nse
 %%DATADIR%%/scripts/ssl-google-cert-catalog.nse
 %%DATADIR%%/scripts/ssl-known-key.nse
@@ -458,6 +563,8 @@ bin/nping
 %%DATADIR%%/scripts/telnet-brute.nse
 %%DATADIR%%/scripts/telnet-encryption.nse
 %%DATADIR%%/scripts/tftp-enum.nse
+%%DATADIR%%/scripts/tls-nextprotoneg.nse
+%%DATADIR%%/scripts/traceroute-geolocation.nse
 %%DATADIR%%/scripts/unusual-port.nse
 %%DATADIR%%/scripts/upnp-info.nse
 %%DATADIR%%/scripts/url-snarf.nse
@@ -476,6 +583,7 @@ bin/nping
 %%DATADIR%%/scripts/xmpp-info.nse
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/nselib/data/psexec
+@dirrm %%DATADIR%%/nselib/data/jdwp-class
 @dirrm %%DATADIR%%/nselib/data
 @dirrm %%DATADIR%%/nselib
 @dirrm %%DATADIR%%