Nmap 5.50 [2011-01-28]

Some of the highlights are:

o [Zenmap] Added a new script selection interface, allowing you to
  choose scripts and arguments from a list.
o [Nping] Added echo mode, learn more about echo mode at
  http://nmap.org/book/nping-man-echo-mode.html.
o [NSE] Added an amazing 46 scripts, bringing the total to 177!
  You can learn more about any of them at http://nmap.org/nsedoc/
o [NSE] Added 12 new protocol libraries.
o [NSE] Added a new brute library that provides a basic framework and logic
  for brute force password auditing scripts.
o [Zenmap] Greatly improved performance for large scans by
  benchmarking intensively and then recoding dozens of slow parts.
o Performed a major OS detection integration run. The database has
  grown more than 14% to 2,982 fingerprints and many of the existing
  fingerprints were improved. David posted highlights of his integration work at
  http://seclists.org/nmap-dev/2010/q4/651
o Performed a huge version detection integration run. The number of
  signatures has grown by more than 11% to 7,355. David posted highlights at
  http://seclists.org/nmap-dev/2010/q4/761
o [NSE] Nmap has two new NSE script scanning phases. See
  http://nmap.org/book/nse-usage.html#nse-script-types
o Dramatically improved nmap.xsl (used for converting Nmap XML output
  to HTML).
o Integrated cracked passwords from the Gawker.com compromise
  (http://seclists.org/nmap-dev/2010/q4/674) into Nmap's top-5000
  password database.
o Merged port names in the nmap-services file with allocated names
  from the IANA (http://www.iana.org/assignments/port-numbers).
o [Zenmap] Made the topology node radiuses grow logarithmically
  instead of linearly, so that hosts with thousands of open ports
  don't overwhelm the diagram.
o Improved IPv6 host output in that we now remember and report the
  forward DNS name (given by the user) and any non-scanned addresses
  (usually because of round robin DNS).
o [Zenmap] Upgraded to the newer gtk.Tooltip API to avoid deprecation
  messages about gtk.Tooltip.
o [NSE] Enhance ssl-cert to also report the type and bit size of SSL
  certificate public keys.
o [Nping] Nping now limits concurrent open file descriptors properly
  based on the resources available on the host.
o Ncat now logs Nsock debug output to stderr instead of stdout for
  consistency with its other debug messages.
o Changed the name of libdnet's sctp_chunkhdr to avoid a conflict with
  a struct of the same name in <netinet/sctp.h>.
o [NSE] Host tables now have a host.traceroute member available when
  --traceroute is used.
o Nmap now prints the MTU for interfaces in --iflist output.
o [Ncat,NSE] Server Name Indication (SNI) is now supported by Ncat and
  Nmap NSE, allowing them to connect to servers which run multiple SSL
  websites on one IP address.
o [Nsock] Added a new function, nsi_set_hostname, to set the intended
  hostname of the target.
o [NSE] Made sslv2.nse give special output when SSLv2 is supported,
  but no SSLv2 ciphers are offered.
o Fixed the fragmentation options (-f in Nmap, --mtu in Nmap & Nping),
  which were improperly sending whole packets in version 5.35DC1.
o [NSE] When receiving raw packets from Pcap, the packet capture time
  is now available to scripts as an additional return value from
  pcap_receive().
o Updated IANA IP address space assignment list for random IP (-iR)
  generation.
o [Ncat] Ncat now uses case-insensitive string comparison when
  checking authentication schemes and parameters.
o [NSE] There is now a limit of 1,000 concurrent running scripts,
  instituted to keep memory under control when there are many open
  ports.

Plus many bugfixes and improvements.

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

8 files changed, 102 insertions, 110 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 98b3ab46ad9..79dd7cd7de3 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2011/01/13 13:53:32 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2011/01/31 23:22:47 pettai Exp $
 #
 
-DISTNAME=	nmap-5.35DC1
-PKGNAME=	nmap-5.35dc1
-PKGREVISION=	3
+DISTNAME=	nmap-5.50
+#PKGNAME=	nmap-5.50
+#PKGREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index b919c65245c..3cb966cf9d7 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/07/22 20:46:29 pettai Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/01/31 23:22:47 pettai Exp $
 bin/ncat
 bin/nmap
 bin/nping
@@ -33,11 +33,12 @@ share/nmap/nse_main.lua
 share/nmap/nselib/afp.lua
 share/nmap/nselib/asn1.lua
 share/nmap/nselib/base64.lua
+share/nmap/nselib/brute.lua
 share/nmap/nselib/citrixxml.lua
 share/nmap/nselib/comm.lua
 share/nmap/nselib/data/favicon-db
-share/nmap/nselib/data/folders.lst
-share/nmap/nselib/data/http-fingerprints
+share/nmap/nselib/data/http-fingerprints.lua
+share/nmap/nselib/data/http-folders.txt
 share/nmap/nselib/data/oracle-sids
 share/nmap/nselib/data/passwords.lst
 share/nmap/nselib/data/psexec/README
@@ -51,13 +52,18 @@ share/nmap/nselib/data/psexec/nmap_service.c
 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/dhcp.lua
 share/nmap/nselib/dns.lua
+share/nmap/nselib/dnssd.lua
+share/nmap/nselib/drda.lua
+share/nmap/nselib/ftp.lua
+share/nmap/nselib/giop.lua
 share/nmap/nselib/http.lua
 share/nmap/nselib/imap.lua
+share/nmap/nselib/informix.lua
 share/nmap/nselib/ipOps.lua
+share/nmap/nselib/iscsi.lua
 share/nmap/nselib/json.lua
 share/nmap/nselib/ldap.lua
 share/nmap/nselib/listop.lua
@@ -69,11 +75,13 @@ share/nmap/nselib/msrpctypes.lua
 share/nmap/nselib/mssql.lua
 share/nmap/nselib/mysql.lua
 share/nmap/nselib/netbios.lua
+share/nmap/nselib/nrpc.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/rmi.lua
 share/nmap/nselib/rpc.lua
 share/nmap/nselib/shortport.lua
 share/nmap/nselib/smb.lua
@@ -85,8 +93,13 @@ share/nmap/nselib/stdnse.lua
 share/nmap/nselib/strbuf.lua
 share/nmap/nselib/strict.lua
 share/nmap/nselib/tab.lua
+share/nmap/nselib/target.lua
+share/nmap/nselib/tns.lua
 share/nmap/nselib/unpwdb.lua
+share/nmap/nselib/upnp.lua
 share/nmap/nselib/url.lua
+share/nmap/nselib/vnc.lua
+share/nmap/nselib/wsdd.lua
 share/nmap/scripts/afp-brute.nse
 share/nmap/scripts/afp-path-vuln.nse
 share/nmap/scripts/afp-serverinfo.nse
@@ -95,6 +108,11 @@ share/nmap/scripts/asn-query.nse
 share/nmap/scripts/auth-owners.nse
 share/nmap/scripts/auth-spoof.nse
 share/nmap/scripts/banner.nse
+share/nmap/scripts/broadcast-dns-service-discovery.nse
+share/nmap/scripts/broadcast-dropbox-listener.nse
+share/nmap/scripts/broadcast-ms-sql-discover.nse
+share/nmap/scripts/broadcast-upnp-info.nse
+share/nmap/scripts/broadcast-wsdd-discover.nse
 share/nmap/scripts/citrix-brute-xml.nse
 share/nmap/scripts/citrix-enum-apps-xml.nse
 share/nmap/scripts/citrix-enum-apps.nse
@@ -104,9 +122,8 @@ 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/db2-discover.nse
 share/nmap/scripts/dhcp-discover.nse
 share/nmap/scripts/dns-cache-snoop.nse
 share/nmap/scripts/dns-fuzz.nse
@@ -114,17 +131,31 @@ 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-update.nse
 share/nmap/scripts/dns-zone-transfer.nse
+share/nmap/scripts/domcon-brute.nse
+share/nmap/scripts/domcon-cmd.nse
+share/nmap/scripts/domino-enum-users.nse
+share/nmap/scripts/drda-brute.nse
+share/nmap/scripts/drda-info.nse
 share/nmap/scripts/finger.nse
+share/nmap/scripts/firewalk.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/ftp-proftpd-backdoor.nse
+share/nmap/scripts/giop-info.nse
+share/nmap/scripts/gopher-ls.nse
+share/nmap/scripts/hddtemp-info.nse
+share/nmap/scripts/hostmap.nse
 share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-brute.nse
 share/nmap/scripts/http-date.nse
+share/nmap/scripts/http-domino-enum-passwords.nse
 share/nmap/scripts/http-enum.nse
 share/nmap/scripts/http-favicon.nse
+share/nmap/scripts/http-form-brute.nse
 share/nmap/scripts/http-headers.nse
 share/nmap/scripts/http-iis-webdav-vuln.nse
 share/nmap/scripts/http-malware-host.nse
@@ -132,19 +163,28 @@ 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-robots.txt.nse
+share/nmap/scripts/http-title.nse
 share/nmap/scripts/http-trace.nse
 share/nmap/scripts/http-userdir-enum.nse
+share/nmap/scripts/http-vhosts.nse
 share/nmap/scripts/http-vmware-path-vuln.nse
 share/nmap/scripts/iax2-version.nse
 share/nmap/scripts/imap-capabilities.nse
+share/nmap/scripts/informix-brute.nse
+share/nmap/scripts/informix-query.nse
+share/nmap/scripts/informix-tables.nse
 share/nmap/scripts/ipidseq.nse
 share/nmap/scripts/irc-info.nse
 share/nmap/scripts/irc-unrealircd-backdoor.nse
+share/nmap/scripts/iscsi-brute.nse
+share/nmap/scripts/iscsi-info.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/modbus-discover.nse
 share/nmap/scripts/mongodb-databases.nse
 share/nmap/scripts/mongodb-info.nse
 share/nmap/scripts/ms-sql-brute.nse
@@ -161,14 +201,23 @@ 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/nat-pmp-info.nse
 share/nmap/scripts/nbstat.nse
+share/nmap/scripts/netbus-auth-bypass.nse
+share/nmap/scripts/netbus-brute.nse
+share/nmap/scripts/netbus-info.nse
+share/nmap/scripts/netbus-version.nse
 share/nmap/scripts/nfs-ls.nse
 share/nmap/scripts/nfs-showmount.nse
 share/nmap/scripts/nfs-statfs.nse
+share/nmap/scripts/nrpe-enum.nse
 share/nmap/scripts/ntp-info.nse
 share/nmap/scripts/ntp-monlist.nse
+share/nmap/scripts/oracle-brute.nse
+share/nmap/scripts/oracle-enum-users.nse
 share/nmap/scripts/oracle-sid-brute.nse
 share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/path-mtu.nse
 share/nmap/scripts/pgsql-brute.nse
 share/nmap/scripts/pjl-ready-message.nse
 share/nmap/scripts/pop3-brute.nse
@@ -176,7 +225,8 @@ 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/resolveall.nse
+share/nmap/scripts/rmi-dumpregistry.nse
 share/nmap/scripts/rpcinfo.nse
 share/nmap/scripts/script.db
 share/nmap/scripts/skypev2-version.nse
@@ -188,6 +238,7 @@ share/nmap/scripts/smb-enum-processes.nse
 share/nmap/scripts/smb-enum-sessions.nse
 share/nmap/scripts/smb-enum-shares.nse
 share/nmap/scripts/smb-enum-users.nse
+share/nmap/scripts/smb-flood.nse
 share/nmap/scripts/smb-os-discovery.nse
 share/nmap/scripts/smb-psexec.nse
 share/nmap/scripts/smb-security-mode.nse
@@ -211,12 +262,19 @@ 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/ssh2-enum-algos.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/stuxnet-detect.nse
+share/nmap/scripts/svn-brute.nse
+share/nmap/scripts/targets-traceroute.nse
 share/nmap/scripts/telnet-brute.nse
 share/nmap/scripts/upnp-info.nse
+share/nmap/scripts/vnc-brute.nse
+share/nmap/scripts/vnc-info.nse
+share/nmap/scripts/wdb-version.nse
 share/nmap/scripts/whois.nse
+share/nmap/scripts/wsdd-discover.nse
 share/nmap/scripts/x11-access.nse
-@pkgdir share/nping
diff --git a/net/nmap/PLIST.zenmap b/net/nmap/PLIST.zenmap
index a7070a4db47..5724c852ab2 100644
--- a/net/nmap/PLIST.zenmap
+++ b/net/nmap/PLIST.zenmap
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.zenmap,v 1.7 2010/07/22 20:46:29 pettai Exp $
+@comment $NetBSD: PLIST.zenmap,v 1.8 2011/01/31 23:22:47 pettai Exp $
 bin/nmapfe
 bin/uninstall_zenmap
 bin/xnmap
@@ -77,6 +77,8 @@ ${PYSITELIB}/zenmapCore/Diff.py
 ${PYSITELIB}/zenmapCore/Diff.pyc
 ${PYSITELIB}/zenmapCore/I18N.py
 ${PYSITELIB}/zenmapCore/I18N.pyc
+${PYSITELIB}/zenmapCore/NSEDocParser.py
+${PYSITELIB}/zenmapCore/NSEDocParser.pyc
 ${PYSITELIB}/zenmapCore/Name.py
 ${PYSITELIB}/zenmapCore/Name.pyc
 ${PYSITELIB}/zenmapCore/NetworkInventory.py
@@ -91,8 +93,14 @@ ${PYSITELIB}/zenmapCore/Paths.py
 ${PYSITELIB}/zenmapCore/Paths.pyc
 ${PYSITELIB}/zenmapCore/RecentScans.py
 ${PYSITELIB}/zenmapCore/RecentScans.pyc
+${PYSITELIB}/zenmapCore/ScriptArgsParser.py
+${PYSITELIB}/zenmapCore/ScriptArgsParser.pyc
+${PYSITELIB}/zenmapCore/ScriptMetadata.py
+${PYSITELIB}/zenmapCore/ScriptMetadata.pyc
 ${PYSITELIB}/zenmapCore/SearchResult.py
 ${PYSITELIB}/zenmapCore/SearchResult.pyc
+${PYSITELIB}/zenmapCore/StringPool.py
+${PYSITELIB}/zenmapCore/StringPool.pyc
 ${PYSITELIB}/zenmapCore/TargetList.py
 ${PYSITELIB}/zenmapCore/TargetList.pyc
 ${PYSITELIB}/zenmapCore/UmitConf.py
@@ -159,6 +167,8 @@ ${PYSITELIB}/zenmapGUI/ScanToolbar.py
 ${PYSITELIB}/zenmapGUI/ScanToolbar.pyc
 ${PYSITELIB}/zenmapGUI/ScansListStore.py
 ${PYSITELIB}/zenmapGUI/ScansListStore.pyc
+${PYSITELIB}/zenmapGUI/ScriptInterface.py
+${PYSITELIB}/zenmapGUI/ScriptInterface.pyc
 ${PYSITELIB}/zenmapGUI/SearchGUI.py
 ${PYSITELIB}/zenmapGUI/SearchGUI.pyc
 ${PYSITELIB}/zenmapGUI/SearchWindow.py
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 2f3382ad8b8..3d7d323b6f6 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.46 2011/01/30 09:24:40 markd Exp $
+$NetBSD: distinfo,v 1.47 2011/01/31 23:22:47 pettai Exp $
 
-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) = 59c7cd07cc94e7b1fbb2d3c847bb11cdb046df19
+SHA1 (nmap-5.50.tar.bz2) = 49c7a858d2c0a6302df533b1c97a96790bb06f42
+RMD160 (nmap-5.50.tar.bz2) = 587bded08ecf0286228f6ca92cb7cd2568343053
+Size (nmap-5.50.tar.bz2) = 16877762 bytes
+SHA1 (patch-aa) = 87306b2e8c17599e863e47ea5f02f25ed36df712
+SHA1 (patch-ab) = b709689e4bda3bc928ba120678f24a2e2321f612
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
-SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892
-SHA1 (patch-ak) = ffc530fb2987fadbb4990314947015e8cd26c2c9
 SHA1 (patch-al) = c56396c28d96314c8d7e8b19a92bd5db7959e289
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index d272498b43b..153c4e36611 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2009/07/20 19:40:08 adrianp Exp $
+$NetBSD: patch-aa,v 1.24 2011/01/31 23:22:48 pettai Exp $
 
---- Makefile.in.orig	2009-06-24 22:35:54.000000000 +0100
+--- Makefile.in.orig	2011-01-29 20:52:20.000000000 +0000
 +++ Makefile.in
-@@ -24,8 +24,8 @@ CXX = @CXX@
+@@ -25,8 +25,8 @@ CXX = @CXX@
  CCOPT = 
  DBGFLAGS = 
  STRIP = @STRIP@
@@ -11,24 +11,5 @@ $NetBSD: patch-aa,v 1.23 2009/07/20 19:40:08 adrianp Exp $
 +#LIBPCAPDIR = @libpcapdir@
 +#LIBPCREDIR = @LIBPCREDIR@
  export LIBDNETDIR = @LIBDNETDIR@
- ZENMAPDIR = zenmap
- NDIFFDIR = ndiff
-@@ -95,14 +95,14 @@ $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ 
- 	rm -f $@
- 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
--pcre_build: $(LIBPCREDIR)/Makefile
--	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
-+#pcre_build: $(LIBPCREDIR)/Makefile
-+#	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
- 
- dnet_build: $(LIBDNETDIR)/Makefile
- 	@echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
- 
--pcap_build: $(LIBPCAPDIR)/Makefile
--	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
-+#pcap_build: $(LIBPCAPDIR)/Makefile
-+#	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
- 
- nbase_build: $(NBASEDIR)/Makefile
- 	@echo Compiling libnbase;
+ ZENMAPDIR = @ZENMAPDIR@
+ NDIFFDIR = @NDIFFDIR@
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 9d0a8d24c1a..ace42e00adf 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2011/01/30 09:24:40 markd Exp $
+$NetBSD: patch-ab,v 1.16 2011/01/31 23:22:48 pettai Exp $
 
---- configure.orig	2010-07-16 00:43:59.000000000 +0000
+--- configure.orig	2011-01-21 21:00:04.000000000 +0000
 +++ configure
-@@ -6212,7 +6212,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+@@ -5308,7 +5308,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.15 2011/01/30 09:24:40 markd Exp $
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -6466,7 +6466,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+@@ -5558,7 +5558,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.15 2011/01/30 09:24:40 markd Exp $
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -7664,6 +7664,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6115,6 +6115,7 @@ else
  extern char pcap_version[];
  int main() {
    int major, minor1, minor2;
@@ -28,11 +28,11 @@ $NetBSD: patch-ab,v 1.15 2011/01/30 09:24:40 markd Exp $
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      exit(0);
-@@ -7714,6 +7715,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -6137,6 +6138,8 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-+#define  _BSD_SOURCE
++#define BSD_SOURCE
 +#include <sys/types.h>
  #include <stdio.h>
  #ifdef HAVE_SYS_IOCCOM_H
diff --git a/net/nmap/patches/patch-aj b/net/nmap/patches/patch-aj
deleted file mode 100644
index 3a6c889aed9..00000000000
--- a/net/nmap/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2009/07/20 19:40:08 adrianp Exp $
-
---- libdnet-stripped/include/dnet/os.h.orig	2009-06-24 22:35:54.000000000 +0100
-+++ libdnet-stripped/include/dnet/os.h
-@@ -115,7 +115,7 @@
- # ifdef __GNUC__
- #  define __flexarr	[0]
- # else
--#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__SUNPRO_C)
- #   define __flexarr	[]
- #  elif defined(_WIN32)
- /* MS VC++ -- using [] works but gives a "nonstandard extension" warning */
diff --git a/net/nmap/patches/patch-ak b/net/nmap/patches/patch-ak
deleted file mode 100644
index 6620a75bc6b..00000000000
--- a/net/nmap/patches/patch-ak
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/11/30 11:04:59 obache Exp $
-
-for OpenSSL without MD2
-
---- nse_openssl.cc.orig	2010-03-28 21:18:02.000000000 +0000
-+++ nse_openssl.cc
-@@ -8,7 +8,9 @@
- #include <openssl/crypto.h>
- #include <openssl/bn.h>
- #include <openssl/rand.h>
-+#ifndef OPENSSL_NO_MD2
- #include <openssl/md2.h>
-+#endif
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-@@ -219,6 +221,7 @@ static int l_rand_pseudo_bytes( lua_Stat
-   return 1;
- }
- 
-+#ifndef OPENSSL_NO_MD2
- static int l_md2(lua_State *L)     /** md2(string s) */
- {
-   size_t len;
-@@ -228,6 +231,7 @@ static int l_md2(lua_State *L)     /** m
-   lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 );
-   return 1;
- }
-+#endif
- 
- static int l_md4(lua_State *L)     /** md4(string s) */
- {
-@@ -515,7 +519,9 @@ static const struct luaL_reg openssllib[
-   { "bignum_mod_exp", l_bignum_mod_exp },
-   { "rand_bytes", l_rand_bytes },
-   { "rand_pseudo_bytes", l_rand_pseudo_bytes },
-+#ifndef OPENSSL_NO_MD2
-   { "md2", l_md2 },
-+#endif
-   { "md4", l_md4 },
-   { "md5", l_md5 },
-   { "sha1", l_sha1 },