svn commit: r190225 - in head/contrib/libpcap: . bpf/net doc missing net packaging pcap

Sat Mar 21 15:58:10 PDT 2009

Author: rpaulo
Date: Sat Mar 21 22:58:08 2009
New Revision: 190225
URL: http://svn.freebsd.org/changeset/base/190225

Log:
  Merge libpcap 1.0.0.

Added:
  head/contrib/libpcap/chmod_bpf
     - copied unchanged from r190215, vendor/libpcap/dist/chmod_bpf
  head/contrib/libpcap/dlpisubs.c
     - copied unchanged from r190215, vendor/libpcap/dist/dlpisubs.c
  head/contrib/libpcap/dlpisubs.h
     - copied unchanged from r190215, vendor/libpcap/dist/dlpisubs.h
  head/contrib/libpcap/fad-sita.c
     - copied unchanged from r190215, vendor/libpcap/dist/fad-sita.c
  head/contrib/libpcap/filtertest.c
     - copied unchanged from r190215, vendor/libpcap/dist/filtertest.c
  head/contrib/libpcap/findalldevstest.c
     - copied unchanged from r190215, vendor/libpcap/dist/findalldevstest.c
  head/contrib/libpcap/ieee80211.h
     - copied unchanged from r190215, vendor/libpcap/dist/ieee80211.h
  head/contrib/libpcap/missing/
     - copied from r190215, vendor/libpcap/dist/missing/
  head/contrib/libpcap/net/
     - copied from r190215, vendor/libpcap/dist/net/
  head/contrib/libpcap/pcap/
     - copied from r190215, vendor/libpcap/dist/pcap/
  head/contrib/libpcap/pcap-bt-linux.c
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-bt-linux.c
  head/contrib/libpcap/pcap-bt-linux.h
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-bt-linux.h
  head/contrib/libpcap/pcap-config.1
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-config.1
  head/contrib/libpcap/pcap-config.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-config.in
  head/contrib/libpcap/pcap-filter.manmisc
  head/contrib/libpcap/pcap-filter.manmisc.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-filter.manmisc.in
  head/contrib/libpcap/pcap-libdlpi.c
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-libdlpi.c
  head/contrib/libpcap/pcap-linktype.manmisc
  head/contrib/libpcap/pcap-linktype.manmisc.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-linktype.manmisc.in
  head/contrib/libpcap/pcap-savefile.manfile
  head/contrib/libpcap/pcap-savefile.manfile.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-savefile.manfile.in
  head/contrib/libpcap/pcap-sita.c
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-sita.c
  head/contrib/libpcap/pcap-sita.h
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-sita.h
  head/contrib/libpcap/pcap-sita.html
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-sita.html
  head/contrib/libpcap/pcap-usb-linux.c
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-usb-linux.c
  head/contrib/libpcap/pcap-usb-linux.h
     - copied unchanged from r190215, vendor/libpcap/dist/pcap-usb-linux.h
  head/contrib/libpcap/pcap.3pcap
  head/contrib/libpcap/pcap.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap.3pcap.in
  head/contrib/libpcap/pcap_activate.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_activate.3pcap
  head/contrib/libpcap/pcap_breakloop.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_breakloop.3pcap
  head/contrib/libpcap/pcap_can_set_rfmon.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_can_set_rfmon.3pcap
  head/contrib/libpcap/pcap_close.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_close.3pcap
  head/contrib/libpcap/pcap_compile.3pcap
  head/contrib/libpcap/pcap_compile.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_compile.3pcap.in
  head/contrib/libpcap/pcap_create.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_create.3pcap
  head/contrib/libpcap/pcap_datalink.3pcap
  head/contrib/libpcap/pcap_datalink.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_datalink.3pcap.in
  head/contrib/libpcap/pcap_datalink_name_to_val.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_datalink_name_to_val.3pcap
  head/contrib/libpcap/pcap_datalink_val_to_name.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_datalink_val_to_name.3pcap
  head/contrib/libpcap/pcap_dump.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump.3pcap
  head/contrib/libpcap/pcap_dump_close.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump_close.3pcap
  head/contrib/libpcap/pcap_dump_file.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump_file.3pcap
  head/contrib/libpcap/pcap_dump_flush.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump_flush.3pcap
  head/contrib/libpcap/pcap_dump_ftell.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump_ftell.3pcap
  head/contrib/libpcap/pcap_dump_open.3pcap
  head/contrib/libpcap/pcap_dump_open.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_dump_open.3pcap.in
  head/contrib/libpcap/pcap_file.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_file.3pcap
  head/contrib/libpcap/pcap_fileno.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_fileno.3pcap
  head/contrib/libpcap/pcap_findalldevs.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_findalldevs.3pcap
  head/contrib/libpcap/pcap_free_datalinks.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_free_datalinks.3pcap
  head/contrib/libpcap/pcap_freealldevs.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_freealldevs.3pcap
  head/contrib/libpcap/pcap_freecode.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_freecode.3pcap
  head/contrib/libpcap/pcap_get_selectable_fd.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_get_selectable_fd.3pcap
  head/contrib/libpcap/pcap_geterr.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_geterr.3pcap
  head/contrib/libpcap/pcap_inject.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_inject.3pcap
  head/contrib/libpcap/pcap_is_swapped.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_is_swapped.3pcap
  head/contrib/libpcap/pcap_lib_version.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_lib_version.3pcap
  head/contrib/libpcap/pcap_list_datalinks.3pcap
  head/contrib/libpcap/pcap_list_datalinks.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_list_datalinks.3pcap.in
  head/contrib/libpcap/pcap_lookupdev.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_lookupdev.3pcap
  head/contrib/libpcap/pcap_lookupnet.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_lookupnet.3pcap
  head/contrib/libpcap/pcap_loop.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_loop.3pcap
  head/contrib/libpcap/pcap_major_version.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_major_version.3pcap
  head/contrib/libpcap/pcap_next_ex.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_next_ex.3pcap
  head/contrib/libpcap/pcap_offline_filter.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_offline_filter.3pcap
  head/contrib/libpcap/pcap_open_dead.3pcap
  head/contrib/libpcap/pcap_open_dead.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_open_dead.3pcap.in
  head/contrib/libpcap/pcap_open_live.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_open_live.3pcap
  head/contrib/libpcap/pcap_open_offline.3pcap
  head/contrib/libpcap/pcap_open_offline.3pcap.in
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_open_offline.3pcap.in
  head/contrib/libpcap/pcap_set_buffer_size.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_buffer_size.3pcap
  head/contrib/libpcap/pcap_set_datalink.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_datalink.3pcap
  head/contrib/libpcap/pcap_set_promisc.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_promisc.3pcap
  head/contrib/libpcap/pcap_set_rfmon.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_rfmon.3pcap
  head/contrib/libpcap/pcap_set_snaplen.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_snaplen.3pcap
  head/contrib/libpcap/pcap_set_timeout.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_set_timeout.3pcap
  head/contrib/libpcap/pcap_setdirection.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_setdirection.3pcap
  head/contrib/libpcap/pcap_setfilter.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_setfilter.3pcap
  head/contrib/libpcap/pcap_setnonblock.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_setnonblock.3pcap
  head/contrib/libpcap/pcap_snapshot.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_snapshot.3pcap
  head/contrib/libpcap/pcap_stats.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_stats.3pcap
  head/contrib/libpcap/pcap_statustostr.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_statustostr.3pcap
  head/contrib/libpcap/pcap_strerror.3pcap
     - copied unchanged from r190215, vendor/libpcap/dist/pcap_strerror.3pcap
  head/contrib/libpcap/runlex.sh
     - copied unchanged from r190215, vendor/libpcap/dist/runlex.sh
Deleted:
  head/contrib/libpcap/FILES
  head/contrib/libpcap/README.Win32
  head/contrib/libpcap/README.aix
  head/contrib/libpcap/README.dag
  head/contrib/libpcap/README.hpux
  head/contrib/libpcap/README.linux
  head/contrib/libpcap/README.macosx
  head/contrib/libpcap/README.septel
  head/contrib/libpcap/README.tru64
  head/contrib/libpcap/acsite.m4
  head/contrib/libpcap/doc/pcap.html
  head/contrib/libpcap/doc/pcap.txt
  head/contrib/libpcap/doc/pcap.xml
  head/contrib/libpcap/pcap-nit.h
  head/contrib/libpcap/pcap-pf.h
  head/contrib/libpcap/pcap.3
  head/contrib/libpcap/pcap1.h
  head/contrib/libpcap/sll.h
Modified:
  head/contrib/libpcap/   (props changed)
  head/contrib/libpcap/CHANGES
  head/contrib/libpcap/CREDITS
  head/contrib/libpcap/INSTALL.txt
  head/contrib/libpcap/Makefile.in
  head/contrib/libpcap/README
  head/contrib/libpcap/VERSION
  head/contrib/libpcap/atmuni31.h
  head/contrib/libpcap/bpf/net/bpf_filter.c
  head/contrib/libpcap/bpf_dump.c
  head/contrib/libpcap/bpf_image.c
  head/contrib/libpcap/config.h.in
  head/contrib/libpcap/configure
  head/contrib/libpcap/configure.in
  head/contrib/libpcap/etherent.c
  head/contrib/libpcap/ethertype.h
  head/contrib/libpcap/fad-getad.c
  head/contrib/libpcap/fad-gifc.c
  head/contrib/libpcap/fad-glifc.c
  head/contrib/libpcap/fad-win32.c
  head/contrib/libpcap/gencode.c
  head/contrib/libpcap/gencode.h
  head/contrib/libpcap/grammar.y
  head/contrib/libpcap/inet.c
  head/contrib/libpcap/mkdep
  head/contrib/libpcap/nametoaddr.c
  head/contrib/libpcap/optimize.c
  head/contrib/libpcap/packaging/pcap.spec.in
  head/contrib/libpcap/pcap-bpf.c
  head/contrib/libpcap/pcap-bpf.h
  head/contrib/libpcap/pcap-dag.c
  head/contrib/libpcap/pcap-dag.h
  head/contrib/libpcap/pcap-dlpi.c
  head/contrib/libpcap/pcap-dos.c
  head/contrib/libpcap/pcap-enet.c
  head/contrib/libpcap/pcap-int.h
  head/contrib/libpcap/pcap-linux.c
  head/contrib/libpcap/pcap-namedb.h
  head/contrib/libpcap/pcap-nit.c
  head/contrib/libpcap/pcap-null.c
  head/contrib/libpcap/pcap-pf.c
  head/contrib/libpcap/pcap-septel.c
  head/contrib/libpcap/pcap-septel.h
  head/contrib/libpcap/pcap-snit.c
  head/contrib/libpcap/pcap-snoop.c
  head/contrib/libpcap/pcap-stdinc.h
  head/contrib/libpcap/pcap-win32.c
  head/contrib/libpcap/pcap.c
  head/contrib/libpcap/pcap.h
  head/contrib/libpcap/savefile.c
  head/contrib/libpcap/scanner.l

Modified: head/contrib/libpcap/CHANGES
==============================================================================

--- head/contrib/libpcap/CHANGES	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/CHANGES	Sat Mar 21 22:58:08 2009	(r190225)
@@ -1,28 +1,41 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.67.2.4 2008-10-28 00:27:42 ken Exp $ (LBL)
 
-Mon.	September 10, 2007.  ken at xelerance.com.  Summary for 0.9.8 libpcap release
-	Change build process to put public libpcap headers into pcap subir
-	DLT: Add value for IPMI IPMB packets
-	DLT: Add value for u10 Networks boards
-	Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
-	 libpcap files on an OS other than where the file was generated
-
-Wed.	July 23, 2007.  mcr at xelerance.com.  Summary for 0.9.7 libpcap release
-
-	FIXED version file to be 0.9.7 instead of 0.9.5.
-	added flags/configuration for cloning bpf device.
-	added DLT_MTP2_WITH_PHDR support (PPI)
-        "fix" the "memory leak" in icode_to_fcode() -- documentation bug
-        Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/
-	introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS.
-	Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added.
-        check for IPv4 and IPv6, even for DLT_RAW 
-	add support for DLT_JUNIPER_ISM
-  	Pick up changes from NetBSD: many from tron, christos, drochner
-	Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala.
-	Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header
+Mon.    October 27, 2008.  ken at netfunctional.ca.  Summary for 1.0.0 libpcap release
+	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
+	Return PCAP_ERROR_IFACE_NOT_UP if the interface isn't 'UP', so applications
+	 can print better diagnostic information
+	Return PCAP_ERROR_PERM_DENIED if we don't have permission to open a device, so
+	 applications can tell the user they need to go play with permissions
+	On Linux, ignore ENETDOWN so we can continue to capture packets if the 
+	 interface goes down and comes back up again.
+	On Linux, support new tpacket frame headers (2.6.27+)
+	On Mac OS X, add scripts for changing permissions on /dev/pbf* and launchd plist
+	On Solaris, support 'passive mode' on systems that support it
+	Fixes to autoconf and general build environment
+	Man page reorganization + cleanup
+	Autogenerate VERSION numbers better
+
+Mon.    September 10, 2007.  ken at xelerance.com.  Summary for 0.9.8 libpcap release
+        Change build process to put public libpcap headers into pcap subir
+        DLT: Add value for IPMI IPMB packets
+        DLT: Add value for u10 Networks boards
+        Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
+         libpcap files on an OS other than where the file was generated
 
-Wed.	April 25, 2007. ken at xelerance.com.  Summary for 0.9.6 libpcap release
+Wed.	April 25, 2007.  ken at xelerance.com.  Summary for 0.9.6 libpcap release
 
 	Put the public libpcap headers into a pcap subdirectory in both the
 	 source directory and the target include directory, and have include

Modified: head/contrib/libpcap/CREDITS
==============================================================================
--- head/contrib/libpcap/CREDITS	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/CREDITS	Sat Mar 21 22:58:08 2009	(r190225)
@@ -1,108 +1,126 @@
 This file lists people who have contributed to libpcap:
 
 The current maintainers:
-	Bill Fenner			<fenner at research.att.com>
-	Fulvio Risso			<risso at polito.it>
-	Guy Harris	 		<guy at alum.mit.edu>
-	Hannes Gredler			<hannes at juniper.net>
-	Jun-ichiro itojun Hagino	<itojun at iijlab.net>
-	Michael Richardson	 	<mcr at sandelman.ottawa.on.ca>
+	Bill Fenner			<fenner at research dot att dot com>
+	Fulvio Risso			<risso at polito dot it>
+	Guy Harris	 		<guy at alum dot mit dot edu>
+	Hannes Gredler			<hannes at juniper dot net>
+	Michael Richardson	 	<mcr at sandelman dot ottawa dot on dot ca>
 
 Additional people who have contributed patches:
 
-	Alan Bawden			<Alan at LCS.MIT.EDU>
-	Alexey Kuznetsov		<kuznet at ms2.inr.ac.ru>
-	Albert Chin			<china at thewrittenword.com>
-	Andrew Brown			<atatat at atatdot.net>
-	Antti Kantee			<pooka at netbsd.org>
-	Arkadiusz Miskiewicz		<misiek at pld.org.pl>
-	Armando L. Caro Jr.		<acaro at mail.eecis.udel.edu>
-	Assar Westerlund	 	<assar at sics.se>
-	Brian Ginsbach			<ginsbach at cray.com>
-	Charles M. Hannum		<mycroft at netbsd.org>
-	Chris G. Demetriou		<cgd at netbsd.org>
-	Chris Lightfoot			<cwrl at users.sourceforge.net>
-	Chris Pepper			<pepper at mail.reppep.com>
-	Daniele Orlandi			<daniele at orlandi.com>
-	Darren Reed			<darrenr at reed.wattle.id.au>
-	David Kaelbling			<drk at sgi.com>
-	David Young			<dyoung at ojctech.com>
-	Dean Gaudet			<dean at arctic.org>
-	Don Ebright			<Don.Ebright at compuware.com> 
-	Dug Song			<dugsong at monkey.org>
-	Eric Anderson			<anderse at hpl.hp.com>
-        Erik de Castro Lopo             <erik.de.castro.lopo at sensorynetworks.com>
-	Florent Drouin			<Florent.Drouin at alcatel-lucent.fr>
-	Franz Schaefer			<schaefer at mond.at>
-	Gianluca Varenni		<varenni at netgroup-serv.polito.it>
-	Gilbert Hoyek			<gil_hoyek at hotmail.com>
-	Gisle Vanem			<giva at bgnett.no>
-	Graeme Hewson			<ghewson at cix.compulink.co.uk>
-	Greg Stark			<gsstark at mit.edu>
-	Greg Troxel			<gdt at ir.bbn.com>
-	Guillaume Pelat			<endymion_ at users.sourceforge.net>
-	Hyung Sik Yoon			<hsyn at kr.ibm.com>
-	Igor Khristophorov		<igor at atdot.org>
-	Jan-Philip Velders		<jpv at veldersjes.net>
-	Jason R. Thorpe			<thorpej at netbsd.org>
-	Javier Achirica			<achirica at ttd.net>
-	Jean Tourrilhes			<jt at hpl.hp.com>
-	Jefferson Ogata			<jogata at nodc.noaa.gov>
-	Jesper Peterson			<jesper at endace.com>
-	John Bankier			<jbankier at rainfinity.com>
-	Jon Lindgren			<jonl at yubyub.net>
-	Juergen Schoenwaelder		<schoenw at ibr.cs.tu-bs.de>
-	Jung-uk Kim			<jkim at FreeBSD.org>
-	Kazushi Sugyo			<sugyo at pb.jp.nec.com>
-	Klaus Klein			<kleink at netbsd.org>
-	Koryn Grant			<koryn at endace.com>
-	Krzysztof Halasa		<khc at pm.waw.pl>
-	Lorenzo Cavallaro		<sullivan at sikurezza.org>
-	Loris Degioanni			<loris at netgroup-serv.polito.it>
-	Love Hörnquist-Åstrand		<lha at stacken.kth.se>
-	Maciej W. Rozycki		<macro at ds2.pg.gda.pl>
-	Marcus Felipe Pereira		<marcus at task.com.br>
-	Mark C. Brown			<mbrown at hp.com>
-	Mark Pizzolato			<List-tcpdump-workers at subscriptions.pizzolato.net>
-	Martin Husemann			<martin at netbsd.org>
-	Matthew Luckie			<mjl at luckie.org.nz>
-	Max Laier			<max at love2party.net>
-	Mike Kershaw			<dragorn at kismetwireless.net>
-	Mike Wiacek			<mike at iroot.net>
-	Monroe Williams			<monroe at pobox.com>
-	Nicolas Dade			<ndade at nsd.dyndns.org>
-	Octavian Cerna			<tavy at ylabs.com>
-	Olaf Kirch			<okir at caldera.de>
-	Ollie Wild			<aaw at users.sourceforge.net>
-	Onno van der Linden		<onno at simplex.nl>
-	Patrick Marie			<mycroft at virgaria.org>
-	Paul Mundt			<lethal at linux-sh.org>
-	Pavel Kankovsky			<kan at dcit.cz>
-	Pawel Pokrywka			<publicpp at gmail.com>
-	Peter Fales			<peter at fales-lorenz.net>
-	Peter Jeremy			<peter.jeremy at alcatel.com.au>
-	Phil Wood			<cpw at lanl.gov>
-	Rafal Maszkowski		<rzm at icm.edu.pl>
-					<rcb-isis at users.sourceforge.net>
-	Rick Jones			<raj at cup.hp.com>
-	Scott Barron			<sb125499 at ohiou.edu>
-	Scott Gifford			<sgifford at tir.com>
-	Sebastian Krahmer		<krahmer at cs.uni-potsdam.de>
-	Shaun Clowes			<delius at progsoc.uts.edu.au>
-	Solomon Peachy			<pizza at shaftnet.org>
-	Stefan Hudson			<hudson at mbay.net>
-	Stephen Donnelly		<stephen at endace.com>
-	Takashi Yamamoto		<yamt at mwd.biglobe.ne.jp>
-        Tanaka Shin-ya                  <zstanaka at archer.livedoor.com>
-	Tony Li				<tli at procket.com>
-	Torsten Landschoff	 	<torsten at debian.org>
-	Uns Lider			<unslider at miranda.org>
-	Uwe Girlich			<Uwe.Girlich at philosys.de>
-	Xianjie Zhang			<xzhang at cup.hp.com>
+	Alan Bawden			<Alan at LCS dot MIT dot EDU>
+	Alexander 'Leo' Bergolth	<Leo dot Bergolth at wu-wien dot ac dot at>
+	Alexey Kuznetsov		<kuznet at ms2 dot inr dot ac dot ru>
+	Albert Chin			<china at thewrittenword dot com>
+	Andrew Brown			<atatat at atatdot dot net>
+	Antti Kantee			<pooka at netbsd dot org>
+	Arien Vijn			<arienvijn at sourceforge dot net>
+	Arkadiusz Miskiewicz		<misiek at pld dot org dot pl>
+	Armando L. Caro Jr.		<acaro at mail dot eecis dot udel dot edu>
+	Assar Westerlund	 	<assar at sics dot se>
+	Brian Ginsbach			<ginsbach at cray dot com>
+	Charles M. Hannum		<mycroft at netbsd dot org>
+	Chris G. Demetriou		<cgd at netbsd dot org>
+	Chris Lightfoot			<cwrl at users dot sourceforge dot net>
+	Chris Pepper			<pepper at mail dot reppep dot com>
+	Christian Peron			<csjp at freebsd dot org>
+	Daniele Orlandi			<daniele at orlandi dot com>
+	Darren Reed			<darrenr at reed dot wattle dot id dot au>
+	David Kaelbling			<drk at sgi dot com>
+	David Young			<dyoung at ojctech dot com>
+	Dean Gaudet			<dean at arctic dot org>
+	Don Ebright			<Don dot Ebright at compuware dot com> 
+	Dug Song			<dugsong at monkey dot org>
+	Eric Anderson			<anderse at hpl dot hp dot com>
+	Erik de Castro Lopo		<erik dot de dot castro dot lopo at sensorynetworks dot com>
+	Florent Drouin			<Florent dot Drouin at alcatel-lucent dot fr>
+	Franz Schaefer			<schaefer at mond dot at>
+	Fulko Hew			<fulko dot hew at gmail dot com>
+	Gianluca Varenni		<varenni at netgroup-serv dot polito dot it>
+	Gilbert Hoyek			<gil_hoyek at hotmail dot com>
+	Gisle Vanem			<gvanem at broadpark dot no>
+	Gisle Vanem			<giva at bgnett dot no>
+	Graeme Hewson			<ghewson at cix dot compulink dot co dot uk>
+	Greg Stark			<gsstark at mit dot edu>
+	Greg Troxel			<gdt at ir dot bbn dot com>
+	Gregor Maier			<gregor at net dot in dot tum dot de>
+	Guillaume Pelat			<endymion_ at users dot sourceforge dot net>
+	Hagen Paul Pfeifer		<hagen at jauu dot net>
+	Hyung Sik Yoon			<hsyn at kr dot ibm dot com>
+	Igor Khristophorov		<igor at atdot dot org>
+	Jan-Philip Velders		<jpv at veldersjes dot net>
+	Jason R. Thorpe			<thorpej at netbsd dot org>
+	Javier Achirica			<achirica at ttd dot net>
+	Jean Tourrilhes			<jt at hpl dot hp dot com>
+	Jefferson Ogata			<jogata at nodc dot noaa dot gov>
+	Jesper Peterson			<jesper at endace dot com>
+	Joerg Mayer			<jmayer at loplof dot de>
+	John Bankier			<jbankier at rainfinity dot com>
+	Jon Lindgren			<jonl at yubyub dot net>
+	Juergen Schoenwaelder		<schoenw at ibr dot cs dot tu-bs dot de>
+	Jung-uk Kim			<jkim at FreeBSD dot org>
+	Kazushi Sugyo			<sugyo at pb dot jp dot nec dot com>
+	Klaus Klein			<kleink at netbsd dot org>
+	Koryn Grant			<koryn at endace dot com>
+	Kris Katterjohn			<katterjohn at gmail dot com>
+	Krzysztof Halasa		<khc at pm dot waw dot pl>
+	Lorenzo Cavallaro		<sullivan at sikurezza dot org>
+	Loris Degioanni			<loris at netgroup-serv dot polito dot it>
+	Love Hörnquist-Åstrand		<lha at stacken dot kth dot se>
+	Luis Martin Garcia		<luis dot mgarc at gmail dot com>
+	Maciej W. Rozycki		<macro at ds2 dot pg dot gda dot pl>
+	Marcus Felipe Pereira		<marcus at task dot com dot br>
+	Mark C. Brown			<mbrown at hp dot com>
+	Mark Pizzolato			<List-tcpdump-workers at subscriptions dot pizzolato dot net>
+	Martin Husemann			<martin at netbsd dot org>
+	Matthew Luckie			<mjl at luckie dot org dot nz>
+	Max Laier			<max at love2party dot net>
+	Mike Frysinger			<vapier at gmail dot com>
+	Mike Kershaw			<dragorn at kismetwireless dot net>
+	Mike Wiacek			<mike at iroot dot net>
+	Monroe Williams			<monroe at pobox dot com>
+	Nicolas Dade			<ndade at nsd dot dyndns dot org>
+	Octavian Cerna			<tavy at ylabs dot com>
+	Olaf Kirch			<okir at caldera dot de>
+	Ollie Wild			<aaw at users dot sourceforge dot net>
+	Onno van der Linden		<onno at simplex dot nl>
+	Paolo Abeni			<paolo dot abeni at email dot it>
+	Patrick Marie			<mycroft at virgaria dot org>
+	Patrick McHardy			<kaber at trash not net>
+	Paul Mundt			<lethal at linux-sh dot org>
+	Pavel Kankovsky			<kan at dcit dot cz>
+	Pawel Pokrywka			<publicpp at gmail dot com>
+	Peter Fales			<peter at fales-lorenz dot net>
+	Peter Jeremy			<peter dot jeremy at alcatel dot com dot au>
+	Phil Wood			<cpw at lanl dot gov>
+	Rafal Maszkowski		<rzm at icm dot edu dot pl>
+					<rcb-isis at users dot sourceforge dot net>
+	Richard Stearn			<richard at rns-stearn dot demon dot co dot uk>
+	Rick Jones			<raj at cup dot hp dot com>
+	Sagun Shakya			<sagun dot shakya at sun dot com>
+	Scott Barron			<sb125499 at ohiou dot edu>
+	Scott Gifford			<sgifford at tir dot com>
+	Sebastian Krahmer		<krahmer at cs dot uni-potsdam dot de>
+	Sepherosa Ziehau		<sepherosa at gmail dot com>
+	Shaun Clowes			<delius at progsoc dot uts dot edu dot au>
+	Solomon Peachy			<pizza at shaftnet dot org>
+	Stefan Hudson			<hudson at mbay dot net>
+	Stephen Donnelly		<stephen at endace dot com>
+	Takashi Yamamoto		<yamt at mwd dot biglobe dot ne dot jp>
+	Tanaka Shin-ya			<zstanaka at archer dot livedoor dot com>
+	Tony Li				<tli at procket dot com>
+	Torsten Landschoff	 	<torsten at debian dot org>
+	Uns Lider			<unslider at miranda dot org>
+	Uwe Girlich			<Uwe dot Girlich at philosys dot de>
+	Xianjie Zhang			<xzhang at cup dot hp dot com>
 	Yen Yen Lim
-	Yoann Vandoorselaere		<yoann at prelude-ids.org>
+	Yoann Vandoorselaere		<yoann at prelude-ids dot org>
 
 The original LBL crew:
 	Steve McCanne
 	Craig Leres
 	Van Jacobson
+
+Past maintainers:
+	Jun-ichiro itojun Hagino	<itojun at iijlab dot net>

Modified: head/contrib/libpcap/INSTALL.txt
==============================================================================
--- head/contrib/libpcap/INSTALL.txt	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/INSTALL.txt	Sat Mar 21 22:58:08 2009	(r190225)
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.21.2.8 2008-06-12 20:25:38 guy Exp $ (LBL)
 
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an
@@ -211,8 +211,7 @@ Read the README.aix file for information
 configuring your system to be able to support libpcap.
 
 If you use NeXTSTEP, you will not be able to build libpcap from this
-release. We hope to support this operating system in some future
-release of libpcap.
+release.
 
 If you use SINIX, you should be able to build libpcap from this
 release. It is known to compile and run on SINIX-Y/N 5.42 with the C-DS
@@ -229,22 +228,22 @@ Another workaround is to use flex and bi
 
 If you use SCO, you might have trouble building libpcap from this
 release. We do not have a machine running SCO and have not had reports
-of anyone successfully building on it. Since SCO apparently supports
-DLPI, it's possible the current version works. Meanwhile, SCO provides
-a tcpdump binary as part of their "Network/Security Tools" package:
-
-    http://www.sco.com/technology/internet/goodies/#SECURITY
-
-There is also a README that explains how to enable packet capture.
-
-If you use UnixWare, you will not be able to build libpcap from this
-release. We hope to support this operating system in some future
-release of libpcap. Meanwhile, there appears to be an UnixWare port of
-libpcap 0.0 (and tcpdump 3.0) in:
-
-    ftp://ftp1.freebird.org/pub/mirror/freebird/internet/systools/
-
-UnixWare appears to use a hacked version of DLPI.
+of anyone successfully building on it; the current release of libpcap
+does not compile on SCO OpenServer 5.  Although SCO apparently supports
+DLPI to some extent, the DLPI in OpenServer 5 is very non-standard, and
+it appears that completely new code would need to be written to capture
+network traffic.  SCO do not appear to provide tcpdump binaries for
+OpenServer 5 or OpenServer 6 as part of SCO Skunkware:
+
+	http://www.sco.com/skunkware/
+
+If you use UnixWare, you might be able to build libpcap from this
+release, or you might not.  We do not have a machine running UnixWare,
+so we have not tested it; however, SCO provide packages for libpcap
+0.6.2 and tcpdump 3.7.1 in the UnixWare 7/Open UNIX 8 part of SCO
+Skunkware, and the source package for libpcap 0.6.2 is not changed from
+the libpcap 0.6.2 source release, so this release of libpcap might also
+build without changes on UnixWare 7.
 
 If linking tcpdump fails with "Undefined: _alloca" when using bison on
 a Sun4, your version of bison is broken. In any case version 1.16 or
@@ -298,7 +297,6 @@ CHANGES		- description of differences be
 ChmodBPF/*	- Mac OS X startup item to set ownership and permissions
 		  on /dev/bpf*
 CREDITS		- people that have helped libpcap along
-FILES		- list of files exported as part of the distribution
 INSTALL.txt	- this file
 LICENSE		- the license under which tcpdump is distributed
 Makefile.in	- compilation rules (input to the configure script)
@@ -309,6 +307,7 @@ README.hpux	- notes on using libpcap on 
 README.linux	- notes on using libpcap on Linux
 README.macosx	- notes on using libpcap on Mac OS X
 README.septel   - notes on using libpcap to capture on Intel/Septel devices
+README.sita	- notes on using libpcap to capture on SITA devices
 README.tru64	- notes on using libpcap on Digital/Tru64 UNIX
 README.Win32	- notes on using libpcap on Win32 systems (with WinPcap)
 SUNOS4		- pre-SunOS 4.1 replacement kernel nit modules
@@ -326,16 +325,22 @@ config.h.in	- autoconf input
 config.sub	- autoconf support
 configure	- configure script (run this first)
 configure.in	- configure script source
+dlpisubs.c	- DLPI-related functions for pcap-dlpi.c and pcap-libdlpi.c
+dlpisubs.h	- DLPI-related function declarations
 etherent.c	- /etc/ethers support routines
 ethertype.h	- Ethernet protocol types and names definitions
 fad-getad.c	- pcap_findalldevs() for systems with getifaddrs()
 fad-gifc.c	- pcap_findalldevs() for systems with only SIOCGIFLIST
 fad-glifc.c	- pcap_findalldevs() for systems with SIOCGLIFCONF
 fad-null.c	- pcap_findalldevs() for systems without capture support
+fad-sita.c	- pcap_findalldevs() for systems with SITA support
 fad-win32.c	- pcap_findalldevs() for WinPcap
+filtertest.c	- test program for BPF compiler
+findalldevstest.c - test program for pcap_findalldevs()
 gencode.c	- BPF code generation routines
 gencode.h	- BPF code generation definitions
 grammar.y	- filter string grammar
+ieee80211.h	- 802.11 definitions
 inet.c		- network routines
 install-sh	- BSD style install script
 lbl/os-*.h	- OS-dependent defines and prototypes
@@ -348,8 +353,16 @@ nlpid.h		- OSI network layer protocol id
 net		- symlink to bpf/net
 optimize.c	- BPF optimization routines
 packaging	- packaging information for building libpcap RPMs
+pcap/bluetooth.h - public definition of DLT_BLUETOOTH_HCI_H4_WITH_PHDR header
+pcap/bpf.h	- BPF definitions
+pcap/namedb.h	- public libpcap name database definitions
+pcap/pcap.h	- public libpcap definitions
+pcap/sll.h	- public definition of DLT_LINUX_SLL header
+pcap/usb.h	- public definition of DLT_USB header
 pcap-bpf.c	- BSD Packet Filter support
-pcap-bpf.h	- BPF definitions
+pcap-bpf.h	- header for backwards compatibility
+pcap-bt-linux.c	- Bluetooth capture support for Linux
+pcap-bt-linux.h	- Bluetooth capture support for Linux
 pcap-dag.c	- Endace DAG device capture support
 pcap-dag.h	- Endace DAG device capture support
 pcap-dlpi.c	- Data Link Provider Interface support
@@ -357,26 +370,34 @@ pcap-dos.c	- MS-DOS capture support
 pcap-dos.h	- headers for MS-DOS capture support
 pcap-enet.c	- enet support
 pcap-int.h	- internal libpcap definitions
+pcap-libdlpi.c	- Data Link Provider Interface support for systems with libdlpi
 pcap-linux.c	- Linux packet socket support
-pcap-namedb.h	- public libpcap name database definitions
+pcap-namedb.h	- header for backwards compatibility
 pcap-nit.c	- SunOS Network Interface Tap support
 pcap-nit.h	- SunOS Network Interface Tap definitions
 pcap-null.c	- dummy monitor support (allows offline use of libpcap)
 pcap-pf.c	- Ultrix and Digital/Tru64 UNIX Packet Filter support
 pcap-pf.h	- Ultrix and Digital/Tru64 UNIX Packet Filter definitions
-pcap-septel.c   - INTEL/Septel device capture support
-pcap-septel.h   - INTEL/Septel device capture support
+pcap-septel.c   - Intel/Septel device capture support
+pcap-septel.h   - Intel/Septel device capture support
+pcap-sita.c	- SITA device capture support
+pcap-sita.h	- SITA device capture support
+pcap-sita.html	- SITA device capture documentation
 pcap-stdinc.h	- includes and #defines for compiling on Win32 systems
 pcap-snit.c	- SunOS 4.x STREAMS-based Network Interface Tap support
 pcap-snoop.c	- IRIX Snoop network monitoring support
+pcap-usb-linux.c - USB capture support for Linux
+pcap-usb-linux.h - USB capture support for Linux
 pcap-win32.c	- WinPcap capture support
-pcap.3		- manual entry
+pcap.3pcap	- manual entry for the library
 pcap.c		- pcap utility routines
-pcap.h		- public libpcap definitions
+pcap.h		- header for backwards compatibility
+pcap_*.3pcap	- manual entries for library functions
+pcap-filter.4	- manual entry for filter syntax
+pcap-linktype.4	- manual entry for link-layer header types
 ppp.h		- Point to Point Protocol definitions
-rawss7.h	- information on DLT_ types for SS7
+runlex.sh	- wrapper for Lex/Flex
 savefile.c	- offline support
 scanner.l	- filter string scanner
-sll.h		- definitions for Linux cooked mode fake link-layer header
 sunatmpos.h	- definitions for SunATM capturing
 Win32		- headers and routines for building on Win32 systems

Modified: head/contrib/libpcap/Makefile.in
==============================================================================
--- head/contrib/libpcap/Makefile.in	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/Makefile.in	Sat Mar 21 22:58:08 2009	(r190225)
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.108.2.28 2008-10-23 22:13:21 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -26,11 +26,14 @@
 # Top level hierarchy
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+# Pathname of directory to install the configure program
+bindir = @bindir@
 # Pathname of directory to install the include files
 includedir = @includedir@
 # Pathname of directory to install the library
 libdir =  @libdir@
-# Pathname of directory to install the man page
+# Pathname of directory to install the man pages
 mandir = @mandir@
 
 # VPATH
@@ -47,6 +50,7 @@ INCLS = -I. @V_INCLS@
 DEFS = @DEFS@ @V_DEFS@
 LIBS = @V_LIBS@
 DAGLIBS = @DAGLIBS@
+DEPLIBS = @DEPLIBS@
 DYEXT = @DYEXT@
 PROG=libpcap
 
@@ -73,7 +77,7 @@ YACC = @V_YACC@
 	@rm -f $@
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 
-PSRC =	pcap- at V_PCAP@.c
+PSRC =	pcap- at V_PCAP@.c @USB_SRC@ @BT_SRC@
 FSRC =  fad- at V_FINDALLDEVS@.c
 SSRC =  @SSRC@
 CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c \
@@ -86,10 +90,31 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
 # hack the extra indirection
 OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
-HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
-	ethertype.h gencode.h gnuc.h
+HDR = \
+	acconfig.h \
+	arcnet.h \
+	atmuni31.h \
+	ethertype.h \
+	gencode.h \
+	ieee80211.h \
+	llc.h \
+	nlpid.h \
+	pcap/bluetooth.h \
+	pcap/bpf.h \
+	pcap/namedb.h \
+	pcap/pcap.h \
+	pcap/sll.h \
+	pcap/usb.h \
+	pcap/vlan.h \
+	pcap.h \
+	pcap-int.h \
+	pcap-namedb.h \
+	pcap-stdinc.h \
+	ppp.h \
+	sunatmpos.h
+
 GENHDR = \
-	tokdefs.h version.h
+	scanner.h tokdefs.h version.h
 
 TAGHDR = \
 	pcap-bpf.h
@@ -99,11 +124,198 @@ TAGFILES = \
 
 CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
 
-all: libpcap.a
+MAN1 = pcap-config.1
+
+MAN3PCAP_EXPAND = \
+	pcap.3pcap.in \
+	pcap_compile.3pcap.in \
+	pcap_datalink.3pcap.in \
+	pcap_dump_open.3pcap.in \
+	pcap_list_datalinks.3pcap.in \
+	pcap_open_dead.3pcap.in \
+	pcap_open_offline.3pcap.in
+
+MAN3PCAP_NOEXPAND = \
+	pcap_activate.3pcap \
+	pcap_breakloop.3pcap \
+	pcap_can_set_rfmon.3pcap \
+	pcap_close.3pcap \
+	pcap_create.3pcap \
+	pcap_datalink_name_to_val.3pcap \
+	pcap_datalink_val_to_name.3pcap \
+	pcap_dump.3pcap \
+	pcap_dump_close.3pcap \
+	pcap_dump_file.3pcap \
+	pcap_dump_flush.3pcap \
+	pcap_dump_ftell.3pcap \
+	pcap_file.3pcap \
+	pcap_fileno.3pcap \
+	pcap_findalldevs.3pcap \
+	pcap_freealldevs.3pcap \
+	pcap_freecode.3pcap \
+	pcap_free_datalinks.3pcap \
+	pcap_get_selectable_fd.3pcap \
+	pcap_geterr.3pcap \
+	pcap_inject.3pcap \
+	pcap_is_swapped.3pcap \
+	pcap_lib_version.3pcap \
+	pcap_lookupdev.3pcap \
+	pcap_lookupnet.3pcap \
+	pcap_loop.3pcap \
+	pcap_major_version.3pcap \
+	pcap_next_ex.3pcap \
+	pcap_offline_filter.3pcap \
+	pcap_open_live.3pcap \
+	pcap_set_buffer_size.3pcap \
+	pcap_set_datalink.3pcap \
+	pcap_set_promisc.3pcap \
+	pcap_set_rfmon.3pcap \
+	pcap_set_snaplen.3pcap \
+	pcap_set_timeout.3pcap \
+	pcap_setdirection.3pcap \
+	pcap_setfilter.3pcap \
+	pcap_setnonblock.3pcap \
+	pcap_snapshot.3pcap \
+	pcap_stats.3pcap \
+	pcap_statustostr.3pcap \
+	pcap_strerror.3pcap
+
+MAN3PCAP = $(MAN3PCAP_NOEXPAND) $(MAN3PCAP_EXPAND:.in=)
+
+MANFILE = \
+	pcap-savefile.manfile.in
+
+MANMISC = \
+	pcap-filter.manmisc.in \
+	pcap-linktype.manmisc.in
+
+EXTRA_DIST = \
+	CHANGES \
+	ChmodBPF/ChmodBPF \
+	ChmodBPF/StartupParameters.plist \
+	CREDITS \
+	INSTALL.txt \
+	LICENSE \
+	Makefile.in \
+	README \
+	README.aix \
+	README.dag \
+	README.hpux \
+	README.linux \
+	README.macosx \
+	README.septel \
+	README.sita \
+	README.tru64 \
+	README.Win32 \
+	SUNOS4/nit_if.o.sparc \
+	SUNOS4/nit_if.o.sun3 \
+	SUNOS4/nit_if.o.sun4c.4.0.3c \
+	TODO \
+	VERSION \
+	aclocal.m4 \
+	bpf/net/bpf_filter.c \
+	chmod_bpf \
+	config.guess \
+	config.h.in \
+	config.sub \
+	configure \
+	configure.in \
+	dlpisubs.c \
+	dlpisubs.h \
+	fad-getad.c \
+	fad-gifc.c \
+	fad-glifc.c \
+	fad-null.c \
+	fad-sita.c \
+	fad-win32.c \
+	filtertest.c \
+	findalldevstest.c \
+	grammar.y \
+	install-sh \
+	lbl/os-aix4.h \
+	lbl/os-hpux11.h \
+	lbl/os-osf4.h \
+	lbl/os-osf5.h \
+	lbl/os-solaris2.h \
+	lbl/os-sunos4.h \
+	lbl/os-ultrix4.h \
+	missing/snprintf.c \
+	mkdep \
+	msdos/bin2c.c \
+	msdos/common.dj \
+	msdos/makefile \
+	msdos/makefile.dj \
+	msdos/makefile.wc \
+	msdos/ndis2.c \
+	msdos/ndis2.h \
+	msdos/ndis_0.asm \
+	msdos/pkt_rx0.asm \
+	msdos/pkt_rx1.s \
+	msdos/pktdrvr.c \
+	msdos/pktdrvr.h \
+	msdos/readme.dos \
+	net/bpf_filter.c \
+	org.tcpdump.chmod_bpf.plist \
+	packaging/pcap.spec.in \
+	pcap-bpf.c \
+	pcap-bpf.h \
+	pcap-bt-linux.c \
+	pcap-bt-linux.h \
+	pcap-config.in \
+	pcap-dag.c \
+	pcap-dag.h \
+	pcap-dlpi.c \
+	pcap-dos.c \
+	pcap-dos.h \
+	pcap-enet.c \
+	pcap-int.h \
+	pcap-libdlpi.c \
+	pcap-linux.c \
+	pcap-namedb.h \
+	pcap-nit.c \
+	pcap-null.c \
+	pcap-pf.c \
+	pcap-septel.c \
+	pcap-septel.h \
+	pcap-sita.h \
+	pcap-sita.c \
+	pcap-sita.html \
+	pcap-snit.c \
+	pcap-snoop.c \
+	pcap-usb-linux.c \
+	pcap-usb-linux.h \
+	pcap-win32.c \
+	runlex.sh \
+	scanner.l \
+	Win32/Include/Gnuc.h \
+	Win32/Include/addrinfo.h \
+	Win32/Include/bittypes.h \
+	Win32/Include/cdecl_ext.h \
+	Win32/Include/inetprivate.h \
+	Win32/Include/ip6_misc.h \
+	Win32/Include/sockstorage.h \
+	Win32/Include/arpa/nameser.h \
+	Win32/Include/net/if.h \
+	Win32/Include/net/netdb.h \
+	Win32/Include/net/paths.h \
+	Win32/Prj/libpcap.dsp \
+	Win32/Prj/libpcap.dsw \
+	Win32/Src/ffs.c \
+	Win32/Src/gai_strerror.c \
+	Win32/Src/getaddrinfo.c \
+	Win32/Src/getnetbynm.c \
+	Win32/Src/getnetent.c \
+	Win32/Src/getopt.c \
+	Win32/Src/getservent.c \
+	Win32/Src/inet_aton.c \
+	Win32/Src/inet_net.c \
+	Win32/Src/inet_pton.c
+
+all: libpcap.a pcap-config
 
 libpcap.a: $(OBJ)
 	@rm -f $@
-	ar rc $@ $(OBJ) $(LIBS)
+	$(AR) rc $@ $(OBJ) $(LIBS)
 	$(RANLIB) $@
 
 shared: libpcap.$(DYEXT)
@@ -114,19 +326,27 @@ shared: libpcap.$(DYEXT)
 #
 libpcap.so: $(OBJ)
 	@rm -f $@
-	$(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS)
+	$(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
 
-# the following rule succeeds, but the result is untested.
+#
+# The following rule succeeds, but the result is untested.
+#
+# XXX - OS X installs the library as "libpcap.A.dylib", with that as the
+# install_name, and sets the current version to 1 as well.  VERSION
+# might contain a not-purely-numeric version number, but
+# -current_version requires a purely numeric version, so this won't
+# work with top-of-tree builds.
+#
 libpcap.dylib: $(OBJ)
 	rm -f libpcap*.dylib
-	$(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \
-		-install_name $(libdir)/libpcap.0.dylib -compatibility_version `cat VERSION` \
-		-current_version `cat VERSION`
-
+	$(CC) -dynamiclib -undefined error -o libpcap.`cat $(srcdir)/VERSION`.dylib $(OBJ) \
+		-install_name $(libdir)/libpcap.A.dylib \
+		-compatibility_version 1 \
+		-current_version `sed 's/[^0-9.].*$$//' $(srcdir)/VERSION`
 
 scanner.c: $(srcdir)/scanner.l
 	@rm -f $@
-	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+	./runlex.sh $(LEX) -o$@ $<
 
 scanner.o: scanner.c tokdefs.h
 	$(CC) $(CFLAGS) -c scanner.c
@@ -172,43 +392,135 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
 bpf_filter.o: bpf_filter.c
 	$(CC) $(CFLAGS) -c bpf_filter.c
 
-install: libpcap.a 
+#
+# Generate the pcap-config script.
+#
+pcap-config: pcap-config.in Makefile
+	@rm -f $@ $@.tmp
+	sed -e 's|@includedir[@]|$(includedir)|g' \
+	    -e 's|@libdir[@]|$(libdir)|g' \
+	    -e 's|@DEPLIBS[@]|$(DEPLIBS)|g' \
+	    pcap-config.in >$@.tmp
+	mv $@.tmp $@
+	chmod a+x $@
+
+#
+# Test programs - not built by default, and not installed.
+#
+filtertest: filtertest.c libpcap.a
+	$(CC) $(CFLAGS) -I. -L. -o 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
 	[ -d $(DESTDIR)$(libdir) ] || \
 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
 	[ -d $(DESTDIR)$(includedir) ] || \
 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+	[ -d $(DESTDIR)$(includedir)/pcap ] || \
+	    (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
+	[ -d $(DESTDIR)$(mandir)/man1 ] || \
+	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
+	[ -d $(DESTDIR)$(mandir)/man3 ] || \
+	    (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
+	[ -d $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@ ] || \
+	    (mkdir -p $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@)
+	[ -d $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@ ] || \
+	    (mkdir -p $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@)
+	$(INSTALL_DATA) $(srcdir)/pcap/pcap.h \
+	    $(DESTDIR)$(includedir)/pcap/pcap.h
+	$(INSTALL_DATA) $(srcdir)/pcap/bpf.h \
+	    $(DESTDIR)$(includedir)/pcap/bpf.h
+	$(INSTALL_DATA) $(srcdir)/pcap/namedb.h \
+	    $(DESTDIR)$(includedir)/pcap/namedb.h
+	$(INSTALL_DATA) $(srcdir)/pcap/sll.h \
+	    $(DESTDIR)$(includedir)/pcap/sll.h
+	$(INSTALL_DATA) $(srcdir)/pcap/usb.h \
+	    $(DESTDIR)$(includedir)/pcap/usb.h
 	$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
 	$(INSTALL_DATA) $(srcdir)/pcap-bpf.h \
 	    $(DESTDIR)$(includedir)/pcap-bpf.h
 	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
 	    $(DESTDIR)$(includedir)/pcap-namedb.h
-	[ -d $(DESTDIR)$(mandir)/man3 ] || \
-		(mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
-	$(INSTALL_DATA) $(srcdir)/pcap.3 \
-	    $(DESTDIR)$(mandir)/man3/pcap.3
+	$(INSTALL_PROGRAM) 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 \
+		    $(DESTDIR)$(mandir)/man3/$$i; done
+	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
+	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
+		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+	for i in $(MANFILE); do \
+		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
+		    $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done
+	for i in $(MANMISC); do \
+		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manmisc.in/.manmisc/'` \
+		    $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done
 
 install-shared: install-shared-$(DYEXT)
 install-shared-so: libpcap.so
 	$(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION`
 install-shared-dylib: libpcap.dylib
 	$(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib
-	VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.0.dylib;  ln -sf libpcap.0.dylib libpcap.dylib
+	VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib;  ln -sf libpcap.A.dylib libpcap.dylib
 
 uninstall:
 	rm -f $(DESTDIR)$(libdir)/libpcap.a
+	rm -f $(DESTDIR)$(includedir)/pcap/pcap.h
+	rm -f $(DESTDIR)$(includedir)/pcap/bpf.h
+	rm -f $(DESTDIR)$(includedir)/pcap/namedb.h
+	rm -f $(DESTDIR)$(includedir)/pcap/sll.h
+	rm -f $(DESTDIR)$(includedir)/pcap/usb.h
+	-rmdir $(DESTDIR)$(includedir)/pcap
 	rm -f $(DESTDIR)$(includedir)/pcap.h
 	rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
 	rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
-	rm -f $(DESTDIR)$(mandir)/man3/pcap.3
+	for i in $(MAN1); do \
+		rm -f $(DESTDIR)$(mandir)/man1/$$i; done
+	for i in $(MAN3PCAP); do \
+		rm -f $(DESTDIR)$(mandir)/man3/$$i; done
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
+	rm -f  $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+	for i in $(MANFILE); do \
+		rm -f $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done
+	for i in $(MANMISC); do \
+		rm -f $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done
 
 clean:
 	rm -f $(CLEANFILES) libpcap*.dylib libpcap.so*
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-	    config.h gnuc.h os-proto.h bpf_filter.c stamp-h stamp-h.in
+	    config.h gnuc.h os-proto.h bpf_filter.c pcap-config \
+	    stamp-h stamp-h.in
+	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
 	rm -rf autom4te.cache
 
 tags: $(TAGFILES)
@@ -220,8 +532,12 @@ packaging/pcap.spec: packaging/pcap.spec
 
 releasetar:
 	@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
-	   list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \
-	   tar -c -z -f $$name.tar.gz $$name/. ;
+	   mkdir $$name; \
+	   tar cf - $(CSRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \
+	      $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) | \
+	      (cd $$name; tar xf -); \
+	   tar -c -z -f $$name.tar.gz $$name; \
+	   rm -rf $$name
 
 depend:	$(GENSRC) $(GENHDR) bpf_filter.c
 	./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)

Modified: head/contrib/libpcap/README
==============================================================================
--- head/contrib/libpcap/README	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/README	Sat Mar 21 22:58:08 2009	(r190225)
@@ -1,20 +1,22 @@
-@(#) $Header: /tcpdump/master/libpcap/README,v 1.30 2004/10/12 02:02:28 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/README,v 1.30.4.3 2008-10-17 10:39:20 ken Exp $ (LBL)
 
-LIBPCAP 0.9
-Now maintained by "The Tcpdump Group"
-See 		www.tcpdump.org
+LIBPCAP 1.0.0
 
-Please send inquiries/comments/reports to 	tcpdump-workers at tcpdump.org
+www.tcpdump.org
+
+Please send inquiries/comments/reports to:
+	tcpdump-workers at lists.tcpdump.org
 
 Anonymous CVS is available via:
 	cvs -d :pserver:tcpdump at cvs.tcpdump.org:/tcpdump/master login
 	(password "anoncvs")
 	cvs -d :pserver:tcpdump at cvs.tcpdump.org:/tcpdump/master checkout libpcap
 
-Version 0.9 of LIBPCAP can be retrieved with the CVS tag "libpcap_0_9rel1":
-	cvs -d :pserver:tcpdump at cvs.tcpdump.org:/tcpdump/master checkout -r libpcap_0_9rel1 libpcap
+Version 1.0.0 of LIBPCAP can be retrieved with the CVS tag "libpcap_1_0":
+	cvs -d :pserver:tcpdump at cvs.tcpdump.org:/tcpdump/master checkout -r libpcap_1_0 libpcap
 
-Please send patches against the master copy to patches at tcpdump.org.
+Please submit patches against the master copy to the libpcap project on
+sourceforge.net.
 
 formerly from 	Lawrence Berkeley National Laboratory
 		Network Research Group <libpcap at ee.lbl.gov>
@@ -30,8 +32,6 @@ require this functionality, we've create
 to ease in porting and to alleviate the need for several
 system-dependent packet capture modules in each application.
 
-Note well: this interface is new and is likely to change.
-
 For some platforms there are README.{system} files that discuss issues
 with the OS's interface for packet capture on those platforms, such as
 how to enable support for that interface in the OS, if it's not built in
@@ -77,16 +77,28 @@ Linux, in the 2.2 kernel and later kerne
 mechanism that accepts BPF filters; see the README.linux file for
 information on configuring that option.
 
+Note to Linux distributions and *BSD systems that include libpcap:
+
+There's now a rule to make a shared library, which should work on Linux 
+and *BSD (and OS X).
+
+It sets the soname of the library to "libpcap.so.1"; this is what it 
+should be, *NOT* libpcap.so.1.0 or libpcap.so.1.0.0 or something such as 
+that.
+
+We've been maintaining binary compatibility between libpcap releases for 
+quite a while; there's no reason to tie a binary linked with libpcap to 
+a particular release of libpcap.
+
 Problems, bugs, questions, desirable enhancements, etc. should be sent
-to the address "tcpdump-workers at tcpdump.org".  Bugs, support requests,
-and feature requests may also be submitted on the SourceForge site for
-libpcap at
+to the address "tcpdump-workers at lists.tcpdump.org".  Bugs, support
+requests, and feature requests may also be submitted on the SourceForge
+site for libpcap at
 
 	http://sourceforge.net/projects/libpcap/
 
 Source code contributions, etc. should be sent to the email address
-"patches at tcpdump.org", or submitted as patches on the SourceForge site
-for libpcap.
+submitted as patches on the SourceForge site for libpcap.
 
 Current versions can be found at www.tcpdump.org, or the SourceForge
 site for libpcap.

Modified: head/contrib/libpcap/VERSION
==============================================================================
--- head/contrib/libpcap/VERSION	Sat Mar 21 22:35:44 2009	(r190224)
+++ head/contrib/libpcap/VERSION	Sat Mar 21 22:58:08 2009	(r190225)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
