Nmap 7.12

o [Zenmap] Avoid file corruption in zenmap.conf, reported as files containing
  many null ("\x00") characters. Example exception:
    ValueError: unable to parse colour specification

o [NSE] VNC updates including vnc-brute support for TLS security type and
  negotiating a lower RFB version if the server sends an unknown higher
  version.

o [NSE] Added STARTTLS support for VNC, NNTP, and LMTP

o Added new service probes and match lines for OpenVPN on UDP and TCP.

5 files changed, 120 insertions, 113 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 1320bf14863..e361e10a0e7 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.128 2016/03/05 11:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.129 2016/04/09 06:38:05 adam Exp $
 
-DISTNAME=	nmap-7.01
-PKGREVISION=	1
+DISTNAME=	nmap-7.12
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 26b41d9bfe7..68fd54ab5b6 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,13 +1,32 @@
-@comment $NetBSD: PLIST,v 1.22 2016/01/24 13:46:49 richard Exp $
+@comment $NetBSD: PLIST,v 1.23 2016/04/09 06:38:05 adam Exp $
 bin/ncat
 ${PLIST.ndiff}bin/ndiff
-${PLIST.ndiff}${PYSITELIB}/ndiff.py
-${PLIST.ndiff}${PYSITELIB}/ndiff.pyc
 bin/nmap
 ${PLIST.zenmap}bin/nmapfe
 bin/nping
 ${PLIST.zenmap}bin/xnmap
 ${PLIST.zenmap}bin/zenmap
+man/de/man1/nmap.1
+man/es/man1/nmap.1
+man/fr/man1/nmap.1
+man/hr/man1/nmap.1
+man/hu/man1/nmap.1
+man/it/man1/nmap.1
+man/ja/man1/nmap.1
+man/man1/ncat.1
+${PLIST.ndiff}man/man1/ndiff.1
+man/man1/nmap.1
+man/man1/nping.1
+${PLIST.zenmap}man/man1/zenmap.1
+man/pl/man1/nmap.1
+man/pt_BR/man1/nmap.1
+man/pt_PT/man1/nmap.1
+man/ro/man1/nmap.1
+man/ru/man1/nmap.1
+man/sk/man1/nmap.1
+man/zh/man1/nmap.1
+${PLIST.ndiff}${PYSITELIB}/ndiff.py
+${PLIST.ndiff}${PYSITELIB}/ndiff.pyc
 ${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.py
 ${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.pyc
 ${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/__init__.py
@@ -220,25 +239,6 @@ ${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.py
 ${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyc
 ${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.py
 ${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc
-man/de/man1/nmap.1
-man/es/man1/nmap.1
-man/fr/man1/nmap.1
-man/hr/man1/nmap.1
-man/hu/man1/nmap.1
-man/it/man1/nmap.1
-man/ja/man1/nmap.1
-man/man1/ncat.1
-${PLIST.ndiff}man/man1/ndiff.1
-man/man1/nmap.1
-man/man1/nping.1
-${PLIST.zenmap}man/man1/zenmap.1
-man/pl/man1/nmap.1
-man/pt_BR/man1/nmap.1
-man/pt_PT/man1/nmap.1
-man/ro/man1/nmap.1
-man/ru/man1/nmap.1
-man/sk/man1/nmap.1
-man/zh/man1/nmap.1
 ${PLIST.zenmap}share/applications/zenmap-root.desktop
 ${PLIST.zenmap}share/applications/zenmap.desktop
 share/ncat/ca-bundle.crt
@@ -251,70 +251,11 @@ share/nmap/nmap-service-probes
 share/nmap/nmap-services
 share/nmap/nmap.dtd
 share/nmap/nmap.xsl
-${PLIST.lua}share/nmap/nselib/anyconnect.lua
-${PLIST.lua}share/nmap/nselib/data/drupal-themes.lst
-${PLIST.lua}share/nmap/nselib/data/enterprise_numbers.txt
-${PLIST.lua}share/nmap/nselib/data/targets-ipv6-wordlist
-${PLIST.lua}share/nmap/nselib/data/wp-themes.lst
-${PLIST.lua}share/nmap/nselib/lpeg-utility.lua
-${PLIST.lua}share/nmap/nselib/ls.lua
-${PLIST.lua}share/nmap/nselib/re.lua
-${PLIST.lua}share/nmap/nselib/slaxml.lua
-${PLIST.lua}share/nmap/scripts/bacnet-info.nse
-${PLIST.lua}share/nmap/scripts/broadcast-sonicwall-discover.nse
-${PLIST.lua}share/nmap/scripts/docker-version.nse
-${PLIST.lua}share/nmap/scripts/enip-info.nse
-${PLIST.lua}share/nmap/scripts/fcrdns.nse
-${PLIST.lua}share/nmap/scripts/hnap-info.nse
-${PLIST.lua}share/nmap/scripts/http-avaya-ipoffice-users.nse
-${PLIST.lua}share/nmap/scripts/http-cisco-anyconnect.nse
-${PLIST.lua}share/nmap/scripts/http-cross-domain-policy.nse
-${PLIST.lua}share/nmap/scripts/http-drupal-enum.nse
-${PLIST.lua}share/nmap/scripts/http-fetch.nse
-${PLIST.lua}share/nmap/scripts/http-ls.nse
-${PLIST.lua}share/nmap/scripts/http-shellshock.nse
-${PLIST.lua}share/nmap/scripts/http-svn-enum.nse
-${PLIST.lua}share/nmap/scripts/http-svn-info.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2006-3392.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-7091.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2126.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2127.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2128.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2129.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-8877.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1427.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1635.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-misfortune-cookie.nse
-${PLIST.lua}share/nmap/scripts/http-vuln-wnr1000-creds.nse
-${PLIST.lua}share/nmap/scripts/http-webdav-scan.nse
-${PLIST.lua}share/nmap/scripts/http-wordpress-users.nse
-${PLIST.lua}share/nmap/scripts/ip-https-discover.nse
-${PLIST.lua}share/nmap/scripts/knx-gateway-discover.nse
-${PLIST.lua}share/nmap/scripts/knx-gateway-info.nse
-${PLIST.lua}share/nmap/scripts/mikrotik-routeros-brute.nse
-${PLIST.lua}share/nmap/scripts/nje-node-brute.nse
-${PLIST.lua}share/nmap/scripts/omron-info.nse
-${PLIST.lua}share/nmap/scripts/s7-info.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-conficker.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-cve2009-3103.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-ms06-025.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-ms07-029.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-ms08-067.nse
-${PLIST.lua}share/nmap/scripts/smb-vuln-regsvc-dos.nse
-${PLIST.lua}share/nmap/scripts/snmp-info.nse
-${PLIST.lua}share/nmap/scripts/ssl-ccs-injection.nse
-${PLIST.lua}share/nmap/scripts/ssl-dh-params.nse
-${PLIST.lua}share/nmap/scripts/ssl-poodle.nse
-${PLIST.lua}share/nmap/scripts/supermicro-ipmi-conf.nse
-${PLIST.lua}share/nmap/scripts/targets-ipv6-map4to6.nse
-${PLIST.lua}share/nmap/scripts/targets-ipv6-wordlist.nse
-${PLIST.lua}share/nmap/scripts/targets-xml.nse
-${PLIST.lua}share/nmap/scripts/tor-consensus-checker.nse
-${PLIST.lua}share/nmap/scripts/xmlrpc-methods.nse
 ${PLIST.lua}share/nmap/nse_main.lua
 ${PLIST.lua}share/nmap/nselib/afp.lua
 ${PLIST.lua}share/nmap/nselib/ajp.lua
 ${PLIST.lua}share/nmap/nselib/amqp.lua
+${PLIST.lua}share/nmap/nselib/anyconnect.lua
 ${PLIST.lua}share/nmap/nselib/asn1.lua
 ${PLIST.lua}share/nmap/nselib/base32.lua
 ${PLIST.lua}share/nmap/nselib/base64.lua
@@ -331,6 +272,8 @@ ${PLIST.lua}share/nmap/nselib/creds.lua
 ${PLIST.lua}share/nmap/nselib/cvs.lua
 ${PLIST.lua}share/nmap/nselib/data/dns-srv-names
 ${PLIST.lua}share/nmap/nselib/data/drupal-modules.lst
+${PLIST.lua}share/nmap/nselib/data/drupal-themes.lst
+${PLIST.lua}share/nmap/nselib/data/enterprise_numbers.txt
 ${PLIST.lua}share/nmap/nselib/data/favicon-db
 ${PLIST.lua}share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 ${PLIST.lua}share/nmap/nselib/data/http-devframework-fingerprints.lua
@@ -364,11 +307,13 @@ ${PLIST.lua}share/nmap/nselib/data/psexec/pwdump.lua
 ${PLIST.lua}share/nmap/nselib/data/rtsp-urls.txt
 ${PLIST.lua}share/nmap/nselib/data/snmpcommunities.lst
 ${PLIST.lua}share/nmap/nselib/data/ssl-fingerprints
+${PLIST.lua}share/nmap/nselib/data/targets-ipv6-wordlist
 ${PLIST.lua}share/nmap/nselib/data/tftplist.txt
 ${PLIST.lua}share/nmap/nselib/data/usernames.lst
 ${PLIST.lua}share/nmap/nselib/data/vhosts-default.lst
 ${PLIST.lua}share/nmap/nselib/data/vhosts-full.lst
 ${PLIST.lua}share/nmap/nselib/data/wp-plugins.lst
+${PLIST.lua}share/nmap/nselib/data/wp-themes.lst
 ${PLIST.lua}share/nmap/nselib/datafiles.lua
 ${PLIST.lua}share/nmap/nselib/dhcp.lua
 ${PLIST.lua}share/nmap/nselib/dhcp6.lua
@@ -397,6 +342,9 @@ ${PLIST.lua}share/nmap/nselib/json.lua
 ${PLIST.lua}share/nmap/nselib/ldap.lua
 ${PLIST.lua}share/nmap/nselib/lfs.luadoc
 ${PLIST.lua}share/nmap/nselib/listop.lua
+${PLIST.lua}share/nmap/nselib/lpeg-utility.lua
+${PLIST.lua}share/nmap/nselib/lpeg.luadoc
+${PLIST.lua}share/nmap/nselib/ls.lua
 ${PLIST.lua}share/nmap/nselib/match.lua
 ${PLIST.lua}share/nmap/nselib/membase.lua
 ${PLIST.lua}share/nmap/nselib/mobileme.lua
@@ -405,6 +353,7 @@ ${PLIST.lua}share/nmap/nselib/msrpc.lua
 ${PLIST.lua}share/nmap/nselib/msrpcperformance.lua
 ${PLIST.lua}share/nmap/nselib/msrpctypes.lua
 ${PLIST.lua}share/nmap/nselib/mssql.lua
+${PLIST.lua}share/nmap/nselib/multicast.lua
 ${PLIST.lua}share/nmap/nselib/mysql.lua
 ${PLIST.lua}share/nmap/nselib/natpmp.lua
 ${PLIST.lua}share/nmap/nselib/ncp.lua
@@ -423,6 +372,7 @@ ${PLIST.lua}share/nmap/nselib/pop3.lua
 ${PLIST.lua}share/nmap/nselib/pppoe.lua
 ${PLIST.lua}share/nmap/nselib/proxy.lua
 ${PLIST.lua}share/nmap/nselib/rdp.lua
+${PLIST.lua}share/nmap/nselib/re.lua
 ${PLIST.lua}share/nmap/nselib/redis.lua
 ${PLIST.lua}share/nmap/nselib/rmi.lua
 ${PLIST.lua}share/nmap/nselib/rpc.lua
@@ -432,6 +382,7 @@ ${PLIST.lua}share/nmap/nselib/rtsp.lua
 ${PLIST.lua}share/nmap/nselib/sasl.lua
 ${PLIST.lua}share/nmap/nselib/shortport.lua
 ${PLIST.lua}share/nmap/nselib/sip.lua
+${PLIST.lua}share/nmap/nselib/slaxml.lua
 ${PLIST.lua}share/nmap/nselib/smb.lua
 ${PLIST.lua}share/nmap/nselib/smbauth.lua
 ${PLIST.lua}share/nmap/nselib/smtp.lua
@@ -481,6 +432,7 @@ ${PLIST.lua}share/nmap/scripts/auth-owners.nse
 ${PLIST.lua}share/nmap/scripts/auth-spoof.nse
 ${PLIST.lua}share/nmap/scripts/backorifice-brute.nse
 ${PLIST.lua}share/nmap/scripts/backorifice-info.nse
+${PLIST.lua}share/nmap/scripts/bacnet-info.nse
 ${PLIST.lua}share/nmap/scripts/banner.nse
 ${PLIST.lua}share/nmap/scripts/bitcoin-getaddr.nse
 ${PLIST.lua}share/nmap/scripts/bitcoin-info.nse
@@ -509,6 +461,7 @@ ${PLIST.lua}share/nmap/scripts/broadcast-ping.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-pppoe-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-rip-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-ripng-discover.nse
+${PLIST.lua}share/nmap/scripts/broadcast-sonicwall-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-sybase-asa-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-tellstick-discover.nse
 ${PLIST.lua}share/nmap/scripts/broadcast-upnp-info.nse
@@ -556,6 +509,7 @@ ${PLIST.lua}share/nmap/scripts/dns-srv-enum.nse
 ${PLIST.lua}share/nmap/scripts/dns-update.nse
 ${PLIST.lua}share/nmap/scripts/dns-zeustracker.nse
 ${PLIST.lua}share/nmap/scripts/dns-zone-transfer.nse
+${PLIST.lua}share/nmap/scripts/docker-version.nse
 ${PLIST.lua}share/nmap/scripts/domcon-brute.nse
 ${PLIST.lua}share/nmap/scripts/domcon-cmd.nse
 ${PLIST.lua}share/nmap/scripts/domino-enum-users.nse
@@ -564,8 +518,10 @@ ${PLIST.lua}share/nmap/scripts/drda-brute.nse
 ${PLIST.lua}share/nmap/scripts/drda-info.nse
 ${PLIST.lua}share/nmap/scripts/duplicates.nse
 ${PLIST.lua}share/nmap/scripts/eap-info.nse
+${PLIST.lua}share/nmap/scripts/enip-info.nse
 ${PLIST.lua}share/nmap/scripts/epmd-info.nse
 ${PLIST.lua}share/nmap/scripts/eppc-enum-processes.nse
+${PLIST.lua}share/nmap/scripts/fcrdns.nse
 ${PLIST.lua}share/nmap/scripts/finger.nse
 ${PLIST.lua}share/nmap/scripts/firewalk.nse
 ${PLIST.lua}share/nmap/scripts/firewall-bypass.nse
@@ -591,14 +547,17 @@ ${PLIST.lua}share/nmap/scripts/hadoop-tasktracker-info.nse
 ${PLIST.lua}share/nmap/scripts/hbase-master-info.nse
 ${PLIST.lua}share/nmap/scripts/hbase-region-info.nse
 ${PLIST.lua}share/nmap/scripts/hddtemp-info.nse
+${PLIST.lua}share/nmap/scripts/hnap-info.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-bfk.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-ip2hosts.nse
 ${PLIST.lua}share/nmap/scripts/hostmap-robtex.nse
 ${PLIST.lua}share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse
 ${PLIST.lua}share/nmap/scripts/http-affiliate-id.nse
 ${PLIST.lua}share/nmap/scripts/http-apache-negotiation.nse
+${PLIST.lua}share/nmap/scripts/http-apache-server-status.nse
 ${PLIST.lua}share/nmap/scripts/http-auth-finder.nse
 ${PLIST.lua}share/nmap/scripts/http-auth.nse
+${PLIST.lua}share/nmap/scripts/http-avaya-ipoffice-users.nse
 ${PLIST.lua}share/nmap/scripts/http-awstatstotals-exec.nse
 ${PLIST.lua}share/nmap/scripts/http-axis2-dir-traversal.nse
 ${PLIST.lua}share/nmap/scripts/http-backup-finder.nse
@@ -606,10 +565,12 @@ ${PLIST.lua}share/nmap/scripts/http-barracuda-dir-traversal.nse
 ${PLIST.lua}share/nmap/scripts/http-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-cakephp-version.nse
 ${PLIST.lua}share/nmap/scripts/http-chrono.nse
+${PLIST.lua}share/nmap/scripts/http-cisco-anyconnect.nse
 ${PLIST.lua}share/nmap/scripts/http-coldfusion-subzero.nse
 ${PLIST.lua}share/nmap/scripts/http-comments-displayer.nse
 ${PLIST.lua}share/nmap/scripts/http-config-backup.nse
 ${PLIST.lua}share/nmap/scripts/http-cors.nse
+${PLIST.lua}share/nmap/scripts/http-cross-domain-policy.nse
 ${PLIST.lua}share/nmap/scripts/http-csrf.nse
 ${PLIST.lua}share/nmap/scripts/http-date.nse
 ${PLIST.lua}share/nmap/scripts/http-default-accounts.nse
@@ -618,11 +579,13 @@ ${PLIST.lua}share/nmap/scripts/http-dlink-backdoor.nse
 ${PLIST.lua}share/nmap/scripts/http-dombased-xss.nse
 ${PLIST.lua}share/nmap/scripts/http-domino-enum-passwords.nse
 ${PLIST.lua}share/nmap/scripts/http-drupal-enum-users.nse
+${PLIST.lua}share/nmap/scripts/http-drupal-enum.nse
 ${PLIST.lua}share/nmap/scripts/http-enum.nse
 ${PLIST.lua}share/nmap/scripts/http-errors.nse
 ${PLIST.lua}share/nmap/scripts/http-exif-spider.nse
 ${PLIST.lua}share/nmap/scripts/http-favicon.nse
 ${PLIST.lua}share/nmap/scripts/http-feed.nse
+${PLIST.lua}share/nmap/scripts/http-fetch.nse
 ${PLIST.lua}share/nmap/scripts/http-fileupload-exploiter.nse
 ${PLIST.lua}share/nmap/scripts/http-form-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-form-fuzzer.nse
@@ -640,6 +603,7 @@ ${PLIST.lua}share/nmap/scripts/http-iis-short-name-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-iis-webdav-vuln.nse
 ${PLIST.lua}share/nmap/scripts/http-joomla-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-litespeed-sourcecode-download.nse
+${PLIST.lua}share/nmap/scripts/http-ls.nse
 ${PLIST.lua}share/nmap/scripts/http-majordomo2-dir-traversal.nse
 ${PLIST.lua}share/nmap/scripts/http-malware-host.nse
 ${PLIST.lua}share/nmap/scripts/http-method-tamper.nse
@@ -661,11 +625,14 @@ ${PLIST.lua}share/nmap/scripts/http-robots.txt.nse
 ${PLIST.lua}share/nmap/scripts/http-robtex-reverse-ip.nse
 ${PLIST.lua}share/nmap/scripts/http-robtex-shared-ns.nse
 ${PLIST.lua}share/nmap/scripts/http-server-header.nse
+${PLIST.lua}share/nmap/scripts/http-shellshock.nse
 ${PLIST.lua}share/nmap/scripts/http-sitemap-generator.nse
 ${PLIST.lua}share/nmap/scripts/http-slowloris-check.nse
 ${PLIST.lua}share/nmap/scripts/http-slowloris.nse
 ${PLIST.lua}share/nmap/scripts/http-sql-injection.nse
 ${PLIST.lua}share/nmap/scripts/http-stored-xss.nse
+${PLIST.lua}share/nmap/scripts/http-svn-enum.nse
+${PLIST.lua}share/nmap/scripts/http-svn-info.nse
 ${PLIST.lua}share/nmap/scripts/http-title.nse
 ${PLIST.lua}share/nmap/scripts/http-tplink-dir-traversal.nse
 ${PLIST.lua}share/nmap/scripts/http-trace.nse
@@ -677,6 +644,7 @@ ${PLIST.lua}share/nmap/scripts/http-vhosts.nse
 ${PLIST.lua}share/nmap/scripts/http-virustotal.nse
 ${PLIST.lua}share/nmap/scripts/http-vlcstreamer-ls.nse
 ${PLIST.lua}share/nmap/scripts/http-vmware-path-vuln.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2006-3392.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2009-3960.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2010-0738.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2010-2861.nse
@@ -684,10 +652,24 @@ ${PLIST.lua}share/nmap/scripts/http-vuln-cve2011-3192.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2011-3368.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2012-1823.nse
 ${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-0156.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-6786.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2013-7091.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2126.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2127.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2128.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-2129.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-3704.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2014-8877.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1427.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-cve2015-1635.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-misfortune-cookie.nse
+${PLIST.lua}share/nmap/scripts/http-vuln-wnr1000-creds.nse
 ${PLIST.lua}share/nmap/scripts/http-waf-detect.nse
 ${PLIST.lua}share/nmap/scripts/http-waf-fingerprint.nse
+${PLIST.lua}share/nmap/scripts/http-webdav-scan.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-brute.nse
 ${PLIST.lua}share/nmap/scripts/http-wordpress-enum.nse
+${PLIST.lua}share/nmap/scripts/http-wordpress-users.nse
 ${PLIST.lua}share/nmap/scripts/http-xssed.nse
 ${PLIST.lua}share/nmap/scripts/iax2-brute.nse
 ${PLIST.lua}share/nmap/scripts/iax2-version.nse
@@ -695,6 +677,7 @@ ${PLIST.lua}share/nmap/scripts/icap-info.nse
 ${PLIST.lua}share/nmap/scripts/ike-version.nse
 ${PLIST.lua}share/nmap/scripts/imap-brute.nse
 ${PLIST.lua}share/nmap/scripts/imap-capabilities.nse
+${PLIST.lua}share/nmap/scripts/imap-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/informix-brute.nse
 ${PLIST.lua}share/nmap/scripts/informix-query.nse
 ${PLIST.lua}share/nmap/scripts/informix-tables.nse
@@ -703,7 +686,9 @@ ${PLIST.lua}share/nmap/scripts/ip-geolocation-geobytes.nse
 ${PLIST.lua}share/nmap/scripts/ip-geolocation-geoplugin.nse
 ${PLIST.lua}share/nmap/scripts/ip-geolocation-ipinfodb.nse
 ${PLIST.lua}share/nmap/scripts/ip-geolocation-maxmind.nse
+${PLIST.lua}share/nmap/scripts/ip-https-discover.nse
 ${PLIST.lua}share/nmap/scripts/ipidseq.nse
+${PLIST.lua}share/nmap/scripts/ipv6-multicast-mld-list.nse
 ${PLIST.lua}share/nmap/scripts/ipv6-node-info.nse
 ${PLIST.lua}share/nmap/scripts/ipv6-ra-flood.nse
 ${PLIST.lua}share/nmap/scripts/irc-botnet-channels.nse
@@ -718,6 +703,8 @@ ${PLIST.lua}share/nmap/scripts/jdwp-exec.nse
 ${PLIST.lua}share/nmap/scripts/jdwp-info.nse
 ${PLIST.lua}share/nmap/scripts/jdwp-inject.nse
 ${PLIST.lua}share/nmap/scripts/jdwp-version.nse
+${PLIST.lua}share/nmap/scripts/knx-gateway-discover.nse
+${PLIST.lua}share/nmap/scripts/knx-gateway-info.nse
 ${PLIST.lua}share/nmap/scripts/krb5-enum-users.nse
 ${PLIST.lua}share/nmap/scripts/ldap-brute.nse
 ${PLIST.lua}share/nmap/scripts/ldap-novell-getpass.nse
@@ -734,6 +721,7 @@ ${PLIST.lua}share/nmap/scripts/memcached-info.nse
 ${PLIST.lua}share/nmap/scripts/metasploit-info.nse
 ${PLIST.lua}share/nmap/scripts/metasploit-msgrpc-brute.nse
 ${PLIST.lua}share/nmap/scripts/metasploit-xmlrpc-brute.nse
+${PLIST.lua}share/nmap/scripts/mikrotik-routeros-brute.nse
 ${PLIST.lua}share/nmap/scripts/mmouse-brute.nse
 ${PLIST.lua}share/nmap/scripts/mmouse-exec.nse
 ${PLIST.lua}share/nmap/scripts/modbus-discover.nse
@@ -748,6 +736,7 @@ ${PLIST.lua}share/nmap/scripts/ms-sql-dump-hashes.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-empty-password.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-hasdbaccess.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-info.nse
+${PLIST.lua}share/nmap/scripts/ms-sql-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-query.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-tables.nse
 ${PLIST.lua}share/nmap/scripts/ms-sql-xp-cmdshell.nse
@@ -782,12 +771,15 @@ ${PLIST.lua}share/nmap/scripts/nexpose-brute.nse
 ${PLIST.lua}share/nmap/scripts/nfs-ls.nse
 ${PLIST.lua}share/nmap/scripts/nfs-showmount.nse
 ${PLIST.lua}share/nmap/scripts/nfs-statfs.nse
+${PLIST.lua}share/nmap/scripts/nje-node-brute.nse
+${PLIST.lua}share/nmap/scripts/nntp-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/nping-brute.nse
 ${PLIST.lua}share/nmap/scripts/nrpe-enum.nse
 ${PLIST.lua}share/nmap/scripts/ntp-info.nse
 ${PLIST.lua}share/nmap/scripts/ntp-monlist.nse
 ${PLIST.lua}share/nmap/scripts/omp2-brute.nse
 ${PLIST.lua}share/nmap/scripts/omp2-enum-targets.nse
+${PLIST.lua}share/nmap/scripts/omron-info.nse
 ${PLIST.lua}share/nmap/scripts/openlookup-info.nse
 ${PLIST.lua}share/nmap/scripts/openvas-otp-brute.nse
 ${PLIST.lua}share/nmap/scripts/oracle-brute-stealth.nse
@@ -802,6 +794,7 @@ ${PLIST.lua}share/nmap/scripts/pgsql-brute.nse
 ${PLIST.lua}share/nmap/scripts/pjl-ready-message.nse
 ${PLIST.lua}share/nmap/scripts/pop3-brute.nse
 ${PLIST.lua}share/nmap/scripts/pop3-capabilities.nse
+${PLIST.lua}share/nmap/scripts/pop3-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/pptp-version.nse
 ${PLIST.lua}share/nmap/scripts/qconn-exec.nse
 ${PLIST.lua}share/nmap/scripts/qscan.nse
@@ -829,9 +822,12 @@ ${PLIST.lua}share/nmap/scripts/rsync-brute.nse
 ${PLIST.lua}share/nmap/scripts/rsync-list-modules.nse
 ${PLIST.lua}share/nmap/scripts/rtsp-methods.nse
 ${PLIST.lua}share/nmap/scripts/rtsp-url-brute.nse
+${PLIST.lua}share/nmap/scripts/rusers.nse
+${PLIST.lua}share/nmap/scripts/s7-info.nse
 ${PLIST.lua}share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 ${PLIST.lua}share/nmap/scripts/script.db
 ${PLIST.lua}share/nmap/scripts/servicetags.nse
+${PLIST.lua}share/nmap/scripts/shodan-api.nse
 ${PLIST.lua}share/nmap/scripts/sip-brute.nse
 ${PLIST.lua}share/nmap/scripts/sip-call-spoof.nse
 ${PLIST.lua}share/nmap/scripts/sip-enum-users.nse
@@ -853,12 +849,19 @@ ${PLIST.lua}share/nmap/scripts/smb-psexec.nse
 ${PLIST.lua}share/nmap/scripts/smb-security-mode.nse
 ${PLIST.lua}share/nmap/scripts/smb-server-stats.nse
 ${PLIST.lua}share/nmap/scripts/smb-system-info.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-conficker.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-cve2009-3103.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms06-025.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms07-029.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-ms08-067.nse
 ${PLIST.lua}share/nmap/scripts/smb-vuln-ms10-054.nse
 ${PLIST.lua}share/nmap/scripts/smb-vuln-ms10-061.nse
+${PLIST.lua}share/nmap/scripts/smb-vuln-regsvc-dos.nse
 ${PLIST.lua}share/nmap/scripts/smbv2-enabled.nse
 ${PLIST.lua}share/nmap/scripts/smtp-brute.nse
 ${PLIST.lua}share/nmap/scripts/smtp-commands.nse
 ${PLIST.lua}share/nmap/scripts/smtp-enum-users.nse
+${PLIST.lua}share/nmap/scripts/smtp-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/smtp-open-relay.nse
 ${PLIST.lua}share/nmap/scripts/smtp-strangeport.nse
 ${PLIST.lua}share/nmap/scripts/smtp-vuln-cve2010-4344.nse
@@ -867,6 +870,7 @@ ${PLIST.lua}share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 ${PLIST.lua}share/nmap/scripts/sniffer-detect.nse
 ${PLIST.lua}share/nmap/scripts/snmp-brute.nse
 ${PLIST.lua}share/nmap/scripts/snmp-hh3c-logins.nse
+${PLIST.lua}share/nmap/scripts/snmp-info.nse
 ${PLIST.lua}share/nmap/scripts/snmp-interfaces.nse
 ${PLIST.lua}share/nmap/scripts/snmp-ios-config.nse
 ${PLIST.lua}share/nmap/scripts/snmp-netstat.nse
@@ -882,30 +886,39 @@ ${PLIST.lua}share/nmap/scripts/socks-open-proxy.nse
 ${PLIST.lua}share/nmap/scripts/ssh-hostkey.nse
 ${PLIST.lua}share/nmap/scripts/ssh2-enum-algos.nse
 ${PLIST.lua}share/nmap/scripts/sshv1.nse
+${PLIST.lua}share/nmap/scripts/ssl-ccs-injection.nse
 ${PLIST.lua}share/nmap/scripts/ssl-cert.nse
 ${PLIST.lua}share/nmap/scripts/ssl-date.nse
+${PLIST.lua}share/nmap/scripts/ssl-dh-params.nse
 ${PLIST.lua}share/nmap/scripts/ssl-enum-ciphers.nse
 ${PLIST.lua}share/nmap/scripts/ssl-google-cert-catalog.nse
 ${PLIST.lua}share/nmap/scripts/ssl-heartbleed.nse
 ${PLIST.lua}share/nmap/scripts/ssl-known-key.nse
+${PLIST.lua}share/nmap/scripts/ssl-poodle.nse
 ${PLIST.lua}share/nmap/scripts/sslv2.nse
 ${PLIST.lua}share/nmap/scripts/sstp-discover.nse
 ${PLIST.lua}share/nmap/scripts/stun-info.nse
 ${PLIST.lua}share/nmap/scripts/stun-version.nse
 ${PLIST.lua}share/nmap/scripts/stuxnet-detect.nse
+${PLIST.lua}share/nmap/scripts/supermicro-ipmi-conf.nse
 ${PLIST.lua}share/nmap/scripts/svn-brute.nse
 ${PLIST.lua}share/nmap/scripts/targets-asn.nse
+${PLIST.lua}share/nmap/scripts/targets-ipv6-map4to6.nse
 ${PLIST.lua}share/nmap/scripts/targets-ipv6-multicast-echo.nse
 ${PLIST.lua}share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
 ${PLIST.lua}share/nmap/scripts/targets-ipv6-multicast-mld.nse
 ${PLIST.lua}share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+${PLIST.lua}share/nmap/scripts/targets-ipv6-wordlist.nse
 ${PLIST.lua}share/nmap/scripts/targets-sniffer.nse
 ${PLIST.lua}share/nmap/scripts/targets-traceroute.nse
+${PLIST.lua}share/nmap/scripts/targets-xml.nse
 ${PLIST.lua}share/nmap/scripts/teamspeak2-version.nse
 ${PLIST.lua}share/nmap/scripts/telnet-brute.nse
 ${PLIST.lua}share/nmap/scripts/telnet-encryption.nse
+${PLIST.lua}share/nmap/scripts/telnet-ntlm-info.nse
 ${PLIST.lua}share/nmap/scripts/tftp-enum.nse
 ${PLIST.lua}share/nmap/scripts/tls-nextprotoneg.nse
+${PLIST.lua}share/nmap/scripts/tor-consensus-checker.nse
 ${PLIST.lua}share/nmap/scripts/traceroute-geolocation.nse
 ${PLIST.lua}share/nmap/scripts/unittest.nse
 ${PLIST.lua}share/nmap/scripts/unusual-port.nse
@@ -925,6 +938,7 @@ ${PLIST.lua}share/nmap/scripts/whois-ip.nse
 ${PLIST.lua}share/nmap/scripts/wsdd-discover.nse
 ${PLIST.lua}share/nmap/scripts/x11-access.nse
 ${PLIST.lua}share/nmap/scripts/xdmcp-discover.nse
+${PLIST.lua}share/nmap/scripts/xmlrpc-methods.nse
 ${PLIST.lua}share/nmap/scripts/xmpp-brute.nse
 ${PLIST.lua}share/nmap/scripts/xmpp-info.nse
 ${PLIST.zenmap}share/zenmap/config/scan_profile.usp
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 0e1dea23f9c..2b13bc66998 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.70 2016/02/11 06:10:02 jklos Exp $
+$NetBSD: distinfo,v 1.71 2016/04/09 06:38:05 adam Exp $
 
-SHA1 (nmap-7.01.tar.bz2) = c1a44558c72aed3c78d63d54b5b008db69f0aaac
-RMD160 (nmap-7.01.tar.bz2) = 4f79df88e836adb260966ddf1d322b18e16251a2
-SHA512 (nmap-7.01.tar.bz2) = 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7
-Size (nmap-7.01.tar.bz2) = 8922697 bytes
+SHA1 (nmap-7.12.tar.bz2) = 0c25e4089f93adec2ad50e99b92dc8c5bf85c231
+RMD160 (nmap-7.12.tar.bz2) = 8cab24dc5bd69cff06f235b5166a511f5bf2865f
+SHA512 (nmap-7.12.tar.bz2) = 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98
+Size (nmap-7.12.tar.bz2) = 8960599 bytes
 SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600
+SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
 SHA1 (patch-ndiff_setup.py) = 4e4af27cb896fd1bffc2c9089f930d7075daeb22
-SHA1 (patch-nmap__dns.cc) = f2fc895b2f241a39913fed4e3947379a776fef00
 SHA1 (patch-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
 SHA1 (patch-zenmap_test_run__tests.py) = 46b2445eed4255cf838e37123c23121eeaf360b6
diff --git a/net/nmap/patches/patch-libdnet-stripped_src_arp-bsd.c b/net/nmap/patches/patch-libdnet-stripped_src_arp-bsd.c
new file mode 100644
index 00000000000..57a9fa8a6d4
--- /dev/null
+++ b/net/nmap/patches/patch-libdnet-stripped_src_arp-bsd.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-libdnet-stripped_src_arp-bsd.c,v 1.1 2016/04/09 06:38:05 adam Exp $
+
+Fix building on systems where RTF_LLINFO is not defined.
+
+--- libdnet-stripped/src/arp-bsd.c.orig	2016-04-09 06:32:03.612302485 +0000
++++ libdnet-stripped/src/arp-bsd.c
+@@ -22,6 +22,9 @@
+ #include <net/if.h>
+ #include <net/if_dl.h>
+ #include <net/route.h>
++#ifndef RTF_LLINFO
++#define RTF_LLINFO RTF_LLDATA
++#endif
+ #include <netinet/in.h>
+ #include <netinet/if_ether.h>
+ 
diff --git a/net/nmap/patches/patch-nmap__dns.cc b/net/nmap/patches/patch-nmap__dns.cc
deleted file mode 100644
index d0728354b80..00000000000
--- a/net/nmap/patches/patch-nmap__dns.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-nmap__dns.cc,v 1.1 2016/02/11 06:08:39 jklos Exp $
-
---- nmap_dns.cc.orig	2015-10-07 17:49:24.000000000 +0000
-+++ nmap_dns.cc
-@@ -1317,7 +1317,7 @@ bool DNS::Factory::ipToPtr(const sockadd
- 
-       std::string ipv4 = ipv4_c;
-       std::string octet;
--      for (std::string::const_reverse_iterator c=ipv4.rbegin(); c != ipv4.rend(); ++c)
-+      for (std::reverse_iterator<std::string::iterator> c=ipv4.rbegin(); c != ipv4.rend(); ++c)
-         if((*c)=='.')
-         {
-           ptr += octet + ".";
-@@ -1382,7 +1382,7 @@ bool DNS::Factory::ptrToIp(const std::st
-   {
- 
-     std::string octet;
--    for (std::string::const_reverse_iterator it = mptr.rend()-pos; it != mptr.rend(); ++it)
-+    for (std::reverse_iterator<std::string::iterator> it = mptr.rend()-pos; it != mptr.rend(); ++it)
-     {
-       const char &c = *it;
-       if(c == '.')