svn commit: r214555 - in user/ed/compiler-rt: . bin/rm bin/sh cddl/lib/drti contrib/bsnmp/snmpd contrib/ipfilter/tools contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/lbl contrib/libpcap/mi...

Ed Schouten ed at FreeBSD.org
Sat Oct 30 13:25:42 UTC 2010 

Author: ed
Date: Sat Oct 30 13:25:41 2010
New Revision: 214555
URL: http://svn.freebsd.org/changeset/base/214555

Log:
  Sync with HEAD.

Added:
  user/ed/compiler-rt/contrib/libpcap/opentest.c
     - copied unchanged from r214550, head/contrib/libpcap/opentest.c
  user/ed/compiler-rt/contrib/libpcap/pcap-can-linux.c
     - copied unchanged from r214550, head/contrib/libpcap/pcap-can-linux.c
  user/ed/compiler-rt/contrib/libpcap/pcap-can-linux.h
     - copied unchanged from r214550, head/contrib/libpcap/pcap-can-linux.h
  user/ed/compiler-rt/contrib/libpcap/pcap-common.c
     - copied unchanged from r214550, head/contrib/libpcap/pcap-common.c
  user/ed/compiler-rt/contrib/libpcap/pcap-common.h
     - copied unchanged from r214550, head/contrib/libpcap/pcap-common.h
  user/ed/compiler-rt/contrib/libpcap/pcap-snf.c
     - copied unchanged from r214550, head/contrib/libpcap/pcap-snf.c
  user/ed/compiler-rt/contrib/libpcap/pcap-snf.h
     - copied unchanged from r214550, head/contrib/libpcap/pcap-snf.h
  user/ed/compiler-rt/contrib/libpcap/pcap/ipnet.h
     - copied unchanged from r214550, head/contrib/libpcap/pcap/ipnet.h
  user/ed/compiler-rt/contrib/libpcap/selpolltest.c
     - copied unchanged from r214550, head/contrib/libpcap/selpolltest.c
  user/ed/compiler-rt/contrib/libpcap/sf-pcap-ng.c
     - copied unchanged from r214550, head/contrib/libpcap/sf-pcap-ng.c
  user/ed/compiler-rt/contrib/libpcap/sf-pcap-ng.h
     - copied unchanged from r214550, head/contrib/libpcap/sf-pcap-ng.h
  user/ed/compiler-rt/contrib/libpcap/sf-pcap.c
     - copied unchanged from r214550, head/contrib/libpcap/sf-pcap.c
  user/ed/compiler-rt/contrib/libpcap/sf-pcap.h
     - copied unchanged from r214550, head/contrib/libpcap/sf-pcap.h
  user/ed/compiler-rt/contrib/tcpdump/Makefile-devel-adds
     - copied unchanged from r214550, head/contrib/tcpdump/Makefile-devel-adds
  user/ed/compiler-rt/contrib/tcpdump/forces.h
     - copied unchanged from r214550, head/contrib/tcpdump/forces.h
  user/ed/compiler-rt/contrib/tcpdump/ipnet.h
     - copied unchanged from r214550, head/contrib/tcpdump/ipnet.h
  user/ed/compiler-rt/contrib/tcpdump/print-forces.c
     - copied unchanged from r214550, head/contrib/tcpdump/print-forces.c
  user/ed/compiler-rt/contrib/tcpdump/print-ipnet.c
     - copied unchanged from r214550, head/contrib/tcpdump/print-ipnet.c
  user/ed/compiler-rt/contrib/tcpdump/print-usb.c
     - copied unchanged from r214550, head/contrib/tcpdump/print-usb.c
  user/ed/compiler-rt/contrib/tcpdump/signature.c
     - copied unchanged from r214550, head/contrib/tcpdump/signature.c
  user/ed/compiler-rt/contrib/tcpdump/signature.h
     - copied unchanged from r214550, head/contrib/tcpdump/signature.h
  user/ed/compiler-rt/contrib/tcpdump/tcpdump.1.in
     - copied unchanged from r214550, head/contrib/tcpdump/tcpdump.1.in
  user/ed/compiler-rt/contrib/tcpdump/tests/
     - copied from r214550, head/contrib/tcpdump/tests/
  user/ed/compiler-rt/share/examples/jails/
     - copied from r214550, head/share/examples/jails/
  user/ed/compiler-rt/share/examples/netgraph/virtual.chain
     - copied unchanged from r214550, head/share/examples/netgraph/virtual.chain
  user/ed/compiler-rt/share/examples/netgraph/virtual.lan
     - copied unchanged from r214550, head/share/examples/netgraph/virtual.lan
  user/ed/compiler-rt/sys/net/if_debug.c
     - copied unchanged from r214550, head/sys/net/if_debug.c
  user/ed/compiler-rt/sys/netinet/in_debug.c
     - copied unchanged from r214550, head/sys/netinet/in_debug.c
  user/ed/compiler-rt/sys/x86/x86/dump_machdep.c
     - copied unchanged from r214550, head/sys/x86/x86/dump_machdep.c
  user/ed/compiler-rt/sys/x86/x86/mptable.c
     - copied unchanged from r214550, head/sys/x86/x86/mptable.c
  user/ed/compiler-rt/sys/x86/x86/mptable_pci.c
     - copied unchanged from r214550, head/sys/x86/x86/mptable_pci.c
  user/ed/compiler-rt/sys/x86/x86/nexus.c
     - copied unchanged from r214550, head/sys/x86/x86/nexus.c
  user/ed/compiler-rt/tools/regression/bin/sh/errors/bad-keyword1.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/errors/bad-keyword1.0
  user/ed/compiler-rt/tools/regression/bin/sh/execution/func3.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/execution/func3.0
  user/ed/compiler-rt/tools/regression/bin/sh/execution/redir3.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/execution/redir3.0
  user/ed/compiler-rt/tools/regression/bin/sh/execution/redir4.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/execution/redir4.0
  user/ed/compiler-rt/tools/regression/bin/sh/expansion/plus-minus5.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/expansion/plus-minus5.0
  user/ed/compiler-rt/tools/regression/bin/sh/expansion/plus-minus6.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/expansion/plus-minus6.0
  user/ed/compiler-rt/tools/regression/bin/sh/expansion/trim5.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/expansion/trim5.0
  user/ed/compiler-rt/tools/regression/bin/sh/expansion/trim6.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/expansion/trim6.0
  user/ed/compiler-rt/tools/regression/bin/sh/parser/alias1.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/parser/alias1.0
  user/ed/compiler-rt/tools/regression/bin/sh/parser/alias2.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/parser/alias2.0
  user/ed/compiler-rt/tools/regression/bin/sh/parser/func1.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/parser/func1.0
  user/ed/compiler-rt/tools/regression/bin/sh/parser/pipe-not1.0
     - copied unchanged from r214550, head/tools/regression/bin/sh/parser/pipe-not1.0
  user/ed/compiler-rt/usr.sbin/tcpdump/tcpdump/tcpdump.1
     - copied unchanged from r214550, head/usr.sbin/tcpdump/tcpdump/tcpdump.1
Deleted:
  user/ed/compiler-rt/contrib/libpcap/FREEBSD-Xlist
  user/ed/compiler-rt/contrib/libpcap/FREEBSD-upgrade
  user/ed/compiler-rt/contrib/libpcap/net/bpf_filter.c
  user/ed/compiler-rt/contrib/tcpdump/FREEBSD-Xlist
  user/ed/compiler-rt/contrib/tcpdump/FREEBSD-upgrade
  user/ed/compiler-rt/contrib/tcpdump/missing/getaddrinfo.c
  user/ed/compiler-rt/contrib/tcpdump/tcpdump.1
  user/ed/compiler-rt/sys/amd64/amd64/dump_machdep.c
  user/ed/compiler-rt/sys/amd64/amd64/mptable.c
  user/ed/compiler-rt/sys/amd64/amd64/mptable_pci.c
  user/ed/compiler-rt/sys/amd64/amd64/nexus.c
  user/ed/compiler-rt/sys/i386/i386/dump_machdep.c
  user/ed/compiler-rt/sys/i386/i386/mptable.c
  user/ed/compiler-rt/sys/i386/i386/mptable_pci.c
  user/ed/compiler-rt/sys/i386/i386/nexus.c
Modified:
  user/ed/compiler-rt/UPDATING
  user/ed/compiler-rt/bin/rm/rm.1
  user/ed/compiler-rt/bin/sh/eval.c
  user/ed/compiler-rt/bin/sh/expand.c
  user/ed/compiler-rt/bin/sh/expand.h
  user/ed/compiler-rt/bin/sh/histedit.c
  user/ed/compiler-rt/bin/sh/mksyntax.c
  user/ed/compiler-rt/bin/sh/parser.c
  user/ed/compiler-rt/bin/sh/parser.h
  user/ed/compiler-rt/bin/sh/redir.c
  user/ed/compiler-rt/bin/sh/var.c
  user/ed/compiler-rt/cddl/lib/drti/Makefile
  user/ed/compiler-rt/contrib/bsnmp/snmpd/bsnmpd.1
  user/ed/compiler-rt/contrib/ipfilter/tools/ipf_y.y
  user/ed/compiler-rt/contrib/libpcap/CHANGES
  user/ed/compiler-rt/contrib/libpcap/CREDITS
  user/ed/compiler-rt/contrib/libpcap/INSTALL.txt
  user/ed/compiler-rt/contrib/libpcap/Makefile.in
  user/ed/compiler-rt/contrib/libpcap/README
  user/ed/compiler-rt/contrib/libpcap/TODO
  user/ed/compiler-rt/contrib/libpcap/VERSION
  user/ed/compiler-rt/contrib/libpcap/arcnet.h
  user/ed/compiler-rt/contrib/libpcap/atmuni31.h
  user/ed/compiler-rt/contrib/libpcap/bpf/net/bpf_filter.c
  user/ed/compiler-rt/contrib/libpcap/bpf_dump.c
  user/ed/compiler-rt/contrib/libpcap/bpf_image.c
  user/ed/compiler-rt/contrib/libpcap/config.guess
  user/ed/compiler-rt/contrib/libpcap/config.h.in
  user/ed/compiler-rt/contrib/libpcap/config.sub
  user/ed/compiler-rt/contrib/libpcap/configure
  user/ed/compiler-rt/contrib/libpcap/configure.in
  user/ed/compiler-rt/contrib/libpcap/dlpisubs.c
  user/ed/compiler-rt/contrib/libpcap/dlpisubs.h
  user/ed/compiler-rt/contrib/libpcap/etherent.c
  user/ed/compiler-rt/contrib/libpcap/ethertype.h
  user/ed/compiler-rt/contrib/libpcap/fad-getad.c
  user/ed/compiler-rt/contrib/libpcap/fad-gifc.c
  user/ed/compiler-rt/contrib/libpcap/fad-glifc.c
  user/ed/compiler-rt/contrib/libpcap/fad-null.c
  user/ed/compiler-rt/contrib/libpcap/fad-win32.c
  user/ed/compiler-rt/contrib/libpcap/filtertest.c
  user/ed/compiler-rt/contrib/libpcap/gencode.c
  user/ed/compiler-rt/contrib/libpcap/gencode.h
  user/ed/compiler-rt/contrib/libpcap/grammar.y
  user/ed/compiler-rt/contrib/libpcap/inet.c
  user/ed/compiler-rt/contrib/libpcap/lbl/os-aix4.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-hpux11.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-osf4.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-osf5.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-solaris2.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-sunos4.h
  user/ed/compiler-rt/contrib/libpcap/lbl/os-ultrix4.h
  user/ed/compiler-rt/contrib/libpcap/llc.h
  user/ed/compiler-rt/contrib/libpcap/missing/snprintf.c
  user/ed/compiler-rt/contrib/libpcap/nametoaddr.c
  user/ed/compiler-rt/contrib/libpcap/nlpid.h
  user/ed/compiler-rt/contrib/libpcap/optimize.c
  user/ed/compiler-rt/contrib/libpcap/pcap-bpf.c
  user/ed/compiler-rt/contrib/libpcap/pcap-bpf.h
  user/ed/compiler-rt/contrib/libpcap/pcap-bt-linux.c
  user/ed/compiler-rt/contrib/libpcap/pcap-bt-linux.h
  user/ed/compiler-rt/contrib/libpcap/pcap-config.1
  user/ed/compiler-rt/contrib/libpcap/pcap-config.in
  user/ed/compiler-rt/contrib/libpcap/pcap-dag.c
  user/ed/compiler-rt/contrib/libpcap/pcap-dag.h
  user/ed/compiler-rt/contrib/libpcap/pcap-dlpi.c
  user/ed/compiler-rt/contrib/libpcap/pcap-dos.c
  user/ed/compiler-rt/contrib/libpcap/pcap-dos.h
  user/ed/compiler-rt/contrib/libpcap/pcap-enet.c
  user/ed/compiler-rt/contrib/libpcap/pcap-filter.manmisc.in
  user/ed/compiler-rt/contrib/libpcap/pcap-int.h
  user/ed/compiler-rt/contrib/libpcap/pcap-libdlpi.c
  user/ed/compiler-rt/contrib/libpcap/pcap-linktype.manmisc.in
  user/ed/compiler-rt/contrib/libpcap/pcap-linux.c
  user/ed/compiler-rt/contrib/libpcap/pcap-namedb.h
  user/ed/compiler-rt/contrib/libpcap/pcap-nit.c
  user/ed/compiler-rt/contrib/libpcap/pcap-null.c
  user/ed/compiler-rt/contrib/libpcap/pcap-pf.c
  user/ed/compiler-rt/contrib/libpcap/pcap-savefile.manfile.in
  user/ed/compiler-rt/contrib/libpcap/pcap-septel.c
  user/ed/compiler-rt/contrib/libpcap/pcap-septel.h
  user/ed/compiler-rt/contrib/libpcap/pcap-sita.html
  user/ed/compiler-rt/contrib/libpcap/pcap-snit.c
  user/ed/compiler-rt/contrib/libpcap/pcap-snoop.c
  user/ed/compiler-rt/contrib/libpcap/pcap-stdinc.h
  user/ed/compiler-rt/contrib/libpcap/pcap-usb-linux.c
  user/ed/compiler-rt/contrib/libpcap/pcap-usb-linux.h
  user/ed/compiler-rt/contrib/libpcap/pcap-win32.c
  user/ed/compiler-rt/contrib/libpcap/pcap.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap.c
  user/ed/compiler-rt/contrib/libpcap/pcap.h
  user/ed/compiler-rt/contrib/libpcap/pcap/bluetooth.h
  user/ed/compiler-rt/contrib/libpcap/pcap/bpf.h
  user/ed/compiler-rt/contrib/libpcap/pcap/namedb.h
  user/ed/compiler-rt/contrib/libpcap/pcap/pcap.h
  user/ed/compiler-rt/contrib/libpcap/pcap/sll.h
  user/ed/compiler-rt/contrib/libpcap/pcap/usb.h
  user/ed/compiler-rt/contrib/libpcap/pcap/vlan.h
  user/ed/compiler-rt/contrib/libpcap/pcap_activate.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_breakloop.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_can_set_rfmon.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_close.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_compile.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_create.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_datalink.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_datalink_name_to_val.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_datalink_val_to_name.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump_close.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump_file.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump_flush.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump_ftell.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_dump_open.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_file.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_fileno.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_findalldevs.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_free_datalinks.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_freealldevs.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_freecode.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_get_selectable_fd.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_geterr.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_inject.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_is_swapped.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_lib_version.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_list_datalinks.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_lookupdev.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_lookupnet.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_loop.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_major_version.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_next_ex.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_offline_filter.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_open_dead.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_open_live.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_open_offline.3pcap.in
  user/ed/compiler-rt/contrib/libpcap/pcap_set_buffer_size.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_set_datalink.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_set_promisc.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_set_rfmon.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_set_snaplen.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_set_timeout.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_setdirection.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_setfilter.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_setnonblock.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_snapshot.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_stats.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_statustostr.3pcap
  user/ed/compiler-rt/contrib/libpcap/pcap_strerror.3pcap
  user/ed/compiler-rt/contrib/libpcap/ppp.h
  user/ed/compiler-rt/contrib/libpcap/runlex.sh
  user/ed/compiler-rt/contrib/libpcap/savefile.c
  user/ed/compiler-rt/contrib/libpcap/scanner.l
  user/ed/compiler-rt/contrib/libpcap/sunatmpos.h
  user/ed/compiler-rt/contrib/tcpdump/CHANGES
  user/ed/compiler-rt/contrib/tcpdump/CREDITS
  user/ed/compiler-rt/contrib/tcpdump/INSTALL.txt
  user/ed/compiler-rt/contrib/tcpdump/Makefile.in
  user/ed/compiler-rt/contrib/tcpdump/README
  user/ed/compiler-rt/contrib/tcpdump/VERSION
  user/ed/compiler-rt/contrib/tcpdump/acconfig.h
  user/ed/compiler-rt/contrib/tcpdump/addrtoname.c
  user/ed/compiler-rt/contrib/tcpdump/af.c
  user/ed/compiler-rt/contrib/tcpdump/af.h
  user/ed/compiler-rt/contrib/tcpdump/atmuni31.h
  user/ed/compiler-rt/contrib/tcpdump/bootp.h
  user/ed/compiler-rt/contrib/tcpdump/bpf_dump.c
  user/ed/compiler-rt/contrib/tcpdump/checksum.c
  user/ed/compiler-rt/contrib/tcpdump/config.guess
  user/ed/compiler-rt/contrib/tcpdump/config.h.in
  user/ed/compiler-rt/contrib/tcpdump/config.sub
  user/ed/compiler-rt/contrib/tcpdump/configure
  user/ed/compiler-rt/contrib/tcpdump/configure.in
  user/ed/compiler-rt/contrib/tcpdump/ethertype.h
  user/ed/compiler-rt/contrib/tcpdump/gmpls.c
  user/ed/compiler-rt/contrib/tcpdump/gmpls.h
  user/ed/compiler-rt/contrib/tcpdump/gmt2local.h
  user/ed/compiler-rt/contrib/tcpdump/icmp6.h
  user/ed/compiler-rt/contrib/tcpdump/ieee802_11.h
  user/ed/compiler-rt/contrib/tcpdump/ieee802_11_radio.h
  user/ed/compiler-rt/contrib/tcpdump/interface.h
  user/ed/compiler-rt/contrib/tcpdump/ip6.h
  user/ed/compiler-rt/contrib/tcpdump/ipproto.c
  user/ed/compiler-rt/contrib/tcpdump/ipproto.h
  user/ed/compiler-rt/contrib/tcpdump/isakmp.h
  user/ed/compiler-rt/contrib/tcpdump/l2vpn.c
  user/ed/compiler-rt/contrib/tcpdump/l2vpn.h
  user/ed/compiler-rt/contrib/tcpdump/lbl/os-sunos4.h
  user/ed/compiler-rt/contrib/tcpdump/lbl/os-ultrix4.h
  user/ed/compiler-rt/contrib/tcpdump/missing/addrinfo.h
  user/ed/compiler-rt/contrib/tcpdump/netdissect.h
  user/ed/compiler-rt/contrib/tcpdump/nfs.h
  user/ed/compiler-rt/contrib/tcpdump/nlpid.c
  user/ed/compiler-rt/contrib/tcpdump/nlpid.h
  user/ed/compiler-rt/contrib/tcpdump/oui.c
  user/ed/compiler-rt/contrib/tcpdump/oui.h
  user/ed/compiler-rt/contrib/tcpdump/print-802_11.c
  user/ed/compiler-rt/contrib/tcpdump/print-ap1394.c
  user/ed/compiler-rt/contrib/tcpdump/print-arcnet.c
  user/ed/compiler-rt/contrib/tcpdump/print-atm.c
  user/ed/compiler-rt/contrib/tcpdump/print-bfd.c
  user/ed/compiler-rt/contrib/tcpdump/print-bgp.c
  user/ed/compiler-rt/contrib/tcpdump/print-bootp.c
  user/ed/compiler-rt/contrib/tcpdump/print-bt.c
  user/ed/compiler-rt/contrib/tcpdump/print-cdp.c
  user/ed/compiler-rt/contrib/tcpdump/print-cfm.c
  user/ed/compiler-rt/contrib/tcpdump/print-dccp.c
  user/ed/compiler-rt/contrib/tcpdump/print-dhcp6.c
  user/ed/compiler-rt/contrib/tcpdump/print-domain.c
  user/ed/compiler-rt/contrib/tcpdump/print-enc.c
  user/ed/compiler-rt/contrib/tcpdump/print-esp.c
  user/ed/compiler-rt/contrib/tcpdump/print-ether.c
  user/ed/compiler-rt/contrib/tcpdump/print-fr.c
  user/ed/compiler-rt/contrib/tcpdump/print-gre.c
  user/ed/compiler-rt/contrib/tcpdump/print-icmp6.c
  user/ed/compiler-rt/contrib/tcpdump/print-ip.c
  user/ed/compiler-rt/contrib/tcpdump/print-ip6.c
  user/ed/compiler-rt/contrib/tcpdump/print-isakmp.c
  user/ed/compiler-rt/contrib/tcpdump/print-isoclns.c
  user/ed/compiler-rt/contrib/tcpdump/print-juniper.c
  user/ed/compiler-rt/contrib/tcpdump/print-l2tp.c
  user/ed/compiler-rt/contrib/tcpdump/print-lane.c
  user/ed/compiler-rt/contrib/tcpdump/print-llc.c
  user/ed/compiler-rt/contrib/tcpdump/print-lldp.c
  user/ed/compiler-rt/contrib/tcpdump/print-lspping.c
  user/ed/compiler-rt/contrib/tcpdump/print-nfs.c
  user/ed/compiler-rt/contrib/tcpdump/print-ntp.c
  user/ed/compiler-rt/contrib/tcpdump/print-olsr.c
  user/ed/compiler-rt/contrib/tcpdump/print-ospf.c
  user/ed/compiler-rt/contrib/tcpdump/print-pflog.c
  user/ed/compiler-rt/contrib/tcpdump/print-pim.c
  user/ed/compiler-rt/contrib/tcpdump/print-ppp.c
  user/ed/compiler-rt/contrib/tcpdump/print-rrcp.c
  user/ed/compiler-rt/contrib/tcpdump/print-rsvp.c
  user/ed/compiler-rt/contrib/tcpdump/print-rx.c
  user/ed/compiler-rt/contrib/tcpdump/print-sctp.c
  user/ed/compiler-rt/contrib/tcpdump/print-sip.c
  user/ed/compiler-rt/contrib/tcpdump/print-sll.c
  user/ed/compiler-rt/contrib/tcpdump/print-smb.c
  user/ed/compiler-rt/contrib/tcpdump/print-sunrpc.c
  user/ed/compiler-rt/contrib/tcpdump/print-symantec.c
  user/ed/compiler-rt/contrib/tcpdump/print-tcp.c
  user/ed/compiler-rt/contrib/tcpdump/print-tftp.c
  user/ed/compiler-rt/contrib/tcpdump/print-token.c
  user/ed/compiler-rt/contrib/tcpdump/print-udp.c
  user/ed/compiler-rt/contrib/tcpdump/setsignal.h
  user/ed/compiler-rt/contrib/tcpdump/sll.h
  user/ed/compiler-rt/contrib/tcpdump/smbutil.c
  user/ed/compiler-rt/contrib/tcpdump/strcasecmp.c
  user/ed/compiler-rt/contrib/tcpdump/tcp.h
  user/ed/compiler-rt/contrib/tcpdump/tcpdump-stdinc.h
  user/ed/compiler-rt/contrib/tcpdump/tcpdump.c
  user/ed/compiler-rt/contrib/tcpdump/tftp.h
  user/ed/compiler-rt/contrib/tcpdump/timed.h
  user/ed/compiler-rt/contrib/tcpdump/token.h
  user/ed/compiler-rt/contrib/tcpdump/util.c
  user/ed/compiler-rt/contrib/tzcode/stdtime/asctime.c
  user/ed/compiler-rt/contrib/tzcode/stdtime/localtime.c
  user/ed/compiler-rt/contrib/tzcode/zic/zic.8
  user/ed/compiler-rt/contrib/tzcode/zic/zic.c
  user/ed/compiler-rt/etc/mtree/BSD.usr.dist
  user/ed/compiler-rt/include/unistd.h
  user/ed/compiler-rt/lib/libc/gen/sysconf.c
  user/ed/compiler-rt/lib/libc/mips/SYS.h
  user/ed/compiler-rt/lib/libc/stdlib/strtonum.3
  user/ed/compiler-rt/lib/libc/sys/chflags.2
  user/ed/compiler-rt/lib/libfetch/common.c
  user/ed/compiler-rt/lib/libjail/jail.c
  user/ed/compiler-rt/lib/libpcap/Makefile
  user/ed/compiler-rt/lib/libpcap/config.h
  user/ed/compiler-rt/lib/libthr/thread/thr_attr.c
  user/ed/compiler-rt/lib/libthr/thread/thr_mutex.c
  user/ed/compiler-rt/lib/libthr/thread/thr_private.h
  user/ed/compiler-rt/lib/libthr/thread/thr_sig.c
  user/ed/compiler-rt/libexec/rtld-elf/Makefile
  user/ed/compiler-rt/libexec/rtld-elf/ia64/reloc.c
  user/ed/compiler-rt/release/fixit.profile
  user/ed/compiler-rt/sbin/camcontrol/camcontrol.c
  user/ed/compiler-rt/sbin/geom/class/eli/geom_eli.c
  user/ed/compiler-rt/sbin/geom/class/part/geom_part.c
  user/ed/compiler-rt/sbin/geom/class/part/gpart.8
  user/ed/compiler-rt/sbin/hastd/hastd.c
  user/ed/compiler-rt/sbin/hastd/nv.c
  user/ed/compiler-rt/sbin/hastd/nv.h
  user/ed/compiler-rt/sbin/hastd/parse.y
  user/ed/compiler-rt/sbin/hastd/primary.c
  user/ed/compiler-rt/sbin/hastd/secondary.c
  user/ed/compiler-rt/sbin/hastd/synch.h
  user/ed/compiler-rt/sbin/mount_nfs/mount_nfs.c
  user/ed/compiler-rt/sbin/pflogd/Makefile
  user/ed/compiler-rt/share/examples/Makefile
  user/ed/compiler-rt/share/man/man3/pthread_attr_affinity_np.3
  user/ed/compiler-rt/share/man/man4/acpi.4
  user/ed/compiler-rt/share/man/man4/ada.4
  user/ed/compiler-rt/share/man/man4/re.4
  user/ed/compiler-rt/share/man/man5/nsmb.conf.5
  user/ed/compiler-rt/share/man/man7/build.7
  user/ed/compiler-rt/share/man/man9/Makefile
  user/ed/compiler-rt/share/man/man9/make_dev.9
  user/ed/compiler-rt/share/misc/committers-ports.dot
  user/ed/compiler-rt/sys/amd64/amd64/amd64_mem.c
  user/ed/compiler-rt/sys/amd64/amd64/fpu.c
  user/ed/compiler-rt/sys/amd64/amd64/intr_machdep.c
  user/ed/compiler-rt/sys/amd64/amd64/pmap.c
  user/ed/compiler-rt/sys/amd64/include/pmap.h
  user/ed/compiler-rt/sys/amd64/include/profile.h
  user/ed/compiler-rt/sys/boot/i386/boot2/boot2.c
  user/ed/compiler-rt/sys/boot/ofw/common/main.c
  user/ed/compiler-rt/sys/boot/ofw/libofw/ofw_memory.c
  user/ed/compiler-rt/sys/boot/ofw/libofw/ofw_net.c
  user/ed/compiler-rt/sys/boot/ofw/libofw/openfirm.c
  user/ed/compiler-rt/sys/boot/pc98/boot2/boot2.c
  user/ed/compiler-rt/sys/boot/sparc64/loader/main.c
  user/ed/compiler-rt/sys/cam/ata/ata_da.c
  user/ed/compiler-rt/sys/cam/cam_xpt.c
  user/ed/compiler-rt/sys/cam/scsi/scsi_da.c
  user/ed/compiler-rt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/ed/compiler-rt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/ed/compiler-rt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/ed/compiler-rt/sys/conf/files
  user/ed/compiler-rt/sys/conf/files.amd64
  user/ed/compiler-rt/sys/conf/files.i386
  user/ed/compiler-rt/sys/conf/files.pc98
  user/ed/compiler-rt/sys/conf/options.amd64
  user/ed/compiler-rt/sys/dev/acpica/acpi.c
  user/ed/compiler-rt/sys/dev/ahci/ahci.c
  user/ed/compiler-rt/sys/dev/alc/if_alc.c
  user/ed/compiler-rt/sys/dev/bge/if_bge.c
  user/ed/compiler-rt/sys/dev/bge/if_bgereg.h
  user/ed/compiler-rt/sys/dev/e1000/if_em.c
  user/ed/compiler-rt/sys/dev/e1000/if_em.h
  user/ed/compiler-rt/sys/dev/fxp/if_fxp.c
  user/ed/compiler-rt/sys/dev/iwi/if_iwi.c
  user/ed/compiler-rt/sys/dev/mii/brgphy.c
  user/ed/compiler-rt/sys/dev/mii/mii_physubr.c
  user/ed/compiler-rt/sys/dev/mii/miidevs
  user/ed/compiler-rt/sys/dev/mii/miivar.h
  user/ed/compiler-rt/sys/dev/mii/mlphy.c
  user/ed/compiler-rt/sys/dev/mii/pnaphy.c
  user/ed/compiler-rt/sys/dev/mii/smcphy.c
  user/ed/compiler-rt/sys/dev/mii/tlphy.c
  user/ed/compiler-rt/sys/dev/pci/pci.c
  user/ed/compiler-rt/sys/dev/siis/siis.c
  user/ed/compiler-rt/sys/dev/sound/pcm/channel.c
  user/ed/compiler-rt/sys/dev/tl/if_tl.c
  user/ed/compiler-rt/sys/dev/tl/if_tlreg.h
  user/ed/compiler-rt/sys/dev/usb/controller/ehci.c
  user/ed/compiler-rt/sys/dev/usb/controller/ehcireg.h
  user/ed/compiler-rt/sys/dev/usb/usb_device.c
  user/ed/compiler-rt/sys/dev/usb/usb_freebsd.h
  user/ed/compiler-rt/sys/dev/usb/usb_hub.c
  user/ed/compiler-rt/sys/dev/usb/usbdi.h
  user/ed/compiler-rt/sys/dev/xen/blkback/blkback.c
  user/ed/compiler-rt/sys/fs/nfs/nfs_var.h
  user/ed/compiler-rt/sys/fs/nfs/nfsclstate.h
  user/ed/compiler-rt/sys/fs/nfs/nfsdport.h
  user/ed/compiler-rt/sys/fs/nfsclient/nfs_clnode.c
  user/ed/compiler-rt/sys/fs/nfsclient/nfs_clstate.c
  user/ed/compiler-rt/sys/fs/nfsclient/nfs_clvnops.c
  user/ed/compiler-rt/sys/fs/nfsserver/nfs_nfsdport.c
  user/ed/compiler-rt/sys/geom/eli/g_eli.c
  user/ed/compiler-rt/sys/geom/eli/g_eli.h
  user/ed/compiler-rt/sys/geom/eli/g_eli_ctl.c
  user/ed/compiler-rt/sys/geom/eli/g_eli_key.c
  user/ed/compiler-rt/sys/geom/part/g_part.c
  user/ed/compiler-rt/sys/geom/part/g_part.h
  user/ed/compiler-rt/sys/geom/part/g_part_gpt.c
  user/ed/compiler-rt/sys/geom/part/g_part_if.m
  user/ed/compiler-rt/sys/i386/i386/elan-mmcr.c
  user/ed/compiler-rt/sys/i386/i386/identcpu.c
  user/ed/compiler-rt/sys/i386/i386/initcpu.c
  user/ed/compiler-rt/sys/i386/i386/intr_machdep.c
  user/ed/compiler-rt/sys/i386/i386/longrun.c
  user/ed/compiler-rt/sys/i386/i386/perfmon.c
  user/ed/compiler-rt/sys/i386/include/profile.h
  user/ed/compiler-rt/sys/i386/isa/npx.c
  user/ed/compiler-rt/sys/kern/init_main.c
  user/ed/compiler-rt/sys/kern/kern_cpuset.c
  user/ed/compiler-rt/sys/kern/kern_exec.c
  user/ed/compiler-rt/sys/kern/kern_exit.c
  user/ed/compiler-rt/sys/kern/kern_fork.c
  user/ed/compiler-rt/sys/kern/kern_kthread.c
  user/ed/compiler-rt/sys/kern/kern_ktrace.c
  user/ed/compiler-rt/sys/kern/kern_shutdown.c
  user/ed/compiler-rt/sys/kern/kern_syscalls.c
  user/ed/compiler-rt/sys/kern/kern_thr.c
  user/ed/compiler-rt/sys/kern/sched_ule.c
  user/ed/compiler-rt/sys/kern/subr_acl_nfs4.c
  user/ed/compiler-rt/sys/kern/vfs_bio.c
  user/ed/compiler-rt/sys/net/bpf.h
  user/ed/compiler-rt/sys/net/if.c
  user/ed/compiler-rt/sys/netinet/if_ether.c
  user/ed/compiler-rt/sys/netinet/ip_ipsec.c
  user/ed/compiler-rt/sys/netinet6/ip6_ipsec.c
  user/ed/compiler-rt/sys/netipsec/ipsec_input.c
  user/ed/compiler-rt/sys/netipsec/ipsec_output.c
  user/ed/compiler-rt/sys/netipsec/key.c
  user/ed/compiler-rt/sys/netipsec/keydb.h
  user/ed/compiler-rt/sys/nfsclient/nfs_vfsops.c
  user/ed/compiler-rt/sys/pc98/pc98/machdep.c
  user/ed/compiler-rt/sys/powerpc/mambo/mambo_console.c
  user/ed/compiler-rt/sys/security/mac/mac_vfs.c
  user/ed/compiler-rt/sys/sparc64/sparc64/pmap.c
  user/ed/compiler-rt/sys/sparc64/sparc64/tick.c
  user/ed/compiler-rt/sys/sys/ktrace.h
  user/ed/compiler-rt/sys/ufs/ufs/ufs_dirhash.c
  user/ed/compiler-rt/sys/x86/x86/local_apic.c
  user/ed/compiler-rt/tools/tools/syscall_timing/syscall_timing.c
  user/ed/compiler-rt/usr.bin/lex/flex.skl
  user/ed/compiler-rt/usr.bin/unzip/unzip.1
  user/ed/compiler-rt/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c
  user/ed/compiler-rt/usr.sbin/config/main.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_config.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_drive.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_evt.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_flash.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_patrol.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_show.c
  user/ed/compiler-rt/usr.sbin/mfiutil/mfi_volume.c
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend-query/query-langs.sh
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend-query/test-live.sh
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
  user/ed/compiler-rt/usr.sbin/pc-sysinstall/backend/functions.sh
  user/ed/compiler-rt/usr.sbin/rtadvd/rtadvd.conf.5
  user/ed/compiler-rt/usr.sbin/tcpdump/tcpdump/Makefile
  user/ed/compiler-rt/usr.sbin/usbconfig/usbconfig.c
Directory Properties:
  user/ed/compiler-rt/   (props changed)
  user/ed/compiler-rt/cddl/contrib/opensolaris/   (props changed)
  user/ed/compiler-rt/contrib/bind9/   (props changed)
  user/ed/compiler-rt/contrib/binutils/   (props changed)
  user/ed/compiler-rt/contrib/bzip2/   (props changed)
  user/ed/compiler-rt/contrib/ee/   (props changed)
  user/ed/compiler-rt/contrib/expat/   (props changed)
  user/ed/compiler-rt/contrib/file/   (props changed)
  user/ed/compiler-rt/contrib/gdb/   (props changed)
  user/ed/compiler-rt/contrib/gdtoa/   (props changed)
  user/ed/compiler-rt/contrib/gnu-sort/   (props changed)
  user/ed/compiler-rt/contrib/groff/   (props changed)
  user/ed/compiler-rt/contrib/less/   (props changed)
  user/ed/compiler-rt/contrib/libpcap/   (props changed)
  user/ed/compiler-rt/contrib/llvm/   (props changed)
  user/ed/compiler-rt/contrib/llvm/tools/clang/   (props changed)
  user/ed/compiler-rt/contrib/ncurses/   (props changed)
  user/ed/compiler-rt/contrib/netcat/   (props changed)
  user/ed/compiler-rt/contrib/ntp/   (props changed)
  user/ed/compiler-rt/contrib/one-true-awk/   (props changed)
  user/ed/compiler-rt/contrib/openbsm/   (props changed)
  user/ed/compiler-rt/contrib/openpam/   (props changed)
  user/ed/compiler-rt/contrib/pf/   (props changed)
  user/ed/compiler-rt/contrib/sendmail/   (props changed)
  user/ed/compiler-rt/contrib/tcpdump/   (props changed)
  user/ed/compiler-rt/contrib/tcsh/   (props changed)
  user/ed/compiler-rt/contrib/top/   (props changed)
  user/ed/compiler-rt/contrib/top/install-sh   (props changed)
  user/ed/compiler-rt/contrib/tzcode/stdtime/   (props changed)
  user/ed/compiler-rt/contrib/tzcode/zic/   (props changed)
  user/ed/compiler-rt/contrib/tzdata/   (props changed)
  user/ed/compiler-rt/contrib/wpa/   (props changed)
  user/ed/compiler-rt/contrib/xz/   (props changed)
  user/ed/compiler-rt/crypto/openssh/   (props changed)
  user/ed/compiler-rt/crypto/openssl/   (props changed)
  user/ed/compiler-rt/lib/libc/   (props changed)
  user/ed/compiler-rt/lib/libc/stdtime/   (props changed)
  user/ed/compiler-rt/lib/libutil/   (props changed)
  user/ed/compiler-rt/lib/libz/   (props changed)
  user/ed/compiler-rt/sbin/   (props changed)
  user/ed/compiler-rt/sbin/ipfw/   (props changed)
  user/ed/compiler-rt/share/mk/bsd.arch.inc.mk   (props changed)
  user/ed/compiler-rt/share/zoneinfo/   (props changed)
  user/ed/compiler-rt/sys/   (props changed)
  user/ed/compiler-rt/sys/amd64/include/xen/   (props changed)
  user/ed/compiler-rt/sys/cddl/contrib/opensolaris/   (props changed)
  user/ed/compiler-rt/sys/contrib/dev/acpica/   (props changed)
  user/ed/compiler-rt/sys/contrib/pf/   (props changed)
  user/ed/compiler-rt/sys/contrib/x86emu/   (props changed)
  user/ed/compiler-rt/sys/dev/xen/xenpci/   (props changed)
  user/ed/compiler-rt/usr.bin/calendar/   (props changed)
  user/ed/compiler-rt/usr.bin/csup/   (props changed)
  user/ed/compiler-rt/usr.bin/procstat/   (props changed)
  user/ed/compiler-rt/usr.sbin/zic/   (props changed)

Modified: user/ed/compiler-rt/UPDATING
==============================================================================
--- user/ed/compiler-rt/UPDATING	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/UPDATING	Sat Oct 30 13:25:41 2010	(r214555)
@@ -35,10 +35,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 20100915:
 	A workaround for a fixed ld bug has been removed in kernel code,
 	so make sure that your system ld is built from sources after
-	revision 210245 (r211583 if building head kernel on stable/8,
-	r211584 for stable/7).  A symptom of incorrect ld version is
-	different addresses for set_pcpu section and __start_set_pcpu
-	symbol in kernel and/or modules.
+	revision 210245 from 2010-07-19 (r211583 if building head kernel
+	on stable/8, r211584 for stable/7; both from 2010-08-21).
+	A symptom of incorrect ld version is different addresses for
+	set_pcpu section and __start_set_pcpu symbol in kernel and/or modules.
 
 20100913:
 	The $ipv6_prefer variable in rc.conf(5) has been split into

Modified: user/ed/compiler-rt/bin/rm/rm.1
==============================================================================
--- user/ed/compiler-rt/bin/rm/rm.1	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/rm/rm.1	Sat Oct 30 13:25:41 2010	(r214555)
@@ -231,6 +231,6 @@ The
 .Fl P
 option assumes that the underlying file system updates existing blocks
 in-place and does not store new data in a new location.
-This is true for UFS but not for ZFS, which is using a Copy-On-Write strategy.
-In addition, only regular files are overwritten, other types of files
-are not.
+This is true for UFS, but not for ZFS or other file systems which use
+copy-on-write semantics.
+In addition, only regular files are overwritten.

Modified: user/ed/compiler-rt/bin/sh/eval.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/eval.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/eval.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -1130,7 +1130,7 @@ commandcmd(int argc, char **argv)
 		return typecmd_impl(2, argv - 1, cmd, path);
 	}
 	if (argc != 0)
-		error("commandcmd() called while it should not be");
+		error("commandcmd bad call");
 
 	/*
 	 * Do nothing successfully if no command was specified;

Modified: user/ed/compiler-rt/bin/sh/expand.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/expand.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/expand.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -98,7 +98,7 @@ static struct arglist exparg;		/* holds 
 static void argstr(char *, int);
 static char *exptilde(char *, int);
 static void expbackq(union node *, int, int);
-static int subevalvar(char *, char *, int, int, int, int);
+static int subevalvar(char *, char *, int, int, int, int, int);
 static char *evalvar(char *, int);
 static int varisset(char *, int);
 static void varvalue(char *, int, int, int);
@@ -216,7 +216,12 @@ argstr(char *p, int flag)
 	char c;
 	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);	/* do CTLESC */
 	int firsteq = 1;
+	int split_lit;
+	int lit_quoted;
 
+	split_lit = flag & EXP_SPLIT_LIT;
+	lit_quoted = flag & EXP_LIT_QUOTED;
+	flag &= ~(EXP_SPLIT_LIT | EXP_LIT_QUOTED);
 	if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE)))
 		p = exptilde(p, flag);
 	for (;;) {
@@ -225,17 +230,25 @@ argstr(char *p, int flag)
 		case CTLENDVAR:
 			goto breakloop;
 		case CTLQUOTEMARK:
+			lit_quoted = 1;
 			/* "$@" syntax adherence hack */
 			if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=')
 				break;
 			if ((flag & EXP_FULL) != 0)
 				STPUTC(c, expdest);
 			break;
+		case CTLQUOTEEND:
+			lit_quoted = 0;
+			break;
 		case CTLESC:
 			if (quotes)
 				STPUTC(c, expdest);
 			c = *p++;
 			STPUTC(c, expdest);
+			if (split_lit && !lit_quoted)
+				recordregion(expdest - stackblock() -
+				    (quotes ? 2 : 1),
+				    expdest - stackblock(), 0);
 			break;
 		case CTLVAR:
 			p = evalvar(p, flag);
@@ -255,18 +268,21 @@ argstr(char *p, int flag)
 			 * assignments (after the first '=' and after ':'s).
 			 */
 			STPUTC(c, expdest);
-			if (flag & EXP_VARTILDE && *p == '~') {
-				if (c == '=') {
-					if (firsteq)
-						firsteq = 0;
-					else
-						break;
-				}
+			if (split_lit && !lit_quoted)
+				recordregion(expdest - stackblock() - 1,
+				    expdest - stackblock(), 0);
+			if (flag & EXP_VARTILDE && *p == '~' &&
+			    (c != '=' || firsteq)) {
+				if (c == '=')
+					firsteq = 0;
 				p = exptilde(p, flag);
 			}
 			break;
 		default:
 			STPUTC(c, expdest);
+			if (split_lit && !lit_quoted)
+				recordregion(expdest - stackblock() - 1,
+				    expdest - stackblock(), 0);
 		}
 	}
 breakloop:;
@@ -510,7 +526,7 @@ expbackq(union node *cmd, int quoted, in
 
 static int
 subevalvar(char *p, char *str, int strloc, int subtype, int startloc,
-  int varflags)
+  int varflags, int quotes)
 {
 	char *startp;
 	char *loc = NULL;
@@ -555,12 +571,12 @@ subevalvar(char *p, char *str, int strlo
 		for (loc = startp; loc < str; loc++) {
 			c = *loc;
 			*loc = '\0';
-			if (patmatch(str, startp, varflags & VSQUOTE)) {
+			if (patmatch(str, startp, quotes)) {
 				*loc = c;
 				goto recordleft;
 			}
 			*loc = c;
-			if ((varflags & VSQUOTE) && *loc == CTLESC)
+			if (quotes && *loc == CTLESC)
 				loc++;
 		}
 		return 0;
@@ -569,14 +585,13 @@ subevalvar(char *p, char *str, int strlo
 		for (loc = str - 1; loc >= startp;) {
 			c = *loc;
 			*loc = '\0';
-			if (patmatch(str, startp, varflags & VSQUOTE)) {
+			if (patmatch(str, startp, quotes)) {
 				*loc = c;
 				goto recordleft;
 			}
 			*loc = c;
 			loc--;
-			if ((varflags & VSQUOTE) && loc > startp &&
-			    *(loc - 1) == CTLESC) {
+			if (quotes && loc > startp && *(loc - 1) == CTLESC) {
 				for (q = startp; q < loc; q++)
 					if (*q == CTLESC)
 						q++;
@@ -588,14 +603,13 @@ subevalvar(char *p, char *str, int strlo
 
 	case VSTRIMRIGHT:
 		for (loc = str - 1; loc >= startp;) {
-			if (patmatch(str, loc, varflags & VSQUOTE)) {
+			if (patmatch(str, loc, quotes)) {
 				amount = loc - expdest;
 				STADJUST(amount, expdest);
 				return 1;
 			}
 			loc--;
-			if ((varflags & VSQUOTE) && loc > startp &&
-			    *(loc - 1) == CTLESC) {
+			if (quotes && loc > startp && *(loc - 1) == CTLESC) {
 				for (q = startp; q < loc; q++)
 					if (*q == CTLESC)
 						q++;
@@ -607,12 +621,12 @@ subevalvar(char *p, char *str, int strlo
 
 	case VSTRIMRIGHTMAX:
 		for (loc = startp; loc < str - 1; loc++) {
-			if (patmatch(str, loc, varflags & VSQUOTE)) {
+			if (patmatch(str, loc, quotes)) {
 				amount = loc - expdest;
 				STADJUST(amount, expdest);
 				return 1;
 			}
-			if ((varflags & VSQUOTE) && *loc == CTLESC)
+			if (quotes && *loc == CTLESC)
 				loc++;
 		}
 		return 0;
@@ -742,7 +756,8 @@ record:
 	case VSPLUS:
 	case VSMINUS:
 		if (!set) {
-			argstr(p, flag);
+			argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) |
+			    (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0));
 			break;
 		}
 		if (easy)
@@ -762,7 +777,7 @@ record:
 		STPUTC('\0', expdest);
 		patloc = expdest - stackblock();
 		if (subevalvar(p, NULL, patloc, subtype,
-			       startloc, varflags) == 0) {
+		    startloc, varflags, quotes) == 0) {
 			int amount = (expdest - stackblock() - patloc) + 1;
 			STADJUST(-amount, expdest);
 		}
@@ -773,7 +788,8 @@ record:
 	case VSASSIGN:
 	case VSQUESTION:
 		if (!set) {
-			if (subevalvar(p, var, 0, subtype, startloc, varflags)) {
+			if (subevalvar(p, var, 0, subtype, startloc, varflags,
+			    quotes)) {
 				varflags &= ~VSNUL;
 				/*
 				 * Remove any recorded regions beyond
@@ -1495,13 +1511,13 @@ rmescapes(char *str)
 	char *p, *q;
 
 	p = str;
-	while (*p != CTLESC && *p != CTLQUOTEMARK) {
+	while (*p != CTLESC && *p != CTLQUOTEMARK && *p != CTLQUOTEEND) {
 		if (*p++ == '\0')
 			return;
 	}
 	q = p;
 	while (*p) {
-		if (*p == CTLQUOTEMARK) {
+		if (*p == CTLQUOTEMARK || *p == CTLQUOTEEND) {
 			p++;
 			continue;
 		}

Modified: user/ed/compiler-rt/bin/sh/expand.h
==============================================================================
--- user/ed/compiler-rt/bin/sh/expand.h	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/expand.h	Sat Oct 30 13:25:41 2010	(r214555)
@@ -52,6 +52,8 @@ struct arglist {
 #define	EXP_VARTILDE	0x4	/* expand tildes in an assignment */
 #define	EXP_REDIR	0x8	/* file glob for a redirection (1 match only) */
 #define EXP_CASE	0x10	/* keeps quotes around for CASE pattern */
+#define EXP_SPLIT_LIT	0x20	/* IFS split literal text ${v+-a b c} */
+#define EXP_LIT_QUOTED	0x40	/* for EXP_SPLIT_LIT, start off quoted */
 
 
 union node;

Modified: user/ed/compiler-rt/bin/sh/histedit.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/histedit.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/histedit.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -297,7 +297,7 @@ histcmd(int argc, char **argv)
 		laststr = argv[1];
 		break;
 	default:
-		error("too many args");
+		error("too many arguments");
 	}
 	/*
 	 * Turn into event numbers.
@@ -329,7 +329,7 @@ histcmd(int argc, char **argv)
 		editfile = editfilestr;
 		if ((efp = fdopen(fd, "w")) == NULL) {
 			close(fd);
-			error("can't allocate stdio buffer for temp");
+			error("Out of space");
 		}
 	}
 

Modified: user/ed/compiler-rt/bin/sh/mksyntax.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/mksyntax.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/mksyntax.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -75,6 +75,7 @@ struct synclass synclass[] = {
 	{ "CEOF",	"end of file" },
 	{ "CCTL",	"like CWORD, except it must be escaped" },
 	{ "CSPCL",	"these terminate a word" },
+	{ "CIGN",       "character should be ignored" },
 	{ NULL,		NULL }
 };
 
@@ -232,7 +233,7 @@ main(int argc __unused, char **argv __un
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
-	add("\"", "CDQUOTE");
+	add("\"", "CIGN");
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("(", "CLP");
@@ -284,6 +285,7 @@ init(void)
 	syntax[base + CTLARI] = "CCTL";
 	syntax[base + CTLENDARI] = "CCTL";
 	syntax[base + CTLQUOTEMARK] = "CCTL";
+	syntax[base + CTLQUOTEEND] = "CCTL";
 }
 
 

Modified: user/ed/compiler-rt/bin/sh/parser.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/parser.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/parser.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include "alias.h"
 #include "show.h"
 #include "eval.h"
+#include "exec.h"	/* to check for special builtins */
 #ifndef NO_HISTORY
 #include "myhistedit.h"
 #endif
@@ -105,7 +106,7 @@ static struct parser_temp *parser_temp;
 static int noaliases = 0;
 
 
-static union node *list(int);
+static union node *list(int, int);
 static union node *andor(void);
 static union node *pipeline(void);
 static union node *command(void);
@@ -219,18 +220,18 @@ parsecmd(int interact)
 	if (t == TNL)
 		return NULL;
 	tokpushback++;
-	return list(1);
+	return list(1, 1);
 }
 
 
 static union node *
-list(int nlflag)
+list(int nlflag, int erflag)
 {
 	union node *n1, *n2, *n3;
 	int tok;
 
 	checkkwd = 2;
-	if (nlflag == 0 && tokendlist[peektoken()])
+	if (!nlflag && !erflag && tokendlist[peektoken()])
 		return NULL;
 	n1 = NULL;
 	for (;;) {
@@ -276,7 +277,7 @@ list(int nlflag)
 				tokpushback++;
 			}
 			checkkwd = 2;
-			if (tokendlist[peektoken()])
+			if (!nlflag && !erflag && tokendlist[peektoken()])
 				return n1;
 			break;
 		case TEOF:
@@ -286,7 +287,7 @@ list(int nlflag)
 				pungetc();		/* push back EOF on input */
 			return n1;
 		default:
-			if (nlflag)
+			if (nlflag || erflag)
 				synexpect(-1);
 			tokpushback++;
 			return n1;
@@ -328,7 +329,7 @@ pipeline(void)
 {
 	union node *n1, *n2, *pipenode;
 	struct nodelist *lp, *prev;
-	int negate;
+	int negate, t;
 
 	negate = 0;
 	checkkwd = 2;
@@ -347,7 +348,13 @@ pipeline(void)
 		do {
 			prev = lp;
 			lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
-			lp->n = command();
+			checkkwd = 2;
+			t = readtoken();
+			tokpushback++;
+			if (t == TNOT)
+				lp->n = pipeline();
+			else
+				lp->n = command();
 			prev->next = lp;
 		} while (readtoken() == TPIPE);
 		lp->next = NULL;
@@ -372,7 +379,7 @@ command(void)
 	union node *ap, **app;
 	union node *cp, **cpp;
 	union node *redir, **rpp;
-	int t, negate = 0;
+	int t;
 
 	checkkwd = 2;
 	redir = NULL;
@@ -387,34 +394,28 @@ command(void)
 	}
 	tokpushback++;
 
-	while (readtoken() == TNOT) {
-		TRACE(("command: TNOT recognized\n"));
-		negate = !negate;
-	}
-	tokpushback++;
-
 	switch (readtoken()) {
 	case TIF:
 		n1 = (union node *)stalloc(sizeof (struct nif));
 		n1->type = NIF;
-		if ((n1->nif.test = list(0)) == NULL)
+		if ((n1->nif.test = list(0, 0)) == NULL)
 			synexpect(-1);
 		if (readtoken() != TTHEN)
 			synexpect(TTHEN);
-		n1->nif.ifpart = list(0);
+		n1->nif.ifpart = list(0, 0);
 		n2 = n1;
 		while (readtoken() == TELIF) {
 			n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif));
 			n2 = n2->nif.elsepart;
 			n2->type = NIF;
-			if ((n2->nif.test = list(0)) == NULL)
+			if ((n2->nif.test = list(0, 0)) == NULL)
 				synexpect(-1);
 			if (readtoken() != TTHEN)
 				synexpect(TTHEN);
-			n2->nif.ifpart = list(0);
+			n2->nif.ifpart = list(0, 0);
 		}
 		if (lasttoken == TELSE)
-			n2->nif.elsepart = list(0);
+			n2->nif.elsepart = list(0, 0);
 		else {
 			n2->nif.elsepart = NULL;
 			tokpushback++;
@@ -428,13 +429,13 @@ command(void)
 		int got;
 		n1 = (union node *)stalloc(sizeof (struct nbinary));
 		n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL;
-		if ((n1->nbinary.ch1 = list(0)) == NULL)
+		if ((n1->nbinary.ch1 = list(0, 0)) == NULL)
 			synexpect(-1);
 		if ((got=readtoken()) != TDO) {
 TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
 			synexpect(TDO);
 		}
-		n1->nbinary.ch2 = list(0);
+		n1->nbinary.ch2 = list(0, 0);
 		if (readtoken() != TDONE)
 			synexpect(TDONE);
 		checkkwd = 1;
@@ -486,7 +487,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 			t = TEND;
 		else
 			synexpect(-1);
-		n1->nfor.body = list(0);
+		n1->nfor.body = list(0, 0);
 		if (readtoken() != t)
 			synexpect(t);
 		checkkwd = 1;
@@ -526,7 +527,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 			ap->narg.next = NULL;
 			if (lasttoken != TRP)
 				noaliases = 0, synexpect(TRP);
-			cp->nclist.body = list(0);
+			cp->nclist.body = list(0, 0);
 
 			checkkwd = 2;
 			if ((t = readtoken()) != TESAC) {
@@ -544,14 +545,14 @@ TRACE(("expecting DO got %s %s\n", tokna
 	case TLP:
 		n1 = (union node *)stalloc(sizeof (struct nredir));
 		n1->type = NSUBSHELL;
-		n1->nredir.n = list(0);
+		n1->nredir.n = list(0, 0);
 		n1->nredir.redirect = NULL;
 		if (readtoken() != TRP)
 			synexpect(TRP);
 		checkkwd = 1;
 		break;
 	case TBEGIN:
-		n1 = list(0);
+		n1 = list(0, 0);
 		if (readtoken() != TEND)
 			synexpect(TEND);
 		checkkwd = 1;
@@ -573,7 +574,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 	case TRP:
 		tokpushback++;
 		n1 = simplecmd(rpp, redir);
-		goto checkneg;
+		return n1;
 	default:
 		synexpect(-1);
 	}
@@ -596,15 +597,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 		n1->nredir.redirect = redir;
 	}
 
-checkneg:
-	if (negate) {
-		n2 = (union node *)stalloc(sizeof (struct nnot));
-		n2->type = NNOT;
-		n2->nnot.com = n1;
-		return n2;
-	}
-	else
-		return n1;
+	return n1;
 }
 
 
@@ -614,6 +607,7 @@ simplecmd(union node **rpp, union node *
 	union node *args, **app;
 	union node **orig_rpp = rpp;
 	union node *n = NULL;
+	int special;
 
 	/* If we don't have any redirections already, then we must reset */
 	/* rpp to be the address of the local redir variable.  */
@@ -647,10 +641,21 @@ simplecmd(union node **rpp, union node *
 			if (readtoken() != TRP)
 				synexpect(TRP);
 			funclinno = plinno;
-#ifdef notdef
-			if (! goodname(n->narg.text))
+			/*
+			 * - Require plain text.
+			 * - Functions with '/' cannot be called.
+			 * - Reject name=().
+			 * - Reject ksh extended glob patterns.
+			 */
+			if (!noexpand(n->narg.text) || quoteflag ||
+			    strchr(n->narg.text, '/') ||
+			    strchr("!%*+-=?@}~",
+				n->narg.text[strlen(n->narg.text) - 1]))
 				synerror("Bad function name");
-#endif
+			rmescapes(n->narg.text);
+			if (find_builtin(n->narg.text, &special) >= 0 &&
+			    special)
+				synerror("Cannot override a special builtin with a function");
 			n->type = NDEFUN;
 			n->narg.next = command();
 			funclinno = 0;
@@ -1065,7 +1070,7 @@ done:
 		doprompt = 0;
 	}
 
-	n = list(0);
+	n = list(0, oldstyle);
 
 	if (oldstyle)
 		doprompt = saveprompt;
@@ -1160,7 +1165,7 @@ readtoken1(int firstc, char const *initi
 	loop: {	/* for each line, until end of word */
 		CHECKEND();	/* set c to PEOF if at end of here document */
 		for (;;) {	/* until end of line or end of word */
-			CHECKSTRSPACE(3, out);	/* permit 3 calls to USTPUTC */
+			CHECKSTRSPACE(4, out);	/* permit 4 calls to USTPUTC */
 
 			synentry = state[level].syntax[c];
 
@@ -1202,12 +1207,18 @@ readtoken1(int firstc, char const *initi
 						newvarnest == 0)) &&
 					    (c != '}' || state[level].category != TSTATE_VAR_OLD))
 						USTPUTC('\\', out);
+					if ((eofmark == NULL ||
+					    newvarnest > 0) &&
+					    state[level].syntax == BASESYNTAX)
+						USTPUTC(CTLQUOTEMARK, out);
 					if (SQSYNTAX[c] == CCTL)
 						USTPUTC(CTLESC, out);
-					else if (eofmark == NULL ||
-					    newvarnest > 0)
-						USTPUTC(CTLQUOTEMARK, out);
 					USTPUTC(c, out);
+					if ((eofmark == NULL ||
+					    newvarnest > 0) &&
+					    state[level].syntax == BASESYNTAX &&
+					    state[level].category == TSTATE_VAR_OLD)
+						USTPUTC(CTLQUOTEEND, out);
 					quotef++;
 				}
 				break;
@@ -1223,10 +1234,9 @@ readtoken1(int firstc, char const *initi
 				if (eofmark != NULL && newvarnest == 0)
 					USTPUTC(c, out);
 				else {
-					if (state[level].category == TSTATE_ARITH)
-						state[level].syntax = ARISYNTAX;
-					else
-						state[level].syntax = BASESYNTAX;
+					if (state[level].category == TSTATE_VAR_OLD)
+						USTPUTC(CTLQUOTEEND, out);
+					state[level].syntax = BASESYNTAX;
 					quotef++;
 				}
 				break;
@@ -1235,11 +1245,12 @@ readtoken1(int firstc, char const *initi
 				break;
 			case CENDVAR:	/* '}' */
 				if (level > 0 &&
-				    (state[level].category == TSTATE_VAR_OLD ||
-				    state[level].category == TSTATE_VAR_NEW)) {
-					if (state[level].category == TSTATE_VAR_OLD)
-						state[level - 1].syntax = state[level].syntax;
-					else
+				    ((state[level].category == TSTATE_VAR_OLD &&
+				      state[level].syntax ==
+				      state[level - 1].syntax) ||
+				    (state[level].category == TSTATE_VAR_NEW &&
+				     state[level].syntax == BASESYNTAX))) {
+					if (state[level].category == TSTATE_VAR_NEW)
 						newvarnest--;
 					level--;
 					USTPUTC(CTLENDVAR, out);
@@ -1281,6 +1292,8 @@ readtoken1(int firstc, char const *initi
 				break;
 			case CEOF:
 				goto endword;		/* exit outer loop */
+			case CIGN:
+				break;
 			default:
 				if (level == 0)
 					goto endword;	/* exit outer loop */
@@ -1725,7 +1738,7 @@ getprompt(void *unused __unused)
 	char *fmt;
 	const char *pwd;
 	int i, trim;
-	static char internal_error[] = "<internal prompt error>";
+	static char internal_error[] = "??";
 
 	/*
 	 * Select prompt format.

Modified: user/ed/compiler-rt/bin/sh/parser.h
==============================================================================
--- user/ed/compiler-rt/bin/sh/parser.h	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/parser.h	Sat Oct 30 13:25:41 2010	(r214555)
@@ -43,6 +43,7 @@
 #define	CTLARI	'\206'
 #define	CTLENDARI '\207'
 #define	CTLQUOTEMARK '\210'
+#define	CTLQUOTEEND '\211' /* only for ${v+-...} */
 
 /* variable substitution byte (follows CTLVAR) */
 #define VSTYPE		0x0f	/* type of variable substitution */

Modified: user/ed/compiler-rt/bin/sh/redir.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/redir.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/redir.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -217,8 +217,11 @@ movefd:
 		if (redir->ndup.dupfd >= 0) {	/* if not ">&-" */
 			if (memory[redir->ndup.dupfd])
 				memory[fd] = 1;
-			else
-				dup2(redir->ndup.dupfd, fd);
+			else {
+				if (dup2(redir->ndup.dupfd, fd) < 0)
+					error("%d: %s", redir->ndup.dupfd,
+							strerror(errno));
+			}
 		} else {
 			close(fd);
 		}

Modified: user/ed/compiler-rt/bin/sh/var.c
==============================================================================
--- user/ed/compiler-rt/bin/sh/var.c	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/bin/sh/var.c	Sat Oct 30 13:25:41 2010	(r214555)
@@ -826,7 +826,7 @@ setvarcmd(int argc, char **argv)
 	else if (argc == 3)
 		setvar(argv[1], argv[2], 0);
 	else
-		error("List assignment not implemented");
+		error("too many arguments");
 	return 0;
 }
 

Modified: user/ed/compiler-rt/cddl/lib/drti/Makefile
==============================================================================
--- user/ed/compiler-rt/cddl/lib/drti/Makefile	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/cddl/lib/drti/Makefile	Sat Oct 30 13:25:41 2010	(r214555)
@@ -16,6 +16,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
-		-DPIC -fpic
+		-DPIC ${PICFLAG}
 
 .include <bsd.prog.mk>

Modified: user/ed/compiler-rt/contrib/bsnmp/snmpd/bsnmpd.1
==============================================================================
--- user/ed/compiler-rt/contrib/bsnmp/snmpd/bsnmpd.1	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/bsnmp/snmpd/bsnmpd.1	Sat Oct 30 13:25:41 2010	(r214555)
@@ -31,7 +31,7 @@
 .\"
 .\" $Begemot: bsnmp/snmpd/bsnmpd.1,v 1.12 2006/02/27 09:50:03 brandt_h Exp $
 .\"
-.Dd August 16, 2010
+.Dd October 23, 2010
 .Dt BSNMPD 1
 .Os
 .Sh NAME
@@ -68,11 +68,9 @@ Use
 .Ar file
 as configuration file instead of the standard one.
 .It Fl D Ar options
-Debugging options are specified with a
-.Fl o
-flag followed by a comma separated string of options.
+Debugging options are specified as a comma separated string.
 The following options are available.
-.Bl -tag -width ".It Cm trace Ns Cm = Ns Cm level"
+.Bl -tag -width "trace=level"
 .It Cm dump
 Dump all sent and received PDUs to the terminal.
 .It Cm events

Modified: user/ed/compiler-rt/contrib/ipfilter/tools/ipf_y.y
==============================================================================
--- user/ed/compiler-rt/contrib/ipfilter/tools/ipf_y.y	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/ipfilter/tools/ipf_y.y	Sat Oct 30 13:25:41 2010	(r214555)
@@ -10,8 +10,6 @@
 #include <sys/ioctl.h>
 #include <syslog.h>
 #ifdef IPFILTER_BPF
-# include "pcap-bpf.h"
-# define _NET_BPF_H_
 # include <pcap.h>
 #endif
 #include "netinet/ip_pool.h"

Modified: user/ed/compiler-rt/contrib/libpcap/CHANGES
==============================================================================
--- user/ed/compiler-rt/contrib/libpcap/CHANGES	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/libpcap/CHANGES	Sat Oct 30 13:25:41 2010	(r214555)
@@ -1,4 +1,77 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.67.2.4 2008-10-28 00:27:42 ken Exp $ (LBL)
+Thu.    April 1, 2010.  guy at alum.mit.edu.
+Summary for 1.1.1 libpcap release
+	Update CHANGES to reflect more of the changes in 1.1.0.
+	Fix build on RHEL5.
+	Fix shared library build on AIX.
+
+Thu.	March 11, 2010.  ken at netfunctional.ca/guy at alum.mit.edu.
+Summary for 1.1.0 libpcap release
+	Add SocketCAN capture support
+	Add Myricom SNF API support
+	Update Endace DAG and ERF support
+	Add support for shared libraries on Solaris, HP-UX, and AIX
+	Build, install, and un-install shared libraries by default;
+	  don't build/install shared libraries on platforms we don't support
+	Fix building from a directory other than the source directory
+	Fix compiler warnings and builds on some platforms
+	Update config.guess and config.sub
+	Support monitor mode on mac80211 devices on Linux
+	Fix USB memory-mapped capturing on Linux; it requires a new DLT_
+	  value
+	On Linux, scan /sys/class/net for devices if we have it; scan
+	  it, or /proc/net/dev if we don't have /sys/class/net, even if
+	  we have getifaddrs(), as it'll find interfaces with no
+	  addresses
+	Add limited support for reading pcap-ng files
+	Fix BPF driver-loading error handling on AIX
+	Support getting the full-length interface description on FreeBSD
+	In the lexical analyzer, free up any addrinfo structure we got back
+	  from getaddrinfo().
+	Add support for BPF and libdlpi in OpenSolaris (and SXCE)
+	Hyphenate "link-layer" everywhere
+	Add /sys/kernel/debug/usb/usbmon to the list of usbmon locations
+	In pcap_read_linux_mmap(), if there are no frames available, call
+	  poll() even if we're in non-blocking mode, so we pick up
+	  errors, and check for the errors in question.
+	Note that poll() works on BPF devices is Snow Leopard
+	If an ENXIO or ENETDOWN is received, it may mean the device has
+	  gone away.  Deal with it.
+	For BPF, raise the default capture buffer size to from 32k to 512k
+	Support ps_ifdrop on Linux
+	Added a bunch of #ifdef directives to make wpcap.dll (WinPcap) compile
+	 under cygwin.
+	Changes to Linux mmapped captures.
+	Fix bug where create_ring would fail for particular snaplen and
+	  buffer size combinations
+	Update pcap-config so that it handles libpcap requiring
+	  additional libraries
+	Add workaround for threadsafeness on Windows
+	Add missing mapping for DLT_ENC <-> LINKTYPE_ENC
+	DLT: Add DLT_CAN_SOCKETCAN
+	DLT: Add Solaris ipnet
+	Don't check for DLT_IPNET if it's not defined
+	Add link-layer types for Fibre Channel FC-2
+	Add link-layer types for Wireless HART
+	Add link-layer types for AOS
+	Add link-layer types for DECT
+	Autoconf fixes (AIX, HP-UX, OSF/1, Tru64 cleanups)
+	Install headers unconditionally, and include vlan.h/bluetooth.h if
+	  enabled
+	Autoconf fixes+cleanup
+	Support enabling/disabling bluetooth (--{en,dis}able-bluetooth)
+	Support disabling SITA support (--without-sita)
+	Return -1 on failure to create packet ring (if supported but
+	  creation failed)
+	Fix handling of 'any' device, so that it can be opened, and no longer
+	  attempt to open it in Monitor mode
+	Add support for snapshot length for USB Memory-Mapped Interface
+	Fix configure and build on recent Linux kernels
+	Fix memory-mapped Linux capture to support pcap_next() and
+	  pcap_next_ex()
+	Fixes for Linux USB capture
+	DLT: Add DLT_LINUX_EVDEV
+	DLT: Add DLT_GSMTAP_UM
+	DLT: Add DLT_GSMTAP_ABIS
 
 Mon.    October 27, 2008.  ken at netfunctional.ca.  Summary for 1.0.0 libpcap release
 	Compile with IPv6 support by default
@@ -12,7 +85,10 @@ Mon.    October 27, 2008.  ken at netfuncti
 	Variable length 802.11 header support
 	X2E data type support 
 	SITA ACN Interface support - see README.sita
+	Support for memory-mapped capture on Linux
 	Support for zerocopy BPF on platforms that support it
+	Support for setting buffer size when opening devices
+	Support for setting monitor mode when opening 802.11 devices
 	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
@@ -22,7 +98,7 @@ Mon.    October 27, 2008.  ken at netfuncti
 	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 Mac OS X, add scripts for changing permissions on /dev/bpf* and launchd plist
 	On Solaris, support 'passive mode' on systems that support it
 	Fixes to autoconf and general build environment
 	Man page reorganization + cleanup

Modified: user/ed/compiler-rt/contrib/libpcap/CREDITS
==============================================================================
--- user/ed/compiler-rt/contrib/libpcap/CREDITS	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/libpcap/CREDITS	Sat Oct 30 13:25:41 2010	(r214555)
@@ -10,9 +10,10 @@ The current maintainers:
 Additional people who have contributed patches:
 
 	Alan Bawden			<Alan at LCS dot MIT dot EDU>
+	Albert Chin			<china at thewrittenword dot com>
 	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>
+	Alon Bar-Lev			<alonbl at sourceforge dot net>
 	Andrew Brown			<atatat at atatdot dot net>
 	Antti Kantee			<pooka at netbsd dot org>
 	Arien Vijn			<arienvijn at sourceforge dot net>
@@ -23,24 +24,28 @@ Additional people who have contributed p
 	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 Maynard			<Chris dot Maynard at gtech dot com>
 	Chris Pepper			<pepper at mail dot reppep dot com>
+	Christian Bell			<csbell at myri 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>
+	Darren Reed			<darrenr at sun dot com>
 	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>
+	Dustin Spicuzza			<dustin at virtualroadside dot com>
 	Eric Anderson			<anderse at hpl dot hp dot com>
 	Erik de Castro Lopo		<erik dot de dot castro dot lopo at sensorynetworks dot com>
+	Felix Obenhuber			<felix at obenhuber dot de>
 	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>
+	Fumiyuki Shimizu		<fumifumi at abacustech dot jp>
 	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>
@@ -53,11 +58,13 @@ Additional people who have contributed p
 	Jason R. Thorpe			<thorpej at netbsd dot org>
 	Javier Achirica			<achirica at ttd dot net>
 	Jean Tourrilhes			<jt at hpl dot hp dot com>
+	Jean-Louis Charton		<Jean-Louis.CHARTON at oikialog 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>
+	Jon Smirl			<jonsmirl at gmail dot com>
 	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>
@@ -67,19 +74,22 @@ Additional people who have contributed p
 	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>
+	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>
+	Markus Mayer			<markus_mayer at sourceforge dot net>
 	Martin Husemann			<martin at netbsd dot org>
+	Márton Németh			<nm127 at freemail dot hu>
 	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>
+	N. Leiten			<nleiten at sourceforge dot net>
 	Nicolas Dade			<ndade at nsd dot dyndns dot org>
 	Octavian Cerna			<tavy at ylabs dot com>
 	Olaf Kirch			<okir at caldera dot de>
@@ -93,15 +103,20 @@ Additional people who have contributed p
 	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>
+	Peter Volkov			<pva at gentoo dot org>
 	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>
+	Robert Edmonds			<stu-42 at sourceforge dot net>
+	Roberto Mariani			<jelot-tcpdump at jelot dot it>
+	Romain Francoise		<rfrancoise at debian dot org>
 	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>
+	Sebastien Roy			<Sebastien dot Roy at Sun dot COM>
 	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>
@@ -109,12 +124,16 @@ Additional people who have contributed p
 	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>
+	Tobias Poschwatta		<posch at sourceforge dot net>
 	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>
+	Wesley Shields			<wxs at FreeBSD dot org>
 	Xianjie Zhang			<xzhang at cup dot hp dot com>
+	Xin Li				<delphij at FreeBSD dot org>
 	Yen Yen Lim
+	Yvan Vanhullebus		<vanhu at sourceforge dot net>
 	Yoann Vandoorselaere		<yoann at prelude-ids dot org>
 
 The original LBL crew:

Modified: user/ed/compiler-rt/contrib/libpcap/INSTALL.txt
==============================================================================
--- user/ed/compiler-rt/contrib/libpcap/INSTALL.txt	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/libpcap/INSTALL.txt	Sat Oct 30 13:25:41 2010	(r214555)
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.21.2.8 2008-06-12 20:25:38 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.29 2008-06-12 20:21:51 guy Exp $ (LBL)
 
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an

Modified: user/ed/compiler-rt/contrib/libpcap/Makefile.in
==============================================================================
--- user/ed/compiler-rt/contrib/libpcap/Makefile.in	Sat Oct 30 12:39:51 2010	(r214554)
+++ user/ed/compiler-rt/contrib/libpcap/Makefile.in	Sat Oct 30 13:25:41 2010	(r214555)
@@ -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.108.2.28 2008-10-23 22:13:21 guy Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.142 2008-11-22 17:30:24 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -44,14 +44,17 @@ VPATH = @srcdir@
 # You shouldn't need to edit anything below.
 #
 
+LD = /usr/bin/ld
 CC = @CC@
 CCOPT = @V_CCOPT@
 INCLS = -I. @V_INCLS@
 DEFS = @DEFS@ @V_DEFS@
-LIBS = @V_LIBS@
-DAGLIBS = @DAGLIBS@
-DEPLIBS = @DEPLIBS@
+ADDLOBJS = @ADDLOBJS@
+ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
+LIBS = @LIBS@
+LDFLAGS = @LDFLAGS@
 DYEXT = @DYEXT@
+V_RPATH_OPT = @V_RPATH_OPT@
 PROG=libpcap
 
 # Standard CFLAGS
@@ -77,12 +80,13 @@ YACC = @V_YACC@
 	@rm -f $@
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 
-PSRC =	pcap- at V_PCAP@.c @USB_SRC@ @BT_SRC@
+PSRC =	pcap- at V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@
 FSRC =  fad- at V_FINDALLDEVS@.c
 SSRC =  @SSRC@
-CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c \
-	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c
-GENSRC = scanner.c grammar.c version.c
+CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
+	savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
+	bpf_image.c bpf_dump.c
+GENSRC = scanner.c grammar.c bpf_filter.c version.c
 LIBOBJS = @LIBOBJS@
 
 SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
@@ -90,8 +94,20 @@ 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 = \
-	acconfig.h \
+PUBHDR = \
+	pcap.h \
+	pcap-bpf.h \
+	pcap-namedb.h \

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

More information about the svn-src-user mailing list