nmap: updated to 7.70

7.70:
We're excited to make our first Nmap release of 2018--version 7.70!  It
includes hundreds of new OS and service fingerprints, 9 new NSE scripts
(for a total of 588), a much-improved version of our Npcap windows packet
capturing library/driver, and service detection improvements to make -sV
faster and more accurate.

4 files changed, 49 insertions, 39 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index abda45b57e4..cd5216b0610 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.138 2018/03/12 11:17:22 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2018/04/03 14:34:00 adam Exp $
 
-DISTNAME=	nmap-7.60
-PKGREVISION=	2
+DISTNAME=	nmap-7.70
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index e7a154da688..221dbfe94bf 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2017/08/03 13:52:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/04/03 14:34:00 adam Exp $
 bin/ncat
 ${PLIST.ndiff}bin/ndiff
 bin/nmap
@@ -6,25 +6,6 @@ ${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
@@ -241,6 +222,25 @@ ${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
@@ -285,6 +285,7 @@ ${PLIST.lua}share/nmap/nselib/data/http-fingerprints.lua
 ${PLIST.lua}share/nmap/nselib/data/http-folders.txt
 ${PLIST.lua}share/nmap/nselib/data/http-sql-errors.lst
 ${PLIST.lua}share/nmap/nselib/data/http-web-files-extensions.lst
+${PLIST.lua}share/nmap/nselib/data/idnaMappings.lua
 ${PLIST.lua}share/nmap/nselib/data/ike-fingerprints.lua
 ${PLIST.lua}share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class
 ${PLIST.lua}share/nmap/nselib/data/jdwp-class/JDWPExecCmd.java
@@ -298,7 +299,6 @@ ${PLIST.lua}share/nmap/nselib/data/oracle-sids
 ${PLIST.lua}share/nmap/nselib/data/packetdecoders.lua
 ${PLIST.lua}share/nmap/nselib/data/passwords.lst
 ${PLIST.lua}share/nmap/nselib/data/pixel.gif
-${PLIST.lua}share/nmap/nselib/data/publickeydb
 ${PLIST.lua}share/nmap/nselib/data/psexec/README
 ${PLIST.lua}share/nmap/nselib/data/psexec/backdoor.lua
 ${PLIST.lua}share/nmap/nselib/data/psexec/default.lua
@@ -309,6 +309,7 @@ ${PLIST.lua}share/nmap/nselib/data/psexec/network.lua
 ${PLIST.lua}share/nmap/nselib/data/psexec/nmap_service.c
 ${PLIST.lua}share/nmap/nselib/data/psexec/nmap_service.vcproj
 ${PLIST.lua}share/nmap/nselib/data/psexec/pwdump.lua
+${PLIST.lua}share/nmap/nselib/data/publickeydb
 ${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
@@ -337,6 +338,7 @@ ${PLIST.lua}share/nmap/nselib/gps.lua
 ${PLIST.lua}share/nmap/nselib/http.lua
 ${PLIST.lua}share/nmap/nselib/httpspider.lua
 ${PLIST.lua}share/nmap/nselib/iax2.lua
+${PLIST.lua}share/nmap/nselib/idna.lua
 ${PLIST.lua}share/nmap/nselib/ike.lua
 ${PLIST.lua}share/nmap/nselib/imap.lua
 ${PLIST.lua}share/nmap/nselib/informix.lua
@@ -368,6 +370,7 @@ ${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/nbd.lua
 ${PLIST.lua}share/nmap/nselib/ncp.lua
 ${PLIST.lua}share/nmap/nselib/ndmp.lua
 ${PLIST.lua}share/nmap/nselib/netbios.lua
@@ -383,6 +386,7 @@ ${PLIST.lua}share/nmap/nselib/pgsql.lua
 ${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/punycode.lua
 ${PLIST.lua}share/nmap/nselib/rdp.lua
 ${PLIST.lua}share/nmap/nselib/re.lua
 ${PLIST.lua}share/nmap/nselib/redis.lua
@@ -428,6 +432,7 @@ ${PLIST.lua}share/nmap/nselib/vuzedht.lua
 ${PLIST.lua}share/nmap/nselib/wsdd.lua
 ${PLIST.lua}share/nmap/nselib/xdmcp.lua
 ${PLIST.lua}share/nmap/nselib/xmpp.lua
+${PLIST.lua}share/nmap/nselib/zlib.luadoc
 ${PLIST.lua}share/nmap/scripts/acarsd-info.nse
 ${PLIST.lua}share/nmap/scripts/address-info.nse
 ${PLIST.lua}share/nmap/scripts/afp-brute.nse
@@ -511,6 +516,7 @@ ${PLIST.lua}share/nmap/scripts/cvs-brute.nse
 ${PLIST.lua}share/nmap/scripts/daap-get-library.nse
 ${PLIST.lua}share/nmap/scripts/daytime.nse
 ${PLIST.lua}share/nmap/scripts/db2-das-info.nse
+${PLIST.lua}share/nmap/scripts/deluge-rpc-brute.nse
 ${PLIST.lua}share/nmap/scripts/dhcp-discover.nse
 ${PLIST.lua}share/nmap/scripts/dict-info.nse
 ${PLIST.lua}share/nmap/scripts/distcc-cve2004-2687.nse
@@ -575,6 +581,7 @@ ${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-crtsh.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
@@ -589,6 +596,7 @@ ${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
 ${PLIST.lua}share/nmap/scripts/http-barracuda-dir-traversal.nse
+${PLIST.lua}share/nmap/scripts/http-bigip-cookie.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
@@ -631,6 +639,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-internal-ip-disclosure.nse
 ${PLIST.lua}share/nmap/scripts/http-joomla-brute.nse
+${PLIST.lua}share/nmap/scripts/http-jsonp-detection.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
@@ -668,6 +677,7 @@ ${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
 ${PLIST.lua}share/nmap/scripts/http-traceroute.nse
+${PLIST.lua}share/nmap/scripts/http-trane-info.nse
 ${PLIST.lua}share/nmap/scripts/http-unsafe-output-escaping.nse
 ${PLIST.lua}share/nmap/scripts/http-useragent-tester.nse
 ${PLIST.lua}share/nmap/scripts/http-userdir-enum.nse
@@ -799,6 +809,7 @@ ${PLIST.lua}share/nmap/scripts/mysql-variables.nse
 ${PLIST.lua}share/nmap/scripts/mysql-vuln-cve2012-2122.nse
 ${PLIST.lua}share/nmap/scripts/nat-pmp-info.nse
 ${PLIST.lua}share/nmap/scripts/nat-pmp-mapport.nse
+${PLIST.lua}share/nmap/scripts/nbd-info.nse
 ${PLIST.lua}share/nmap/scripts/nbstat.nse
 ${PLIST.lua}share/nmap/scripts/ncp-enum-users.nse
 ${PLIST.lua}share/nmap/scripts/ncp-serverinfo.nse
@@ -866,6 +877,7 @@ ${PLIST.lua}share/nmap/scripts/rpc-grind.nse
 ${PLIST.lua}share/nmap/scripts/rpcap-brute.nse
 ${PLIST.lua}share/nmap/scripts/rpcap-info.nse
 ${PLIST.lua}share/nmap/scripts/rpcinfo.nse
+${PLIST.lua}share/nmap/scripts/rsa-vuln-roca.nse
 ${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
@@ -886,6 +898,7 @@ ${PLIST.lua}share/nmap/scripts/smb-double-pulsar-backdoor.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-domains.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-groups.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-processes.nse
+${PLIST.lua}share/nmap/scripts/smb-enum-services.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-sessions.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-shares.nse
 ${PLIST.lua}share/nmap/scripts/smb-enum-users.nse
@@ -940,9 +953,9 @@ ${PLIST.lua}share/nmap/scripts/socks-brute.nse
 ${PLIST.lua}share/nmap/scripts/socks-open-proxy.nse
 ${PLIST.lua}share/nmap/scripts/ssh-auth-methods.nse
 ${PLIST.lua}share/nmap/scripts/ssh-brute.nse
+${PLIST.lua}share/nmap/scripts/ssh-hostkey.nse
 ${PLIST.lua}share/nmap/scripts/ssh-publickey-acceptance.nse
 ${PLIST.lua}share/nmap/scripts/ssh-run.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
@@ -977,6 +990,7 @@ ${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-alpn.nse
 ${PLIST.lua}share/nmap/scripts/tls-nextprotoneg.nse
 ${PLIST.lua}share/nmap/scripts/tls-ticketbleed.nse
 ${PLIST.lua}share/nmap/scripts/tn3270-screen.nse
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 967b2833a49..209722d565b 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.75 2017/08/03 13:52:00 adam Exp $
+$NetBSD: distinfo,v 1.76 2018/04/03 14:34:00 adam Exp $
 
-SHA1 (nmap-7.60.tar.bz2) = 5d36a55ce772ec24f7f50ab52780f932ee20529f
-RMD160 (nmap-7.60.tar.bz2) = 24d27f10cbfcb4ae895f1010b401246a510fab0c
-SHA512 (nmap-7.60.tar.bz2) = 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
-Size (nmap-7.60.tar.bz2) = 10394925 bytes
+SHA1 (nmap-7.70.tar.bz2) = 71057361a0953bba5967dc0385de77f3eed792de
+RMD160 (nmap-7.70.tar.bz2) = 39b176e3b515bb5bf95503e3cb431a0dcd9e97ed
+SHA512 (nmap-7.70.tar.bz2) = 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
+Size (nmap-7.70.tar.bz2) = 10467371 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-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
-SHA1 (patch-zenmap_test_run__tests.py) = 452b4584f9607586f5a3a43b852369bd9fa78ce7
+SHA1 (patch-zenmap_test_run__tests.py) = 189e3b8d71131da31b65ebb6444e517bb1611a9b
diff --git a/net/nmap/patches/patch-zenmap_test_run__tests.py b/net/nmap/patches/patch-zenmap_test_run__tests.py
index 135ba33f0cb..031310d29b3 100644
--- a/net/nmap/patches/patch-zenmap_test_run__tests.py
+++ b/net/nmap/patches/patch-zenmap_test_run__tests.py
@@ -1,15 +1,12 @@
-$NetBSD: patch-zenmap_test_run__tests.py,v 1.2 2016/10/14 15:11:16 maya Exp $
+$NetBSD: patch-zenmap_test_run__tests.py,v 1.3 2018/04/03 14:34:00 adam Exp $
 
---- zenmap/test/run_tests.py.orig	2016-06-26 04:39:29.000000000 +0000
+--- zenmap/test/run_tests.py.orig	2017-08-07 16:14:51.000000000 +0000
 +++ zenmap/test/run_tests.py
-@@ -11,8 +11,9 @@ if __name__ == "__main__":
+@@ -11,6 +11,7 @@ if __name__ == "__main__":
          sys.exit(0)
  
      os.chdir("..")
-+    sys.path.insert(1,"build/lib")
++    sys.path.insert(1, "build/lib")
      suite = unittest.defaultTestLoader.discover(
--        start_dir=glob.glob("build/lib.*")[0],
-+        start_dir=glob.glob("build/lib/*")[0],
+         start_dir=glob.glob("build/lib*")[0],
          pattern="*.py"
-         )
-     unittest.TextTestRunner().run(suite)