- update to 3.55

  /usr/local/share/doc/nmap/CHANGELOG

7 files changed, 6 insertions, 75 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 88bff4110f1..6b5bca8d062 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	nmap-${DISTVERSION}	# needed for security/nmapfe
 MAINTAINER=	eik@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
 
-DISTVERSION=	3.51-TEST4
+DISTVERSION=	3.55
 
 USE_BZIP2=	yes
 
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 77756d59396..cb6d4c12a72 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-MD5 (nmap-3.51-TEST4.tar.bz2) = 6c1ffb13a8fc49f3783e27dd66f537d5
-SIZE (nmap-3.51-TEST4.tar.bz2) = 1325396
+MD5 (nmap-3.55.tar.bz2) = 88b5f010f43b0e2ee0c2cfb468796aa9
+SIZE (nmap-3.55.tar.bz2) = 1330164
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index c9ff770fa09..9efe1b4c84c 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Mon Oct  6 13:03:26 2003
 +++ configure	Mon Oct  6 13:03:38 2003
-@@ -3299,7 +3299,7 @@
+@@ -3499,7 +3499,7 @@
  
  
  
diff --git a/security/nmap/files/patch-nbase::configure b/security/nmap/files/patch-nbase::configure
index c6b8cc5ac31..6fc2adf5e71 100644
--- a/security/nmap/files/patch-nbase::configure
+++ b/security/nmap/files/patch-nbase::configure
@@ -1,6 +1,6 @@
 --- nbase/configure.orig	Mon Oct  6 13:03:52 2003
 +++ nbase/configure	Mon Oct  6 13:04:08 2003
-@@ -2971,7 +2971,7 @@
+@@ -3081,7 +3081,7 @@
  
  
  
diff --git a/security/nmap/files/patch-nmapfe::nmapfe_sig.c b/security/nmap/files/patch-nmapfe::nmapfe_sig.c
index a1d1f67db6f..5499f073072 100644
--- a/security/nmap/files/patch-nmapfe::nmapfe_sig.c
+++ b/security/nmap/files/patch-nmapfe::nmapfe_sig.c
@@ -1,6 +1,6 @@
 --- nmapfe/nmapfe_sig.c.orig	Mon Oct  6 12:59:49 2003
 +++ nmapfe/nmapfe_sig.c	Mon Oct  6 13:00:06 2003
-@@ -410,7 +410,7 @@
+@@ -412,7 +412,7 @@
    if (size > command_size)
      command = realloc(command, size);
  
diff --git a/security/nmap/files/patch-targets.cc b/security/nmap/files/patch-targets.cc
deleted file mode 100644
index c74f69f8e0f..00000000000
--- a/security/nmap/files/patch-targets.cc
+++ /dev/null
@@ -1,49 +0,0 @@
---- targets.cc.orig	Thu Jun 17 13:33:04 2004
-+++ targets.cc	Thu Jun 17 13:34:44 2004
-@@ -259,16 +259,16 @@
- 	/* We figure out the source IP/device IFF
- 	   1) We are r00t AND
- 	   2) We are doing tcp or udp pingscan OR
--	   3) We are doing a raw-mode portscan or osscan OR 

-+	   3) We are doing a raw-mode portscan or osscan OR
- 	   4) We are on windows and doing ICMP ping */
- 	if (o.isr00t && o.af() == AF_INET && 
- 	    ((*pingtype & (PINGTYPE_TCP|PINGTYPE_UDP)) || 
- 	     o.synscan || o.finscan || o.xmasscan || o.nullscan || 
- 	     o.ipprotscan || o.maimonscan || o.idlescan || o.ackscan || 
--	     o.udpscan || o.osscan || o.windowscan

--#ifdef WIN32

--         || (*pingtype & (PINGTYPE_ICMP_PING|PINGTYPE_ICMP_MASK|PINGTYPE_ICMP_TS))

--#endif // WIN32

-+	     o.udpscan || o.osscan || o.windowscan
-+#ifdef WIN32
-+         || (*pingtype & (PINGTYPE_ICMP_PING|PINGTYPE_ICMP_MASK|PINGTYPE_ICMP_TS))
-+#endif // WIN32
- 		 )) {
- 	  struct sockaddr_in *sin = (struct sockaddr_in *) &ss;
- 	  sslen = sizeof(*sin);
-@@ -279,14 +279,13 @@
- 	  device = routethrough(hs->hostbatch[hidx]->v4hostip(), 
- 				&(sin->sin_addr));
- 	  hs->hostbatch[hidx]->setSourceSockAddr(&ss, sslen);
--      o.decoys[o.decoyturn] = hs->hostbatch[hidx]->v4source();
- 	  if (!device) {
- 	    if (*pingtype == PINGTYPE_NONE) {
- 	      fatal("Could not determine what interface to route packets through, run again with -e <device>");
- 	    } else {
--#if WIN32

-+#if WIN32
-           fatal("Unable to determine what interface to route packets through to %s", hs->hostbatch[hidx]->targetipstr());
--#endif

-+#endif
- 	      error("WARNING:  Could not determine what interface to route packets through to %s, changing ping scantype to ICMP ping only", hs->hostbatch[hidx]->targetipstr());
- 	      *pingtype = PINGTYPE_ICMP_PING;
- 	    }
-@@ -305,6 +304,7 @@
- 	delete hs->hostbatch[hidx];
- 	goto batchfull;
-       }
-+      o.decoys[o.decoyturn] = hs->hostbatch[hidx]->v4source();
-       hs->current_batch_sz++;
-     }
- 
diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc
deleted file mode 100644
index a7ebe21da04..00000000000
--- a/security/nmap/files/patch-tcpip.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- tcpip.cc.orig	Thu Jun 17 13:36:02 2004
-+++ tcpip.cc	Thu Jun 17 13:38:54 2004
-@@ -1769,7 +1769,7 @@
- #if TCPIP_DEBUGGING
-     printf("ifnet list length = %d\n",ifc.ifc_len);
-     printf("sa_len = %d\n",len);
--    hdump(buf, ifc.ifc_len);
-+    hdump((unsigned char *)buf, ifc.ifc_len);
-     printf("ifr = %X\n",(unsigned int)(*(char **)&ifr));
-     printf("Size of struct ifreq: %d\n", sizeof(struct ifreq));
- #endif
-@@ -2214,7 +2214,7 @@
-     error("sendto in %s: sendto(%d, packet, %d, 0, %s, %d) => %s",
- 	  functionname, sd, len, inet_ntoa(sin->sin_addr), tolen,
- 	  strerror(socket_errno()));
--    if (retries > 2 || socket_errno() == EPERM) 
-+    if (retries > 2 || socket_errno() == EPERM || socket_errno() == EACCES || socket_errno() == EADDRNOTAVAIL) 
-       return -1;
-     sleeptime = 15 * (1 << (2 * retries));
-     error("Sleeping %d seconds then retrying", sleeptime);