5 files changed, 59 insertions, 11 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index a4f9836c6f76..f5b6978c4ad6 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nmap
-DISTVERSION=	5.59BETA1
+DISTVERSION=	5.61TEST1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 1e457baa09dc..2d97e5f57fc0 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-5.59BETA1.tar.bz2) = c43d9b93431b47d4e8c0cfa1812ff655b2b84ed30d25b5494ea7f1692a1ad782
-SIZE (nmap-5.59BETA1.tar.bz2) = 21306127
+SHA256 (nmap-5.61TEST1.tar.bz2) = c87e98c4d0493b02e50a43979f3a9e7ee411c50dec695e92b0b6c1a8eb539f1c
+SIZE (nmap-5.61TEST1.tar.bz2) = 21616904
diff --git a/security/nmap/files/patch-liblinear__Makefile b/security/nmap/files/patch-liblinear__Makefile
new file mode 100644
index 000000000000..1ed4a0157409
--- /dev/null
+++ b/security/nmap/files/patch-liblinear__Makefile
@@ -0,0 +1,13 @@
+--- ./liblinear/Makefile.orig	2011-08-16 23:43:30.000000000 +0200
++++ ./liblinear/Makefile	2011-09-23 22:15:11.000000000 +0200
+@@ -29,8 +29,8 @@
+ 	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
+ 
+ blas/blas.a:
+-	cd blas; make OPTFLAGS='$(CFLAGS)' CC='$(CC)';
++	cd blas; ${MAKE} OPTFLAGS='$(CFLAGS)' CC='$(CC)';
+ 
+ clean:
+-	cd blas;	make clean
++	cd blas;	${MAKE} clean
+ 	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER) liblinear.a
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index a5a89f73c2df..3d2f102f93ec 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -1,14 +1,14 @@
---- output.cc.orig	2009-12-20 04:22:19.000000000 +0100
-+++ output.cc	2010-01-21 17:42:20.000000000 +0100
-@@ -111,6 +111,7 @@
- #include <string>
+--- ./output.cc.orig	2011-09-19 20:31:46.000000000 +0200
++++ ./output.cc	2011-09-23 22:11:50.000000000 +0200
+@@ -114,6 +114,7 @@
+ #include <set>
  #include <vector>
  #include <list>
 +#include <sys/param.h>
+ #include <sstream>
  
  /* Workaround for lack of namespace std on HP-UX 11.00 */
- namespace std {};
-@@ -1037,7 +1038,7 @@
+@@ -940,7 +941,7 @@
    case LOG_MACHINE:
    case LOG_SKID:
    case LOG_XML:
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index a9ff60ee763a..4a07b85802af 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -15,15 +15,20 @@ bin/nping
 %%DATADIR%%/nselib/afp.lua
 %%DATADIR%%/nselib/asn1.lua
 %%DATADIR%%/nselib/base64.lua
+%%DATADIR%%/nselib/bittorrent.lua
 %%DATADIR%%/nselib/brute.lua
 %%DATADIR%%/nselib/citrixxml.lua
 %%DATADIR%%/nselib/comm.lua
 %%DATADIR%%/nselib/creds.lua
+%%DATADIR%%/nselib/cvs.lua
 %%DATADIR%%/nselib/data/favicon-db
+%%DATADIR%%/nselib/data/http-default-accounts-fingerprints.lua
 %%DATADIR%%/nselib/data/http-fingerprints.lua
 %%DATADIR%%/nselib/data/http-folders.txt
 %%DATADIR%%/nselib/data/mysql-cis.audit
+%%DATADIR%%/nselib/data/oracle-default-accounts.lst
 %%DATADIR%%/nselib/data/oracle-sids
+%%DATADIR%%/nselib/data/packetdecoders.lua
 %%DATADIR%%/nselib/data/passwords.lst
 %%DATADIR%%/nselib/data/psexec/README
 %%DATADIR%%/nselib/data/psexec/backdoor.lua
@@ -35,6 +40,8 @@ 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/snmpcommunities.lst
+%%DATADIR%%/nselib/data/ssl-ciphers
 %%DATADIR%%/nselib/data/ssl-fingerprints
 %%DATADIR%%/nselib/data/usernames.lst
 %%DATADIR%%/nselib/data/wp-plugins.lst
@@ -71,6 +78,7 @@ bin/nping
 %%DATADIR%%/nselib/proxy.lua
 %%DATADIR%%/nselib/rmi.lua
 %%DATADIR%%/nselib/rpc.lua
+%%DATADIR%%/nselib/sasl.lua
 %%DATADIR%%/nselib/shortport.lua
 %%DATADIR%%/nselib/sip.lua
 %%DATADIR%%/nselib/smb.lua
@@ -92,6 +100,8 @@ bin/nping
 %%DATADIR%%/nselib/url.lua
 %%DATADIR%%/nselib/vnc.lua
 %%DATADIR%%/nselib/wsdd.lua
+%%DATADIR%%/nselib/xmpp.lua
+%%DATADIR%%/scripts/address-info.nse
 %%DATADIR%%/scripts/afp-brute.nse
 %%DATADIR%%/scripts/afp-ls.nse
 %%DATADIR%%/scripts/afp-path-vuln.nse
@@ -103,12 +113,17 @@ bin/nping
 %%DATADIR%%/scripts/backorifice-brute.nse
 %%DATADIR%%/scripts/backorifice-info.nse
 %%DATADIR%%/scripts/banner.nse
+%%DATADIR%%/scripts/bittorrent-discovery.nse
 %%DATADIR%%/scripts/broadcast-avahi-dos.nse
+%%DATADIR%%/scripts/broadcast-db2-discover.nse
+%%DATADIR%%/scripts/broadcast-dhcp-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-novell-locate.nse
+%%DATADIR%%/scripts/broadcast-ping.nse
 %%DATADIR%%/scripts/broadcast-upnp-info.nse
 %%DATADIR%%/scripts/broadcast-wsdd-discover.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
@@ -119,6 +134,8 @@ bin/nping
 %%DATADIR%%/scripts/couchdb-databases.nse
 %%DATADIR%%/scripts/couchdb-stats.nse
 %%DATADIR%%/scripts/creds-summary.nse
+%%DATADIR%%/scripts/cvs-brute-repository.nse
+%%DATADIR%%/scripts/cvs-brute.nse
 %%DATADIR%%/scripts/daap-get-library.nse
 %%DATADIR%%/scripts/daytime.nse
 %%DATADIR%%/scripts/db2-das-info.nse
@@ -148,22 +165,30 @@ bin/nping
 %%DATADIR%%/scripts/ftp-brute.nse
 %%DATADIR%%/scripts/ftp-libopie.nse
 %%DATADIR%%/scripts/ftp-proftpd-backdoor.nse
+%%DATADIR%%/scripts/ftp-vsftpd-backdoor.nse
+%%DATADIR%%/scripts/ftp-vuln-cve2010-4221.nse
 %%DATADIR%%/scripts/giop-info.nse
 %%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-awstatstotals-exec.nse
+%%DATADIR%%/scripts/http-axis2-dir-traversal.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-default-accounts.nse
 %%DATADIR%%/scripts/http-domino-enum-passwords.nse
 %%DATADIR%%/scripts/http-enum.nse
 %%DATADIR%%/scripts/http-favicon.nse
 %%DATADIR%%/scripts/http-form-brute.nse
+%%DATADIR%%/scripts/http-google-malware.nse
 %%DATADIR%%/scripts/http-headers.nse
 %%DATADIR%%/scripts/http-iis-webdav-vuln.nse
+%%DATADIR%%/scripts/http-joomla-brute.nse
+%%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse
 %%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse
 %%DATADIR%%/scripts/http-malware-host.nse
 %%DATADIR%%/scripts/http-methods.nse
@@ -176,8 +201,13 @@ bin/nping
 %%DATADIR%%/scripts/http-userdir-enum.nse
 %%DATADIR%%/scripts/http-vhosts.nse
 %%DATADIR%%/scripts/http-vmware-path-vuln.nse
+%%DATADIR%%/scripts/http-vuln-cve2011-3192.nse
+%%DATADIR%%/scripts/http-waf-detect.nse
+%%DATADIR%%/scripts/http-wordpress-brute.nse
+%%DATADIR%%/scripts/http-wp-enum.nse
 %%DATADIR%%/scripts/http-wp-plugins.nse
 %%DATADIR%%/scripts/iax2-version.nse
+%%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
@@ -197,7 +227,6 @@ bin/nping
 %%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
@@ -271,12 +300,14 @@ bin/nping
 %%DATADIR%%/scripts/smb-server-stats.nse
 %%DATADIR%%/scripts/smb-system-info.nse
 %%DATADIR%%/scripts/smbv2-enabled.nse
+%%DATADIR%%/scripts/smtp-brute.nse
 %%DATADIR%%/scripts/smtp-commands.nse
 %%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/smtp-vuln-cve2011-1764.nse
 %%DATADIR%%/scripts/sniffer-detect.nse
 %%DATADIR%%/scripts/snmp-brute.nse
 %%DATADIR%%/scripts/snmp-interfaces.nse
@@ -299,6 +330,9 @@ bin/nping
 %%DATADIR%%/scripts/sslv2.nse
 %%DATADIR%%/scripts/stuxnet-detect.nse
 %%DATADIR%%/scripts/svn-brute.nse
+%%DATADIR%%/scripts/targets-ipv6-multicast-echo.nse
+%%DATADIR%%/scripts/targets-ipv6-multicast-invalid-dst.nse
+%%DATADIR%%/scripts/targets-ipv6-multicast-slaac.nse
 %%DATADIR%%/scripts/targets-sniffer.nse
 %%DATADIR%%/scripts/targets-traceroute.nse
 %%DATADIR%%/scripts/telnet-brute.nse
@@ -309,7 +343,8 @@ bin/nping
 %%DATADIR%%/scripts/whois.nse
 %%DATADIR%%/scripts/wsdd-discover.nse
 %%DATADIR%%/scripts/x11-access.nse
-%%DATADIR%%/scripts/xmpp.nse
+%%DATADIR%%/scripts/xmpp-brute.nse
+%%DATADIR%%/scripts/xmpp-info.nse
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/nselib/data/psexec
 @dirrm %%DATADIR%%/nselib/data