4 files changed, 60 insertions, 13 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index b1d4b60f2098..3a4465b2fb50 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nmap
-DISTVERSION=	5.61TEST4
-PORTREVISION=	1
+DISTVERSION=	5.61TEST5
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 65014e21f304..81aee7c4acb9 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-5.61TEST4.tar.bz2) = b914d42dd578ffd711e6e5a8ea136acbe367c356c03c967811e76bd24a1923ae
-SIZE (nmap-5.61TEST4.tar.bz2) = 21757047
+SHA256 (nmap-5.61TEST5.tar.bz2) = 048fb618dd02e9003280a10a7fe0584b70f47a4220583ad575c8acee31a0a465
+SIZE (nmap-5.61TEST5.tar.bz2) = 21500913
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index 3d2f102f93ec..af5c99e6ef48 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -8,12 +8,3 @@
  #include <sstream>
  
  /* Workaround for lack of namespace std on HP-UX 11.00 */
-@@ -940,7 +941,7 @@
-   case LOG_MACHINE:
-   case LOG_SKID:
-   case LOG_XML:
--#ifdef WIN32
-+#if defined(WIN32) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-     apcopy = ap;
- #else
-     va_copy(apcopy, ap); /* Needed in case we need to do a second vsnprintf */
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 5e8e1d51b313..3f91f04fac56 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -51,14 +51,17 @@ bin/nping
 %%DATADIR%%/nselib/data/wp-plugins.lst
 %%DATADIR%%/nselib/datafiles.lua
 %%DATADIR%%/nselib/dhcp.lua
+%%DATADIR%%/nselib/dhcp6.lua
 %%DATADIR%%/nselib/dns.lua
 %%DATADIR%%/nselib/dnsbl.lua
 %%DATADIR%%/nselib/dnssd.lua
 %%DATADIR%%/nselib/drda.lua
+%%DATADIR%%/nselib/eap.lua
 %%DATADIR%%/nselib/ftp.lua
 %%DATADIR%%/nselib/giop.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
@@ -67,13 +70,16 @@ bin/nping
 %%DATADIR%%/nselib/ldap.lua
 %%DATADIR%%/nselib/listop.lua
 %%DATADIR%%/nselib/match.lua
+%%DATADIR%%/nselib/membase.lua
 %%DATADIR%%/nselib/mongodb.lua
 %%DATADIR%%/nselib/msrpc.lua
 %%DATADIR%%/nselib/msrpcperformance.lua
 %%DATADIR%%/nselib/msrpctypes.lua
 %%DATADIR%%/nselib/mssql.lua
 %%DATADIR%%/nselib/mysql.lua
+%%DATADIR%%/nselib/natpmp.lua
 %%DATADIR%%/nselib/ncp.lua
+%%DATADIR%%/nselib/ndmp.lua
 %%DATADIR%%/nselib/netbios.lua
 %%DATADIR%%/nselib/nrpc.lua
 %%DATADIR%%/nselib/nsedebug.lua
@@ -81,9 +87,13 @@ bin/nping
 %%DATADIR%%/nselib/packet.lua
 %%DATADIR%%/nselib/pgsql.lua
 %%DATADIR%%/nselib/pop3.lua
+%%DATADIR%%/nselib/pppoe.lua
 %%DATADIR%%/nselib/proxy.lua
+%%DATADIR%%/nselib/redis.lua
 %%DATADIR%%/nselib/rmi.lua
 %%DATADIR%%/nselib/rpc.lua
+%%DATADIR%%/nselib/rpcap.lua
+%%DATADIR%%/nselib/rsync.lua
 %%DATADIR%%/nselib/rtsp.lua
 %%DATADIR%%/nselib/sasl.lua
 %%DATADIR%%/nselib/shortport.lua
@@ -92,9 +102,11 @@ bin/nping
 %%DATADIR%%/nselib/smbauth.lua
 %%DATADIR%%/nselib/smtp.lua
 %%DATADIR%%/nselib/snmp.lua
+%%DATADIR%%/nselib/socks.lua
 %%DATADIR%%/nselib/srvloc.lua
 %%DATADIR%%/nselib/ssh1.lua
 %%DATADIR%%/nselib/ssh2.lua
+%%DATADIR%%/nselib/sslcert.lua
 %%DATADIR%%/nselib/stdnse.lua
 %%DATADIR%%/nselib/strbuf.lua
 %%DATADIR%%/nselib/strict.lua
@@ -105,11 +117,14 @@ bin/nping
 %%DATADIR%%/nselib/unpwdb.lua
 %%DATADIR%%/nselib/upnp.lua
 %%DATADIR%%/nselib/url.lua
+%%DATADIR%%/nselib/versant.lua
 %%DATADIR%%/nselib/vnc.lua
 %%DATADIR%%/nselib/vulns.lua
 %%DATADIR%%/nselib/vuzedht.lua
 %%DATADIR%%/nselib/wsdd.lua
+%%DATADIR%%/nselib/xdmcp.lua
 %%DATADIR%%/nselib/xmpp.lua
+%%DATADIR%%/scripts/acarsd-info.nse
 %%DATADIR%%/scripts/address-info.nse
 %%DATADIR%%/scripts/afp-brute.nse
 %%DATADIR%%/scripts/afp-ls.nse
@@ -118,6 +133,7 @@ bin/nping
 %%DATADIR%%/scripts/afp-showmount.nse
 %%DATADIR%%/scripts/amqp-info.nse
 %%DATADIR%%/scripts/asn-query.nse
+%%DATADIR%%/scripts/asn-to-prefix.nse
 %%DATADIR%%/scripts/auth-owners.nse
 %%DATADIR%%/scripts/auth-spoof.nse
 %%DATADIR%%/scripts/backorifice-brute.nse
@@ -130,21 +146,28 @@ bin/nping
 %%DATADIR%%/scripts/broadcast-avahi-dos.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-listener.nse
 %%DATADIR%%/scripts/broadcast-ms-sql-discover.nse
 %%DATADIR%%/scripts/broadcast-netbios-master-browser.nse
+%%DATADIR%%/scripts/broadcast-networker-discover.nse
 %%DATADIR%%/scripts/broadcast-novell-locate.nse
 %%DATADIR%%/scripts/broadcast-pc-anywhere.nse
 %%DATADIR%%/scripts/broadcast-pc-duo.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-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/cccam-version.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps.nse
@@ -163,12 +186,15 @@ bin/nping
 %%DATADIR%%/scripts/dns-blacklist.nse
 %%DATADIR%%/scripts/dns-brute.nse
 %%DATADIR%%/scripts/dns-cache-snoop.nse
+%%DATADIR%%/scripts/dns-client-subnet-scan.nse
 %%DATADIR%%/scripts/dns-fuzz.nse
 %%DATADIR%%/scripts/dns-nsec-enum.nse
+%%DATADIR%%/scripts/dns-nsid.nse
 %%DATADIR%%/scripts/dns-random-srcport.nse
 %%DATADIR%%/scripts/dns-random-txid.nse
 %%DATADIR%%/scripts/dns-recursion.nse
 %%DATADIR%%/scripts/dns-service-discovery.nse
+%%DATADIR%%/scripts/dns-srv-enum.nse
 %%DATADIR%%/scripts/dns-update.nse
 %%DATADIR%%/scripts/dns-zeustracker.nse
 %%DATADIR%%/scripts/dns-zone-transfer.nse
@@ -178,6 +204,7 @@ bin/nping
 %%DATADIR%%/scripts/dpap-brute.nse
 %%DATADIR%%/scripts/drda-brute.nse
 %%DATADIR%%/scripts/drda-info.nse
+%%DATADIR%%/scripts/eap-info.nse
 %%DATADIR%%/scripts/epmd-info.nse
 %%DATADIR%%/scripts/finger.nse
 %%DATADIR%%/scripts/firewalk.nse
@@ -202,6 +229,7 @@ bin/nping
 %%DATADIR%%/scripts/hostmap.nse
 %%DATADIR%%/scripts/http-affiliate-id.nse
 %%DATADIR%%/scripts/http-apache-negotiation.nse
+%%DATADIR%%/scripts/http-auth-finder.nse
 %%DATADIR%%/scripts/http-auth.nse
 %%DATADIR%%/scripts/http-awstatstotals-exec.nse
 %%DATADIR%%/scripts/http-axis2-dir-traversal.nse
@@ -209,6 +237,7 @@ bin/nping
 %%DATADIR%%/scripts/http-barracuda-dir-traversal.nse
 %%DATADIR%%/scripts/http-brute.nse
 %%DATADIR%%/scripts/http-cakephp-version.nse
+%%DATADIR%%/scripts/http-config-backup.nse
 %%DATADIR%%/scripts/http-cors.nse
 %%DATADIR%%/scripts/http-date.nse
 %%DATADIR%%/scripts/http-default-accounts.nse
@@ -217,6 +246,7 @@ bin/nping
 %%DATADIR%%/scripts/http-enum.nse
 %%DATADIR%%/scripts/http-favicon.nse
 %%DATADIR%%/scripts/http-form-brute.nse
+%%DATADIR%%/scripts/http-generator.nse
 %%DATADIR%%/scripts/http-google-malware.nse
 %%DATADIR%%/scripts/http-grep.nse
 %%DATADIR%%/scripts/http-headers.nse
@@ -231,7 +261,9 @@ bin/nping
 %%DATADIR%%/scripts/http-open-redirect.nse
 %%DATADIR%%/scripts/http-passwd.nse
 %%DATADIR%%/scripts/http-php-version.nse
+%%DATADIR%%/scripts/http-proxy-brute.nse
 %%DATADIR%%/scripts/http-put.nse
+%%DATADIR%%/scripts/http-qnap-nas-info.nse
 %%DATADIR%%/scripts/http-robots.txt.nse
 %%DATADIR%%/scripts/http-robtex-reverse-ip.nse
 %%DATADIR%%/scripts/http-title.nse
@@ -240,12 +272,15 @@ bin/nping
 %%DATADIR%%/scripts/http-userdir-enum.nse
 %%DATADIR%%/scripts/http-vhosts.nse
 %%DATADIR%%/scripts/http-vmware-path-vuln.nse
+%%DATADIR%%/scripts/http-vuln-cve2009-3960.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-waf-detect.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/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
@@ -273,8 +308,12 @@ bin/nping
 %%DATADIR%%/scripts/lexmark-config.nse
 %%DATADIR%%/scripts/lltd-discovery.nse
 %%DATADIR%%/scripts/maxdb-info.nse
+%%DATADIR%%/scripts/membase-brute.nse
+%%DATADIR%%/scripts/membase-http-info.nse
+%%DATADIR%%/scripts/memcached-info.nse
 %%DATADIR%%/scripts/metasploit-xmlrpc-brute.nse
 %%DATADIR%%/scripts/modbus-discover.nse
+%%DATADIR%%/scripts/mongodb-brute.nse
 %%DATADIR%%/scripts/mongodb-databases.nse
 %%DATADIR%%/scripts/mongodb-info.nse
 %%DATADIR%%/scripts/ms-sql-brute.nse
@@ -294,10 +333,14 @@ bin/nping
 %%DATADIR%%/scripts/mysql-users.nse
 %%DATADIR%%/scripts/mysql-variables.nse
 %%DATADIR%%/scripts/nat-pmp-info.nse
+%%DATADIR%%/scripts/nat-pmp-mapport.nse
 %%DATADIR%%/scripts/nbstat.nse
 %%DATADIR%%/scripts/ncp-enum-users.nse
 %%DATADIR%%/scripts/ncp-serverinfo.nse
+%%DATADIR%%/scripts/ndmp-fs-info.nse
+%%DATADIR%%/scripts/ndmp-version.nse
 %%DATADIR%%/scripts/nessus-brute.nse
+%%DATADIR%%/scripts/nessus-xmlrpc-brute.nse
 %%DATADIR%%/scripts/netbus-auth-bypass.nse
 %%DATADIR%%/scripts/netbus-brute.nse
 %%DATADIR%%/scripts/netbus-info.nse
@@ -329,12 +372,19 @@ bin/nping
 %%DATADIR%%/scripts/quake3-info.nse
 %%DATADIR%%/scripts/quake3-master-getservers.nse
 %%DATADIR%%/scripts/realvnc-auth-bypass.nse
+%%DATADIR%%/scripts/redis-brute.nse
+%%DATADIR%%/scripts/redis-info.nse
 %%DATADIR%%/scripts/resolveall.nse
 %%DATADIR%%/scripts/reverse-index.nse
 %%DATADIR%%/scripts/rexec-brute.nse
+%%DATADIR%%/scripts/riak-http-info.nse
 %%DATADIR%%/scripts/rlogin-brute.nse
 %%DATADIR%%/scripts/rmi-dumpregistry.nse
+%%DATADIR%%/scripts/rpcap-brute.nse
+%%DATADIR%%/scripts/rpcap-info.nse
 %%DATADIR%%/scripts/rpcinfo.nse
+%%DATADIR%%/scripts/rsync-brute.nse
+%%DATADIR%%/scripts/rsync-list-modules.nse
 %%DATADIR%%/scripts/rtsp-methods.nse
 %%DATADIR%%/scripts/rtsp-url-brute.nse
 %%DATADIR%%/scripts/script.db
@@ -377,6 +427,8 @@ bin/nping
 %%DATADIR%%/scripts/snmp-win32-shares.nse
 %%DATADIR%%/scripts/snmp-win32-software.nse
 %%DATADIR%%/scripts/snmp-win32-users.nse
+%%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
@@ -399,13 +451,18 @@ bin/nping
 %%DATADIR%%/scripts/tftp-enum.nse
 %%DATADIR%%/scripts/unusual-port.nse
 %%DATADIR%%/scripts/upnp-info.nse
+%%DATADIR%%/scripts/url-snarf.nse
+%%DATADIR%%/scripts/versant-info.nse
+%%DATADIR%%/scripts/vmauthd-brute.nse
 %%DATADIR%%/scripts/vnc-brute.nse
 %%DATADIR%%/scripts/vnc-info.nse
+%%DATADIR%%/scripts/voldemort-info.nse
 %%DATADIR%%/scripts/vuze-dht-info.nse
 %%DATADIR%%/scripts/wdb-version.nse
 %%DATADIR%%/scripts/whois.nse
 %%DATADIR%%/scripts/wsdd-discover.nse
 %%DATADIR%%/scripts/x11-access.nse
+%%DATADIR%%/scripts/xdmcp-discover.nse
 %%DATADIR%%/scripts/xmpp-brute.nse
 %%DATADIR%%/scripts/xmpp-info.nse
 @dirrm %%DATADIR%%/scripts