Changes 4.1.1:

* Fix build on systems with PF, such as FreeBSD and OpenBSD.
* Don't blow up if a zero-length link-layer address is passed to
  linkaddr_string().

Changes  4.1.0:
* Fix printing of MAC addresses for VLAN frames with a length
  field
* Add some additional bounds checks and use the EXTRACT_ macros
  more
* Add a -b flag to print the AS number in BGP packets in ASDOT
  notation rather than ASPLAIN notation
* Add ICMPv6 RFC 5006 support
* Decode the access flags in NFS access requests
* Handle the new DLT_ for memory-mapped USB captures on Linux
* Make the default snapshot (-s) the maximum
* Print name of device (when -L is used)
* Support for OpenSolaris (and SXCE build 125 and later)
* Print new TCP flags
* Add support for RPL DIO
* Add support for TCP User Timeout (UTO)
* Add support for non-standard Ethertypes used by 3com PPPoE gear
* Add support for 802.11n and 802.11s
* Add support for Transparent Ethernet Bridge ethertype in GRE
* Add 4 byte AS support for BGP printer
* Add support for the MDT SAFI 66 BG printer
* Add basic IPv6 support to print-olsr
* Add USB printer
* Add printer for ForCES
* Handle frames with an FCS
* Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames
* Fix TCP sequence number printing
* Report 802.2 packets as 802.2 instead of 802.3
* Don't include -L/usr/lib in LDFLAGS
* On x86_64 Linux, look in lib64 directory too
* Lots of code clean ups
* Autoconf clean ups
* Update testcases to make output changes
* Fix compiling with/out smi (--with{,out}-smi)
* Fix compiling without IPv6 support (--disable-ipv6)

4 files changed, 28 insertions, 38 deletions

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 476aa9fecb7..931cd10c0c6 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.29 2010/01/17 12:02:35 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2011/02/11 12:13:13 adam Exp $
 
-DISTNAME=		tcpdump-4.0.0
-PKGREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		http://www.tcpdump.org/release/
+DISTNAME=	tcpdump-4.1.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.tcpdump.org/release/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.tcpdump.org/
-COMMENT=		Network monitoring tool
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.tcpdump.org/
+COMMENT=	Network monitoring tool
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 
 .include "options.mk"
 
 # not strictly needed
-BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.1.1
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index b630b509293..7225201d482 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2009/05/20 20:09:33 asau Exp $
+$NetBSD: distinfo,v 1.18 2011/02/11 12:13:13 adam Exp $
 
-SHA1 (tcpdump-4.0.0.tar.gz) = 618ac122d1a9d80f64865f0a4e4c4391baa54132
-RMD160 (tcpdump-4.0.0.tar.gz) = 294e8cc7b7026357fa061c296434eab363281de1
-Size (tcpdump-4.0.0.tar.gz) = 708774 bytes
-SHA1 (patch-ag) = ff1d8c79e2137639e0a8aac2a18d18f09340c99a
-SHA1 (patch-ah) = b6ca131244c11a63fb4f3044abba99d217bc80d5
+SHA1 (tcpdump-4.1.1.tar.gz) = 8f356cbc781192ecb527623d68db90e06aa9d4b9
+RMD160 (tcpdump-4.1.1.tar.gz) = 97ac07582f26c4126b09de1dcca6851ad02352d1
+Size (tcpdump-4.1.1.tar.gz) = 1587392 bytes
+SHA1 (patch-ah) = c3adfebd0c763583ae9609e07fc816972eb223c0
diff --git a/net/tcpdump/patches/patch-ag b/net/tcpdump/patches/patch-ag
deleted file mode 100644
index 18b4bd23db6..00000000000
--- a/net/tcpdump/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/05/20 20:09:33 asau Exp $
-
-Fix breakage with IPv6 disabled.
-
---- print-enc.c.orig	2008-09-01 06:44:22.000000000 +0400
-+++ print-enc.c	2009-05-20 11:05:45.000000000 +0400
-@@ -77,9 +77,11 @@
- 	case AF_INET:
- 		ip_print(gndo, p, length);
- 		break;
-+#ifdef INET6
- 	case AF_INET6:
- 		ip6_print(p, length);
- 		break;
-+#endif
- 	}
- 
- out:
diff --git a/net/tcpdump/patches/patch-ah b/net/tcpdump/patches/patch-ah
index 8c22659a786..2486467862e 100644
--- a/net/tcpdump/patches/patch-ah
+++ b/net/tcpdump/patches/patch-ah
@@ -1,14 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2009/05/20 20:09:33 asau Exp $
+$NetBSD: patch-ah,v 1.2 2011/02/11 12:13:13 adam Exp $
 
+Fix VERSION dependency, or install will fail on case-insensitive file-system.
 Don't install another copy.
 
 --- Makefile.in.orig	2008-09-01 06:44:11.000000000 +0400
 +++ Makefile.in	2009-05-20 11:08:24.000000000 +0400
-@@ -325,7 +325,6 @@
+@@ -389,7 +389,7 @@ strsep.o: $(srcdir)/missing/strsep.c
+ version.o: version.c
+ 	$(CC) $(CFLAGS) -c version.c
+ 
+-version.c: $(srcdir)/VERSION
++version.c: VERSION
+ 	@rm -f $@
+ 	if grep GIT ${srcdir}/VERSION >/dev/null; then \
+ 		read ver <${srcdir}/VERSION; \
+@@ -403,7 +403,6 @@ install: all
  	[ -d $(DESTDIR)$(sbindir) ] || \
  	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 -	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
  	[ -d $(DESTDIR)$(mandir)/man1 ] || \
  	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
- 	$(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
+ 	$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1