update to 0.9.3

changes:
Option to chroot() when dropping privs
Fixes for compiling on nearly every platform,
	including improved 64bit support
Many new testcases
Support for sending packets
Improved Unicode support
Decoders & DLT Changes, Updates and New

8 files changed, 8 insertions, 180 deletions

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 700fc816139..8cbd95ef3cf 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2005/06/12 19:41:45 salo Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/05 16:29:55 drochner Exp $
 
-DISTNAME=		tcpdump-3.8.3
-PKGREVISION=		3
+DISTNAME=		tcpdump-3.9.3
 CATEGORIES=		net
 MASTER_SITES= 		http://www.tcpdump.org/release/
 
@@ -13,6 +12,8 @@ GNU_CONFIGURE=		YES
 
 .include "options.mk"
 
+# not strictly needed
+BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index 7c3bb29165a..5adb391e33a 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/06/12 15:38:32 salo Exp $
+$NetBSD: distinfo,v 1.10 2005/08/05 16:29:55 drochner Exp $
 
-SHA1 (tcpdump-3.8.3.tar.gz) = 7ae3c29fe843fc23ae89acd8b1b1e513213f6042
-RMD160 (tcpdump-3.8.3.tar.gz) = 585c1ad9a93a8329b1d60057dd334e7b1a88097c
-Size (tcpdump-3.8.3.tar.gz) = 567116 bytes
-SHA1 (patch-aa) = d70302c6fa68d0d170fa5c22ce0a348bdf0233be
-SHA1 (patch-ab) = 628f0ecf34a7c9a5c17000b234360f7846c07847
-SHA1 (patch-ac) = 94a334a86cd42e247e1270e74cc049b908db751a
-SHA1 (patch-ad) = 2229b6cf3af0b30bc612e3dca796f01d8e8bae90
-SHA1 (patch-ae) = 9c3b318668c3558a9cee3ce90fe7ac17fd748de5
-SHA1 (patch-af) = c0c0ce4a3a3eda013fea164ed173181b271ad6b1
+SHA1 (tcpdump-3.9.3.tar.gz) = 5a92cba21ff70d1306077e6ab9c8bf7b4c0371c2
+RMD160 (tcpdump-3.9.3.tar.gz) = b6000dd099be545c6a62fe3763634fdd41798fe8
+Size (tcpdump-3.9.3.tar.gz) = 664369 bytes
diff --git a/net/tcpdump/patches/patch-aa b/net/tcpdump/patches/patch-aa
deleted file mode 100644
index 0a2069b64f5..00000000000
--- a/net/tcpdump/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/26 16:40:33 dmcmahill Exp $
-
---- configure.in.orig	2004-03-28 16:04:48.000000000 -0500
-+++ configure.in
-@@ -513,7 +513,7 @@ needsnprintf=no
- AC_CHECK_FUNCS(vsnprintf snprintf,,
- 	[needsnprintf=yes])
- if test $needsnprintf = yes; then
--	AC_LIBOBJ(snprintf.o)
-+	AC_LIBOBJ(snprintf)
- fi
- 
- AC_LBL_TYPE_SIGNAL
-@@ -550,7 +550,7 @@ AC_TRY_LINK([#include <sys/types.h>
- #include <arpa/inet.h>], [char src[4], dst[128];
- inet_ntop(AF_INET, src, dst, sizeof(dst));],
- 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
--	AC_LIBOBJ(inet_ntop.o)])
-+	AC_LIBOBJ(inet_ntop)])
- AC_MSG_CHECKING(for inet_pton)
- AC_TRY_LINK([#include <sys/types.h>
- #include <sys/socket.h>
-@@ -558,7 +558,7 @@ AC_TRY_LINK([#include <sys/types.h>
- #include <arpa/inet.h>], [char src[128], dst[4];
- inet_pton(AF_INET, src, dst);],
- 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
--	AC_LIBOBJ(inet_pton.o)])
-+	AC_LIBOBJ(inet_pton)])
- AC_MSG_CHECKING(for inet_aton)
- AC_TRY_LINK([#include <sys/types.h>
- #include <netinet/in.h>
-@@ -566,7 +566,7 @@ AC_TRY_LINK([#include <sys/types.h>
- struct in_addr dst;
- inet_aton(src, &dst);],
- 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
--	AC_LIBOBJ(inet_aton.o)])
-+	AC_LIBOBJ(inet_aton)])
- 
- dnl portability macros for getaddrinfo/getnameinfo
- dnl
diff --git a/net/tcpdump/patches/patch-ab b/net/tcpdump/patches/patch-ab
deleted file mode 100644
index 191345365e8..00000000000
--- a/net/tcpdump/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/03/26 16:40:33 dmcmahill Exp $
-
---- configure.orig	2004-03-28 16:06:09.000000000 -0500
-+++ configure
-@@ -6836,7 +6836,7 @@ fi
- done
- 
- if test $needsnprintf = yes; then
--	LIBOBJS="$LIBOBJS snprintf.o.$ac_objext"
-+	LIBOBJS="$LIBOBJS snprintf.$ac_objext"
- fi
- 
- 
-@@ -8509,7 +8509,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--	LIBOBJS="$LIBOBJS inet_ntop.o.$ac_objext"
-+	LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for inet_pton" >&5
-@@ -8554,7 +8554,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--	LIBOBJS="$LIBOBJS inet_pton.o.$ac_objext"
-+	LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for inet_aton" >&5
-@@ -8599,7 +8599,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--	LIBOBJS="$LIBOBJS inet_aton.o.$ac_objext"
-+	LIBOBJS="$LIBOBJS inet_aton.$ac_objext"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
diff --git a/net/tcpdump/patches/patch-ac b/net/tcpdump/patches/patch-ac
deleted file mode 100644
index b336c701c39..00000000000
--- a/net/tcpdump/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/06/12 15:38:32 salo Exp $
-
---- print-bgp.c.orig	2004-03-24 01:04:04.000000000 +0100
-+++ print-bgp.c	2005-06-12 17:22:17.000000000 +0200
-@@ -1216,6 +1216,8 @@
-                             tptr = pptr + len;
-                             break;
- 			}
-+			if (advance < 0) /* infinite loop protection */
-+				break;
- 			tptr += advance;
- 		}
- 		break;
-@@ -1646,9 +1648,10 @@
- 		while (dat + length > p) {
- 			char buf[MAXHOSTNAMELEN + 100];
- 			i = decode_prefix4(p, buf, sizeof(buf));
--			if (i == -1)
-+			if (i == -1) {
- 				printf("\n\t    (illegal prefix length)");
--			else if (i == -2)
-+				break;
-+                        } else if (i == -2)
- 				goto trunc;
- 			else {
- 				printf("\n\t    %s", buf);
diff --git a/net/tcpdump/patches/patch-ad b/net/tcpdump/patches/patch-ad
deleted file mode 100644
index acc19ca4364..00000000000
--- a/net/tcpdump/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/05/28 14:15:23 adrianp Exp $
-
---- print-isoclns.c.orig	2005-05-06 09:11:15.000000000 +0100
-+++ print-isoclns.c
-@@ -1506,6 +1506,9 @@ static int isis_print (const u_int8_t *p
-                tlv_type,
-                tlv_len);
- 
-+	if (tlv_len == 0) /* something is malformed */
-+		break;
-+
-         /* now check if we have a decoder otherwise do a hexdump at the end*/
- 	switch (tlv_type) {
- 	case TLV_AREA_ADDR:
-@@ -1536,7 +1539,7 @@ static int isis_print (const u_int8_t *p
- 	    break;
- 
-         case TLV_ISNEIGH_VARLEN:
--            if (!TTEST2(*tptr, 1))
-+            if (!TTEST2(*tptr, 1) || tmp < 3) /* min. TLV length */
- 		goto trunctlv;
- 	    lan_alen = *tptr++; /* LAN adress length */
-             tmp --;
diff --git a/net/tcpdump/patches/patch-ae b/net/tcpdump/patches/patch-ae
deleted file mode 100644
index 2087889ff04..00000000000
--- a/net/tcpdump/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/05/28 14:15:23 adrianp Exp $
-
---- print-ldp.c.orig	2005-05-06 09:17:24.000000000 +0100
-+++ print-ldp.c
-@@ -326,6 +326,9 @@ ldp_print(register const u_char *pptr, r
-                EXTRACT_32BITS(&ldp_msg_header->id),
-                LDP_MASK_U_BIT(EXTRACT_16BITS(&ldp_msg_header->type)) ? "continue processing" : "ignore");
- 
-+	if (msg_len == 0) /* infinite loop protection */
-+		break;
-+
-         msg_tptr=tptr+sizeof(struct ldp_msg_header);
-         msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type & Length fields not included */
- 
diff --git a/net/tcpdump/patches/patch-af b/net/tcpdump/patches/patch-af
deleted file mode 100644
index b1ebead6b4f..00000000000
--- a/net/tcpdump/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/05/28 14:15:23 adrianp Exp $
-
---- print-rsvp.c.orig	2004-03-24 04:01:08.000000000 +0000
-+++ print-rsvp.c
-@@ -875,10 +875,17 @@ rsvp_print(register const u_char *pptr, 
-             switch(rsvp_obj_ctype) {
-             case RSVP_CTYPE_IPV4:
-                 while(obj_tlen >= 4 ) {
--                    printf("\n\t    Subobject Type: %s",
-+                    printf("\n\t    Subobject Type: %s, length %u",
-                            tok2str(rsvp_obj_xro_values,
-                                    "Unknown %u",
--                                   RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)));                
-+                                   RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)),
-+                           *(obj_tptr+1));                
-+
-+                    if (*(obj_tptr+1) == 0) { /* prevent infinite loops */
-+                        printf("\n\t      ERROR: zero length ERO subtype");
-+                        break;
-+                    }
-+
-                     switch(RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)) {
-                     case RSVP_OBJ_XRO_IPV4:
-                         printf(", %s, %s/%u, Flags: [%s]",