Changes 1.0.0:

* Compile with IPv6 support by default
* Compile with large file support on by default
* Add pcap-config script, which deals with -I/-L flags for compiling
* DLT: Add IPMB
* DLT: Add LAPD
* DLT: Add AX25 (AX.25 w/KISS header)
* DLT: Add JUNIPER_ST
* 802.15.4 support
* Variable length 802.11 header support
* X2E data type support
* SITA ACN Interface support - see README.sita
* Support for zerocopy BPF on platforms that support it
* Better support for dealing with VLAN tagging/stripping on Linux
* Fix dynamic library support on OSX

5 files changed, 166 insertions, 30 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index e148418a702..05c27d7f24c 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2008/02/29 00:38:12 heinz Exp $
+# $NetBSD: Makefile,v 1.43 2008/10/30 08:12:34 adam Exp $
 
-DISTNAME=	libpcap-0.9.8
+DISTNAME=	libpcap-1.0.0
 SVR4_PKGNAME=	lpcap
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
diff --git a/net/libpcap/PLIST b/net/libpcap/PLIST
index 89c5997587c..491fe620698 100644
--- a/net/libpcap/PLIST
+++ b/net/libpcap/PLIST
@@ -1,7 +1,76 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/13 07:04:59 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/30 08:12:34 adam Exp $
+bin/pcap-config
 include/pcap-bpf.h
 include/pcap-int.h
 include/pcap-namedb.h
 include/pcap.h
+include/pcap/bpf.h
+include/pcap/namedb.h
+include/pcap/pcap.h
+include/pcap/sll.h
+include/pcap/usb.h
 lib/libpcap.la
+man/man1/pcap-config.1
 man/man3/pcap.3
+man/man3/pcap_activate.3
+man/man3/pcap_breakloop.3
+man/man3/pcap_can_set_rfmon.3
+man/man3/pcap_close.3
+man/man3/pcap_compile.3
+man/man3/pcap_create.3
+man/man3/pcap_datalink.3
+man/man3/pcap_datalink_name_to_val.3
+man/man3/pcap_datalink_val_to_description.3
+man/man3/pcap_datalink_val_to_name.3
+man/man3/pcap_dispatch.3
+man/man3/pcap_dump.3
+man/man3/pcap_dump_close.3
+man/man3/pcap_dump_file.3
+man/man3/pcap_dump_flush.3
+man/man3/pcap_dump_fopen.3
+man/man3/pcap_dump_ftell.3
+man/man3/pcap_dump_open.3
+man/man3/pcap_file.3
+man/man3/pcap_fileno.3
+man/man3/pcap_findalldevs.3
+man/man3/pcap_fopen_offline.3
+man/man3/pcap_free_datalinks.3
+man/man3/pcap_freealldevs.3
+man/man3/pcap_freecode.3
+man/man3/pcap_get_selectable_fd.3
+man/man3/pcap_geterr.3
+man/man3/pcap_getnonblock.3
+man/man3/pcap_inject.3
+man/man3/pcap_is_swapped.3
+man/man3/pcap_lib_version.3
+man/man3/pcap_list_datalinks.3
+man/man3/pcap_lookupdev.3
+man/man3/pcap_lookupnet.3
+man/man3/pcap_loop.3
+man/man3/pcap_major_version.3
+man/man3/pcap_minor_version.3
+man/man3/pcap_next.3
+man/man3/pcap_next_ex.3
+man/man3/pcap_offline_filter.3
+man/man3/pcap_open_dead.3
+man/man3/pcap_open_live.3
+man/man3/pcap_open_offline.3
+man/man3/pcap_perror.3
+man/man3/pcap_sendpacket.3
+man/man3/pcap_set_buffer_size.3
+man/man3/pcap_set_datalink.3
+man/man3/pcap_set_promisc.3
+man/man3/pcap_set_rfmon.3
+man/man3/pcap_set_snaplen.3
+man/man3/pcap_set_timeout.3
+man/man3/pcap_setdirection.3
+man/man3/pcap_setfilter.3
+man/man3/pcap_setnonblock.3
+man/man3/pcap_snapshot.3
+man/man3/pcap_stats.3
+man/man3/pcap_statustostr.3
+man/man3/pcap_strerror.3
+man/man5/pcap-savefile.5
+man/man7/pcap-filter.7
+man/man7/pcap-linktype.7
+@dirrm include/pcap
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 321007cb351..0625f13e6cf 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2007/10/11 21:37:57 adam Exp $
+$NetBSD: distinfo,v 1.21 2008/10/30 08:12:34 adam Exp $
 
-SHA1 (libpcap-0.9.8.tar.gz) = 11dfe67cfc1c279c7346d626a99ad4ba90621028
-RMD160 (libpcap-0.9.8.tar.gz) = 2f5ecbc9840d8bd646798c977b7a02abe191311e
-Size (libpcap-0.9.8.tar.gz) = 520526 bytes
-SHA1 (patch-ac) = f1d911e4c4136ae332d3e756fe92dbf8f0ea8c9d
+SHA1 (libpcap-1.0.0.tar.gz) = 9893654027ae11033d785045ff35583da43fe8fa
+RMD160 (libpcap-1.0.0.tar.gz) = 20857fe6af5dc70fffb19da46e0fee908f55b3ea
+Size (libpcap-1.0.0.tar.gz) = 524273 bytes
+SHA1 (patch-aa) = 2bf7bef9e114db7ee9e7d6e5facc8f314969f703
+SHA1 (patch-ac) = 436b9401274bab4ee295ea2d185d57605d9ce8ca
diff --git a/net/libpcap/patches/patch-aa b/net/libpcap/patches/patch-aa
new file mode 100644
index 00000000000..d9f36c0476c
--- /dev/null
+++ b/net/libpcap/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.6 2008/10/30 08:12:52 adam Exp $
+
+--- pcap/pcap.h.orig	2008-10-29 15:08:55.000000000 +0100
++++ pcap/pcap.h
+@@ -336,10 +336,12 @@ void	pcap_freealldevs(pcap_if_t *);
+ const char *pcap_lib_version(void);
+ 
+ /* XXX this guy lives in the bpf tree */
++#ifndef _NET_BPF_H_
+ u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
+ int	bpf_validate(const struct bpf_insn *f, int len);
+ char	*bpf_image(const struct bpf_insn *, int);
+ void	bpf_dump(const struct bpf_program *, int);
++#endif
+ 
+ #if defined(WIN32)
+ 
diff --git a/net/libpcap/patches/patch-ac b/net/libpcap/patches/patch-ac
index dcfb7f98d89..c0d5cba2f97 100644
--- a/net/libpcap/patches/patch-ac
+++ b/net/libpcap/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
+$NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
 
---- Makefile.in.orig	2007-07-24 04:35:15.000000000 +0200
+--- Makefile.in.orig	2008-10-28 02:26:13.000000000 +0100
 +++ Makefile.in
-@@ -41,7 +41,7 @@ VPATH = @srcdir@
+@@ -44,7 +44,7 @@ VPATH = @srcdir@
  # You shouldn't need to edit anything below.
  #
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
  DEFS = @DEFS@ @V_DEFS@
-@@ -69,7 +69,8 @@ YACC = @V_YACC@
+@@ -73,7 +73,8 @@ YACC = @V_YACC@
  # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
  # Also, gcc does not remove the .o before forking 'as', which can be a
  # problem if you don't own the file but can write to the directory.
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
-@@ -79,13 +80,13 @@ SSRC =  @SSRC@
+@@ -83,13 +84,13 @@ SSRC =  @SSRC@
  CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c \
  	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c
  GENSRC = scanner.c grammar.c version.c
@@ -34,28 +34,28 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  # hack the extra indirection
 -OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
 +OBJ =	$(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
- HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
- 	ethertype.h gencode.h gnuc.h
- GENHDR = \
-@@ -99,12 +100,10 @@ TAGFILES = \
+ HDR = \
+ 	acconfig.h \
+ 	arcnet.h \
+@@ -311,12 +312,10 @@ EXTRA_DIST = \
+ 	Win32/Src/inet_net.c \
+ 	Win32/Src/inet_pton.c
  
- CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
- 
--all: libpcap.a
-+all: libpcap.la
+-all: libpcap.a pcap-config
++all: libpcap.la pcap-config
  
 -libpcap.a: $(OBJ)
 -	@rm -f $@
--	ar rc $@ $(OBJ) $(LIBS)
+-	$(AR) rc $@ $(OBJ) $(LIBS)
 -	$(RANLIB) $@
 +libpcap.la: $(OBJ)
 +	${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la
  
  shared: libpcap.$(DYEXT)
  
-@@ -128,10 +127,10 @@ scanner.c: $(srcdir)/scanner.l
+@@ -348,10 +347,10 @@ scanner.c: $(srcdir)/scanner.l
  	@rm -f $@
- 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 	./runlex.sh $(LEX) -o$@ $<
  
 -scanner.o: scanner.c tokdefs.h
 +scanner.lo: scanner.c tokdefs.h
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  
  tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -140,17 +139,17 @@ grammar.c: $(srcdir)/grammar.y
+@@ -360,17 +359,17 @@ grammar.c: $(srcdir)/grammar.y
  	mv y.tab.c grammar.c
  	mv y.tab.h tokdefs.h
  
@@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  	@rm -f $@
  	sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
  
-@@ -161,7 +160,7 @@ version.c: $(srcdir)/VERSION
+@@ -381,7 +380,7 @@ version.c: $(srcdir)/VERSION
  # so we make the version string static and return it from
  # a function, which does work.
  #
@@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
  	@rm -f $@
  	sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@
  
-@@ -169,14 +168,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+@@ -389,7 +388,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
  
@@ -105,8 +105,13 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
 +bpf_filter.lo: bpf_filter.c
  	$(CC) $(CFLAGS) -c bpf_filter.c
  
--install: libpcap.a 
-+install: libpcap.la 
+ #
+@@ -413,11 +412,10 @@ filtertest: filtertest.c libpcap.a
+ findalldevstest: findalldevstest.c libpcap.a
+ 	$(CC) $(CFLAGS) -I. -L. -o findalldevstest findalldevstest.c libpcap.a
+ 
+-install: libpcap.a pcap-config
++install: libpcap.la pcap-config
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 -	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
@@ -114,4 +119,48 @@ $NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
 +	${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
  	[ -d $(DESTDIR)$(includedir) ] || \
  	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
- 	$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
+ 	[ -d $(DESTDIR)$(includedir)/pcap ] || \
+@@ -445,31 +443,31 @@ install: libpcap.a pcap-config
+ 	    $(DESTDIR)$(includedir)/pcap-bpf.h
+ 	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
+ 	    $(DESTDIR)$(includedir)/pcap-namedb.h
+-	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
++	${BSD_INSTALL_SCRIPT} pcap-config $(DESTDIR)$(bindir)/pcap-config
+ 	for i in $(MAN1); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i \
+ 		    $(DESTDIR)$(mandir)/man1/$$i; done
+-	for i in $(MAN3PCAP); do \
+-		$(INSTALL_DATA) $(srcdir)/$$i \
++	for i in $(MAN3PCAP:.3pcap=.3); do \
++		$(INSTALL_DATA) $(srcdir)/$${i}pcap \
+ 		    $(DESTDIR)$(mandir)/man3/$$i; done
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_perror.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_next.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
+ 	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
++		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
+ 	for i in $(MANFILE); do \
+ 		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
+ 		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done