Date: Thu, 28 Oct 2010 19:06:17 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r214478 - in head/contrib/tcpdump: . lbl missing tests win32 Message-ID: <201010281906.o9SJ6HM3025571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Thu Oct 28 19:06:17 2010 New Revision: 214478 URL: http://svn.freebsd.org/changeset/base/214478 Log: Merge tcpdump-4.1.1. Added: head/contrib/tcpdump/Makefile-devel-adds - copied unchanged from r214475, vendor/tcpdump/dist/Makefile-devel-adds head/contrib/tcpdump/Readme.Win32 - copied unchanged from r214475, vendor/tcpdump/dist/Readme.Win32 head/contrib/tcpdump/forces.h - copied unchanged from r214475, vendor/tcpdump/dist/forces.h head/contrib/tcpdump/ipnet.h - copied unchanged from r214475, vendor/tcpdump/dist/ipnet.h head/contrib/tcpdump/print-forces.c - copied unchanged from r214475, vendor/tcpdump/dist/print-forces.c head/contrib/tcpdump/print-ipnet.c - copied unchanged from r214475, vendor/tcpdump/dist/print-ipnet.c head/contrib/tcpdump/print-usb.c - copied unchanged from r214475, vendor/tcpdump/dist/print-usb.c head/contrib/tcpdump/signature.c - copied unchanged from r214475, vendor/tcpdump/dist/signature.c head/contrib/tcpdump/signature.h - copied unchanged from r214475, vendor/tcpdump/dist/signature.h head/contrib/tcpdump/tcpdump.1.in - copied unchanged from r214475, vendor/tcpdump/dist/tcpdump.1.in head/contrib/tcpdump/tests/ - copied from r214475, vendor/tcpdump/dist/tests/ head/contrib/tcpdump/win32/ - copied from r214475, vendor/tcpdump/dist/win32/ Deleted: head/contrib/tcpdump/missing/getaddrinfo.c head/contrib/tcpdump/tcpdump.1 Modified: head/contrib/tcpdump/CHANGES head/contrib/tcpdump/CREDITS head/contrib/tcpdump/INSTALL.txt head/contrib/tcpdump/Makefile.in head/contrib/tcpdump/README head/contrib/tcpdump/VERSION head/contrib/tcpdump/acconfig.h head/contrib/tcpdump/addrtoname.c head/contrib/tcpdump/af.c head/contrib/tcpdump/af.h head/contrib/tcpdump/atmuni31.h head/contrib/tcpdump/bootp.h head/contrib/tcpdump/bpf_dump.c head/contrib/tcpdump/checksum.c head/contrib/tcpdump/config.guess head/contrib/tcpdump/config.h.in head/contrib/tcpdump/config.sub head/contrib/tcpdump/configure head/contrib/tcpdump/configure.in head/contrib/tcpdump/ethertype.h head/contrib/tcpdump/gmpls.c head/contrib/tcpdump/gmpls.h head/contrib/tcpdump/gmt2local.h head/contrib/tcpdump/icmp6.h head/contrib/tcpdump/ieee802_11.h head/contrib/tcpdump/ieee802_11_radio.h head/contrib/tcpdump/interface.h head/contrib/tcpdump/ip6.h head/contrib/tcpdump/ipproto.c head/contrib/tcpdump/ipproto.h head/contrib/tcpdump/isakmp.h head/contrib/tcpdump/l2vpn.c head/contrib/tcpdump/l2vpn.h head/contrib/tcpdump/lbl/os-sunos4.h head/contrib/tcpdump/lbl/os-ultrix4.h head/contrib/tcpdump/missing/addrinfo.h head/contrib/tcpdump/netdissect.h head/contrib/tcpdump/nfs.h head/contrib/tcpdump/nlpid.c head/contrib/tcpdump/nlpid.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-atm.c head/contrib/tcpdump/print-bfd.c head/contrib/tcpdump/print-bgp.c head/contrib/tcpdump/print-bootp.c head/contrib/tcpdump/print-bt.c head/contrib/tcpdump/print-cdp.c head/contrib/tcpdump/print-cfm.c head/contrib/tcpdump/print-dccp.c head/contrib/tcpdump/print-dhcp6.c head/contrib/tcpdump/print-domain.c head/contrib/tcpdump/print-enc.c head/contrib/tcpdump/print-esp.c head/contrib/tcpdump/print-ether.c head/contrib/tcpdump/print-fr.c head/contrib/tcpdump/print-gre.c head/contrib/tcpdump/print-icmp6.c head/contrib/tcpdump/print-ip.c head/contrib/tcpdump/print-ip6.c head/contrib/tcpdump/print-isakmp.c head/contrib/tcpdump/print-isoclns.c head/contrib/tcpdump/print-juniper.c head/contrib/tcpdump/print-l2tp.c head/contrib/tcpdump/print-lane.c head/contrib/tcpdump/print-llc.c head/contrib/tcpdump/print-lldp.c head/contrib/tcpdump/print-lspping.c head/contrib/tcpdump/print-nfs.c head/contrib/tcpdump/print-ntp.c head/contrib/tcpdump/print-olsr.c head/contrib/tcpdump/print-ospf.c head/contrib/tcpdump/print-pflog.c head/contrib/tcpdump/print-pim.c head/contrib/tcpdump/print-ppp.c head/contrib/tcpdump/print-rrcp.c head/contrib/tcpdump/print-rsvp.c head/contrib/tcpdump/print-rx.c head/contrib/tcpdump/print-sctp.c head/contrib/tcpdump/print-sip.c head/contrib/tcpdump/print-sll.c head/contrib/tcpdump/print-smb.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-token.c head/contrib/tcpdump/print-udp.c head/contrib/tcpdump/setsignal.h head/contrib/tcpdump/sll.h head/contrib/tcpdump/smbutil.c head/contrib/tcpdump/strcasecmp.c head/contrib/tcpdump/tcp.h head/contrib/tcpdump/tcpdump-stdinc.h head/contrib/tcpdump/tcpdump.c head/contrib/tcpdump/tftp.h head/contrib/tcpdump/timed.h head/contrib/tcpdump/token.h head/contrib/tcpdump/util.c Directory Properties: head/contrib/tcpdump/ (props changed) Modified: head/contrib/tcpdump/CHANGES ============================================================================== --- head/contrib/tcpdump/CHANGES Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/CHANGES Thu Oct 28 19:06:17 2010 (r214478) @@ -1,4 +1,45 @@ -$Header: /tcpdump/master/tcpdump/CHANGES,v 1.98.2.2 2008-10-15 23:26:30 ken Exp $ +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. + Don't blow up if a zero-length link-layer address is passed to + linkaddr_string(). + +Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. + Summary for 4.1.0 tcpdump release + Fix printing of MAC addresses for VLAN frames with a length + field + Add some additional bounds checks and use the EXTRACT_ macros + more + Add a -b flag to print the AS number in BGP packets in ASDOT + notation rather than ASPLAIN notation + Add ICMPv6 RFC 5006 support + Decode the access flags in NFS access requests + Handle the new DLT_ for memory-mapped USB captures on Linux + Make the default snapshot (-s) the maximum + Print name of device (when -L is used) + Support for OpenSolaris (and SXCE build 125 and later) + Print new TCP flags + Add support for RPL DIO + Add support for TCP User Timeout (UTO) + Add support for non-standard Ethertypes used by 3com PPPoE gear + Add support for 802.11n and 802.11s + Add support for Transparent Ethernet Bridge ethertype in GRE + Add 4 byte AS support for BGP printer + Add support for the MDT SAFI 66 BG printer + Add basic IPv6 support to print-olsr + Add USB printer + Add printer for ForCES + Handle frames with an FCS + Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames + Fix TCP sequence number printing + Report 802.2 packets as 802.2 instead of 802.3 + Don't include -L/usr/lib in LDFLAGS + On x86_64 Linux, look in lib64 directory too + Lots of code clean ups + Autoconf clean ups + Update testcases to make output changes + Fix compiling with/out smi (--with{,out}-smi) + Fix compiling without IPv6 support (--disable-ipv6) Mon. October 27, 2008. ken@netfunctional.ca. Summary for 4.0.0 tcpdump release Add support for Bluetooth Sniffing Modified: head/contrib/tcpdump/CREDITS ============================================================================== --- head/contrib/tcpdump/CREDITS Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/CREDITS Thu Oct 28 19:06:17 2010 (r214478) @@ -27,6 +27,7 @@ Additional people who have contributed p 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> @@ -44,11 +45,15 @@ Additional people who have contributed p 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> @@ -68,8 +73,10 @@ Additional people who have contributed p 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> - Jacek Tobiasz <Jacek dot Tobiasz at atm dot com dot pl> + 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> @@ -78,10 +85,12 @@ Additional people who have contributed p 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> + 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> @@ -92,7 +101,8 @@ Additional people who have contributed p 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> + 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> @@ -100,12 +110,13 @@ Additional people who have contributed p 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> + 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> @@ -132,13 +143,16 @@ Additional people who have contributed p 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> @@ -155,11 +169,14 @@ Additional people who have contributed p 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> + Will Drewry <will at alum dot bu dot edu> + William J. Hulley <bill dot hulley at gmail dot com> Yen Yen Lim Yoshifumi Nishida Modified: head/contrib/tcpdump/INSTALL.txt ============================================================================== --- head/contrib/tcpdump/INSTALL.txt Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/INSTALL.txt Thu Oct 28 19:06:17 2010 (r214478) @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.1.2.1 2008-02-06 10:49:22 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47:53 guy Exp $ (LBL) If you have not built libpcap, and your system does not have libpcap installed, install libpcap first. Your system might provide a version @@ -221,6 +221,7 @@ print-tftp.c - Trivial File Transfer Pro print-timed.c - BSD time daemon protocol printer routines print-token.c - Token Ring printer routines print-udp.c - UDP printer routines +print-usb.c - USB printer routines print-vjc.c - PPP Van Jacobson compression (RFC1144) printer routines print-vrrp.c - Virtual Router Redundancy Protocol print-wb.c - White Board printer routines Copied: head/contrib/tcpdump/Makefile-devel-adds (from r214475, vendor/tcpdump/dist/Makefile-devel-adds) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/tcpdump/Makefile-devel-adds Thu Oct 28 19:06:17 2010 (r214478, copy of r214475, vendor/tcpdump/dist/Makefile-devel-adds) @@ -0,0 +1,22 @@ +# +# Auto-regenerate configure script or Makefile when things change. +# From autoconf.info . Works best with GNU Make. +# +${srcdir}/configure: configure.in + cd ${srcdir} && autoconf + +# autoheader might not change config.h.in, so touch a stamp file. +${srcdir}/config.h.in: ${srcdir}/stamp-h.in +${srcdir}/stamp-h.in: configure.in acconfig.h + cd ${srcdir} && autoheader + echo timestamp > ${srcdir}/stamp-h.in + +config.h: stamp-h +stamp-h: ${srcdir}/config.h.in config.status + ./config.status + +Makefile: Makefile.in config.status + ./config.status + +config.status: ${srcdir}/configure + ./config.status --recheck Modified: head/contrib/tcpdump/Makefile.in ============================================================================== --- head/contrib/tcpdump/Makefile.in Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/Makefile.in Thu Oct 28 19:06:17 2010 (r214478) @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.317.2.4 2008-05-27 07:14:26 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 23:17:26 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -77,7 +77,7 @@ CSRC = addrtoname.c af.c checksum.c cpac print-eap.c print-eigrp.c\ print-esp.c print-ether.c print-fddi.c print-fr.c \ print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ - print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \ + print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ print-lmp.c print-lspping.c print-lwapp.c \ @@ -88,9 +88,9 @@ CSRC = addrtoname.c af.c checksum.c cpac 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 \ - print-timed.c print-token.c print-udld.c print-udp.c \ - print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \ - print-wb.c print-zephyr.c setsignal.c tcpdump.c util.c + print-timed.c print-token.c print-udld.c print-udp.c print-usb.c \ + print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-forces.c \ + print-wb.c print-zephyr.c signature.c setsignal.c tcpdump.c util.c LIBNETDISSECT_SRC=print-isakmp.c LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) @@ -128,6 +128,7 @@ HDR = \ ethertype.h \ extract.h \ fddi.h \ + forces.h \ gmpls.h \ gmt2local.h \ icmp6.h \ @@ -139,6 +140,7 @@ HDR = \ ip.h \ ip6.h \ ipfc.h \ + ipnet.h \ ipproto.h \ ipsec_doi.h \ ipx.h \ @@ -171,6 +173,7 @@ HDR = \ sctpConstants.h \ sctpHeader.h \ setsignal.h \ + signature.h \ slcompress.h \ slip.h \ sll.h \ @@ -204,6 +207,7 @@ EXTRA_DIST = \ INSTALL.txt \ LICENSE \ Makefile.in \ + Makefile-devel-adds \ README \ Readme.Win32 \ VERSION \ @@ -226,7 +230,6 @@ EXTRA_DIST = \ missing/bittypes.h \ missing/dlnames.c \ missing/datalinks.c \ - missing/getaddrinfo.c \ missing/getnameinfo.c \ missing/inet_aton.c \ missing/inet_ntop.c \ @@ -258,7 +261,83 @@ EXTRA_DIST = \ smbutil.c \ stime.awk \ strcasecmp.c \ - tcpdump.1 \ + tcpdump.1.in \ + tests/02-sunrise-sunset-esp.puu \ + tests/08-sunrise-sunset-aes.puu \ + tests/08-sunrise-sunset-esp2.puu \ + tests/TESTLIST \ + tests/TESTonce \ + tests/TESTrun.sh \ + tests/bgp-infinite-loop.pcap \ + tests/bgp_vpn_attrset.out \ + tests/bgp_vpn_attrset.pcap \ + tests/chdlc-slarp-short.pcap \ + tests/chdlc-slarp.pcap \ + tests/dio.out \ + tests/dio.pcap \ + tests/e1000g.out \ + tests/e1000g.pcap \ + tests/eapon1.gdbinit \ + tests/eapon1.out \ + tests/eapon1.puu \ + tests/eapon2.puu \ + tests/esp-secrets.txt \ + tests/esp0.out \ + tests/esp1.gdbinit \ + tests/esp1.out \ + tests/esp2.gdbinit \ + tests/esp2.out \ + tests/esp3.gdbinit \ + tests/esp4.gdbinit \ + tests/esp5.gdbinit \ + tests/esp5.out \ + tests/espudp1.out \ + tests/espudp1.puu \ + 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/ikev2four.out \ + tests/ikev2four.puu \ + 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/isakmp1.out \ + tests/isakmp2.out \ + tests/isakmp3.out \ + tests/isakmp4.out \ + tests/isakmp4500.puu \ + tests/isis-infinite-loop.pcap \ + tests/ldp-infinite-loop.pcap \ + tests/lmp.out \ + tests/lmp.puu \ + 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-traceroute.pcap \ + tests/ospf-gmpls.out \ + tests/ospf-gmpls.puu \ + tests/print-A.out \ + tests/print-AA.out \ + tests/print-capX.out \ + tests/print-capXX.out \ + tests/print-flags.puu \ + tests/print-flags.sh \ + tests/print-x.out \ + tests/print-xx.out \ + tests/rsvp-infinite-loop.pcap \ vfprintf.c \ win32/Include/Arpa/tftp.h \ win32/Include/errno.h \ @@ -312,14 +391,13 @@ version.o: version.c version.c: $(srcdir)/VERSION @rm -f $@ - if grep CVS ${srcdir}/VERSION >/dev/null; then \ + if grep GIT ${srcdir}/VERSION >/dev/null; then \ read ver <${srcdir}/VERSION; \ echo $$ver | tr -d '\012'; \ date +_%Y_%m_%d; \ else \ cat ${srcdir}/VERSION; \ - fi | sed -e 's/.*/char version[] = "&";/' > $@ - + fi | sed -e 's/.*/const char version[] = "&";/' > $@ install: all [ -d $(DESTDIR)$(sbindir) ] || \ @@ -328,7 +406,7 @@ install: all $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` [ -d $(DESTDIR)$(mandir)/man1 ] || \ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) - $(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 + $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 uninstall: rm -f $(DESTDIR)$(sbindir)/$(PROG) @@ -340,11 +418,15 @@ lint: $(GENSRC) grep -v 'possible pointer alignment problem' clean: - rm -f $(CLEANFILES) + rm -f $(CLEANFILES) $(PROG)-`cat VERSION`.tar.gz distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h stamp-h stamp-h.in + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 + +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) ctags -wtd $(TAGFILES) Modified: head/contrib/tcpdump/README ============================================================================== --- head/contrib/tcpdump/README Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/README Thu Oct 28 19:06:17 2010 (r214478) @@ -1,19 +1,17 @@ -@(#) $Header: /tcpdump/master/tcpdump/README,v 1.66.2.1 2008-05-30 01:38:20 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/README,v 1.68 2008-12-15 00:05:27 guy Exp $ (LBL) -TCPDUMP 3.9 +TCPDUMP 4.x.y Now maintained by "The Tcpdump Group" See www.tcpdump.org Please send inquiries/comments/reports to: tcpdump-workers@lists.tcpdump.org -Anonymous CVS is available via: - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master login - (password "anoncvs") - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout tcpdump +Anonymous Git is available via: + git clone git://bpf.tcpdump.org/tcpdump -Version 3.9 of TCPDUMP can be retrieved with the CVS tag "tcpdump_3_9rel1": - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_9rel1 tcpdump +Version 4.x.y of TCPDUMP can be retrieved with the CVS tag "tcpdump_4_xrely": + cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_4_xrely tcpdump Please submit patches against the master copy to the tcpdump project on sourceforge.net. Copied: head/contrib/tcpdump/Readme.Win32 (from r214475, vendor/tcpdump/dist/Readme.Win32) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/tcpdump/Readme.Win32 Thu Oct 28 19:06:17 2010 (r214478, copy of r214475, vendor/tcpdump/dist/Readme.Win32) @@ -0,0 +1,24 @@ +To build tcpdump under Windows, you need: + +- version 6 (or higher) of Microsoft Visual Studio or the Cygnus gnu +C compiler. +- The November 2001 (or later) edition of Microsoft Platform +Software Development Kit (SDK), that contains some necessary includes +for IPv6 support. You can download it from http://www.microsoft.com/sdk +- the WinPcap source code, that includes libpcap for win32. Download it +from http://winpcap.polito.it or download libpcap sources from +http://www.tcpdump.org and follow the instructions in the README.Win32 +file. + +First, extract tcpdump and WinPcap in the same folder, and build WinPcap. + +The Visual Studio project and the cygwin makefile are in the Win32\prj +folder. + +From Visual Studio, open windump.dsw and build the program. The release +version of the WinDump.exe executable file will be created in the +windump\win32\prj\release directory . The debug version will be generated +in windump\win32\prj\debug. + +From cygnus, go to windump\win32\prj\ and type "make". WinDump.exe will be +created in the same directory. \ No newline at end of file Modified: head/contrib/tcpdump/VERSION ============================================================================== --- head/contrib/tcpdump/VERSION Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/VERSION Thu Oct 28 19:06:17 2010 (r214478) @@ -1 +1 @@ -4.0.0 +4.1.1 Modified: head/contrib/tcpdump/acconfig.h ============================================================================== --- head/contrib/tcpdump/acconfig.h Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/acconfig.h Thu Oct 28 19:06:17 2010 (r214478) @@ -2,32 +2,18 @@ * make them to acconfig.h and rerun autoheader */ @TOP@ -/* Define if you have SSLeay 0.9.0b with the buggy cast128. */ -#undef HAVE_BUGGY_CAST128 - /* Define if you enable IPv6 support */ #undef INET6 /* Define if you enable support for the libsmi. */ #undef LIBSMI -/* Define if you have the <smi.h> header file. */ -#undef HAVE_SMI_H - /* 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 struct ether_header.ether_dhost is a struct with ether_addr_octet - */ -#undef ETHER_HEADER_HAS_EA - -/* define if struct ether_arp contains arp_xsha */ -#undef ETHER_ARP_HAS_X - /* define if you have the addrinfo function. */ #undef HAVE_ADDRINFO @@ -43,18 +29,9 @@ /* define if INADDRSZ is defined (XXX not used!) */ #undef HAVE_INADDRSZ -/* define if this is a development version, to use additional prototypes. */ -#undef HAVE_OS_PROTO_H - -/* define if <unistd.h> defines __P() */ -#undef HAVE_PORTABLE_PROTOTYPE - /* define if RES_USE_INET6 is defined */ #undef HAVE_RES_USE_INET6 -/* define if struct sockaddr has the sa_len member */ -#undef HAVE_SOCKADDR_SA_LEN - /* define if you have struct sockaddr_storage */ #undef HAVE_SOCKADDR_STORAGE @@ -91,18 +68,6 @@ /* define if you have getrpcbynumber() */ #undef HAVE_GETRPCBYNUMBER -/* define if unaligned memory accesses fail */ -#undef LBL_ALIGN - -/* The successful return value from signal (?)XXX */ -#undef RETSIGVAL - -/* Define this on IRIX */ -#undef _BSD_SIGNALS - -/* For HP/UX ANSI compiler? */ -#undef _HPUX_SOURCE - /* AIX hack. */ #undef _SUN @@ -115,14 +80,6 @@ /* Whether or not to include the possibly-buggy SMB printer */ #undef TCPDUMP_DO_SMB -/* Long story short: aclocal.m4 depends on autoconf 2.13 - * implementation details wrt "const"; newer versions - * have different implementation details so for now we - * put "const" here. This may cause duplicate definitions - * in config.h but that should be OK since they're the same. - */ -#undef const - /* Define if you have the dnet_htoa function. */ #undef HAVE_DNET_HTOA Modified: head/contrib/tcpdump/addrtoname.c ============================================================================== --- head/contrib/tcpdump/addrtoname.c Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/addrtoname.c Thu Oct 28 19:06:17 2010 (r214478) @@ -88,12 +88,12 @@ struct hnamemem { struct hnamemem *nxt; }; -struct hnamemem hnametable[HASHNAMESIZE]; -struct hnamemem tporttable[HASHNAMESIZE]; -struct hnamemem uporttable[HASHNAMESIZE]; -struct hnamemem eprototable[HASHNAMESIZE]; -struct hnamemem dnaddrtable[HASHNAMESIZE]; -struct hnamemem ipxsaptable[HASHNAMESIZE]; +static struct hnamemem hnametable[HASHNAMESIZE]; +static struct hnamemem tporttable[HASHNAMESIZE]; +static struct hnamemem uporttable[HASHNAMESIZE]; +static struct hnamemem eprototable[HASHNAMESIZE]; +static struct hnamemem dnaddrtable[HASHNAMESIZE]; +static struct hnamemem ipxsaptable[HASHNAMESIZE]; #if defined(INET6) && defined(WIN32) /* @@ -142,7 +142,7 @@ struct h6namemem { struct h6namemem *nxt; }; -struct h6namemem h6nametable[HASHNAMESIZE]; +static struct h6namemem h6nametable[HASHNAMESIZE]; #endif /* INET6 */ struct enamemem { @@ -155,9 +155,9 @@ struct enamemem { struct enamemem *e_nxt; }; -struct enamemem enametable[HASHNAMESIZE]; -struct enamemem nsaptable[HASHNAMESIZE]; -struct enamemem bytestringtable[HASHNAMESIZE]; +static struct enamemem enametable[HASHNAMESIZE]; +static struct enamemem nsaptable[HASHNAMESIZE]; +static struct enamemem bytestringtable[HASHNAMESIZE]; struct protoidmem { u_int32_t p_oui; @@ -166,7 +166,7 @@ struct protoidmem { struct protoidmem *p_nxt; }; -struct protoidmem protoidtable[HASHNAMESIZE]; +static struct protoidmem protoidtable[HASHNAMESIZE]; /* * A faster replacement for inet_ntoa(). @@ -313,7 +313,7 @@ getname6(const u_char *ap) } #endif /* INET6 */ -static char hex[] = "0123456789abcdef"; +static const char hex[] = "0123456789abcdef"; /* Find the hash node that corresponds the ether address 'ep' */ @@ -516,13 +516,14 @@ linkaddr_string(const u_char *ep, const register char *cp; register struct enamemem *tp; - if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) { - return etheraddr_string(ep); - } - - if (type == LINKADDR_FRELAY) { - return q922_string(ep); - } + if (len == 0) + return ("<empty>"); + + if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) + return (etheraddr_string(ep)); + + if (type == LINKADDR_FRELAY) + return (q922_string(ep)); tp = lookup_bytestring(ep, len); if (tp->e_name) @@ -749,7 +750,7 @@ init_eprotoarray(void) } } -static struct protoidlist { +static const struct protoidlist { const u_char protoid[5]; const char *name; } protoidlist[] = { @@ -770,7 +771,7 @@ init_protoidarray(void) { register int i; register struct protoidmem *tp; - struct protoidlist *pl; + const struct protoidlist *pl; u_char protoid[5]; protoid[0] = 0; @@ -794,7 +795,7 @@ init_protoidarray(void) } } -static struct etherlist { +static const struct etherlist { const u_char addr[6]; const char *name; } etherlist[] = { @@ -819,7 +820,7 @@ static struct etherlist { static void init_etherarray(void) { - register struct etherlist *el; + register const struct etherlist *el; register struct enamemem *tp; #ifdef USE_ETHER_NTOHOST char name[256]; @@ -863,7 +864,7 @@ init_etherarray(void) } } -static struct tok ipxsap_db[] = { +static const struct tok ipxsap_db[] = { { 0x0000, "Unknown" }, { 0x0001, "User" }, { 0x0002, "User Group" }, Modified: head/contrib/tcpdump/af.c ============================================================================== --- head/contrib/tcpdump/af.c Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/af.c Thu Oct 28 19:06:17 2010 (r214478) @@ -28,7 +28,7 @@ static const char rcsid[] _U_ = #include "interface.h" #include "af.h" -struct tok af_values[] = { +const struct tok af_values[] = { { 0, "Reserved"}, { AFNUM_INET, "IPv4"}, { AFNUM_INET6, "IPv6"}, @@ -50,7 +50,7 @@ struct tok af_values[] = { { 0, NULL}, }; -struct tok bsd_af_values[] = { +const struct tok bsd_af_values[] = { { BSD_AFNUM_INET, "IPv4" }, { BSD_AFNUM_NS, "NS" }, { BSD_AFNUM_ISO, "ISO" }, Modified: head/contrib/tcpdump/af.h ============================================================================== --- head/contrib/tcpdump/af.h Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/af.h Thu Oct 28 19:06:17 2010 (r214478) @@ -17,8 +17,8 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -extern struct tok af_values[]; -extern struct tok bsd_af_values[]; +extern const struct tok af_values[]; +extern const struct tok bsd_af_values[]; /* RFC1700 address family numbers */ #define AFNUM_INET 1 Modified: head/contrib/tcpdump/atmuni31.h ============================================================================== --- head/contrib/tcpdump/atmuni31.h Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/atmuni31.h Thu Oct 28 19:06:17 2010 (r214478) @@ -29,7 +29,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/tcpdump/atmuni31.h,v 1.2.6.1 2007-10-22 19:39:12 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/atmuni31.h,v 1.3 2007-10-22 19:37:51 guy Exp $ (LBL) */ /* Based on UNI3.1 standard by ATM Forum */ Modified: head/contrib/tcpdump/bootp.h ============================================================================== --- head/contrib/tcpdump/bootp.h Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/bootp.h Thu Oct 28 19:06:17 2010 (r214478) @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.18 2007-08-21 21:59:11 guy Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.19 2008-04-22 09:46:03 hannes Exp $ (LBL) */ /* * Bootstrap Protocol (BOOTP). RFC951 and RFC1048. * @@ -27,7 +27,8 @@ struct bootp { u_int8_t bp_hops; /* gateway hops */ u_int32_t bp_xid; /* transaction ID */ u_int16_t bp_secs; /* seconds since boot began */ - u_int16_t bp_flags; /* flags - see bootp_flag_values[] in print-bootp.c */ + u_int16_t bp_flags; /* flags - see bootp_flag_values[] + in print-bootp.c */ struct in_addr bp_ciaddr; /* client IP address */ struct in_addr bp_yiaddr; /* 'your' IP address */ struct in_addr bp_siaddr; /* server IP address */ Modified: head/contrib/tcpdump/bpf_dump.c ============================================================================== --- head/contrib/tcpdump/bpf_dump.c Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/bpf_dump.c Thu Oct 28 19:06:17 2010 (r214478) @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.16.4.1 2008-02-14 20:54:53 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H Modified: head/contrib/tcpdump/checksum.c ============================================================================== --- head/contrib/tcpdump/checksum.c Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/checksum.c Thu Oct 28 19:06:17 2010 (r214478) @@ -31,17 +31,73 @@ static const char rcsid[] _U_ = #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <assert.h> #include "interface.h" -#define CRC10_POLYNOMIAL 0x633 -static u_int16_t crc10_table[256]; +/* + * CRC-10 table generated using the following Python snippet: + +import sys + +crc_table = [] +for i in range(256): + accum = i << 2 + for j in range(8): + accum <<= 1 + if accum & 0x400: + accum ^= 0x633 + crc_table.append(accum) + +for i in range(len(crc_table)/8): + for j in range(8): + sys.stdout.write("0x%04x, " % crc_table[i*8+j]) + sys.stdout.write("\n") + + */ +static const u_int16_t crc10_table[256] = +{ + 0x0000, 0x0233, 0x0255, 0x0066, 0x0299, 0x00aa, 0x00cc, 0x02ff, + 0x0301, 0x0132, 0x0154, 0x0367, 0x0198, 0x03ab, 0x03cd, 0x01fe, + 0x0031, 0x0202, 0x0264, 0x0057, 0x02a8, 0x009b, 0x00fd, 0x02ce, + 0x0330, 0x0103, 0x0165, 0x0356, 0x01a9, 0x039a, 0x03fc, 0x01cf, + 0x0062, 0x0251, 0x0237, 0x0004, 0x02fb, 0x00c8, 0x00ae, 0x029d, + 0x0363, 0x0150, 0x0136, 0x0305, 0x01fa, 0x03c9, 0x03af, 0x019c, + 0x0053, 0x0260, 0x0206, 0x0035, 0x02ca, 0x00f9, 0x009f, 0x02ac, + 0x0352, 0x0161, 0x0107, 0x0334, 0x01cb, 0x03f8, 0x039e, 0x01ad, + 0x00c4, 0x02f7, 0x0291, 0x00a2, 0x025d, 0x006e, 0x0008, 0x023b, + 0x03c5, 0x01f6, 0x0190, 0x03a3, 0x015c, 0x036f, 0x0309, 0x013a, + 0x00f5, 0x02c6, 0x02a0, 0x0093, 0x026c, 0x005f, 0x0039, 0x020a, + 0x03f4, 0x01c7, 0x01a1, 0x0392, 0x016d, 0x035e, 0x0338, 0x010b, + 0x00a6, 0x0295, 0x02f3, 0x00c0, 0x023f, 0x000c, 0x006a, 0x0259, + 0x03a7, 0x0194, 0x01f2, 0x03c1, 0x013e, 0x030d, 0x036b, 0x0158, + 0x0097, 0x02a4, 0x02c2, 0x00f1, 0x020e, 0x003d, 0x005b, 0x0268, + 0x0396, 0x01a5, 0x01c3, 0x03f0, 0x010f, 0x033c, 0x035a, 0x0169, + 0x0188, 0x03bb, 0x03dd, 0x01ee, 0x0311, 0x0122, 0x0144, 0x0377, + 0x0289, 0x00ba, 0x00dc, 0x02ef, 0x0010, 0x0223, 0x0245, 0x0076, + 0x01b9, 0x038a, 0x03ec, 0x01df, 0x0320, 0x0113, 0x0175, 0x0346, + 0x02b8, 0x008b, 0x00ed, 0x02de, 0x0021, 0x0212, 0x0274, 0x0047, + 0x01ea, 0x03d9, 0x03bf, 0x018c, 0x0373, 0x0140, 0x0126, 0x0315, + 0x02eb, 0x00d8, 0x00be, 0x028d, 0x0072, 0x0241, 0x0227, 0x0014, + 0x01db, 0x03e8, 0x038e, 0x01bd, 0x0342, 0x0171, 0x0117, 0x0324, + 0x02da, 0x00e9, 0x008f, 0x02bc, 0x0043, 0x0270, 0x0216, 0x0025, + 0x014c, 0x037f, 0x0319, 0x012a, 0x03d5, 0x01e6, 0x0180, 0x03b3, + 0x024d, 0x007e, 0x0018, 0x022b, 0x00d4, 0x02e7, 0x0281, 0x00b2, + 0x017d, 0x034e, 0x0328, 0x011b, 0x03e4, 0x01d7, 0x01b1, 0x0382, + 0x027c, 0x004f, 0x0029, 0x021a, 0x00e5, 0x02d6, 0x02b0, 0x0083, + 0x012e, 0x031d, 0x037b, 0x0148, 0x03b7, 0x0184, 0x01e2, 0x03d1, + 0x022f, 0x001c, 0x007a, 0x0249, 0x00b6, 0x0285, 0x02e3, 0x00d0, + 0x011f, 0x032c, 0x034a, 0x0179, 0x0386, 0x01b5, 0x01d3, 0x03e0, + 0x021e, 0x002d, 0x004b, 0x0278, 0x0087, 0x02b4, 0x02d2, 0x00e1 +}; static void init_crc10_table(void) { +#define CRC10_POLYNOMIAL 0x633 register int i, j; register u_int16_t accum; + u_int16_t verify_crc10_table[256]; for ( i = 0; i < 256; i++ ) { @@ -50,9 +106,12 @@ init_crc10_table(void) { if ((accum <<= 1) & 0x400) accum ^= CRC10_POLYNOMIAL; } - crc10_table[i] = accum; + verify_crc10_table[i] = accum; } - return; + assert(memcmp(verify_crc10_table, + crc10_table, + sizeof(verify_crc10_table)) == 0); +#undef CRC10_POLYNOMIAL } u_int16_t Modified: head/contrib/tcpdump/config.guess ============================================================================== --- head/contrib/tcpdump/config.guess Thu Oct 28 19:05:21 2010 (r214477) +++ head/contrib/tcpdump/config.guess Thu Oct 28 19:06:17 2010 (r214478) @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. -timestamp='2003-10-16' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,23 +18,25 @@ timestamp='2003-10-16' # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner <per@bothner.com>. -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. + +# Originally written by Per Bothner. Please send patches (context +# diff format) to <config-patches@gnu.org> and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +56,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +70,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +108,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +127,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -166,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -196,53 +201,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010281906.o9SJ6HM3025571>