nmap: 6.01 -> 6.25

3 files changed, 111 insertions, 3 deletions

diff --git a/nmap/.footprint b/nmap/.footprint
index c64e81652..e364017db 100644
--- a/nmap/.footprint
+++ b/nmap/.footprint
@@ -26,21 +26,34 @@ drwxr-xr-x	root/root	usr/share/nmap/
 -rw-r--r--	root/root	usr/share/nmap/nse_main.lua
 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/asn1.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/base32.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/base64.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/bitcoin.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/bittorrent.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/bjnp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/brute.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/cassandra.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/citrixxml.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/comm.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/creds.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/cvs.lua
 drwxr-xr-x	root/root	usr/share/nmap/nselib/data/
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/drupal-modules.lst
 -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-fingerprints.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/http-folders.txt
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/http-sql-errors.lst
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/http-web-files-extensions.lst
+drwxr-xr-x	root/root	usr/share/nmap/nselib/data/jdwp-class/
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/jdwp-class/JDWPExecCmd.java
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.class
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.java
+-rw-r--r--	root/root	usr/share/nmap/nselib/data/jdwp-class/README.txt
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/mysql-cis.audit
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/oracle-default-accounts.lst
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/oracle-sids
@@ -62,6 +75,8 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/data/ssl-fingerprints
 -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/datafiles.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/dhcp.lua
@@ -71,20 +86,26 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/dnssd.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/drda.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/eap.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/eigrp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/ftp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/giop.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/gps.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/http.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/httpspider.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/iax2.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/imap.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/informix.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/ipOps.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/ipp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/iscsi.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/isns.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/jdwp.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/json.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/ldap.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/listop.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
 -rw-r--r--	root/root	usr/share/nmap/nselib/mongodb.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/msrpc.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/msrpcperformance.lua
@@ -98,11 +119,13 @@ drwxr-xr-x	root/root	usr/share/nmap/nselib/data/psexec/
 -rw-r--r--	root/root	usr/share/nmap/nselib/nrpc.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/nsedebug.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/omp2.lua
+-rw-r--r--	root/root	usr/share/nmap/nselib/ospf.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/packet.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/pgsql.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/pop3.lua
 -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/redis.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/rmi.lua
 -rw-r--r--	root/root	usr/share/nmap/nselib/rpc.lua
@@ -147,6 +170,11 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/afp-path-vuln.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/afp-serverinfo.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/afp-showmount.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ajp-auth.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ajp-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ajp-headers.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ajp-methods.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ajp-request.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/amqp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/asn-query.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/auth-owners.nse
@@ -158,12 +186,17 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/bitcoin-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/bitcoinrpc-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/bittorrent-discovery.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/bjnp-discover.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-ataoe-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-avahi-dos.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-bjnp-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-db2-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-dhcp-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-dhcp6-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-dropbox-listener.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-eigrp-discovery.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-igmp-discovery.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-listener.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-netbios-master-browser.nse
@@ -171,17 +204,21 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-novell-locate.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-pc-anywhere.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-pc-duo.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-pim-discovery.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-ping.nse
 -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-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
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-versant-locate.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-wake-on-lan.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-wpad-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-wsdd-discover.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/broadcast-xdmcp-discover.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/cassandra-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/cassandra-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/cccam-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/citrix-brute-xml.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/citrix-enum-apps-xml.nse
@@ -191,6 +228,8 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/couchdb-databases.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/couchdb-stats.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/creds-summary.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/cups-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/cups-queue-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/cvs-brute-repository.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/cvs-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/daap-get-library.nse
@@ -198,12 +237,17 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -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
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-blacklist.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-cache-snoop.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/dns-check-zone.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-client-subnet-scan.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-fuzz.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/dns-ip6-arpa-scan.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-nsec-enum.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/dns-nsec3-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-nsid.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-random-srcport.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/dns-random-txid.nse
@@ -222,8 +266,11 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -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/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/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
+-rw-r--r--	root/root	usr/share/nmap/scripts/flume-master-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ftp-anon.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ftp-bounce.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ftp-brute.nse
@@ -233,7 +280,9 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ganglia-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/giop-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/gkrellm-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/gopher-ls.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/gpsd-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hadoop-datanode-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hadoop-jobtracker-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/hadoop-namenode-info.nse
@@ -243,6 +292,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -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/hostmap-bfk.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/hostmap-robtex.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-affiliate-id.nse
 -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
@@ -259,14 +309,24 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -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
 -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-enum.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-form-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-form-fuzzer.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-frontpage-login.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-generator.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-git.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-gitweb-projects-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-google-malware.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-grep.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-headers.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-huawei-hg5xx-vuln.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-icloud-findmyiphone.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-icloud-sendmsg.nse
 -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
@@ -278,45 +338,66 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-open-redirect.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-passwd.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-php-version.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-phpself-xss.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-proxy-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-put.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-qnap-nas-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-rfi-spider.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-robots.txt.nse
 -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-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-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
+-rw-r--r--	root/root	usr/share/nmap/scripts/http-traceroute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-unsafe-output-escaping.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-userdir-enum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vhosts.nse
+-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-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
 -rw-r--r--	root/root	usr/share/nmap/scripts/http-vuln-cve2011-3192.nse
 -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-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-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/iax2-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/iax2-version.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/icap-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/imap-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/imap-capabilities.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/informix-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/informix-query.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/informix-tables.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ip-forwarding.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ip-geolocation-geobytes.nse
 -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/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
 -rw-r--r--	root/root	usr/share/nmap/scripts/irc-botnet-channels.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/irc-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/irc-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/irc-sasl-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/iscsi-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/iscsi-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/isns-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/jdwp-exec.nse
+-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/krb5-enum-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ldap-brute.nse
@@ -324,18 +405,26 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/ldap-rootdse.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ldap-search.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/lexmark-config.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/llmnr-resolve.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/lltd-discovery.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/maxdb-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mcafee-epo-agent.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/membase-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/membase-http-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/memcached-info.nse
+-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/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
 -rw-r--r--	root/root	usr/share/nmap/scripts/mongodb-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mongodb-databases.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mongodb-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mrinfo.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-config.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-dac.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-dump-hashes.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-empty-password.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
@@ -343,13 +432,18 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-query.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-tables.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/msrpc-enum.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mtrace.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-audit.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-databases.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mysql-dump-hashes.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-empty-password.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-info.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mysql-query.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/mysql-variables.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/mysql-vuln-cve2012-2122.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nat-pmp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nat-pmp-mapport.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/nbstat.nse
@@ -375,12 +469,14 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/omp2-enum-targets.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
 -rw-r--r--	root/root	usr/share/nmap/scripts/oracle-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/oracle-enum-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/oracle-sid-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/ovs-agent-version.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/p2p-conficker.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/path-mtu.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/pcanywhere-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/pgsql-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/pjl-ready-message.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/pop3-brute.nse
@@ -389,6 +485,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/qscan.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/quake3-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/quake3-master-getservers.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/rdp-enum-encryption.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rdp-vuln-ms12-020.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/realvnc-auth-bypass.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/redis-brute.nse
@@ -399,6 +496,8 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/riak-http-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rlogin-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rmi-dumpregistry.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/rmi-vuln-classloader.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/rpc-grind.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rpcap-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rpcap-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/rpcinfo.nse
@@ -410,7 +509,9 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/script.db
 -rw-r--r--	root/root	usr/share/nmap/scripts/servicetags.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/sip-brute.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/sip-call-spoof.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/sip-enum-users.nse
+-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
@@ -421,12 +522,16 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-enum-shares.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-enum-users.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-flood.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-ls.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-mbenum.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-os-discovery.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/smb-print-text.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/smb-psexec.nse
 -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-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/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
@@ -438,6 +543,7 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 -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-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
@@ -450,11 +556,11 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -rw-r--r--	root/root	usr/share/nmap/scripts/socks-auth-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/socks-brute.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/socks-open-proxy.nse
--rw-r--r--	root/root	usr/share/nmap/scripts/sql-injection.nse
 -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-cert.nse
+-rw-r--r--	root/root	usr/share/nmap/scripts/ssl-date.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-known-key.nse
@@ -473,6 +579,8 @@ drwxr-xr-x	root/root	usr/share/nmap/scripts/
 -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/traceroute-geolocation.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/unusual-port.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/upnp-info.nse
 -rw-r--r--	root/root	usr/share/nmap/scripts/url-snarf.nse
diff --git a/nmap/.md5sum b/nmap/.md5sum
index 431f2deeb..9a2fc2d02 100644
--- a/nmap/.md5sum
+++ b/nmap/.md5sum
@@ -1 +1 @@
-a1a71940f238abb835dbf3ee7412bcea  nmap-6.01.tar.bz2
+fcc80f94ff3adcb11eedf91092ea6f5e  nmap-6.25.tar.bz2
diff --git a/nmap/Pkgfile b/nmap/Pkgfile
index 0e98517f9..b8261c7dc 100644
--- a/nmap/Pkgfile
+++ b/nmap/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libpcap
 
 name=nmap
-version=6.01
+version=6.25
 release=1
 source=(http://nmap.org/dist/$name-$version.tar.bz2)