From owner-svn-src-head@FreeBSD.ORG  Thu May 17 05:11:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50EF4106564A;
	Thu, 17 May 2012 05:11:58 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3903D8FC19;
	Thu, 17 May 2012 05:11:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4H5BwCp080008;
	Thu, 17 May 2012 05:11:58 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4H5Bvm5079996;
	Thu, 17 May 2012 05:11:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201205170511.q4H5Bvm5079996@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 17 May 2012 05:11:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235530 - in head: contrib/tcpdump
	contrib/tcpdump/missing contrib/tcpdump/tests
	usr.sbin/tcpdump/tcpdump
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 05:11:58 -0000

Author: delphij
Date: Thu May 17 05:11:57 2012
New Revision: 235530
URL: http://svn.freebsd.org/changeset/base/235530

Log:
  Merge tcpdump 4.2.1.
  
  MFC after:	2 weeks

Added:
  head/contrib/tcpdump/in_cksum.c
     - copied unchanged from r235428, vendor/tcpdump/dist/in_cksum.c
  head/contrib/tcpdump/ppi.h
     - copied unchanged from r235428, vendor/tcpdump/dist/ppi.h
  head/contrib/tcpdump/print-802_15_4.c
     - copied unchanged from r235428, vendor/tcpdump/dist/print-802_15_4.c
  head/contrib/tcpdump/print-babel.c
     - copied unchanged from r235428, vendor/tcpdump/dist/print-babel.c
  head/contrib/tcpdump/print-carp.c
     - copied unchanged from r235428, vendor/tcpdump/dist/print-carp.c
  head/contrib/tcpdump/print-ppi.c
     - copied unchanged from r235428, vendor/tcpdump/dist/print-ppi.c
  head/contrib/tcpdump/print-rpki-rtr.c
     - copied unchanged from r235428, vendor/tcpdump/dist/print-rpki-rtr.c
Deleted:
  head/contrib/tcpdump/missing/addrsize.h
  head/contrib/tcpdump/missing/bittypes.h
  head/contrib/tcpdump/missing/resolv6.h
  head/contrib/tcpdump/missing/resolv_ext.h
  head/contrib/tcpdump/tests/
Modified:
  head/contrib/tcpdump/CHANGES
  head/contrib/tcpdump/CREDITS
  head/contrib/tcpdump/Makefile.in
  head/contrib/tcpdump/VERSION
  head/contrib/tcpdump/acconfig.h
  head/contrib/tcpdump/addrtoname.c
  head/contrib/tcpdump/addrtoname.h
  head/contrib/tcpdump/bootp.h
  head/contrib/tcpdump/config.h.in
  head/contrib/tcpdump/configure
  head/contrib/tcpdump/configure.in
  head/contrib/tcpdump/cpack.c
  head/contrib/tcpdump/cpack.h
  head/contrib/tcpdump/ethertype.h
  head/contrib/tcpdump/forces.h
  head/contrib/tcpdump/ieee802_11_radio.h
  head/contrib/tcpdump/interface.h
  head/contrib/tcpdump/ip.h
  head/contrib/tcpdump/ip6.h
  head/contrib/tcpdump/ipproto.c
  head/contrib/tcpdump/ipproto.h
  head/contrib/tcpdump/netdissect.h
  head/contrib/tcpdump/ospf.h
  head/contrib/tcpdump/oui.c
  head/contrib/tcpdump/oui.h
  head/contrib/tcpdump/print-802_11.c
  head/contrib/tcpdump/print-ap1394.c
  head/contrib/tcpdump/print-arcnet.c
  head/contrib/tcpdump/print-arp.c
  head/contrib/tcpdump/print-atalk.c
  head/contrib/tcpdump/print-atm.c
  head/contrib/tcpdump/print-bgp.c
  head/contrib/tcpdump/print-cdp.c
  head/contrib/tcpdump/print-chdlc.c
  head/contrib/tcpdump/print-dccp.c
  head/contrib/tcpdump/print-dhcp6.c
  head/contrib/tcpdump/print-enc.c
  head/contrib/tcpdump/print-ether.c
  head/contrib/tcpdump/print-forces.c
  head/contrib/tcpdump/print-fr.c
  head/contrib/tcpdump/print-gre.c
  head/contrib/tcpdump/print-icmp.c
  head/contrib/tcpdump/print-icmp6.c
  head/contrib/tcpdump/print-igmp.c
  head/contrib/tcpdump/print-ip.c
  head/contrib/tcpdump/print-ip6.c
  head/contrib/tcpdump/print-ipnet.c
  head/contrib/tcpdump/print-ipx.c
  head/contrib/tcpdump/print-isoclns.c
  head/contrib/tcpdump/print-juniper.c
  head/contrib/tcpdump/print-lane.c
  head/contrib/tcpdump/print-llc.c
  head/contrib/tcpdump/print-lldp.c
  head/contrib/tcpdump/print-mobile.c
  head/contrib/tcpdump/print-mpls.c
  head/contrib/tcpdump/print-null.c
  head/contrib/tcpdump/print-ospf.c
  head/contrib/tcpdump/print-pflog.c
  head/contrib/tcpdump/print-pgm.c
  head/contrib/tcpdump/print-pim.c
  head/contrib/tcpdump/print-ppp.c
  head/contrib/tcpdump/print-rrcp.c
  head/contrib/tcpdump/print-sctp.c
  head/contrib/tcpdump/print-sflow.c
  head/contrib/tcpdump/print-sl.c
  head/contrib/tcpdump/print-sll.c
  head/contrib/tcpdump/print-sunrpc.c
  head/contrib/tcpdump/print-symantec.c
  head/contrib/tcpdump/print-tcp.c
  head/contrib/tcpdump/print-tftp.c
  head/contrib/tcpdump/print-udp.c
  head/contrib/tcpdump/print-vrrp.c
  head/contrib/tcpdump/tcp.h
  head/contrib/tcpdump/tcpdump-stdinc.h
  head/contrib/tcpdump/tcpdump.1.in
  head/contrib/tcpdump/tcpdump.c
  head/contrib/tcpdump/udp.h
  head/usr.sbin/tcpdump/tcpdump/Makefile
  head/usr.sbin/tcpdump/tcpdump/config.h
  head/usr.sbin/tcpdump/tcpdump/tcpdump.1
Directory Properties:
  head/contrib/tcpdump/   (props changed)

Modified: head/contrib/tcpdump/CHANGES
==============================================================================
--- head/contrib/tcpdump/CHANGES	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/CHANGES	Thu May 17 05:11:57 2012	(r235530)
@@ -1,3 +1,64 @@
+Friday  December 9, 2011.  guy@alum.mit.edu.
+  Summary for 4.2.1 tcpdump release
+	Only build the Babel printer if IPv6 is enabled.
+	Support Babel on port 6696 as well as 6697.
+	Include ppi.h in release tarball.
+	Include all the test files in the release tarball, and don't
+	 "include" test files that no longer exist.
+	Don't assume we have <rpc/rpc.h> - check for it.
+	Support "-T carp" as a way of dissecting IP protocol 112 as CARP
+	 rather than VRRP.
+	Support Hilscher NetAnalyzer link-layer header format.
+	Constify some pointers and fix compiler warnings.
+	Get rid of never-true test.
+	Fix an unintended fall-through in a case statement in the ARP
+	 printer.
+	Fix several cases where sizeof(sizeof(XXX)) was used when just
+	 sizeof(XXX) was intended.
+	Make stricter sanity checks in the ES-IS printer.
+	Get rid of some GCCisms that caused builds to fai with compilers
+	 that don't support them.
+	Fix typo in man page.
+	Added length checks to Babel printer.
+
+Sunday  July 24, 2011.  mcr@sandelman.ca.
+  Summary for 4.2.+
+	merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov
+	  at gmail dot com>
+        updates to forces for new port numbers
+        Use "-H", not "-h", for the 802.11s option. (-h always help)
+        Better ICMPv6 checksum handling.
+        add support for the RPKI/Router Protocol, per -ietf-sidr-rpki-rtr-12
+        get rid of uuencoded pcap test files, git can do binary.
+        sFlow changes for 64-bit counters.
+        fixes for PPI packet header handling and printing.
+        Add DCB Exchange protocol (DCBX) version 1.01.
+        Babel dissector, from Juliusz Chroboczek and Grégoire Henry.
+        improvements to radiotap for rate values > 127.
+        Many improvements to ForCES decode, including fix SCTP TML port
+        updated RPL type code to RPL-17 draft
+        Improve printout of DHCPv6 options.
+        added support and test case for QinQ (802.1q VLAN) packets
+        Handle DLT_IEEE802_15_4_NOFCS like DLT_IEEE802_15_4.
+        Build fixes for Sparc and other machines with alignment restrictions.
+        Merged changes from Debian package.
+        PGM: Add ACK decoding and add PGMCC DATA and FEEDBACK options.
+        Build fixes for OSX (Snow Leopard and others)
+        Add support for IEEE 802.15.4 packets
+
+Tue.    July 20, 2010.  guy@alum.mit.edu.
+  Summary for 4.1.2 tcpdump release
+	If -U is specified, flush the file after creating it, so it's
+	  not zero-length
+	Fix TCP flags output description, and some typoes, in the man
+	  page
+	Add a -h flag, and only attempt to recognize 802.11s mesh
+	  headers if it's set
+	When printing the link-layer type list, send *all* output to
+	  stderr
+	Include the CFLAGS setting when configure was run in the
+	  compiler flags
+
 Thu.	April 1, 2010.  guy@alum.mit.edu.
   Summary for 4.1.1 tcpdump release
 	Fix build on systems with PF, such as FreeBSD and OpenBSD.

Modified: head/contrib/tcpdump/CREDITS
==============================================================================
--- head/contrib/tcpdump/CREDITS	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/CREDITS	Thu May 17 05:11:57 2012	(r235530)
@@ -1,189 +1,203 @@
 This file lists people who have contributed to tcpdump:
 
 The current maintainers:
-	Bill Fenner			<fenner at research dot att dot com>
-        David Young                     <dyoung at pobox 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>
+    Bill Fenner                   <fenner at research dot att dot com>
+    David Young                   <dyoung at pobox 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:
 
-        Aaron Campbell                  <aaron at arbor dot net>
-	Alfredo Andres			<aandres at s21sec dot com>
-	Albert Chin			<china at thewrittenword dot com>
-	Ananth Suryanarayana 		<anantha at juniper dot net>
-        Andrea Bittau                   <a dot bittau at cs dot ucl dot ac dot uk>
-	Andrew Brown			<atatat at atatdot dot net>
-	Andrew Church			<andrew at users dot sourceforge dot net>
-	Andrew Hintz			<adhintz at users dot sourceforge dot net>
-	Andrew Silent			<andrew at nording dot ru>
-	Andrew Tridgell			<tridge at linuxcare dot com>
-        Andy Heffernan                  <ahh at juniper dot net>
-	Arkadiusz Miskiewicz 		<misiek at pld dot org dot pl>
-	Armando L. Caro Jr. 		<acaro at mail dot eecis dot udel dot edu>
-	Arnaldo Carvalho de Melo	<acme at ghostprotocols dot net>
-	Ben Byer			<bushing at sourceforge dot net>
-	Atsushi Onoe			<onoe at netbsd dot org>
-	Ben Smithurst			<ben at scientia dot demon dot co dot uk>
-	Bert Vermeulen			<bert at biot dot com>
-	Bjoern A. Zeeb			<bzeeb at Zabbadoz dot NeT>
-	Brent L. Bates			<blbates at vigyan dot com>
-	Brian Ginsbach			<ginsbach at cray dot com>
-	Bruce M. Simpson		<bms at spc dot org>
-	Carles Kishimoto Bisbe          <ckishimo at ac dot upc dot es>
-	Charlie Lenahan			<clenahan at fortresstech dot com>
-	Charles M. Hannum		<mycroft at netbsd dot org>
-	Chris Cogdon			<chris at cogdon dot org>
-	Chris G. Demetriou		<cgd at netbsd dot org>
-	Christian Sievers		<c_s at users dot sourceforge dot net>
-	Chris Jepeway			<jepeway at blasted-heath dot com>
-	Chris Larson			<clarson at kergoth dot com>
-	Craig Rodrigues			<rodrigc at mediaone dot net>
-	Crist J. Clark			<cjclark at alum dot mit dot edu>
-	Daniel Hagerty 			<hag at ai dot mit dot edu>
-	Darren Reed			<darrenr at reed dot wattle dot id dot au>
-	David Binderman			<d dot binderman at virgin dot net>
-	David Horn			<dhorn2000 at gmail dot com>
-	David Smith			<dsmith at redhat dot com>
-	David Young			<dyoung at ojctech dot com>
-	Don Ebright			<Don dot Ebright at compuware dot com>
-	Eddie Kohler			<xexd at sourceforge dot net>
-	Elmar Kirchner			<elmar at juniper dot net>
-	Fang Wang			<fangwang at sourceforge dot net>
-	Florent Drouin			<Florent dot Drouin at alcatel-lucent dot fr>
-	Florian Forster			<octo at verplant dot org>
-	Francis Dupont			<Francis dot Dupont at enst-bretagne dot fr>
-	Francisco Matias Cuenca-Acuna	<mcuenca at george dot rutgers dot edu>
-	Francois-Xavier Le Bail		<fx dot lebail at yahoo dot com>
-	Frank Volf			<volf at oasis dot IAEhv dot nl>
-	Fulvio Risso			<risso at polito dot it>
-	George Bakos			<gbakos at ists dot dartmouth dot edu>
-	Gerald Combs			<gerald at ethereal dot com>
-        Gerrit Renker                   <gerrit at erg dot abdn dot ac dot uk>
-	Gert Doering			<gert at greenie dot muc dot de>
-	Greg Minshall			<minshall at acm dot org>
-        Greg Stark                      <gsstark at mit dot edu>
-	Gilbert Ramirez Jr.		<gram at xiexie dot org>
-	Gisle Vanem			<giva at bgnett dot no>
-        Hannes Viertel                  <hviertel at juniper dot net>
-	Hank Leininger			<tcpdump-workers at progressive-comp dot com>
-	Harry Raaymakers		<harryr at connect dot com dot au>
-	Heinz-Ado Arnolds		<Ado dot Arnolds at dhm-systems dot de>
-	Hendrik Scholz			<hendrik at scholz dot net>
-	Ian McDonald			<imcdnzl at gmail dot com>
-	Ilpo Järvinen			<ilpo dot jarvinen at helsinki dot fi>
-	Jacek Tobiasz			<Jacek dot Tobiasz at atm dot com dot pl>
-	Jakob Schlyter			<jakob at openbsd dot org>
-	Jamal Hadi Salim 		<hadi at cyberus dot ca>
-	Jan Oravec			<wsx at wsx6 dot net>
-	Jason R. Thorpe			<thorpej at netbsd dot org>
-	Jefferson Ogata 		<jogata at nodc dot noaa dot gov>
-	Jeffrey Hutzelman		<jhutz at cmu dot edu>
-	Jesper Peterson			<jesper at endace dot com>
-	Jim Hutchins			<jim at ca dot sandia dot gov>
-        Jonathan Heusser                <jonny at drugphish dot ch>
-	Tatuya Jinmei			<jinmei at kame dot net>
-	João Medeiros			<ignotus21 at sourceforge dot net>
-	Joerg Mayer			<jmayer@loplof.de>
-	Jørgen Thomsen			<jth at jth dot net> 
-	Julian Cowley			<julian at lava dot net>
-	Kaarthik Sivakumar		<kaarthik at torrentnet dot com>
-	Karl Norby			<karl-norby at sourceforge dot net>
-	Kazushi Sugyo			<sugyo at pb dot jp dot nec dot com>
-	Kelly Carmichael		<kcarmich at ipapp dot com>
-	Ken Hornstein			<kenh at cmf dot nrl dot navy dot mil>
-	Kevin Steves			<stevesk at pobox dot com>
-	Klaus Klein			<kleink at reziprozitaet dot de>
- 	Kris Kennaway			<kris at freebsd dot org>
-	Krzysztof Halasa		<khc at pm dot waw dot pl>
-	Larry Lile			<lile at stdio dot com>
-	Lennert Buytenhek 		<buytenh at gnu dot org>
-	Loris Degioanni			<loris at netgroup-serv dot polito dot it>
-	Love Hörnquist-Åstrand		<lha at stacken dot kth dot se>
-	Lucas C. Villa Real		<lucasvr at us dot ibm dot com>
-	Luis Martin Garcia		<luis dot mgarc at gmail dot com>
-	Maciej W. Rozycki		<macro at ds2 dot pg dot gda dot pl>
-	Manu Pathak			<mapathak at cisco dot com>
-	Marc Binderberger		<mbind at sourceforge dot net>
-	Marc A. Lehmann			<pcg at goof dot com>
-	Mark Ellzey Thomas		<mark at ackers dot net>
-	Marko Kiiskila			<carnil at cs dot tut dot fi>
-	Markus Schöpflin		<schoepflin at sourceforge dot net>
-	Marshall Rose			<mrose at dbc dot mtview dot ca dot us>
-	Martin Husemann			<martin at netbsd dot org>
-	Max Laier			<max at love2party dot net>
-	Michael A. Meffie III		<meffie at sourceforge dot net>
-	Michael Madore			<mmadore at turbolinux dot com>
-	Michael Riepe			<too-tired at sourceforge dot net>
-	Michael Shalayeff		<mickey at openbsd dot org>
-	Michael Shields			<shields at msrl dot com>
-	Michael T. Stolarchuk		<mts at off dot to>
-	Michele "mydecay" Marchetto	<smarchetto1 at tin dot it>
-	Mike Frysinger			<vapier at gmail dot com>
-	Monroe Williams 		<monroe at pobox dot com>
-	Motonori Shindo			<mshindo at mshindo dot net>
-	Nathan J. Williams		<nathanw at MIT dot EDU>
-	Nathaniel Couper-Noles		<Nathaniel at isi1 dot tccisi dot com>
-	Neil T. Spring			<bluehal at users dot sourceforge dot net>
-	Niels Provos			<provos at openbsd dot org>
-	Nickolai Zeldovich		<kolya at MIT dot EDU>
-        Nicolas Ferrero                 <toorop at babylo dot net>
-	Noritoshi Demizu		<demizu at users dot sourceforge dot net>
-	Olaf Kirch 			<okir at caldera dot de>
-	Onno van der Linden		<onno at simplex dot nl>
-	Paolo Abeni			<paolo dot abeni at email dot it>
-	Pascal Hennequin 		<pascal dot hennequin at int-evry dot fr>
-	Pasvorn Boonmark		<boonmark at juniper dot net>
-	Paul Mundt			<lethal at linux-sh dot org>
-	Paul S. Traina			<pst at freebsd dot org>
-	Pavlin Radoslavov		<pavlin at icir dot org>
-	Pekka Savola 			<pekkas at netcore dot fi>	
-	Peter Fales			<peter at fales-lorenz dot net>
-	Peter Jeremy			<peter dot jeremy at alcatel dot com dot au>
-					<pfhunt at users dot sourceforge dot net>
-	Peter Volkov			<pva at gentoo dot org>
-	Phil Wood			<cpw at lanl dot gov>
-	Rafal Maszkowski		<rzm at icm dot edu dot pl>
-	Randy Sofia			<rsofia at users dot sourceforge dot net>
-	Raphael Raimbault		<raphael dot raimbault at netasq dot com>
-	Rick Cheng                      <rcheng at juniper dot net>
-	Rick Jones			<rick dot jones2 at hp dot com>
-	Rick Watson			<watsonrick at users dot sourceforge dot net>
-	Rob Braun			<bbraun at synack dot net>
-	Robert Edmonds			<stu-42 at sourceforge dot net>
-	Roderick Schertler		<roderick at argon dot org>
-	Sagun Shakya			<sagun dot shakya at sun dot com>
-	Sami Farin			<safari at iki dot fi>
-	Scott Rose			<syberpunk at users dot sourceforge dot net>
-	Sebastian Krahmer		<krahmer at cs dot uni-potsdam dot de>
-	Sebastien Raveau		<sebastien dot raveau at epita dot fr>
-	Sebastien Vincent		<svincent at idems dot fr>
-	Sepherosa Ziehau		<sepherosa at gmail dot com>
-	Seth Webster			<swebster at sst dot ll dot mit dot edu>
-	Shinsuke Suzuki			<suz at kame dot net>
-	Steinar Haug			<sthaug at nethelp dot no>
-        Swaminathan Chandrasekaran      <chander at juniper dot net>
-	Takashi Yamamoto		<yamt at mwd dot biglobe dot ne dot jp>
-	Terry Kennedy			<terry at tmk dot com>
-	Timo Koskiahde
-	Tony Li				<tli at procket dot com>
-	Toshihiro Kanda			<candy at fct dot kgc dot co dot jp>
-	Uns Lider			<unslider at miranda dot org>
-	Victor Oppleman			<oppleman at users dot sourceforge dot net>
-	Wesley Griffin			<wgriffin at users dot sourceforge dot net>
-	Wesley Shields			<wxs at FreeBSD dot org>
-	Wilbert de Graaf		<wilbertdg at hetnet dot nl>
-	Will Drewry			<will at alum dot bu dot edu>
-	William J. Hulley		<bill dot hulley at gmail dot com>
-	Yen Yen Lim
-	Yoshifumi Nishida
+    A Costa                       <agcosta at gis dot net>
+    Aaron Campbell                <aaron at arbor dot net>
+    Alfredo Andres                <aandres at s21sec dot com>
+    Albert Chin                   <china at thewrittenword dot com>
+    Ananth Suryanarayana          <anantha at juniper dot net>
+    Andrea Bittau                 <a dot bittau at cs dot ucl dot ac dot uk>
+    Andrew Brown                  <atatat at atatdot dot net>
+    Andrew Church                 <andrew at users dot sourceforge dot net>
+    Andrew Hintz                  <adhintz at users dot sourceforge dot net>
+    Andrew Nording                <andrew at nording dot ru>
+    Andrew Tridgell               <tridge at linuxcare dot com>
+    Andy Heffernan                <ahh at juniper dot net>
+    Anton Bernal                  <anton at juniper dot net>
+    Arkadiusz Miskiewicz          <misiek at pld dot org dot pl>
+    Armando L. Caro Jr.           <acaro at mail dot eecis dot udel dot edu>
+    Arnaldo Carvalho de Melo      <acme at ghostprotocols dot net>
+    Ben Byer                      <bushing at sourceforge dot net>
+    Atsushi Onoe                  <onoe at netbsd dot org>
+    Ben Smithurst                 <ben at scientia dot demon dot co dot uk>
+    Bert Vermeulen                <bert at biot dot com>
+    Bjoern A. Zeeb                <bzeeb at Zabbadoz dot NeT>
+    Brent L. Bates                <blbates at vigyan dot com>
+    Brian Ginsbach                <ginsbach at cray dot com>
+    Bruce M. Simpson              <bms at spc dot org>
+    Carles Kishimoto Bisbe        <ckishimo at ac dot upc dot es>
+    Charlie Lenahan               <clenahan at fortresstech dot com>
+    Charles M. Hannum             <mycroft at netbsd dot org>
+    Chris Cogdon                  <chris at cogdon dot org>
+    Chris G. Demetriou            <cgd at netbsd dot org>
+    Chris Jepeway                 <jepeway at blasted-heath dot com>
+    Chris Larson                  <clarson at kergoth dot com>
+    Christian Sievers             <c_s at users dot sourceforge dot net>
+    Christophe Rhodes             <csr21 at cantab dot net>
+    Craig Rodrigues               <rodrigc at mediaone dot net>
+    Crist J. Clark                <cjclark at alum dot mit dot edu>
+    Daniel Hagerty                <hag at ai dot mit dot edu>
+    Darren Reed                   <darrenr at reed dot wattle dot id dot au>
+    David Binderman               <d dot binderman at virgin dot net>
+    David Horn                    <dhorn2000 at gmail dot com>
+    David Smith                   <dsmith at redhat dot com>
+    David Young                   <dyoung at ojctech dot com>
+    Dmitry Eremin-Solenikov       <dbaryshkov at gmail dot com>
+    Don Ebright                   <Don dot Ebright at compuware dot com>
+    Eddie Kohler                  <xexd at sourceforge dot net>
+    Elmar Kirchner                <elmar at juniper dot net>
+    Fang Wang                     <fangwang at sourceforge dot net>
+    Florent Drouin                <Florent dot Drouin at alcatel-lucent dot fr>
+    Florian Forster               <octo at verplant dot org>
+    Francis Dupont                <Francis dot Dupont at enst-bretagne dot fr>
+    Francisco Matias Cuenca-Acuna <mcuenca at george dot rutgers dot edu>
+    Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
+    Frank Volf                    <volf at oasis dot IAEhv dot nl>
+    Fulvio Risso                  <risso at polito dot it>
+    George Bakos                  <gbakos at ists dot dartmouth dot edu>
+    Gerald Combs                  <gerald at ethereal dot com>
+    Gerrit Renker                 <gerrit at erg dot abdn dot ac dot uk>
+    Gert Doering                  <gert at greenie dot muc dot de>
+    Greg Minshall                 <minshall at acm dot org>
+    Greg Stark                    <gsstark at mit dot edu>
+    Grégoire Henry                <henry@pps.jussieu.fr>
+    Gilbert Ramirez Jr.           <gram at xiexie dot org>
+    Gisle Vanem                   <gvanem at broadpark dot no>
+    Hannes Viertel                <hviertel at juniper dot net>
+    Hank Leininger                <tcpdump-workers at progressive-comp dot com>
+    Harry Raaymakers              <harryr at connect dot com dot au>
+    Heinz-Ado Arnolds             <Ado dot Arnolds at dhm-systems dot de>
+    Hendrik Scholz                <hendrik at scholz dot net>
+    Ian McDonald                  <imcdnzl at gmail dot com>
+    Ilpo Järvinen                 <ilpo dot jarvinen at helsinki dot fi>
+    Jacek Tobiasz                 <Jacek dot Tobiasz at atm dot com dot pl>
+    Jakob Schlyter                <jakob at openbsd dot org>
+    Jamal Hadi Salim              <hadi at cyberus dot ca>
+    Jan Oravec                    <wsx at wsx6 dot net>
+    Jason R. Thorpe               <thorpej at netbsd dot org>
+    Jefferson Ogata               <jogata at nodc dot noaa dot gov>
+    Jeffrey Hutzelman             <jhutz at cmu dot edu>
+    Jesper Peterson               <jesper at endace dot com>
+    Jim Hutchins                  <jim at ca dot sandia dot gov>
+    Jonathan Heusser              <jonny at drugphish dot ch>
+    Tatuya Jinmei                 <jinmei at kame dot net>
+    João Medeiros                 <ignotus21 at sourceforge dot net>
+    Joerg Mayer                   <jmayer@loplof.de>
+    Jørgen Thomsen                <jth at jth dot net> 
+    Julian Cowley                 <julian at lava dot net>
+    Juliusz Chroboczek            <jch@pps.jussieu.fr>
+    Kaarthik Sivakumar            <kaarthik at torrentnet dot com>
+    Kaladhar Musunuru             <kaladharm at sourceforge dot net>
+    Karl Norby                    <karl-norby at sourceforge dot net>
+    Kazushi Sugyo                 <sugyo at pb dot jp dot nec dot com>
+    Kelly Carmichael              <kcarmich at ipapp dot com>
+    Ken Hornstein                 <kenh at cmf dot nrl dot navy dot mil>
+    Kevin Steves                  <stevesk at pobox dot com>
+    Klaus Klein                   <kleink at reziprozitaet dot de>
+    Kris Kennaway                 <kris at freebsd dot org>
+    Krzysztof Halasa              <khc at pm dot waw dot pl>
+    Larry Lile                    <lile at stdio dot com>
+    Lennert Buytenhek             <buytenh at gnu dot org>
+    Loris Degioanni               <loris at netgroup-serv dot polito dot it>
+    Love Hörnquist-Åstrand        <lha at stacken dot kth dot se>
+    Lucas C. Villa Real           <lucasvr at us dot ibm dot com>
+    Luis MartinGarcia             <luis dot mgarc at gmail dot com>
+    Maciej W. Rozycki             <macro at ds2 dot pg dot gda dot pl>
+    Manu Pathak                   <mapathak at cisco dot com>
+    Marc Binderberger             <mbind at sourceforge dot net>
+    Marc A. Lehmann               <pcg at goof dot com>
+    Mark Ellzey Thomas            <mark at ackers dot net>
+    Marko Kiiskila                <carnil at cs dot tut dot fi>
+    Markus Schöpflin              <schoepflin at sourceforge dot net>
+    Marshall Rose                 <mrose at dbc dot mtview dot ca dot us>
+    Martin Husemann               <martin at netbsd dot org>
+    Max Laier                     <max at love2party dot net>
+    Michael A. Meffie III         <meffie at sourceforge dot net>
+    Michael Madore                <mmadore at turbolinux dot com>
+    Michael Riepe                 <too-tired at sourceforge dot net>
+    Michael Shalayeff             <mickey at openbsd dot org>
+    Michael Shields               <shields at msrl dot com>
+    Michael T. Stolarchuk         <mts at off dot to>
+    Michal Sekletar               <msekleta at redhat dot com>
+    Michele "mydecay" Marchetto   <smarchetto1 at tin dot it>
+    Mike Frysinger                <vapier at gmail dot com>
+    Minto Jeyananth               <minto at juniper dot net>
+    Monroe Williams               <monroe at pobox dot com>
+    Motonori Shindo               <mshindo at mshindo dot net>
+    Nathan J. Williams            <nathanw at MIT dot EDU>
+    Nathaniel Couper-Noles        <Nathaniel at isi1 dot tccisi dot com>
+    Neil T. Spring                <bluehal at users dot sourceforge dot net>
+    Niels Provos                  <provos at openbsd dot org>
+    Nickolai Zeldovich            <kolya at MIT dot EDU>
+    Nicolas Ferrero               <toorop at babylo dot net>
+    Noritoshi Demizu              <demizu at users dot sourceforge dot net>
+    Olaf Kirch                    <okir at caldera dot de>
+    Onno van der Linden           <onno at simplex dot nl>
+    Paolo Abeni                   <paolo dot abeni at email dot it>
+    Pascal Hennequin              <pascal dot hennequin at int-evry dot fr>
+    Pasvorn Boonmark              <boonmark at juniper dot net>
+    Paul Ferrell                  <pflarr at sourceforge dot net>
+    Paul Mundt                    <lethal at linux-sh dot org>
+    Paul S. Traina                <pst at freebsd dot org>
+    Pavlin Radoslavov             <pavlin at icir dot org>
+    Pawel Worach                  <pawel dot worach at gmail dot com>
+    Pekka Savola                  <pekkas at netcore dot fi>    
+    Peter Fales                   <peter at fales-lorenz dot net>
+    Peter Jeremy                  <peter dot jeremy at alcatel dot com dot au>
+                                  <pfhunt at users dot sourceforge dot net>
+    Peter Volkov                  <pva at gentoo dot org>
+    Phil Wood                     <cpw at lanl dot gov>
+    Rafal Maszkowski              <rzm at icm dot edu dot pl>
+    Randy Sofia                   <rsofia at users dot sourceforge dot net>
+    Raphael Raimbault             <raphael dot raimbault at netasq dot com>
+    Rick Cheng                    <rcheng at juniper dot net>
+    Rick Jones                    <rick dot jones2 at hp dot com>
+    Rick Watson                   <watsonrick at users dot sourceforge dot net>
+    Rob Braun                     <bbraun at synack dot net>
+    Robert Edmonds                <stu-42 at sourceforge dot net>
+    Roderick Schertler            <roderick at argon dot org>
+    Romain Francoise              <rfrancoise at debian dot org>
+    Sagun Shakya                  <sagun dot shakya at sun dot com>
+    Sami Farin                    <safari at iki dot fi>
+    Scott Mcmillan                <scott.a.mcmillan at intel dot com>
+    Scott Rose                    <syberpunk at users dot sourceforge dot net>
+    Sebastian Krahmer             <krahmer at cs dot uni-potsdam dot de>
+    Sebastien Raveau              <sebastien dot raveau at epita dot fr>
+    Sebastien Vincent             <svincent at idems dot fr>
+    Sepherosa Ziehau              <sepherosa at gmail dot com>
+    Seth Webster                  <swebster at sst dot ll dot mit dot edu>
+    Shinsuke Suzuki               <suz at kame dot net>
+    Steinar Haug                  <sthaug at nethelp dot no>
+    Swaminathan Chandrasekaran    <chander at juniper dot net>
+    Takashi Yamamoto              <yamt at mwd dot biglobe dot ne dot jp>
+    Terry Kennedy                 <terry at tmk dot com>
+    Timo Koskiahde
+    Tony Li                       <tli at procket dot com>
+    Toshihiro Kanda               <candy at fct dot kgc dot co dot jp>
+    Uns Lider                     <unslider at miranda dot org>
+    Victor Oppleman               <oppleman at users dot sourceforge dot net>
+    Weesan Lee                    <weesan at juniper dot net>
+    Wesley Griffin                <wgriffin at users dot sourceforge dot net>
+    Wesley Shields                <wxs at FreeBSD dot org>
+    Wilbert de Graaf              <wilbertdg at hetnet dot nl>
+    Will Drewry                   <will at alum dot bu dot edu>
+    William J. Hulley             <bill dot hulley at gmail dot com>
+    Yen Yen Lim
+    Yoshifumi Nishida
 
 The original LBL crew:
-	Steve McCanne
-	Craig Leres
-	Van Jacobson
+    Steve McCanne
+    Craig Leres
+    Van Jacobson
 
 Past maintainers:
-	Jun-ichiro itojun Hagino	<itojun at iijlab dot net>
+    Jun-ichiro itojun Hagino      <itojun at iijlab dot net>

Modified: head/contrib/tcpdump/Makefile.in
==============================================================================
--- head/contrib/tcpdump/Makefile.in	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/Makefile.in	Thu May 17 05:11:57 2012	(r235530)
@@ -26,6 +26,7 @@
 # Top level hierarchy
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 # Pathname of directory to install the binary
 sbindir = @sbindir@
 # Pathname of directory to install the man page
@@ -46,7 +47,8 @@ INCLS = -I. @V_INCLS@
 DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@
 
 # Standard CFLAGS
-CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+CFLAGS = @CFLAGS@
+FULL_CFLAGS = $(CCOPT) $(DEFS) $(INCLS) $(CFLAGS)
 
 # Standard LDFLAGS
 LDFLAGS = @LDFLAGS@
@@ -64,15 +66,15 @@ RANLIB = @RANLIB@
 # problem if you don't own the file but can write to the directory.
 .c.o:
 	@rm -f $@
-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
+	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
 
 CSRC =	addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
-        nlpid.c l2vpn.c machdep.c parsenfsfh.c \
-	print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
-	print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
-	print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c \
-	print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c \
-	print-dccp.c print-decnet.c \
+        nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
+	print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
+	print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
+	print-atm.c print-beep.c print-bfd.c print-bgp.c \
+	print-bootp.c print-bt.c print-carp.c print-cdp.c print-cfm.c \
+	print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
 	print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
 	print-eap.c print-eigrp.c\
 	print-esp.c print-ether.c print-fddi.c print-fr.c \
@@ -83,8 +85,9 @@ CSRC =	addrtoname.c af.c checksum.c cpac
         print-lmp.c print-lspping.c print-lwapp.c \
 	print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-msdp.c \
 	print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \
-	print-pgm.c print-pim.c print-ppp.c print-pppoe.c print-pptp.c \
-	print-radius.c print-raw.c print-rip.c print-rrcp.c print-rsvp.c \
+	print-pgm.c print-pim.c \
+	print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \
+	print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \
 	print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \
 	print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \
 	print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \
@@ -165,6 +168,7 @@ HDR = \
 	oui.h \
 	pcap-missing.h \
 	pmap_prot.h \
+	ppi.h \
 	ppp.h \
 	route6d.h \
 	rpc_auth.h \
@@ -226,16 +230,12 @@ EXTRA_DIST = \
 	lbl/os-ultrix4.h \
 	makemib \
 	missing/addrinfo.h \
-	missing/addrsize.h \
-	missing/bittypes.h \
 	missing/dlnames.c \
 	missing/datalinks.c \
 	missing/getnameinfo.c \
 	missing/inet_aton.c \
 	missing/inet_ntop.c \
 	missing/inet_pton.c \
-	missing/resolv6.h \
-	missing/resolv_ext.h \
 	missing/snprintf.c \
 	missing/sockstorage.h \
 	missing/strdup.c \
@@ -245,6 +245,7 @@ EXTRA_DIST = \
 	mkdep \
 	packetdat.awk \
 	pcap_dump_ftell.c \
+	print-babel.c \
 	print-dhcp6.c \
 	print-frag6.c \
 	print-icmp6.c \
@@ -262,12 +263,18 @@ EXTRA_DIST = \
 	stime.awk \
 	strcasecmp.c \
 	tcpdump.1.in \
-	tests/02-sunrise-sunset-esp.puu \
-	tests/08-sunrise-sunset-aes.puu \
-	tests/08-sunrise-sunset-esp2.puu \
+	tests/02-sunrise-sunset-esp.pcap \
+	tests/08-sunrise-sunset-aes.pcap \
+	tests/08-sunrise-sunset-esp2.pcap \
+	tests/QinQpacket.out \
+	tests/QinQpacket.pcap \
+	tests/QinQpacketv.out \
 	tests/TESTLIST \
 	tests/TESTonce \
 	tests/TESTrun.sh \
+	tests/babel.pcap \
+	tests/babel1.out \
+	tests/babel1v.out \
 	tests/bgp-infinite-loop.pcap \
 	tests/bgp_vpn_attrset.out \
 	tests/bgp_vpn_attrset.pcap \
@@ -279,8 +286,8 @@ EXTRA_DIST = \
 	tests/e1000g.pcap \
 	tests/eapon1.gdbinit \
 	tests/eapon1.out \
-	tests/eapon1.puu \
-	tests/eapon2.puu \
+	tests/eapon1.pcap \
+	tests/empty.uu \
 	tests/esp-secrets.txt \
 	tests/esp0.out \
 	tests/esp1.gdbinit \
@@ -292,61 +299,57 @@ EXTRA_DIST = \
 	tests/esp5.gdbinit \
 	tests/esp5.out \
 	tests/espudp1.out \
-	tests/espudp1.puu \
+	tests/espudp1.pcap \
 	tests/forces1.out \
 	tests/forces1.pcap \
 	tests/forces1vvv.out \
 	tests/forces1vvvv.out \
 	tests/forces2.out \
-	tests/forces2.pcap \
 	tests/forces2v.out \
 	tests/forces2vv.out \
-	tests/ikev2.puu \
+	tests/forces3vvv.out \
 	tests/ikev2four.out \
-	tests/ikev2four.puu \
+	tests/ikev2four.pcap \
 	tests/ikev2fourv.out \
 	tests/ikev2fourv4.out \
 	tests/ikev2pI2-secrets.txt \
 	tests/ikev2pI2.out \
-	tests/ikev2pI2.puu \
-	tests/isakmp-delete-segfault.puu \
-	tests/isakmp-identification-segfault.puu \
-	tests/isakmp-pointer-loop.puu \
+	tests/ikev2pI2.pcap \
+	tests/isakmp-delete-segfault.pcap \
+	tests/isakmp-identification-segfault.pcap \
+	tests/isakmp-pointer-loop.pcap \
 	tests/isakmp1.out \
 	tests/isakmp2.out \
 	tests/isakmp3.out \
 	tests/isakmp4.out \
-	tests/isakmp4500.puu \
+	tests/isakmp4500.pcap \
 	tests/isis-infinite-loop.pcap \
 	tests/ldp-infinite-loop.pcap \
 	tests/lmp.out \
-	tests/lmp.puu \
+	tests/lmp.pcap \
 	tests/lmp.sh \
 	tests/lspping-fec-ldp.pcap \
 	tests/lspping-fec-rsvp.pcap \
 	tests/mpls-ldp-hello.out \
-	tests/mpls-ldp-hello.puu \
+	tests/mpls-ldp-hello.pcap \
 	tests/mpls-traceroute.pcap \
 	tests/ospf-gmpls.out \
-	tests/ospf-gmpls.puu \
+	tests/ospf-gmpls.pcap \
 	tests/print-A.out \
 	tests/print-AA.out \
 	tests/print-capX.out \
 	tests/print-capXX.out \
-	tests/print-flags.puu \
+	tests/print-flags.pcap \
 	tests/print-flags.sh \
 	tests/print-x.out \
 	tests/print-xx.out \
 	tests/rsvp-infinite-loop.pcap \
+	tests/sflow_multiple_counter_30_pdus.out \
+	tests/sflow_multiple_counter_30_pdus.pcap \
 	vfprintf.c \
-	win32/Include/Arpa/tftp.h \
 	win32/Include/errno.h \
 	win32/Include/getopt.h \
-	win32/Include/inetprivate.h \
-	win32/Include/telnet.h \
 	win32/Include/w32_fzs.h \
-	win32/Include/Netinet/in_systm.h \
-	win32/Include/Netinet/ip.h \
 	win32/Src/getopt.c \
 	win32/prj/GNUmakefile \
 	win32/prj/WinDump.dsp \
@@ -356,7 +359,7 @@ all: $(PROG)
 
 $(PROG): $(OBJ) @V_PCAPDEP@
 	@rm -f $@
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 
 $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
 	@rm -f $@
@@ -364,30 +367,30 @@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
 	$(RANLIB) $@
 
 datalinks.o: $(srcdir)/missing/datalinks.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
 dlnames.o: $(srcdir)/missing/dlnames.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c
 getnameinfo.o: $(srcdir)/missing/getnameinfo.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c
 getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c
 inet_pton.o: $(srcdir)/missing/inet_pton.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c
 inet_ntop.o: $(srcdir)/missing/inet_ntop.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c
 inet_aton.o: $(srcdir)/missing/inet_aton.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c
 snprintf.o: $(srcdir)/missing/snprintf.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
 strlcat.o: $(srcdir)/missing/strlcat.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
 strlcpy.o: $(srcdir)/missing/strlcpy.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
 strsep.o: $(srcdir)/missing/strsep.c
-	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c
 
 version.o: version.c
-	$(CC) $(CFLAGS) -c version.c
+	$(CC) $(FULL_CFLAGS) -c version.c
 
 version.c: $(srcdir)/VERSION
 	@rm -f $@
@@ -423,9 +426,9 @@ clean:
 distclean:
 	rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
 	    config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1
+	rm -rf autom4te.cache
 
 check: tcpdump
-	uudecode --help || (echo "No uudecode program found, not running tests"; echo "apt-get/rpm install sharutils?"; exit 1)
 	(cd tests && ./TESTrun.sh)
 
 tags: $(TAGFILES)

Modified: head/contrib/tcpdump/VERSION
==============================================================================
--- head/contrib/tcpdump/VERSION	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/VERSION	Thu May 17 05:11:57 2012	(r235530)
@@ -1 +1 @@
-4.1.1
+4.2.1

Modified: head/contrib/tcpdump/acconfig.h
==============================================================================
--- head/contrib/tcpdump/acconfig.h	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/acconfig.h	Thu May 17 05:11:57 2012	(r235530)
@@ -8,12 +8,6 @@
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 
-/* define if you have struct __res_state_ext */
-#undef HAVE_RES_STATE_EXT
-
-/* define if your struct __res_state has the nsort member */
-#undef HAVE_NEW_RES_STATE
-
 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 
@@ -23,15 +17,6 @@
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 
-/* define if IN6ADDRSZ is defined (XXX not used!) */
-#undef HAVE_IN6ADDRSZ
-
-/* define if INADDRSZ is defined (XXX not used!) */
-#undef HAVE_INADDRSZ
-
-/* define if RES_USE_INET6 is defined */
-#undef HAVE_RES_USE_INET6
-
 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 
@@ -68,9 +53,6 @@
 /* define if you have getrpcbynumber() */
 #undef HAVE_GETRPCBYNUMBER
 
-/* AIX hack. */
-#undef _SUN
-
 /* Workaround for missing 64-bit formats */
 #undef PRId64
 #undef PRIo64

Modified: head/contrib/tcpdump/addrtoname.c
==============================================================================
--- head/contrib/tcpdump/addrtoname.c	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/addrtoname.c	Thu May 17 05:11:57 2012	(r235530)
@@ -510,6 +510,34 @@ etheraddr_string(register const u_char *
 }
 
 const char *
+le64addr_string(const u_char *ep)
+{
+	const unsigned int len = 8;
+	register u_int i;
+	register char *cp;
+	register struct enamemem *tp;
+	char buf[BUFSIZE];
+
+	tp = lookup_bytestring(ep, len);
+	if (tp->e_name)
+		return (tp->e_name);
+
+	cp = buf;
+	for (i = len; i > 0 ; --i) {
+		*cp++ = hex[*(ep + i - 1) >> 4];
+		*cp++ = hex[*(ep + i - 1) & 0xf];
+		*cp++ = ':';
+	}
+	cp --;
+
+	*cp = '\0';
+
+	tp->e_name = strdup(buf);
+
+	return (tp->e_name);
+}
+
+const char *
 linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len)
 {
 	register u_int i;

Modified: head/contrib/tcpdump/addrtoname.h
==============================================================================
--- head/contrib/tcpdump/addrtoname.h	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/addrtoname.h	Thu May 17 05:11:57 2012	(r235530)
@@ -34,6 +34,7 @@ enum {
 
 extern const char *linkaddr_string(const u_char *, const unsigned int, const unsigned int);
 extern const char *etheraddr_string(const u_char *);
+extern const char *le64addr_string(const u_char *);
 extern const char *etherproto_string(u_short);
 extern const char *tcpport_string(u_short);
 extern const char *udpport_string(u_short);

Modified: head/contrib/tcpdump/bootp.h
==============================================================================
--- head/contrib/tcpdump/bootp.h	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/bootp.h	Thu May 17 05:11:57 2012	(r235530)
@@ -37,7 +37,7 @@ struct bootp {
 	u_int8_t	bp_sname[64];	/* server host name */
 	u_int8_t	bp_file[128];	/* boot file name */
 	u_int8_t	bp_vend[64];	/* vendor-specific area */
-};
+} UNALIGNED;
 
 /*
  * UDP port numbers, server and client.
@@ -217,7 +217,7 @@ struct cmu_vend {
 	struct in_addr	v_ins1, v_ins2; /* IEN-116 name servers */
 	struct in_addr	v_ts1, v_ts2;	/* Time servers */
 	u_int8_t	v_unused[24];	/* currently unused */
-};
+} UNALIGNED;
 
 
 /* v_flags values */

Modified: head/contrib/tcpdump/config.h.in
==============================================================================
--- head/contrib/tcpdump/config.h.in	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/config.h.in	Thu May 17 05:11:57 2012	(r235530)
@@ -8,12 +8,6 @@
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 
-/* define if you have struct __res_state_ext */
-#undef HAVE_RES_STATE_EXT
-
-/* define if your struct __res_state has the nsort member */
-#undef HAVE_NEW_RES_STATE
-
 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 
@@ -23,15 +17,6 @@
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 
-/* define if IN6ADDRSZ is defined (XXX not used!) */
-#undef HAVE_IN6ADDRSZ
-
-/* define if INADDRSZ is defined (XXX not used!) */
-#undef HAVE_INADDRSZ
-
-/* define if RES_USE_INET6 is defined */
-#undef HAVE_RES_USE_INET6
-
 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 
@@ -68,9 +53,6 @@
 /* define if you have getrpcbynumber() */
 #undef HAVE_GETRPCBYNUMBER
 
-/* AIX hack. */
-#undef _SUN
-
 /* Workaround for missing 64-bit formats */
 #undef PRId64
 #undef PRIo64
@@ -108,6 +90,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
 /* Define to 1 if you have the `getnameinfo' function. */
 #undef HAVE_GETNAMEINFO
 
@@ -165,6 +150,9 @@
 /* Define to 1 if you have the `pcap_lib_version' function. */
 #undef HAVE_PCAP_LIB_VERSION
 
+/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
+#undef HAVE_PCAP_SET_TSTAMP_TYPE
+
 /* Define to 1 if you have the <pcap/usb.h> header file. */
 #undef HAVE_PCAP_USB_H
 
@@ -174,6 +162,9 @@
 /* Define to 1 if you have the <rpc/rpcent.h> header file. */
 #undef HAVE_RPC_RPCENT_H
 
+/* Define to 1 if you have the <rpc/rpc.h> header file. */
+#undef HAVE_RPC_RPC_H
+
 /* Define to 1 if you have the `setlinebuf' function. */
 #undef HAVE_SETLINEBUF
 
@@ -237,6 +228,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
 /* Define to 1 if you have the `vfprintf' function. */
 #undef HAVE_VFPRINTF
 
@@ -276,21 +270,6 @@
 /* return value of signal handlers */
 #undef RETSIGVAL
 
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
@@ -303,6 +282,9 @@
 /* needed on HP-UX */
 #undef _HPUX_SOURCE
 
+/* define on AIX to get certain functions */
+#undef _SUN
+
 /* define if your compiler allows __attribute__((format)) to be applied to
    function pointers */
 #undef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS

Modified: head/contrib/tcpdump/configure
==============================================================================
--- head/contrib/tcpdump/configure	Thu May 17 04:04:48 2012	(r235529)
+++ head/contrib/tcpdump/configure	Thu May 17 05:11:57 2012	(r235530)
@@ -1267,6 +1267,7 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-universal     don't build universal on OS X
   --enable-smb            enable possibly-buggy SMB printer default=yes
   --disable-smb           disable possibly-buggy SMB printer
   --enable-ipv6           enable ipv6 (with ipv4) support
@@ -1845,7 +1846,7 @@ fi
     V_CCOPT="-O"
     V_INCLS=""
     if test "${srcdir}" != "." ; then
-	    V_INCLS="-I\$(srcdir)"
+	    V_INCLS="-I$srcdir"
     fi
     if test "${CFLAGS+set}" = set; then
 	    LBL_CFLAGS="$CFLAGS"
@@ -3217,7 +3218,8 @@ if test "${ac_cv___attribute__+set}" = s
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+  /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3290,7 +3292,8 @@ if test "${ac_cv___attribute___format_fu
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+  /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3986,7 +3989,8 @@ done
 
 
 
-for ac_header in fcntl.h rpc/rpcent.h netdnet/dnetdb.h
+
+for ac_header in fcntl.h rpc/rpc.h rpc/rpcent.h netdnet/dnetdb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -4387,6 +4391,36 @@ fi
 
 case "$host_os" in
 
+darwin*)
+	# Check whether --enable-universal was given.
+if test "${enable_universal+set}" = set; then
+  enableval=$enable_universal;
+fi
+
+	if test "$enable_universal" != "no"; then
+		case "$host_os" in
+

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