Changes 3.77:

o Fixed a memory leak that would generally consume several hundred
  bytes per down host scanned.  While the effect for most scans is
  negligible, it was overwhelming when Scott Carlson
  (Scott.Carlson(a)schwab.com) tried to scan 24 million IPs
  (10.0.0.0/8).  Thanks to him for reporting the problem.

o Fixed a bug in ACK scan that could cause Nmap to crash with the
  message "Unexpected port state: 6" in some cases.  Thanks to Glyn
  Geoghegan (glyng(a)corsaire.com) for reporting the problem.

o Change IP protocol scan (-sO) so that a response from the target
  host in any protocol at all will prove that protocol is open.  As
  before, no response means "open|filtered", an ICMP protocol
  unreachable means "closed", and most other ICMP error messages mean
  "filered".

o Changed IP protocol scan (-sO) so that it sends valid ICMP, TCP, and
  UDP headers when scanning protocols 1, 6, and 17, respectively.  An
  emtpy IP header is still sent for all other protocols.  This should
  prevent the error messages such as "sendto in send_ip_packet:
  sendto(3, packet, 20, 0, 192.31.33.7, 16) => Operation not
  permitted" that Linux (and perhaps other systems) would give when
  they try to interpret the raw packet.  This also makes it more
  likely that these protocols will elicit a response, proving that the
  protocol is "open".

o Null, FIN, Maimon, and Xmas scans now mark ports as "open|filtered"
  instead of "open" when they fail to receive any response from the
  target port.  After all, it could just as easily be filtered as open.
  This is the same change that was made to UDP scan in 3.70.  Also as
  with UDP scan, adding version detection (-sV) will change the state
  from open|filtered to open if it confirms that they really are open.

o Fixed a crash on Windows systems that don't include the iphlpapi
  DLL.  This affects Win95 and perhaps other variants.  Thanks to Ganga
  Bhavani (GBhavani(a)everdreamcorp.com) for reporting the problem and
  sending the patch.

o Ensured that the device type, os vendor, and os family OS
  fingerprinting classification values are scrubbed for XML compliance
  in the XML output.  Thanks to Matthieu Verbert
  (mve(a)zurich.ibm.com) for reporting the problem and sending a patch.

o Changed to Nmap XML DTD to use the same xmloutputversion (1.01) as
  newer versions of Nmap.  Thanks to Laurent Estieux
  (laurent.estieux(a)free.fr) for reporting the problem.

6 files changed, 30 insertions, 32 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 2f1356c88f3..5d46c304255 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2004/11/13 22:04:53 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.40 2004/11/26 09:24:20 adam Exp $
 
-DISTNAME=	nmap-3.75
+DISTNAME=	nmap-3.77
 CATEGORIES=	net security
 MASTER_SITES=	http://www.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,10 +11,9 @@ COMMENT=	Network/port scanner with OS detection
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
-GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c c++
-
+USE_BUILDLINK3=		YES
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.libpcre}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 1c51734f88d..c7ad0c1a46c 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2004/10/19 07:03:10 salo Exp $
+$NetBSD: distinfo,v 1.20 2004/11/26 09:24:20 adam Exp $
 
-SHA1 (nmap-3.75.tar.bz2) = 0f8d80bcd71026ef2ffc262d268d81e03f2297f3
-Size (nmap-3.75.tar.bz2) = 1439720 bytes
-SHA1 (patch-aa) = 0ab8ca4b1123ab22720eb594973eb7e9ca07903b
+SHA1 (nmap-3.77.tar.bz2) = a0efd1d634bcdce0e009440b4d09cdfb67dfa975
+Size (nmap-3.77.tar.bz2) = 1441332 bytes
+SHA1 (patch-aa) = e22e9674173b66240c8e56a0468059b773444ad6
 SHA1 (patch-ab) = 7ac228ff6016b1893b0bdd38134fe46f6ee71b67
-SHA1 (patch-ad) = cf858f405358db39fd28f04055e96746b3411261
-SHA1 (patch-ae) = 703872b2f822e48080b6158774d0adf75e652bff
-SHA1 (patch-af) = 21b03fc6658267c6c40d65f634f4fe20d06a2d77
+SHA1 (patch-ad) = 697142c3eed5c8771c9421e241a06b9c35588b9d
+SHA1 (patch-ae) = 9ef870f3961c38c85c558304595df31f2b9d92fd
+SHA1 (patch-af) = 8c642b7c23f0df89c3a16f368e88070c3db94bdb
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 588b6f67538..94c7b6ae603 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2003/10/13 15:02:15 salo Exp $
+$NetBSD: patch-aa,v 1.12 2004/11/26 09:24:21 adam Exp $
 
---- Makefile.in.orig	2003-10-06 10:23:20.000000000 +0200
-+++ Makefile.in	2003-10-06 13:00:34.000000000 +0200
-@@ -16,9 +16,7 @@
+--- Makefile.in.orig	2004-11-10 02:05:51.000000000 +0000
++++ Makefile.in
+@@ -16,9 +16,7 @@ NSOCKDIR=@NSOCKDIR@
  CC = @CC@
  CXX = @CXX@
  CCOPT = 
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.11 2003/10/13 15:02:15 salo Exp $
  DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
  # For mtrace debugging -- see MTRACE define in main.cc for instructions
  # Should only be enabled during debugging and not in any real release.
-@@ -61,12 +59,6 @@
+@@ -69,12 +67,6 @@ $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_
  # all of the prerequisites (e.g. recursive makes and such)
  FORCE:
  
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 107959f97f5..40de4fbe34f 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2004/01/22 11:20:04 salo Exp $
+$NetBSD: patch-ad,v 1.9 2004/11/26 09:24:21 adam Exp $
 
---- nbase/configure.orig	2004-01-12 04:23:12.000000000 +0100
-+++ nbase/configure	2004-01-22 10:19:15.000000000 +0100
+--- nbase/configure.orig	2004-10-16 05:03:55.000000000 +0000
++++ nbase/configure
 @@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.8 2004/01/22 11:20:04 salo Exp $
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
-@@ -7068,7 +7070,7 @@
+@@ -7074,7 +7076,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.8 2004/01/22 11:20:04 salo Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7131,7 +7133,7 @@
+@@ -7137,7 +7139,7 @@ if test $ac_cv_lib_ssl_SSL_new = yes; th
  #define HAVE_LIBSSL 1
  _ACEOF
  
diff --git a/net/nmap/patches/patch-ae b/net/nmap/patches/patch-ae
index 10465ed73ea..5ea859a461a 100644
--- a/net/nmap/patches/patch-ae
+++ b/net/nmap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2003/09/20 14:15:28 salo Exp $
+$NetBSD: patch-ae,v 1.6 2004/11/26 09:24:21 adam Exp $
 
---- nsock/src/configure.orig	2003-09-11 05:44:08.000000000 +0200
-+++ nsock/src/configure	2003-09-20 14:50:34.000000000 +0200
-@@ -10,6 +10,8 @@
+--- nsock/src/configure.orig	2004-01-12 03:23:15.000000000 +0000
++++ nsock/src/configure
+@@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
diff --git a/net/nmap/patches/patch-af b/net/nmap/patches/patch-af
index 2b0dea46735..0ed80b86588 100644
--- a/net/nmap/patches/patch-af
+++ b/net/nmap/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2003/03/22 04:07:11 salo Exp $
+$NetBSD: patch-af,v 1.4 2004/11/26 09:24:21 adam Exp $
 
---- nmapfe/configure.orig	2002-08-28 02:11:16.000000000 +0200
-+++ nmapfe/configure	2003-03-22 04:52:48.000000000 +0100
-@@ -10,6 +10,8 @@
+--- nmapfe/configure.orig	2004-10-07 21:59:48.000000000 +0000
++++ nmapfe/configure
+@@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##