Nmap 5.35DC1 [2010-07-16]

Some of the highlights are:

o [NSE] Added more scripts, bringing the total to 131!
o Performed a major OS detection integration run.
o Performed a large version detection integration run.
o [Zenmap] Added the ability to print Nmap output to a printer.
o [Nmap, Ncat, Nping] The default unit for time specifications is now
  seconds, not milliseconds, and times may have a decimal point.
o Ports are now considered open during a SYN scan if a SYN packet
  (without the ACK flag) is received in response.
o [Ncat] In listen mode, the --exec and --sh-exec options now accept a
  single connection and then exit, just like in normal listen mode.
o UDP payloads are now stored in an external data file, nmap-payloads,
  instead of being hard-coded in the executable.
o Added a new library, libnetutil, which contains about 2,700 lines of
  networking related code which is now shared between Nmap and Nping
o Improved service detection match lines.
o Improved our brute force password guessing list by mixing in some
  data sent in by Solar Designer of John the Ripper fame.
o [Zenmap] IP addresses are now sorted by octet rather than their
  string representation.
o [Ncat] When receiving a connection/datagram in listen mode, Ncat now
  prints the connecting source port along with the IP address.
o Added EPROTO to the list of known error codes in service scan.
o Updated IANA IP address space assignment list for random IP (-iR)
  generation.
o Zenmap's "slow comprehensive scan profile" has been modified to use
  the best 7-probe host discovery combination we were able to find in
  extensive empirical testing
o Zenmap now lets you save scan results in normal Nmap text output
  format or (as before) as XML.
o [NSE] Raw packet sending at the IP layer is now supported, in
  addition to the existing Ethernet sending functionality.
o Nmap now honors routing table entries that override interface
  addresses and netmasks.
o [Ncat] The HTTP proxy server now accepts client connections over
  SSL, and added support for HTTP digest authentication of proxies, as
  both client and server.
o Improved the MIT Kerberos version detection signatures.

Plus many bugfixes and improvements.

For full changelog, see http://nmap.org/changelog.html

5 files changed, 79 insertions, 64 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 8cd6cc0e40c..e3b678df4fd 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.71 2010/03/21 21:58:23 pettai Exp $
+# $NetBSD: Makefile,v 1.72 2010/07/22 20:46:29 pettai Exp $
 #
 
-DISTNAME=	nmap-5.21
+DISTNAME=	nmap-5.35DC1
+PKGNAME=	nmap-5.35dc1
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://insecure.org/nmap/
 COMMENT=	Network/port scanner with OS detection
 LICENSE=	gnu-gpl-v2
@@ -14,8 +15,8 @@ LICENSE=	gnu-gpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILDLINK_API_DEPENDS.libpcap=	libpcap>=0.9.4
-BUILDLINK_API_DEPENDS.libpcre=	libpcre>=6.7
+BUILDLINK_API_DEPENDS.libpcap=	libpcap>=1.0.0
+BUILDLINK_API_DEPENDS.libpcre=	libpcre>=7.6
 
 GNU_CONFIGURE=		yes
 
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 04f4ba36379..b919c65245c 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2010/03/21 21:58:23 pettai Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/07/22 20:46:29 pettai Exp $
 bin/ncat
 bin/nmap
+bin/nping
 man/de/man1/nmap.1
 man/es/man1/nmap.1
 man/fr/man1/nmap.1
@@ -10,6 +11,7 @@ man/it/man1/nmap.1
 man/jp/man1/nmap.1
 man/man1/ncat.1
 man/man1/nmap.1
+man/man1/nping.1
 man/pl/man1/nmap.1
 man/pt_BR/man1/nmap.1
 man/pt_PT/man1/nmap.1
@@ -20,6 +22,7 @@ man/zh/man1/nmap.1
 share/ncat/ca-bundle.crt
 share/nmap/nmap-mac-prefixes
 share/nmap/nmap-os-db
+share/nmap/nmap-payloads
 share/nmap/nmap-protocols
 share/nmap/nmap-rpc
 share/nmap/nmap-service-probes
@@ -27,6 +30,8 @@ share/nmap/nmap-services
 share/nmap/nmap.dtd
 share/nmap/nmap.xsl
 share/nmap/nse_main.lua
+share/nmap/nselib/afp.lua
+share/nmap/nselib/asn1.lua
 share/nmap/nselib/base64.lua
 share/nmap/nselib/citrixxml.lua
 share/nmap/nselib/comm.lua
@@ -39,31 +44,37 @@ share/nmap/nselib/data/psexec/README
 share/nmap/nselib/data/psexec/backdoor.lua
 share/nmap/nselib/data/psexec/default.lua
 share/nmap/nselib/data/psexec/drives.lua
-share/nmap/nselib/data/psexec/encoder.c
 share/nmap/nselib/data/psexec/examples.lua
 share/nmap/nselib/data/psexec/experimental.lua
 share/nmap/nselib/data/psexec/network.lua
 share/nmap/nselib/data/psexec/nmap_service.c
-share/nmap/nselib/data/psexec/nmap_service.exe
 share/nmap/nselib/data/psexec/nmap_service.vcproj
 share/nmap/nselib/data/psexec/pwdump.lua
 share/nmap/nselib/data/usernames.lst
 share/nmap/nselib/data/yokoso-fingerprints
 share/nmap/nselib/datafiles.lua
+share/nmap/nselib/db2.lua
 share/nmap/nselib/dns.lua
 share/nmap/nselib/http.lua
 share/nmap/nselib/imap.lua
 share/nmap/nselib/ipOps.lua
+share/nmap/nselib/json.lua
+share/nmap/nselib/ldap.lua
 share/nmap/nselib/listop.lua
 share/nmap/nselib/match.lua
+share/nmap/nselib/mongodb.lua
 share/nmap/nselib/msrpc.lua
 share/nmap/nselib/msrpcperformance.lua
 share/nmap/nselib/msrpctypes.lua
+share/nmap/nselib/mssql.lua
+share/nmap/nselib/mysql.lua
 share/nmap/nselib/netbios.lua
 share/nmap/nselib/nsedebug.lua
 share/nmap/nselib/packet.lua
+share/nmap/nselib/pgsql.lua
 share/nmap/nselib/pop3.lua
 share/nmap/nselib/proxy.lua
+share/nmap/nselib/rpc.lua
 share/nmap/nselib/shortport.lua
 share/nmap/nselib/smb.lua
 share/nmap/nselib/smbauth.lua
@@ -76,6 +87,10 @@ share/nmap/nselib/strict.lua
 share/nmap/nselib/tab.lua
 share/nmap/nselib/unpwdb.lua
 share/nmap/nselib/url.lua
+share/nmap/scripts/afp-brute.nse
+share/nmap/scripts/afp-path-vuln.nse
+share/nmap/scripts/afp-serverinfo.nse
+share/nmap/scripts/afp-showmount.nse
 share/nmap/scripts/asn-query.nse
 share/nmap/scripts/auth-owners.nse
 share/nmap/scripts/auth-spoof.nse
@@ -85,17 +100,26 @@ share/nmap/scripts/citrix-enum-apps-xml.nse
 share/nmap/scripts/citrix-enum-apps.nse
 share/nmap/scripts/citrix-enum-servers-xml.nse
 share/nmap/scripts/citrix-enum-servers.nse
+share/nmap/scripts/couchdb-databases.nse
+share/nmap/scripts/couchdb-stats.nse
+share/nmap/scripts/daap-get-library.nse
 share/nmap/scripts/daytime.nse
+share/nmap/scripts/db2-brute.nse
+share/nmap/scripts/db2-das-info.nse
 share/nmap/scripts/db2-info.nse
 share/nmap/scripts/dhcp-discover.nse
+share/nmap/scripts/dns-cache-snoop.nse
+share/nmap/scripts/dns-fuzz.nse
 share/nmap/scripts/dns-random-srcport.nse
 share/nmap/scripts/dns-random-txid.nse
 share/nmap/scripts/dns-recursion.nse
+share/nmap/scripts/dns-service-discovery.nse
 share/nmap/scripts/dns-zone-transfer.nse
 share/nmap/scripts/finger.nse
 share/nmap/scripts/ftp-anon.nse
 share/nmap/scripts/ftp-bounce.nse
 share/nmap/scripts/ftp-brute.nse
+share/nmap/scripts/ftp-libopie.nse
 share/nmap/scripts/html-title.nse
 share/nmap/scripts/http-auth.nse
 share/nmap/scripts/http-date.nse
@@ -104,24 +128,53 @@ share/nmap/scripts/http-favicon.nse
 share/nmap/scripts/http-headers.nse
 share/nmap/scripts/http-iis-webdav-vuln.nse
 share/nmap/scripts/http-malware-host.nse
+share/nmap/scripts/http-methods.nse
 share/nmap/scripts/http-open-proxy.nse
 share/nmap/scripts/http-passwd.nse
+share/nmap/scripts/http-php-version.nse
 share/nmap/scripts/http-trace.nse
 share/nmap/scripts/http-userdir-enum.nse
+share/nmap/scripts/http-vmware-path-vuln.nse
 share/nmap/scripts/iax2-version.nse
 share/nmap/scripts/imap-capabilities.nse
+share/nmap/scripts/ipidseq.nse
 share/nmap/scripts/irc-info.nse
+share/nmap/scripts/irc-unrealircd-backdoor.nse
+share/nmap/scripts/jdwp-version.nse
+share/nmap/scripts/ldap-brute.nse
+share/nmap/scripts/ldap-rootdse.nse
+share/nmap/scripts/ldap-search.nse
+share/nmap/scripts/lexmark-config.nse
+share/nmap/scripts/mongodb-databases.nse
+share/nmap/scripts/mongodb-info.nse
+share/nmap/scripts/ms-sql-brute.nse
+share/nmap/scripts/ms-sql-config.nse
+share/nmap/scripts/ms-sql-empty-password.nse
+share/nmap/scripts/ms-sql-hasdbaccess.nse
 share/nmap/scripts/ms-sql-info.nse
+share/nmap/scripts/ms-sql-query.nse
+share/nmap/scripts/ms-sql-tables.nse
+share/nmap/scripts/ms-sql-xp-cmdshell.nse
+share/nmap/scripts/mysql-brute.nse
+share/nmap/scripts/mysql-databases.nse
+share/nmap/scripts/mysql-empty-password.nse
 share/nmap/scripts/mysql-info.nse
+share/nmap/scripts/mysql-users.nse
+share/nmap/scripts/mysql-variables.nse
 share/nmap/scripts/nbstat.nse
+share/nmap/scripts/nfs-ls.nse
 share/nmap/scripts/nfs-showmount.nse
+share/nmap/scripts/nfs-statfs.nse
 share/nmap/scripts/ntp-info.nse
+share/nmap/scripts/ntp-monlist.nse
 share/nmap/scripts/oracle-sid-brute.nse
 share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/pgsql-brute.nse
 share/nmap/scripts/pjl-ready-message.nse
 share/nmap/scripts/pop3-brute.nse
 share/nmap/scripts/pop3-capabilities.nse
 share/nmap/scripts/pptp-version.nse
+share/nmap/scripts/qscan.nse
 share/nmap/scripts/realvnc-auth-bypass.nse
 share/nmap/scripts/robots.txt.nse
 share/nmap/scripts/rpcinfo.nse
@@ -142,18 +195,28 @@ share/nmap/scripts/smb-server-stats.nse
 share/nmap/scripts/smb-system-info.nse
 share/nmap/scripts/smbv2-enabled.nse
 share/nmap/scripts/smtp-commands.nse
+share/nmap/scripts/smtp-enum-users.nse
 share/nmap/scripts/smtp-open-relay.nse
 share/nmap/scripts/smtp-strangeport.nse
 share/nmap/scripts/sniffer-detect.nse
 share/nmap/scripts/snmp-brute.nse
+share/nmap/scripts/snmp-interfaces.nse
+share/nmap/scripts/snmp-netstat.nse
+share/nmap/scripts/snmp-processes.nse
 share/nmap/scripts/snmp-sysdescr.nse
+share/nmap/scripts/snmp-win32-services.nse
+share/nmap/scripts/snmp-win32-shares.nse
+share/nmap/scripts/snmp-win32-software.nse
+share/nmap/scripts/snmp-win32-users.nse
 share/nmap/scripts/socks-open-proxy.nse
 share/nmap/scripts/sql-injection.nse
 share/nmap/scripts/ssh-hostkey.nse
 share/nmap/scripts/sshv1.nse
 share/nmap/scripts/ssl-cert.nse
+share/nmap/scripts/ssl-enum-ciphers.nse
 share/nmap/scripts/sslv2.nse
 share/nmap/scripts/telnet-brute.nse
 share/nmap/scripts/upnp-info.nse
 share/nmap/scripts/whois.nse
 share/nmap/scripts/x11-access.nse
+@pkgdir share/nping
diff --git a/net/nmap/PLIST.zenmap b/net/nmap/PLIST.zenmap
index afba213adb1..a7070a4db47 100644
--- a/net/nmap/PLIST.zenmap
+++ b/net/nmap/PLIST.zenmap
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.zenmap,v 1.6 2010/03/21 21:58:23 pettai Exp $
+@comment $NetBSD: PLIST.zenmap,v 1.7 2010/07/22 20:46:29 pettai Exp $
 bin/nmapfe
 bin/uninstall_zenmap
 bin/xnmap
@@ -133,6 +133,8 @@ ${PYSITELIB}/zenmapGUI/NmapOutputViewer.py
 ${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc
 ${PYSITELIB}/zenmapGUI/OptionBuilder.py
 ${PYSITELIB}/zenmapGUI/OptionBuilder.pyc
+${PYSITELIB}/zenmapGUI/Print.py
+${PYSITELIB}/zenmapGUI/Print.pyc
 ${PYSITELIB}/zenmapGUI/ProfileCombo.py
 ${PYSITELIB}/zenmapGUI/ProfileCombo.pyc
 ${PYSITELIB}/zenmapGUI/ProfileEditor.py
@@ -161,8 +163,6 @@ ${PYSITELIB}/zenmapGUI/SearchGUI.py
 ${PYSITELIB}/zenmapGUI/SearchGUI.pyc
 ${PYSITELIB}/zenmapGUI/SearchWindow.py
 ${PYSITELIB}/zenmapGUI/SearchWindow.pyc
-${PYSITELIB}/zenmapGUI/Splash.py
-${PYSITELIB}/zenmapGUI/Splash.pyc
 ${PYSITELIB}/zenmapGUI/TargetCombo.py
 ${PYSITELIB}/zenmapGUI/TargetCombo.pyc
 ${PYSITELIB}/zenmapGUI/TopologyPage.py
@@ -241,7 +241,6 @@ share/zenmap/pixmaps/redhat_32.png
 share/zenmap/pixmaps/redhat_75.png
 share/zenmap/pixmaps/solaris_32.png
 share/zenmap/pixmaps/solaris_75.png
-share/zenmap/pixmaps/splash.png
 share/zenmap/pixmaps/throbber.gif
 share/zenmap/pixmaps/throbber.png
 share/zenmap/pixmaps/ubuntu_32.png
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 878f4ca564a..b9d038b1e2d 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.42 2010/03/27 13:37:33 pettai Exp $
+$NetBSD: distinfo,v 1.43 2010/07/22 20:46:29 pettai Exp $
 
-SHA1 (nmap-5.21.tar.bz2) = ce5ff792161dae0037e41b31e0c2ef683ce94655
-RMD160 (nmap-5.21.tar.bz2) = 85e912c3c6a7ed03eb1b399c812836071e4dcf9f
-Size (nmap-5.21.tar.bz2) = 10015121 bytes
+SHA1 (nmap-5.35DC1.tar.bz2) = 5fd786d4bbe6b4fbc0ae625fbb6893b19fbde627
+RMD160 (nmap-5.35DC1.tar.bz2) = d0663a669824a38f05e89c14a2ad5fd9932eddcc
+Size (nmap-5.35DC1.tar.bz2) = 11302092 bytes
 SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429
 SHA1 (patch-ab) = 22c377e9a340a6e6d7b9a36b63e6ffc47a084b3b
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
-SHA1 (patch-ad) = 9ce85af817e3d057b461316b2b2b526e6373a82b
 SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
deleted file mode 100644
index bbb514329ec..00000000000
--- a/net/nmap/patches/patch-ad
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ad,v 1.15 2010/03/27 13:37:34 pettai Exp $
-
-Correct handling of the length of data returned by SIOCGIFCONF.  The
-actual length of each item is never less than sizeof(struct ifreq), but
-may be more than that.  If the platform's struct sockaddr has an sa_len
-field, and if the length in sa_len is larger then the space available in
-ifr_ifru, then the data extends beyond the end of the ifr_ifru field by
-the difference in sizes.
-
-The previous code of the form
-
-    len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
-
-had two problems:
-
-1) It assumes that ifr_name and ifr_ifru are the only members
-   of struct ifreq, so that sizeof(ifr->ifr_name) is equivalent to
-   sizeof(struct ifr) - sizeof(ifr->ifr_ifreq).  This assumption may
-   be incorrect on some thypothetical systems,
-   and it's just as efficient to use code that
-   avoids making the assumption.
-
-2) It assumes that ifr->ifr_addr.sa_len will never be smaller than
-   sizeof(ifr->ifr_ifru).  This assumption is incorrect on some
-   systems, at least on NetBSD.
-
---- tcpip.cc.orig	2010-01-15 04:55:23.000000000 +0100
-+++ tcpip.cc	2010-01-27 22:46:10.000000000 +0100
-@@ -3053,12 +3053,13 @@
-     int rc;
-     char *p;
- 
--    /* On some platforms (such as FreeBSD), the length of each ifr changes
--       based on the sockaddr type used, so we get the next length now. */
--#if HAVE_SOCKADDR_SA_LEN
--    len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
--#else
-+    /* On some platforms struct sockaddr has an sa_len member, if
-+      ifr_ddr.sa_len is larger then sizeof ifr_ifru, then the actual
-+      data extends beyond the end of ifr_ifru. */
-     len = sizeof(struct ifreq);
-+#if HAVE_SOCKADDR_SA_LEN
-+    if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru))
-+      len += (ifr->ifr_addr.sa_len - sizeof(ifr->ifr_ifru));
- #endif
- 
-     /* skip any device with no name */