4 files changed, 55 insertions, 18 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 7c90da8841d2..a4f9836c6f76 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nmap
-PORTVERSION=	5.51
-PORTREVISION=	2
+DISTVERSION=	5.59BETA1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -15,11 +14,11 @@ MASTER_SITES=	http://nmap.org/dist/ \
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Port scanning utility for large networks
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
-
 # http://nmap.org/book/man-legal.html
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
+
 USE_LUA=	5.1
 LUA_COMPS=	lua
 USE_BZIP2=	yes
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index b8d4786f6e84..1e457baa09dc 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-5.51.tar.bz2) = 15b3e134a74fa9b54aba2c3a53d6701c7ad221dc4051657ef95465a5a5a8687e
-SIZE (nmap-5.51.tar.bz2) = 16869068
+SHA256 (nmap-5.59BETA1.tar.bz2) = c43d9b93431b47d4e8c0cfa1812ff655b2b84ed30d25b5494ea7f1692a1ad782
+SIZE (nmap-5.59BETA1.tar.bz2) = 21306127
diff --git a/security/nmap/files/patch-TargetGroup.cc b/security/nmap/files/patch-TargetGroup.cc
deleted file mode 100644
index 46af812ce807..000000000000
--- a/security/nmap/files/patch-TargetGroup.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./TargetGroup.cc.orig	2011-01-21 01:04:16.000000000 +0100
-+++ ./TargetGroup.cc	2011-04-21 00:55:50.000000000 +0200
-@@ -220,7 +220,8 @@
-           resolvedaddrs.push_back(ss);
-         }
-       }
--      freeaddrinfo(addrs);
-+      if(addrs)
-+        freeaddrinfo(addrs);
- 
-       if (resolvedaddrs.empty()) {
-         error("Failed to resolve given hostname/IP: %s.  Note that you can't use '/mask' AND '1-4,7,100-' style IP ranges", target_net);
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 6b0cac277060..a9ff60ee763a 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -18,9 +18,11 @@ bin/nping
 %%DATADIR%%/nselib/brute.lua
 %%DATADIR%%/nselib/citrixxml.lua
 %%DATADIR%%/nselib/comm.lua
+%%DATADIR%%/nselib/creds.lua
 %%DATADIR%%/nselib/data/favicon-db
 %%DATADIR%%/nselib/data/http-fingerprints.lua
 %%DATADIR%%/nselib/data/http-folders.txt
+%%DATADIR%%/nselib/data/mysql-cis.audit
 %%DATADIR%%/nselib/data/oracle-sids
 %%DATADIR%%/nselib/data/passwords.lst
 %%DATADIR%%/nselib/data/psexec/README
@@ -33,7 +35,9 @@ bin/nping
 %%DATADIR%%/nselib/data/psexec/nmap_service.c
 %%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
 %%DATADIR%%/nselib/data/psexec/pwdump.lua
+%%DATADIR%%/nselib/data/ssl-fingerprints
 %%DATADIR%%/nselib/data/usernames.lst
+%%DATADIR%%/nselib/data/wp-plugins.lst
 %%DATADIR%%/nselib/datafiles.lua
 %%DATADIR%%/nselib/dhcp.lua
 %%DATADIR%%/nselib/dns.lua
@@ -56,9 +60,11 @@ bin/nping
 %%DATADIR%%/nselib/msrpctypes.lua
 %%DATADIR%%/nselib/mssql.lua
 %%DATADIR%%/nselib/mysql.lua
+%%DATADIR%%/nselib/ncp.lua
 %%DATADIR%%/nselib/netbios.lua
 %%DATADIR%%/nselib/nrpc.lua
 %%DATADIR%%/nselib/nsedebug.lua
+%%DATADIR%%/nselib/omp2.lua
 %%DATADIR%%/nselib/packet.lua
 %%DATADIR%%/nselib/pgsql.lua
 %%DATADIR%%/nselib/pop3.lua
@@ -66,9 +72,12 @@ bin/nping
 %%DATADIR%%/nselib/rmi.lua
 %%DATADIR%%/nselib/rpc.lua
 %%DATADIR%%/nselib/shortport.lua
+%%DATADIR%%/nselib/sip.lua
 %%DATADIR%%/nselib/smb.lua
 %%DATADIR%%/nselib/smbauth.lua
+%%DATADIR%%/nselib/smtp.lua
 %%DATADIR%%/nselib/snmp.lua
+%%DATADIR%%/nselib/srvloc.lua
 %%DATADIR%%/nselib/ssh1.lua
 %%DATADIR%%/nselib/ssh2.lua
 %%DATADIR%%/nselib/stdnse.lua
@@ -76,6 +85,7 @@ bin/nping
 %%DATADIR%%/nselib/strict.lua
 %%DATADIR%%/nselib/tab.lua
 %%DATADIR%%/nselib/target.lua
+%%DATADIR%%/nselib/tftp.lua
 %%DATADIR%%/nselib/tns.lua
 %%DATADIR%%/nselib/unpwdb.lua
 %%DATADIR%%/nselib/upnp.lua
@@ -83,16 +93,22 @@ bin/nping
 %%DATADIR%%/nselib/vnc.lua
 %%DATADIR%%/nselib/wsdd.lua
 %%DATADIR%%/scripts/afp-brute.nse
+%%DATADIR%%/scripts/afp-ls.nse
 %%DATADIR%%/scripts/afp-path-vuln.nse
 %%DATADIR%%/scripts/afp-serverinfo.nse
 %%DATADIR%%/scripts/afp-showmount.nse
 %%DATADIR%%/scripts/asn-query.nse
 %%DATADIR%%/scripts/auth-owners.nse
 %%DATADIR%%/scripts/auth-spoof.nse
+%%DATADIR%%/scripts/backorifice-brute.nse
+%%DATADIR%%/scripts/backorifice-info.nse
 %%DATADIR%%/scripts/banner.nse
+%%DATADIR%%/scripts/broadcast-avahi-dos.nse
 %%DATADIR%%/scripts/broadcast-dns-service-discovery.nse
 %%DATADIR%%/scripts/broadcast-dropbox-listener.nse
 %%DATADIR%%/scripts/broadcast-ms-sql-discover.nse
+%%DATADIR%%/scripts/broadcast-netbios-master-browser.nse
+%%DATADIR%%/scripts/broadcast-novell-locate.nse
 %%DATADIR%%/scripts/broadcast-upnp-info.nse
 %%DATADIR%%/scripts/broadcast-wsdd-discover.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
@@ -102,13 +118,16 @@ bin/nping
 %%DATADIR%%/scripts/citrix-enum-servers.nse
 %%DATADIR%%/scripts/couchdb-databases.nse
 %%DATADIR%%/scripts/couchdb-stats.nse
+%%DATADIR%%/scripts/creds-summary.nse
 %%DATADIR%%/scripts/daap-get-library.nse
 %%DATADIR%%/scripts/daytime.nse
 %%DATADIR%%/scripts/db2-das-info.nse
 %%DATADIR%%/scripts/db2-discover.nse
 %%DATADIR%%/scripts/dhcp-discover.nse
+%%DATADIR%%/scripts/dns-brute.nse
 %%DATADIR%%/scripts/dns-cache-snoop.nse
 %%DATADIR%%/scripts/dns-fuzz.nse
+%%DATADIR%%/scripts/dns-nsec-enum.nse
 %%DATADIR%%/scripts/dns-random-srcport.nse
 %%DATADIR%%/scripts/dns-random-txid.nse
 %%DATADIR%%/scripts/dns-recursion.nse
@@ -118,8 +137,10 @@ bin/nping
 %%DATADIR%%/scripts/domcon-brute.nse
 %%DATADIR%%/scripts/domcon-cmd.nse
 %%DATADIR%%/scripts/domino-enum-users.nse
+%%DATADIR%%/scripts/dpap-brute.nse
 %%DATADIR%%/scripts/drda-brute.nse
 %%DATADIR%%/scripts/drda-info.nse
+%%DATADIR%%/scripts/epmd-info.nse
 %%DATADIR%%/scripts/finger.nse
 %%DATADIR%%/scripts/firewalk.nse
 %%DATADIR%%/scripts/ftp-anon.nse
@@ -131,8 +152,11 @@ bin/nping
 %%DATADIR%%/scripts/gopher-ls.nse
 %%DATADIR%%/scripts/hddtemp-info.nse
 %%DATADIR%%/scripts/hostmap.nse
+%%DATADIR%%/scripts/http-affiliate-id.nse
 %%DATADIR%%/scripts/http-auth.nse
+%%DATADIR%%/scripts/http-barracuda-dir-traversal.nse
 %%DATADIR%%/scripts/http-brute.nse
+%%DATADIR%%/scripts/http-cakephp-version.nse
 %%DATADIR%%/scripts/http-date.nse
 %%DATADIR%%/scripts/http-domino-enum-passwords.nse
 %%DATADIR%%/scripts/http-enum.nse
@@ -140,6 +164,7 @@ bin/nping
 %%DATADIR%%/scripts/http-form-brute.nse
 %%DATADIR%%/scripts/http-headers.nse
 %%DATADIR%%/scripts/http-iis-webdav-vuln.nse
+%%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse
 %%DATADIR%%/scripts/http-malware-host.nse
 %%DATADIR%%/scripts/http-methods.nse
 %%DATADIR%%/scripts/http-open-proxy.nse
@@ -151,11 +176,16 @@ bin/nping
 %%DATADIR%%/scripts/http-userdir-enum.nse
 %%DATADIR%%/scripts/http-vhosts.nse
 %%DATADIR%%/scripts/http-vmware-path-vuln.nse
+%%DATADIR%%/scripts/http-wp-plugins.nse
 %%DATADIR%%/scripts/iax2-version.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
 %%DATADIR%%/scripts/informix-tables.nse
+%%DATADIR%%/scripts/ip-geolocation-geobytes.nse
+%%DATADIR%%/scripts/ip-geolocation-geoplugin.nse
+%%DATADIR%%/scripts/ip-geolocation-ipinfodb.nse
+%%DATADIR%%/scripts/ip-geolocation-maxmind.nse
 %%DATADIR%%/scripts/ipidseq.nse
 %%DATADIR%%/scripts/irc-info.nse
 %%DATADIR%%/scripts/irc-unrealircd-backdoor.nse
@@ -163,9 +193,11 @@ bin/nping
 %%DATADIR%%/scripts/iscsi-info.nse
 %%DATADIR%%/scripts/jdwp-version.nse
 %%DATADIR%%/scripts/ldap-brute.nse
+%%DATADIR%%/scripts/ldap-novell-getpass.nse
 %%DATADIR%%/scripts/ldap-rootdse.nse
 %%DATADIR%%/scripts/ldap-search.nse
 %%DATADIR%%/scripts/lexmark-config.nse
+%%DATADIR%%/scripts/mac-geolocation.nse
 %%DATADIR%%/scripts/modbus-discover.nse
 %%DATADIR%%/scripts/mongodb-databases.nse
 %%DATADIR%%/scripts/mongodb-info.nse
@@ -177,6 +209,7 @@ bin/nping
 %%DATADIR%%/scripts/ms-sql-query.nse
 %%DATADIR%%/scripts/ms-sql-tables.nse
 %%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse
+%%DATADIR%%/scripts/mysql-audit.nse
 %%DATADIR%%/scripts/mysql-brute.nse
 %%DATADIR%%/scripts/mysql-databases.nse
 %%DATADIR%%/scripts/mysql-empty-password.nse
@@ -185,6 +218,8 @@ bin/nping
 %%DATADIR%%/scripts/mysql-variables.nse
 %%DATADIR%%/scripts/nat-pmp-info.nse
 %%DATADIR%%/scripts/nbstat.nse
+%%DATADIR%%/scripts/ncp-enum-users.nse
+%%DATADIR%%/scripts/ncp-serverinfo.nse
 %%DATADIR%%/scripts/netbus-auth-bypass.nse
 %%DATADIR%%/scripts/netbus-brute.nse
 %%DATADIR%%/scripts/netbus-info.nse
@@ -192,12 +227,16 @@ bin/nping
 %%DATADIR%%/scripts/nfs-ls.nse
 %%DATADIR%%/scripts/nfs-showmount.nse
 %%DATADIR%%/scripts/nfs-statfs.nse
+%%DATADIR%%/scripts/nping-brute.nse
 %%DATADIR%%/scripts/nrpe-enum.nse
 %%DATADIR%%/scripts/ntp-info.nse
 %%DATADIR%%/scripts/ntp-monlist.nse
+%%DATADIR%%/scripts/omp2-brute.nse
+%%DATADIR%%/scripts/omp2-enum-targets.nse
 %%DATADIR%%/scripts/oracle-brute.nse
 %%DATADIR%%/scripts/oracle-enum-users.nse
 %%DATADIR%%/scripts/oracle-sid-brute.nse
+%%DATADIR%%/scripts/ovs-agent-version.nse
 %%DATADIR%%/scripts/p2p-conficker.nse
 %%DATADIR%%/scripts/path-mtu.nse
 %%DATADIR%%/scripts/pgsql-brute.nse
@@ -206,11 +245,15 @@ bin/nping
 %%DATADIR%%/scripts/pop3-capabilities.nse
 %%DATADIR%%/scripts/pptp-version.nse
 %%DATADIR%%/scripts/qscan.nse
+%%DATADIR%%/scripts/quake3-master-getservers.nse
 %%DATADIR%%/scripts/realvnc-auth-bypass.nse
 %%DATADIR%%/scripts/resolveall.nse
 %%DATADIR%%/scripts/rmi-dumpregistry.nse
 %%DATADIR%%/scripts/rpcinfo.nse
 %%DATADIR%%/scripts/script.db
+%%DATADIR%%/scripts/servicetags.nse
+%%DATADIR%%/scripts/sip-brute.nse
+%%DATADIR%%/scripts/sip-enum-users.nse
 %%DATADIR%%/scripts/skypev2-version.nse
 %%DATADIR%%/scripts/smb-brute.nse
 %%DATADIR%%/scripts/smb-check-vulns.nse
@@ -221,6 +264,7 @@ bin/nping
 %%DATADIR%%/scripts/smb-enum-shares.nse
 %%DATADIR%%/scripts/smb-enum-users.nse
 %%DATADIR%%/scripts/smb-flood.nse
+%%DATADIR%%/scripts/smb-mbenum.nse
 %%DATADIR%%/scripts/smb-os-discovery.nse
 %%DATADIR%%/scripts/smb-psexec.nse
 %%DATADIR%%/scripts/smb-security-mode.nse
@@ -231,9 +275,12 @@ bin/nping
 %%DATADIR%%/scripts/smtp-enum-users.nse
 %%DATADIR%%/scripts/smtp-open-relay.nse
 %%DATADIR%%/scripts/smtp-strangeport.nse
+%%DATADIR%%/scripts/smtp-vuln-cve2010-4344.nse
+%%DATADIR%%/scripts/smtp-vuln-cve2011-1720.nse
 %%DATADIR%%/scripts/sniffer-detect.nse
 %%DATADIR%%/scripts/snmp-brute.nse
 %%DATADIR%%/scripts/snmp-interfaces.nse
+%%DATADIR%%/scripts/snmp-ios-config.nse
 %%DATADIR%%/scripts/snmp-netstat.nse
 %%DATADIR%%/scripts/snmp-processes.nse
 %%DATADIR%%/scripts/snmp-sysdescr.nse
@@ -248,9 +295,11 @@ bin/nping
 %%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-cert.nse
 %%DATADIR%%/scripts/ssl-enum-ciphers.nse
+%%DATADIR%%/scripts/ssl-known-key.nse
 %%DATADIR%%/scripts/sslv2.nse
 %%DATADIR%%/scripts/stuxnet-detect.nse
 %%DATADIR%%/scripts/svn-brute.nse
+%%DATADIR%%/scripts/targets-sniffer.nse
 %%DATADIR%%/scripts/targets-traceroute.nse
 %%DATADIR%%/scripts/telnet-brute.nse
 %%DATADIR%%/scripts/upnp-info.nse
@@ -260,6 +309,7 @@ bin/nping
 %%DATADIR%%/scripts/whois.nse
 %%DATADIR%%/scripts/wsdd-discover.nse
 %%DATADIR%%/scripts/x11-access.nse
+%%DATADIR%%/scripts/xmpp.nse
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/nselib/data/psexec
 @dirrm %%DATADIR%%/nselib/data