- update to 5.61TEST1

Here is the (partial) CHANGELOG since 5.59BETA1:

Nmap 5.61TEST1 [2011-09-19]

o The changelog entries below for this test release are not yet
  finished or comprehensive.  We'll update them soon.

o [Ncat] Updated ca-bundle.crt (primarily to remove DigiNotar).

o Fixed compilation on OS X 10.7 Lion. Thanks to Patrik Karlsson and
  Babak Farroki for researching fixes.

o [NSE] Fixed SSL compressor names in ssl-enum-ciphers.nse, and
  removed redundant multiple listings of the NULL compressor.
  [Matt Selsky]

o [NSE] Added cipher strength ratings to ssl-enum-ciphers.nse.
  [Gabriel Lawrence]

o Added Common Platform Enumeration (CPE, http://cpe.mitre.org/)
  output for OS and service versions. These show up in normal output
  with the headings "OS CPE:" and "Service Info:":
    OS CPE: cpe:/o:linux:kernel:2.6.39
    Service Info: OS: Linux; CPE: cpe:/o:linux:kernel
  These also appear in XML output, which additionally has CPE entries
  for service versions. [David, Henri]

o [NSE] Added new default credential list for Oracle and modified the
  oracle-brute script to make use of it. [Patrik]

o [NSE] Added xmpp-info.nse as a replacement for xmpp.nse. This updated version
  brings new features and fixes. [Vasiliy Kulikov]

o Fixed RPC scan for 64-bit architectures by using fixed-size data
  types. [David]

o Relaxed the XML DTD to allow validation of files where the verbosity
  level changed during the scan. [Daniel Miller]

o Made a service confidence of 8 (used when tcpwrapped) and indeed any
  number between 0 and 10 be legal in XML output according to the DTD.
  [Daniel Miller]

o [NSE] Added three scripts that do host discovery on local IPv6
  subnets. Each of them uses a different multicast technique, meaning
  that even very large networks have host discovery done without
  needing to probe every address individually.
  + targets-multicast-ipv6-echo: Sends a multicast echo request, like
    broadcast-ping does for IPv4.
  + targets-multicast-ipv6-invalid-dst: Sends an invalid packet that
    can elicit an ICMPv6 Parameter Problem response.
  + targets-multicast-ipv6-slaac: Sends a phony router advertisement,
    which causes hosts to allocate a temporary address and then send a
    packet to discover if anyone else is using the address.
  [Weilin, David]

o [NSE] Added functions to packet.lua to make it easier to build IPv6
  packets. [Weilin]

o [NSE] Added new script http-vuln-cve2011-3192 which checks whether an instance
  of Apache is vulnerable to a DoS attack exploiting the byterange filter.
  [Duarte Silva].

o [NSE] Fixed authentication problems in the TNS library that would prevent
  authentication from working against Oracle 11.2.0.2.0 XE [Chris Woodbury]

o Removed some restrictions on probe matching that, for example,
  prevented a RST/ACK reply from being recognized in a NULL scan. This
  was found and fixed by Matthew Stickney and Joe McEachern.

o Rearranged some characters classes in service matches to avoid any
  that look like POSIX collating symbols ("[.xyz.]"). John Hutchison
  discovered this error caused by one of the match lines:
    InitMatch: illegal regexp: POSIX collating elements are not supported
  [Daniel Miller]

o [NSE] Added the address-info.nse script, which shows extra information about IP addresses.

o [NSE] Added scripts http-joomla-brute, http-wordpress-brute, http-wp-enum and
  http-awstatstotal-exec. [Paulino]

o [Zenmap] Fixed zenmap deleting ports based on newer scans which did
  not actually scan the port in question. Additionally ncat now only
  updates ports with new information if the new information is the same
  protocol. Not just the same port. [Colin Rice]

o [Ncat] Fixed ncat crashing with --ssl-verify -vvv on windows. [Colin Rice]

o [NSE] Added script http-waf-detect. This script tries to determine
  if an IDS/IPS/WAF is protecting a web server. [Paulino]

o [NSE] Added the bittorrent library and bittorrent-discovery script which
  enables us to discover peers and nodes for a particular torrent file or
  magnet link.

o [NSE] Added basic query support to the Oracle TNS library making it possible
  for scripts to query the database server using SQL. [Patrik]

o [Ncat] Added --append-output option, that when used along with -o and/or -x
  prevents clobbering(truncating) an existing file. [Shinnok]

o [NSE] Added script broadcast-listener that attempts to discover hosts by
  passively listening to the network. It does so by decoding ethernet and IP
  broadcast and multicast messages. [Patrik]

o Fixed a bug that would make Nmap segfault if it failed to open an interface
  using pcap. The bug details and patch are posted here:
  http://seclists.org/nmap-dev/2011/q3/365 [Patrik]

o Ncat SCTP mode supports connection brokering now(--sctp --broker). [Shinnok]

o Nmap now defers options parsing until it has read through all the command line
  arguments. You can now use options like -S with an IPv6 address before
  specifying -6 at the command line, which previously got you an error.
  [Shinnok]

o [NSE] Added the library xmpp.lua and the script xmpp-brute that performs
  brute force password auditing against XMPP (Jabber) servers. [Patrik]

o [NSE] Fixed a bug in the ssh2-enum-algos script that would prevent it from
  displaying any output unless run in debug mode. [Patrik]

o [NSE] Fixed the nsedebug print_hex() function so it does not print an
  empty line if there are no remaining characters, and improved its NSEDoc.
  [Chris Woodbury].

o [NSE] Added the scripts http-axis2-dir-traversal and
  http-litespeed-sourcecode-download that exploits a directory traversal and
  null byte poisoning vulnerabilities in Apache Axis2 and LiteSpeed Web Server
  respectively. [Paulino]

o [Ncat] Ncat now no longer blocks while an ssl handshake is taking place or
  waiting to complete. [Shinnok]

o [NSE] Added the script broadcast-dhcp-discover that sends a DHCP discover
  message to the broadcast address and collects and reports the network
  information received from the DHCP server. [Patrik]

o [NSE] Added the script smtp-brute that performs brute force password
  auditing against SMTP servers. [Patrik]

o [NSE] Updated SMTP library to support authentication using both plain-text
  and the SASL library. [Patrik]

o [NSE] Added the script imap-brute that performs brute force password
  auditing against IMAP servers. [Patrik]

o [NSE] Updated IMAP library to support authentication using both plain-text
  and the SASL library. [Patrik]

o [NSE] Added SASL library created by Djalal Harouni and Patrik Karlsson
  providing common code for "Simple Authentication and Security Layer" to
  services supporting it. The algorithms supported by the library are:
  PLAIN, CRAM-MD5, DIGEST-MD5 and NTLM. [Patrik Karlsson, Djalal Harouni]

o [NSE] Added scripts cvs-brute.nse, cvs-brute-repository.nse and the cvs
  library. The cvs-brute-repository script allows for guessing possible
  repository names needed in order to perform password guessing using the
  cvs-brute.nse script. [Patrik]

o [Zenmap] The Zenmap crash handler now instructs you to mail in crash
  information to nmap-dev. [Colin Rice]

o Added IPv6 Neighbor Discovery ping. This is the IPv6 analog to IPv4
  ARP scan. It is the default ping type for local IPv6 networks.
  [Weilin]

o [NSE] Added smtp-vuln-cve2011-1764 script, which checks if the Exim
  SMTP server is vulnerable to the DKIM Format String vulnerability
  (CVE-2011-1764). [Djalal]

o Added the broadcast-ping script which sends icmp packets to broadcast
  addresses on the selected network interface, or all ethernet interfaces if
  none is selected. It has the option to add the discovered hosts as targets.

o [NSE] Applied patch from Chris Woodbury that adds the following additional
  information to the output of smb-os-discovery:
  + Forest name
  + FQDN
  + NetBIOS computer name
  + NetBIOS domain name

o [Ncat] Ncat now supports IPV6 addresses by default without the -6 flag.
  Additionally ncat listens on both :: and localhost when passed
  -l, or any other listening mode unless a specific listening address is
  supplied.

o [NSE] Split script db2-discover into two scripts, adding a new
  broadcast-db2-discover script. This script attempts to discover DB2
  database servers through broadcast requests. [Patrik Karlsson]

o Fixed broken XML output in the case of timed-out hosts; the
  enclosing host element was missing. The fix was suggested by Rémi
  Mollon.

o [NSE] Added ftp-vuln-cve2010-4221 script, which checks if the ProFTPD
  server is vulnerable to the Telnet IAC stack overflow vulnerability
  (CVE-2010-4221). [Djalal]

o [NSE] Added ftp-vsftpd-backdoor, which detects a backdoor that was introduced
  into vsftpd-2.3.4 source code distributions. [Daniel Miller]

o [NSE] ldap-brute.nse - Multiple changes:
  + Added support for 2008 R2 functional level Active Directory instances
    to ldap-brute.
  + Added detection for valid credentials where the target account was
    expired or limited by time or login host constraints.
  + Added support for specifying a UPN suffix to be appended to usernames
    when brute forcing Microsoft Active Directory accounts.
  + Added support for saving discovered credentials to a CSV file.
  + Now reports valid credentials as they are discovered when the script
    is run with -vv or higher.
	[Tom Sellers]

o [NSE] ldap-search.nse - Added support for saving search results to
  CSV.  This is done by using the ldap.savesearch script argument to
  specify an output filename prefix.  [Tom Sellers]

o [NSE] Updated smb-brute to add detection for valid credentials where the
  target account was expired or limited by time or login host constraints.
  [Tom Sellers]

o [NSE] Updated account status text in brute force password discovery
  scripts in an effort to make the reporting more consistent across
  all scripts.  This will have an impact on any code that parses these
  values.  [Tom Sellers]

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