PERFORCE change 159755 for review
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Tue Mar 24 09:48:37 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=159755
Change 159755 by nwhitehorn at nwhitehorn_comporellon on 2009/03/24 16:47:42
IFC
Affected files ...
.. //depot/projects/ppc-g5/bin/sh/alias.c#2 integrate
.. //depot/projects/ppc-g5/bin/sh/miscbltin.c#3 integrate
.. //depot/projects/ppc-g5/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/ppc-g5/contrib/bind9/lib/dns/validator.c#3 integrate
.. //depot/projects/ppc-g5/contrib/bind9/version#5 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/FILES#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/FREEBSD-Xlist#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/README#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/README.Win32#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.aix#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.dag#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.hpux#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.linux#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.macosx#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.septel#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/README.tru64#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/acsite.m4#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/atmuni31.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/bpf_dump.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/chmod_bpf#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/configure#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/dlpisubs.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/dlpisubs.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/doc/pcap.html#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/doc/pcap.txt#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/doc/pcap.xml#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/etherent.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/ethertype.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/fad-gifc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/fad-glifc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/fad-sita.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/filtertest.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/findalldevstest.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/ieee80211.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/missing/snprintf.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/mkdep#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/net/bpf_filter.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/packaging/pcap.spec.in#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-bpf.c#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-bt-linux.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-bt-linux.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-config.1#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-config.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-dag.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-dos.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-enet.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-filter.manmisc#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-filter.manmisc.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-int.h#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-libdlpi.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-linktype.manmisc#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-linktype.manmisc.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-namedb.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-nit.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-nit.h#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-null.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-pf.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-pf.h#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-savefile.manfile#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-savefile.manfile.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-septel.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-septel.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-sita.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-sita.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-sita.html#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-snit.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-snoop.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-stdinc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-usb-linux.c#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-usb-linux.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.3#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.c#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/bluetooth.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/bpf.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/namedb.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/pcap.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/sll.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/usb.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/vlan.h#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap1.h#2 delete
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_activate.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_breakloop.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_close.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_compile.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_compile.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_create.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_datalink.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_datalink.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_close.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_file.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_flush.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_open.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_file.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_fileno.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_findalldevs.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_freealldevs.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_freecode.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_geterr.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_inject.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_is_swapped.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_lib_version.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_lookupdev.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_lookupnet.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_loop.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_major_version.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_next_ex.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_offline_filter.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_open_dead.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_open_live.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_open_offline.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_datalink.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_promisc.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_set_timeout.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_setdirection.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_setfilter.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_setnonblock.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_snapshot.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_stats.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_statustostr.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/pcap_strerror.3pcap#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/runlex.sh#1 branch
.. //depot/projects/ppc-g5/contrib/libpcap/savefile.c#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/sll.h#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/FILES#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/FREEBSD-Xlist#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/INSTALL#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/INSTALL.txt#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/Makefile-devel-adds#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/PLATFORMS#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/README#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/Readme.Win32#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/TODO#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/addrtoname.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/af.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/af.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/aodv.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/appletalk.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/arcnet.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/atm.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/atmuni31.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/bgp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/bpf_dump.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/chdlc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/checksum.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/configure#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/decnet.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/enc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ether.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ethertype.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/extract.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/fddi.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/gmpls.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/gmpls.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/gmt2local.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/gmt2local.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/icmp6.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ieee802_11_radio.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/igrp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ip6.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ipfc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ipproto.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ipproto.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ipsec_doi.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ipx.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/isakmp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/l2tp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/l2vpn.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/l2vpn.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/lane.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/lbl/os-osf4.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/lbl/os-solaris2.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/lbl/os-sunos4.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/lbl/os-ultrix4.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/machdep.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/machdep.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/makemib#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/addrinfo.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/datalinks.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/dlnames.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/getaddrinfo.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/getnameinfo.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/inet_aton.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/inet_ntop.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/inet_pton.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/snprintf.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/strdup.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/strlcat.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/strlcpy.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/missing/strsep.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/mpls.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/netbios.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/nfs.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/nfsfh.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/nlpid.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/nlpid.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ntp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/oakley.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ospf6.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/oui.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/oui.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/pcap-missing.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/pcap_dump_ftell.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/pmap_prot.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/ppp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ah.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-aodv.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ap1394.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-arcnet.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-arp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ascii.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-atalk.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-beep.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-bgp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-bt.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-cdp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-cfm.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-cip.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-cnfp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-decnet.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-dtp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-dvmrp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-eap.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-egp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-eigrp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-enc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-esp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-frag6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-gre.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-hsrp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-icmp6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-igmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-igrp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ip6opts.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ipcomp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ipx.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-isakmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-krb.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lldp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lwapp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-lwres.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-mobile.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-mobility.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-mpcp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-mpls.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-msdp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-netbios.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ntp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ospf6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-pgm.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-pppoe.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-radius.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-raw.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-rip.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-ripng.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-rrcp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-rt6.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sflow.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sip.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sl.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-slow.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-snmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-stp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sunatm.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-sunrpc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-symantec.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-syslog.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-telnet.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-timed.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-udld.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-vjc.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-vqp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-vrrp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-vtp.c#1 branch
.. //depot/projects/ppc-g5/contrib/tcpdump/print-wb.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/print-zephyr.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/route6d.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/rpc_auth.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/rpc_msg.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/rx.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/sctpConstants.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/sctpHeader.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/setsignal.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/setsignal.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/slcompress.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/slip.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/sll.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/smb.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/strcasecmp.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/telnet.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/.cvsignore#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/alltests.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/bgp_vpn_attrset.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/bgp_vpn_attrset.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/eapon1.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/eapon1.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/eapon1.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/eapon1.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/eapon2.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp-secrets.txt#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp0.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp0.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp1.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp1.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp1.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp2.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp2.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp2.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp3.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp3.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp4.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp4.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp5.gdbinit#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp5.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/esp5.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/espudp1.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/espudp1.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/espudp1.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp-delete-segfault.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp-identification-segfault.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp-pointer-loop.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp1.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp1.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp2.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp2.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp3.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp3.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp4.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp4.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/isakmp4500.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/lmp.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/lmp.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/lmp.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/mpls-ldp-hello.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/mpls-ldp-hello.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/mpls-ldp-hello.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/ospf-gmpls.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/ospf-gmpls.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/ospf-gmpls.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-A.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-AA.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-X.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-XX.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-capX.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-capXX.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-flags.puu#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-flags.sh#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-x.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tests/print-xx.out#2 delete
.. //depot/projects/ppc-g5/contrib/tcpdump/tftp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/timed.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/token.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/ppc-g5/contrib/tcpdump/vfprintf.c#2 integrate
.. //depot/projects/ppc-g5/etc/mail/aliases#2 integrate
.. //depot/projects/ppc-g5/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_debug.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_open.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/nls/ru_RU.KOI8-R.msg#2 integrate
.. //depot/projects/ppc-g5/lib/libc/string/strdup.3#3 integrate
.. //depot/projects/ppc-g5/lib/libpcap/Makefile#3 integrate
.. //depot/projects/ppc-g5/lib/libpcap/config.h#2 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.1#2 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#6 integrate
.. //depot/projects/ppc-g5/release/picobsd/build/picobsd#4 integrate
.. //depot/projects/ppc-g5/sbin/recoverdisk/recoverdisk.c#4 integrate
.. //depot/projects/ppc-g5/share/man/man9/bus_dma.9#4 integrate
.. //depot/projects/ppc-g5/share/zoneinfo/africa#4 integrate
.. //depot/projects/ppc-g5/share/zoneinfo/asia#5 integrate
.. //depot/projects/ppc-g5/share/zoneinfo/southamerica#6 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/genwakecode.sh#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/vm_machdep.c#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/ppc-g5/sys/cddl/dev/dtnfsclient/dtnfsclient.c#1 branch
.. //depot/projects/ppc-g5/sys/conf/files.ppc64#1 add
.. //depot/projects/ppc-g5/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/age/if_age.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/ppc-g5/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/ppc-g5/sys/dev/iwn/if_iwn.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/storage/ustorage_fs.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/usb_dev.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/usb_device.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part.c#9 integrate
.. //depot/projects/ppc-g5/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/ppc-g5/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/ppc-g5/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/ppc-g5/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/ppc-g5/sys/kern/kern_time.c#4 integrate
.. //depot/projects/ppc-g5/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/ppc-g5/sys/kern/subr_param.c#6 integrate
.. //depot/projects/ppc-g5/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/ppc-g5/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/ppc-g5/sys/modules/Makefile#13 integrate
.. //depot/projects/ppc-g5/sys/modules/dtrace/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/dtrace/dtnfsclient/Makefile#1 branch
.. //depot/projects/ppc-g5/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate
.. //depot/projects/ppc-g5/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/netinet/igmp.c#7 integrate
.. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#13 integrate
.. //depot/projects/ppc-g5/sys/netipsec/key.c#7 integrate
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/ppc-g5/sys/sys/dtrace_bsd.h#2 integrate
.. //depot/projects/ppc-g5/sys/sys/param.h#13 integrate
.. //depot/projects/ppc-g5/tools/regression/bin/sh/builtins/alias.0#2 integrate
.. //depot/projects/ppc-g5/tools/regression/bin/sh/builtins/alias.0.stdout#2 integrate
.. //depot/projects/ppc-g5/tools/regression/bin/sh/builtins/read1.0#1 branch
.. //depot/projects/ppc-g5/tools/regression/bin/sh/builtins/read1.0.stdout#1 branch
.. //depot/projects/ppc-g5/tools/tools/sysbuild/sysbuild.sh#3 integrate
.. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.8#5 integrate
.. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.sh#6 integrate
.. //depot/projects/ppc-g5/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
Differences ...
==== //depot/projects/ppc-g5/bin/sh/alias.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.22 2008/06/07 16:28:20 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.24 2009/03/22 21:09:22 stefanf Exp $");
#include <stdlib.h>
#include "shell.h"
@@ -50,6 +50,7 @@
#define ATABSIZE 39
STATIC struct alias *atab[ATABSIZE];
+STATIC int aliases;
STATIC void setalias(char *, char *);
STATIC int unalias(const char *);
@@ -106,6 +107,7 @@
ap->flag = 0;
ap->next = *app;
*app = ap;
+ aliases++;
INTON;
}
@@ -135,6 +137,7 @@
ckfree(ap);
INTON;
}
+ aliases--;
return (0);
}
}
@@ -168,6 +171,7 @@
ckfree(tmp);
}
}
+ aliases = 0;
INTON;
}
@@ -187,9 +191,47 @@
return (NULL);
}
-/*
- * TODO - sort output
- */
+static int
+comparealiases(const void *p1, const void *p2)
+{
+ const struct alias *const *a1 = p1;
+ const struct alias *const *a2 = p2;
+
+ return strcmp((*a1)->name, (*a2)->name);
+}
+
+static void
+printalias(const struct alias *a)
+{
+ char *p;
+
+ out1fmt("%s=", a->name);
+ /* Don't print the space added above. */
+ p = a->val + strlen(a->val) - 1;
+ *p = '\0';
+ out1qstr(a->val);
+ *p = ' ';
+ out1c('\n');
+}
+
+static void
+printaliases(void)
+{
+ int i, j;
+ struct alias **sorted, *ap;
+
+ sorted = ckmalloc(aliases * sizeof(*sorted));
+ j = 0;
+ for (i = 0; i < ATABSIZE; i++)
+ for (ap = atab[i]; ap; ap = ap->next)
+ if (*ap->name != '\0')
+ sorted[j++] = ap;
+ qsort(sorted, aliases, sizeof(*sorted), comparealiases);
+ for (i = 0; i < aliases; i++)
+ printalias(sorted[i]);
+ ckfree(sorted);
+}
+
int
aliascmd(int argc, char **argv)
{
@@ -198,16 +240,7 @@
struct alias *ap;
if (argc == 1) {
- int i;
-
- for (i = 0; i < ATABSIZE; i++)
- for (ap = atab[i]; ap; ap = ap->next) {
- if (*ap->name != '\0') {
- out1fmt("alias %s=", ap->name);
- out1qstr(ap->val);
- out1c('\n');
- }
- }
+ printaliases();
return (0);
}
while ((n = *++argv) != NULL) {
@@ -215,11 +248,8 @@
if ((ap = lookupalias(n, 0)) == NULL) {
outfmt(out2, "alias: %s not found\n", n);
ret = 1;
- } else {
- out1fmt("alias %s=", n);
- out1qstr(ap->val);
- out1c('\n');
- }
+ } else
+ printalias(ap);
else {
*v++ = '\0';
setalias(n, v);
==== //depot/projects/ppc-g5/bin/sh/miscbltin.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.37 2009/03/08 19:09:55 ed Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.39 2009/03/22 22:57:53 stefanf Exp $");
/*
* Miscellaneous builtins.
@@ -73,6 +73,16 @@
* ordinary characters.
*
* This uses unbuffered input, which may be avoidable in some cases.
+ *
+ * Note that if IFS=' :' then read x y should work so that:
+ * 'a b' x='a', y='b'
+ * ' a b ' x='a', y='b'
+ * ':b' x='', y='b'
+ * ':' x='', y=''
+ * '::' x='', y=''
+ * ': :' x='', y=''
+ * ':::' x='', y='::'
+ * ':b c:' x='', y='b c:'
*/
int
@@ -88,6 +98,8 @@
int startword;
int status;
int i;
+ int is_ifs;
+ int saveall = 0;
struct timeval tv;
char *tvptr;
fd_set ifds;
@@ -135,7 +147,7 @@
if (*(ap = argptr) == NULL)
error("arg count");
if ((ifs = bltinlookup("IFS", 1)) == NULL)
- ifs = nullstr;
+ ifs = " \t\n";
if (tv.tv_sec >= 0) {
/*
@@ -167,7 +179,7 @@
}
status = 0;
- startword = 1;
+ startword = 2;
backslash = 0;
STARTSTACKSTR(p);
for (;;) {
@@ -189,22 +201,68 @@
}
if (c == '\n')
break;
- if (startword && *ifs == ' ' && strchr(ifs, c)) {
+ if (strchr(ifs, c))
+ is_ifs = strchr(" \t\n", c) ? 1 : 2;
+ else
+ is_ifs = 0;
+
+ if (startword != 0) {
+ if (is_ifs == 1) {
+ /* Ignore leading IFS whitespace */
+ if (saveall)
+ STPUTC(c, p);
+ continue;
+ }
+ if (is_ifs == 2 && startword == 1) {
+ /* Only one non-whitespace IFS per word */
+ startword = 2;
+ if (saveall)
+ STPUTC(c, p);
+ continue;
+ }
+ }
+
+ if (is_ifs == 0) {
+ /* append this character to the current variable */
+ startword = 0;
+ if (saveall)
+ /* Not just a spare terminator */
+ saveall++;
+ STPUTC(c, p);
continue;
}
- startword = 0;
- if (ap[1] != NULL && strchr(ifs, c) != NULL) {
- STACKSTRNUL(p);
- setvar(*ap, stackblock(), 0);
- ap++;
- startword = 1;
- STARTSTACKSTR(p);
- } else {
+
+ /* end of variable... */
+ startword = is_ifs;
+
+ if (ap[1] == NULL) {
+ /* Last variable needs all IFS chars */
+ saveall++;
STPUTC(c, p);
+ continue;
}
+
+ STACKSTRNUL(p);
+ setvar(*ap, stackblock(), 0);
+ ap++;
+ STARTSTACKSTR(p);
}
STACKSTRNUL(p);
+
+ /* Remove trailing IFS chars */
+ for (; stackblock() <= --p; *p = 0) {
+ if (!strchr(ifs, *p))
+ break;
+ if (strchr(" \t\n", *p))
+ /* Always remove whitespace */
+ continue;
+ if (saveall > 1)
+ /* Don't remove non-whitespace unless it was naked */
+ break;
+ }
setvar(*ap, stackblock(), 0);
+
+ /* Set any remaining args to "" */
while (*++ap != NULL)
setvar(*ap, nullstr, 0);
return status;
==== //depot/projects/ppc-g5/contrib/bind9/CHANGES#5 (text+ko) ====
@@ -1,3 +1,8 @@
+ --- 9.4.3-P2 released ---
+
+2579. [bug] DNSSEC lookaside validation failed to handle unknown
+ algorithms. [RT #19479]
+
--- 9.4.3-P1 released ---
2522. [security] Handle -1 from DSA_do_verify().
==== //depot/projects/ppc-g5/contrib/bind9/lib/dns/validator.c#3 (text+ko) ====
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: validator.c,v 1.119.18.41 2008/08/21 04:59:42 marka Exp $ */
+/* $Id: validator.c,v 1.119.18.41.2.1 2009/03/17 02:23:49 marka Exp $ */
/*! \file */
@@ -211,6 +211,37 @@
return (ISC_TRUE);
}
+/*
+ * Check that we have atleast one supported algorithm in the DLV RRset.
+ */
+static inline isc_boolean_t
+dlv_algorithm_supported(dns_validator_t *val) {
+ dns_rdata_t rdata = DNS_RDATA_INIT;
+ dns_rdata_dlv_t dlv;
+ isc_result_t result;
+
+ for (result = dns_rdataset_first(&val->dlv);
+ result == ISC_R_SUCCESS;
+ result = dns_rdataset_next(&val->dlv)) {
+ dns_rdata_reset(&rdata);
+ dns_rdataset_current(&val->dlv, &rdata);
+ result = dns_rdata_tostruct(&rdata, &dlv, NULL);
+ RUNTIME_CHECK(result == ISC_R_SUCCESS);
+
+ if (!dns_resolver_algorithm_supported(val->view->resolver,
+ val->event->name,
+ dlv.algorithm))
+ continue;
+
+ if (dlv.digest_type != DNS_DSDIGEST_SHA256 &&
+ dlv.digest_type != DNS_DSDIGEST_SHA1)
+ continue;
+
+ return (ISC_TRUE);
+ }
+ return (ISC_FALSE);
+}
+
/*%
* Look in the NSEC record returned from a DS query to see if there is
* a NS RRset at this name. If it is found we are at a delegation point.
@@ -2297,19 +2328,36 @@
sizeof(namebuf));
dns_rdataset_clone(&val->frdataset, &val->dlv);
val->havedlvsep = ISC_TRUE;
- validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
- dlv_validator_start(val);
+ if (dlv_algorithm_supported(val)) {
+ validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
+ namebuf);
+ dlv_validator_start(val);
+ } else {
+ validator_log(val, ISC_LOG_DEBUG(3),
+ "DLV %s found with no supported algorithms",
+ namebuf);
+ markanswer(val);
+ validator_done(val, ISC_R_SUCCESS);
+ }
} else if (eresult == DNS_R_NXRRSET ||
eresult == DNS_R_NXDOMAIN ||
eresult == DNS_R_NCACHENXRRSET ||
eresult == DNS_R_NCACHENXDOMAIN) {
- result = finddlvsep(val, ISC_TRUE);
+ result = finddlvsep(val, ISC_TRUE);
if (result == ISC_R_SUCCESS) {
- dns_name_format(dns_fixedname_name(&val->dlvsep),
- namebuf, sizeof(namebuf));
- validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
- namebuf);
- dlv_validator_start(val);
+ if (dlv_algorithm_supported(val)) {
+ dns_name_format(dns_fixedname_name(&val->dlvsep),
+ namebuf, sizeof(namebuf));
+ validator_log(val, ISC_LOG_DEBUG(3),
+ "DLV %s found", namebuf);
+ dlv_validator_start(val);
+ } else {
+ validator_log(val, ISC_LOG_DEBUG(3),
+ "DLV %s found with no supported "
+ "algorithms", namebuf);
+ markanswer(val);
+ validator_done(val, ISC_R_SUCCESS);
+ }
} else if (result == ISC_R_NOTFOUND) {
validator_log(val, ISC_LOG_DEBUG(3), "DLV not found");
markanswer(val);
@@ -2372,9 +2420,16 @@
}
dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf,
sizeof(namebuf));
- validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
- dlv_validator_start(val);
- return (DNS_R_WAIT);
+ if (dlv_algorithm_supported(val)) {
+ validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
+ dlv_validator_start(val);
+ return (DNS_R_WAIT);
+ }
+ validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found with no supported "
+ "algorithms", namebuf);
+ markanswer(val);
+ validator_done(val, ISC_R_SUCCESS);
+ return (ISC_R_SUCCESS);
}
/*%
==== //depot/projects/ppc-g5/contrib/bind9/version#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $
+# $Id: version,v 1.29.134.23.2.2 2009/03/17 02:23:49 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@
MINORVER=4
PATCHVER=3
RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2
==== //depot/projects/ppc-g5/contrib/libpcap/CHANGES#2 (text+ko) ====
@@ -1,28 +1,41 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.67.2.4 2008-10-28 00:27:42 ken Exp $ (LBL)
-Mon. September 10, 2007. ken at xelerance.com. Summary for 0.9.8 libpcap release
- Change build process to put public libpcap headers into pcap subir
- DLT: Add value for IPMI IPMB packets
- DLT: Add value for u10 Networks boards
- Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted
- libpcap files on an OS other than where the file was generated
+Mon. October 27, 2008. ken at netfunctional.ca. Summary for 1.0.0 libpcap release
+ Compile with IPv6 support by default
+ Compile with large file support on by default
+ Add pcap-config script, which deals with -I/-L flags for compiling
+ DLT: Add IPMB
+ DLT: Add LAPD
+ DLT: Add AX25 (AX.25 w/KISS header)
+ DLT: Add JUNIPER_ST
+ 802.15.4 support
+ Variable length 802.11 header support
+ X2E data type support
+ SITA ACN Interface support - see README.sita
+ Support for zerocopy BPF on platforms that support it
+ Better support for dealing with VLAN tagging/stripping on Linux
+ Fix dynamic library support on OSX
+ Return PCAP_ERROR_IFACE_NOT_UP if the interface isn't 'UP', so applications
+ can print better diagnostic information
+ Return PCAP_ERROR_PERM_DENIED if we don't have permission to open a device, so
+ applications can tell the user they need to go play with permissions
+ On Linux, ignore ENETDOWN so we can continue to capture packets if the
+ interface goes down and comes back up again.
+ On Linux, support new tpacket frame headers (2.6.27+)
+ On Mac OS X, add scripts for changing permissions on /dev/pbf* and launchd plist
+ On Solaris, support 'passive mode' on systems that support it
+ Fixes to autoconf and general build environment
+ Man page reorganization + cleanup
+ Autogenerate VERSION numbers better
-Wed. July 23, 2007. mcr at xelerance.com. Summary for 0.9.7 libpcap release
+Mon. September 10, 2007. ken at xelerance.com. Summary for 0.9.8 libpcap release
+ Change build process to put public libpcap headers into pcap subir
+ DLT: Add value for IPMI IPMB packets
+ DLT: Add value for u10 Networks boards
+ Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted
+ libpcap files on an OS other than where the file was generated
- FIXED version file to be 0.9.7 instead of 0.9.5.
- added flags/configuration for cloning bpf device.
- added DLT_MTP2_WITH_PHDR support (PPI)
- "fix" the "memory leak" in icode_to_fcode() -- documentation bug
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list