nmap: 6.47 -> 7.00

3 files changed, 62 insertions, 9 deletions

diff --git a/nmap/.footprint b/nmap/.footprint
index a0163f7c6..a84469bfd 100644
--- a/nmap/.footprint
+++ b/nmap/.footprint
@@ -26,6 +26,7 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/
 -rw-r--r--	root/root	usr/share/nmap/nselib/afp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/ajp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/amqp.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/anyconnect.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/asn1.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/base32.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/base64.lua
@@ -43,6 +44,8 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/
 drwxr-xr-x	root/root	usr/share/nmap/nselib/data/
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/dns-srv-names
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/drupal-modules.lst
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/drupal-themes.lst
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/enterprise_numbers.txt
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/favicon-db
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/http-devframework-fingerprints.lua
@@ -76,13 +79,14 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/psexec/pwdump.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/rtsp-urls.txt
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/snmpcommunities.lst
--rw-r--r--	root/root	usr/share/nmap/nselib/data/ssl-ciphers
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/ssl-fingerprints
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/targets-ipv6-wordlist
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/tftplist.txt
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/usernames.lst
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/vhosts-default.lst
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/vhosts-full.lst
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/wp-plugins.lst
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/wp-themes.lst
 -rw-r--r--	root/root	usr/share/nmap/nselib/datafiles.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/dhcp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/dhcp6.lua
@@ -111,6 +115,8 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/ldap.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/lfs.luadoc
 -rw-r--r--	root/root	usr/share/nmap/nselib/listop.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/lpeg-utility.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/ls.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/match.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/membase.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/mobileme.lua
@@ -137,6 +143,7 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/pppoe.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/proxy.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/rdp.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/re.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/redis.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/rmi.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/rpc.lua
@@ -146,6 +153,7 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/sasl.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/shortport.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/sip.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/slaxml.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/smb.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/smbauth.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/smtp.lua
@@ -196,6 +204,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/auth-spoof.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/backorifice-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/backorifice-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/bacnet-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/banner.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/bitcoin-getaddr.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/bitcoin-info.nse
@@ -224,6 +233,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-pppoe-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-rip-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-ripng-discover.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-sonicwall-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-tellstick-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-upnp-info.nse
@@ -250,7 +260,6 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/daap-get-library.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/daytime.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/db2-das-info.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/db2-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dhcp-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dict-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/distcc-cve2004-2687.nse
@@ -272,6 +281,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-update.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-zeustracker.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-zone-transfer.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/docker-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/domcon-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/domcon-cmd.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/domino-enum-users.nse
@@ -280,8 +290,10 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/drda-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/duplicates.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/eap-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/enip-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/epmd-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/eppc-enum-processes.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/fcrdns.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/finger.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/firewalk.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/firewall-bypass.nse
@@ -307,6 +319,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/hbase-master-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hbase-region-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hddtemp-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/hnap-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hostmap-bfk.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hostmap-ip2hosts.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hostmap-robtex.nse
@@ -315,6 +328,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-apache-negotiation.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-auth-finder.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-auth.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-avaya-ipoffice-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-awstatstotals-exec.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-axis2-dir-traversal.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-backup-finder.nse
@@ -322,10 +336,12 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-cakephp-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-chrono.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-cisco-anyconnect.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-coldfusion-subzero.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-comments-displayer.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-config-backup.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-cors.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-cross-domain-policy.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-csrf.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-date.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-default-accounts.nse
@@ -334,13 +350,13 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-dombased-xss.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-domino-enum-passwords.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-drupal-enum-users.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/http-drupal-modules.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/http-email-harvest.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-drupal-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-errors.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-exif-spider.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-favicon.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-feed.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-fetch.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-fileupload-exploiter.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-form-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-form-fuzzer.nse
@@ -358,6 +374,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-iis-webdav-vuln.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-joomla-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-ls.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-malware-host.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-method-tamper.nse
@@ -379,11 +396,14 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-robtex-reverse-ip.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-robtex-shared-ns.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-server-header.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-shellshock.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-sitemap-generator.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-slowloris-check.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-slowloris.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-sql-injection.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-stored-xss.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-svn-enum.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-svn-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-title.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-tplink-dir-traversal.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-trace.nse
@@ -395,6 +415,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-virustotal.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vlcstreamer-ls.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vmware-path-vuln.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2006-3392.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2009-3960.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2010-0738.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2010-2861.nse
@@ -402,12 +423,22 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2011-3368.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2012-1823.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2013-0156.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-zimbra-lfi.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2013-7091.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2014-2126.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2014-2127.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2014-2128.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2014-2129.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2014-8877.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2015-1427.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2015-1635.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-misfortune-cookie.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-wnr1000-creds.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-waf-detect.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-waf-fingerprint.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-webdav-scan.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-wordpress-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-wordpress-enum.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/http-wordpress-plugins.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-wordpress-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-xssed.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/iax2-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/iax2-version.nse
@@ -423,6 +454,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/ip-geolocation-geoplugin.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ip-geolocation-maxmind.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ip-https-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ipidseq.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ipv6-node-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ipv6-ra-flood.nse
@@ -438,6 +470,8 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/jdwp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/jdwp-inject.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/jdwp-version.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/knx-gateway-discover.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/knx-gateway-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/krb5-enum-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ldap-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ldap-novell-getpass.nse
@@ -454,6 +488,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/metasploit-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/metasploit-msgrpc-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mikrotik-routeros-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mmouse-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mmouse-exec.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/modbus-discover.nse
@@ -502,12 +537,14 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/nfs-ls.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nfs-showmount.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nfs-statfs.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/nje-node-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nping-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nrpe-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ntp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ntp-monlist.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/omp2-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/omp2-enum-targets.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/omron-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/openlookup-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/openvas-otp-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/oracle-brute-stealth.nse
@@ -549,6 +586,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/rsync-list-modules.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rtsp-methods.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rtsp-url-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/s7-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/script.db
 -rw-r--r--	root/root	usr/share/nmap/scripts/servicetags.nse
@@ -558,7 +596,6 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/sip-methods.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/skypev2-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-brute.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/smb-check-vulns.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-enum-domains.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-enum-groups.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-enum-processes.nse
@@ -574,8 +611,14 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-security-mode.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-server-stats.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-system-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-conficker.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-cve2009-3103.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-ms06-025.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-ms07-029.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-ms08-067.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-ms10-054.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-ms10-061.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-vuln-regsvc-dos.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smbv2-enabled.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smtp-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smtp-commands.nse
@@ -588,6 +631,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/sniffer-detect.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/snmp-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/snmp-hh3c-logins.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/snmp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/snmp-interfaces.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/snmp-ios-config.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/snmp-netstat.nse
@@ -603,30 +647,38 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssh-hostkey.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssh2-enum-algos.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/sshv1.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ssl-ccs-injection.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-cert.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-date.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ssl-dh-params.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-enum-ciphers.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-google-cert-catalog.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-heartbleed.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ssl-known-key.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ssl-poodle.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/sslv2.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/sstp-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/stun-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/stun-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/stuxnet-detect.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/supermicro-ipmi-conf.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/svn-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-asn.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-map4to6.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/targets-ipv6-wordlist.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-sniffer.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/targets-traceroute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/targets-xml.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/teamspeak2-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/telnet-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/telnet-encryption.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/tftp-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/tls-nextprotoneg.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/tor-consensus-checker.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/traceroute-geolocation.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/unittest.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/unusual-port.nse
@@ -646,5 +698,6 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/wsdd-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/x11-access.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/xdmcp-discover.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/xmlrpc-methods.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/xmpp-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/xmpp-info.nse
diff --git a/nmap/.md5sum b/nmap/.md5sum
index c545f9283..fa3b78aea 100644
--- a/nmap/.md5sum
+++ b/nmap/.md5sum
@@ -1 +1 @@
-edfe81f6763223c0a29bfa15a8526e2a  nmap-6.47.tar.bz2
+6cdf5d03cc3294b99d69dfca83f2f2ee  nmap-7.00.tar.bz2
diff --git a/nmap/Pkgfile b/nmap/Pkgfile
index e968f11bb..b58802d1a 100644
--- a/nmap/Pkgfile
+++ b/nmap/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libpcap
 
 name=nmap
-version=6.47
+version=7.00
 release=1
 source=(http://nmap.org/dist/$name-$version.tar.bz2)