PERFORCE change 105901 for review

Robert Watson rwatson at FreeBSD.org
Sat Sep 9 10:17:11 PDT 2006 

http://perforce.freebsd.org/chv.cgi?CH=105901

Change 105901 by rwatson at rwatson_zoo on 2006/09/09 17:16:10

	Integrate TrustedBSD base branch from FreeBSD CVS HEAD:
	
	- bind9 update.
	- libpcap, tcpdump updates.
	- bthidd
	- libthr umutex
	- TSO
	- DDB show vnode
	- More bug fixes, driver tweaks, etc, etc, etc.
	
	TrustedBSD-related:
	
	- Audit of sysarch operation on i386.
	- suser tweaks for kern_ktr.c.
	- audit style cleanups
	- AUE_GETCWD in audit_bsm.c

Affected files ...

.. //depot/projects/trustedbsd/base/Makefile#46 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#78 integrate
.. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#13 integrate
.. //depot/projects/trustedbsd/base/UPDATING#71 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#4 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/version#4 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/FREEBSD-upgrade#3 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#3 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#8 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/configure#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.html#1 branch
.. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.txt#1 branch
.. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.xml#1 branch
.. //depot/projects/trustedbsd/base/contrib/libpcap/ethertype.h#4 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.h#3 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-stdinc.h#3 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#9 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#9 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/dccp.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/ethertype.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/icmp6.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/ppp.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ap1394.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ascii.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cip.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dccp.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-juniper.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-slow.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-symantec.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#9 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/.cvsignore#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/alltests.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon2.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp-secrets.txt#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp0.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp0.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp3.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp3.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp4.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp4.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.gdbinit#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp1.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp1.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp2.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp2.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp3.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp3.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4500.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-A.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-AA.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-X.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-XX.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capX.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capXX.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-flags.puu#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-flags.sh#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-x.out#1 branch
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-xx.out#1 branch
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#59 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#37 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#42 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/bthidd#1 branch
.. //depot/projects/trustedbsd/base/include/Makefile#54 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#21 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#12 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#14 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#17 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/gen/Makefile.inc#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/gen/alloca.S#5 delete
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/alloca.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#32 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_atfork.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrier.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_event.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#22 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#21 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#24 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sem.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setprio.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spinlock.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#5 integrate
.. //depot/projects/trustedbsd/base/lib/libutil/pw_util.c#10 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#33 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#78 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#110 integrate
.. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#4 integrate
.. //depot/projects/trustedbsd/base/release/scripts/package-split.py#7 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/nop/geom_nop.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/nop/gnop.8#7 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#41 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#31 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.8#24 integrate
.. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#27 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/iic.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/le.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#42 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#21 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/security.7#18 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/printf.9#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/if_atereg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/pxeldr/pxeldr.S#6 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#24 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.amd64#32 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#37 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pciids.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/i915_dma.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drm.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/i915_irq.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_drm.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#57 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ic/nec765.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_usb.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iicbus/iic.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ehci_pci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/hid.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_udavreg.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralvar.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/kue_fw.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hs.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsvar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ubser.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ucomvar.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ufoma.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhcivar.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_ethersubr.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/geom/nop/g_nop.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/geom/nop/g_nop.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#63 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#80 integrate
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#81 integrate
.. //depot/projects/trustedbsd/base/sys/modules/agp/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_var.h#40 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#65 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#33 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#48 integrate
.. //depot/projects/trustedbsd/base/sys/sys/param.h#59 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.holiday#13 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cu.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truncate/truncate.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthid_config.h#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.h#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/client.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/hid.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/lexer.l#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/parser.y#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/server.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/session.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#17 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/lcp.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#24 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/tcpdump/tcpdump/Makefile#12 integrate

Differences ...

==== //depot/projects/trustedbsd/base/Makefile#46 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $
+# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -58,8 +58,8 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can
-# cross build world for other architectures using the buildworld target,
+# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can
+# cross build world for other machine types using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
 #
@@ -266,36 +266,32 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
-.for target in i386 i386:pc98 sparc64 ia64 amd64
-.for arch in ${target:C/:.*$//}
-.for mach in ${target:C/^.*://}
-KERNCONFS!=	cd ${.CURDIR}/sys/${mach}/conf && \
+.for target in amd64 i386 ia64 pc98 sparc64
+KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
 		find [A-Z]*[A-Z] -type f -maxdepth 0 \
 		! -name DEFAULTS ! -name LINT
 KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
-universe: universe_${mach}
-.ORDER: universe_prologue universe_${mach} universe_epilogue
-universe_${mach}:
-	@echo ">> ${mach} started on `LC_ALL=C date`"
+universe: universe_${target}
+.ORDER: universe_prologue universe_${target} universe_epilogue
+universe_${target}:
+	@echo ">> ${target} started on `LC_ALL=C date`"
 	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
-	    TARGET_ARCH=${arch} TARGET=${mach} \
+	    TARGET=${target} \
 	    __MAKE_CONF=/dev/null \
-	    > _.${mach}.buildworld 2>&1
-	@echo ">> ${mach} buildworld completed on `LC_ALL=C date`"
-.if exists(${.CURDIR}/sys/${mach}/conf/NOTES)
-	-cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \
-	    > ${.CURDIR}/_.${mach}.makeLINT 2>&1
+	    > _.${target}.buildworld 2>&1
+	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
+.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
+	-cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
+	    > ${.CURDIR}/_.${target}.makeLINT 2>&1
 .endif
 .for kernel in ${KERNCONFS}
 	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
-	    TARGET_ARCH=${arch} TARGET=${mach} \
+	    TARGET=${target} \
 	    KERNCONF=${kernel} \
 	    __MAKE_CONF=/dev/null \
-	    > _.${mach}.${kernel} 2>&1
+	    > _.${target}.${kernel} 2>&1
 .endfor
-	@echo ">> ${mach} completed on `LC_ALL=C date`"
-.endfor
-.endfor
+	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe: universe_epilogue
 universe_epilogue:

==== //depot/projects/trustedbsd/base/Makefile.inc1#78 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -11,7 +11,7 @@
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
-#	TARGET_ARCH="arch" to crossbuild world to a different arch
+#	TARGET="machine" to crossbuild world for a different machine type
 
 #
 # The intended user-driven targets are:
@@ -95,14 +95,36 @@
 OSRELDATE=	0
 .endif
 .endif
+
+# Guess machine architecture from machine type, and vice versa.
+.if !defined(TARGET_ARCH) && defined(TARGET)
+TARGET_ARCH=	${TARGET:S/pc98/i386/}
+.elif !defined(TARGET) && defined(TARGET_ARCH) && \
+    ${TARGET_ARCH} != ${MACHINE_ARCH}
+TARGET=		${TARGET_ARCH}
+.endif
+# Otherwise, default to current machine type and architecture.
+TARGET?=	${MACHINE}
 TARGET_ARCH?=	${MACHINE_ARCH}
-.if ${TARGET_ARCH} == ${MACHINE_ARCH}
-TARGET?=	${MACHINE}
+
+KNOWN_ARCHES?=	amd64 arm i386 i386/pc98 ia64 powerpc sparc64
+.if ${TARGET} == ${TARGET_ARCH}
+_t=		${TARGET}
+.else
+_t=		${TARGET_ARCH}/${TARGET}
+.endif
+.for _t in ${_t}
+.if empty(KNOWN_ARCHES:M${_t})
+.error Unknown target ${TARGET_ARCH}:${TARGET}.
+.endif
+.endfor
+
+.if ${TARGET} == ${MACHINE}
 TARGET_CPUTYPE?=${CPUTYPE}
 .else
-TARGET?=	${TARGET_ARCH}
 TARGET_CPUTYPE?=
 .endif
+
 .if !empty(TARGET_CPUTYPE)
 _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
@@ -185,11 +207,13 @@
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_FORTRAN -DWITHOUT_GDB
 
 # world stage
@@ -465,9 +489,19 @@
 WMAKE_TGTS+=	build32
 .endif
 
-buildworld: ${WMAKE_TGTS}
-.ORDER: ${WMAKE_TGTS}
+buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
+.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
+
+buildworld_prologue:
+	@echo "--------------------------------------------------------------"
+	@echo ">>> World build started on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
 
+buildworld_epilogue:
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> World build completed on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
 
 #
 # We need to have this as a target because the indirection between Makefile

==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.50 2006/09/05 01:17:51 matusita Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -97,6 +97,10 @@
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
+# 20050930: pccardd(8) removed
+OLD_FILES+=usr/sbin/pccardd
+OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
+OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented

==== //depot/projects/trustedbsd/base/UPDATING#71 (text+ko) ====

@@ -21,6 +21,9 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20060903:
+	libpcap updated to v0.9.4 and tcpdump to v3.9.4
+
 20060816:
 	The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour
 	for IP_FIREWALL_FORWARD is now as it was before when it was first
@@ -610,4 +613,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $
+$FreeBSD: src/UPDATING,v 1.455 2006/09/04 21:49:31 sam Exp $

==== //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#4 (text+ko) ====

@@ -1,4 +1,11 @@
 
+	--- 9.3.2-P1 released ---
+
+2066.	[security]	Handle SIG queries gracefully. [RT #16300]
+
+1941.	[bug]		ncache_adderesult() should set eresult even if no
+			rdataset is passed to it. [RT #15642]
+
 	--- 9.3.2 released ---
 
 	--- 9.3.2rc1 released ---

==== //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#3 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */
 
 #include <config.h>
 
@@ -2393,7 +2393,7 @@
 		is_zone = ISC_FALSE;
 
 		qtype = event->qtype;
-		if (qtype == dns_rdatatype_rrsig)
+		if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig)
 			type = dns_rdatatype_any;
 		else
 			type = qtype;
@@ -2434,7 +2434,7 @@
 	/*
 	 * If it's a SIG query, we'll iterate the node.
 	 */
-	if (qtype == dns_rdatatype_rrsig)
+	if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig)
 		type = dns_rdatatype_any;
 	else
 		type = qtype;

==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#5 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */
 
 #include <config.h>
 
@@ -762,7 +762,8 @@
 		INSIST(result != ISC_R_SUCCESS ||
 		       dns_rdataset_isassociated(event->rdataset) ||
 		       fctx->type == dns_rdatatype_any ||
-		       fctx->type == dns_rdatatype_rrsig);
+		       fctx->type == dns_rdatatype_rrsig ||
+		       fctx->type == dns_rdatatype_sig);
 
 		isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event));
 	}
@@ -3188,7 +3189,8 @@
 	if (hevent != NULL) {
 		if (!negative && !chaining &&
 		    (fctx->type == dns_rdatatype_any ||
-		     fctx->type == dns_rdatatype_rrsig)) {
+		     fctx->type == dns_rdatatype_rrsig ||
+		     fctx->type == dns_rdatatype_sig)) {
 			/*
 			 * Don't bind rdatasets; the caller
 			 * will iterate the node.
@@ -3306,7 +3308,8 @@
 	if (!ISC_LIST_EMPTY(fctx->validators)) {
 		INSIST(!negative);
 		INSIST(fctx->type == dns_rdatatype_any ||
-		       fctx->type == dns_rdatatype_rrsig);
+		       fctx->type == dns_rdatatype_rrsig ||
+		       fctx->type == dns_rdatatype_sig);
 		/*
 		 * Don't send a response yet - we have
 		 * more rdatasets that still need to
@@ -3455,14 +3458,15 @@
 				return (result);
 			anodep = &event->node;
 			/*
-			 * If this is an ANY or SIG query, we're not going
-			 * to return any rdatasets, unless we encountered
+			 * If this is an ANY, SIG or RRSIG query, we're not
+			 * going to return any rdatasets, unless we encountered
 			 * a CNAME or DNAME as "the answer".  In this case,
 			 * we're going to return DNS_R_CNAME or DNS_R_DNAME
 			 * and we must set up the rdatasets.
 			 */
 			if ((fctx->type != dns_rdatatype_any &&
-			    fctx->type != dns_rdatatype_rrsig) ||
+			     fctx->type != dns_rdatatype_rrsig &&
+			     fctx->type != dns_rdatatype_sig) ||
 			    (name->attributes & DNS_NAMEATTR_CHAINING) != 0) {
 				ardataset = event->rdataset;
 				asigrdataset = event->sigrdataset;
@@ -3521,7 +3525,7 @@
 		 */
 		if (secure_domain && rdataset->trust != dns_trust_glue) {
 			/*
-			 * SIGs are validated as part of validating the
+			 * RRSIGs are validated as part of validating the
 			 * type they cover.
 			 */
 			if (rdataset->type == dns_rdatatype_rrsig)
@@ -3591,7 +3595,8 @@
 
 			if (ANSWER(rdataset) && need_validation) {
 				if (fctx->type != dns_rdatatype_any &&
-				    fctx->type != dns_rdatatype_rrsig) {
+				    fctx->type != dns_rdatatype_rrsig &&
+				    fctx->type != dns_rdatatype_sig) {
 					/*
 					 * This is The Answer.  We will
 					 * validate it, but first we cache
@@ -3763,23 +3768,28 @@
 		  isc_result_t *eresultp)
 {
 	isc_result_t result;
+	dns_rdataset_t rdataset;
+
+	if (ardataset == NULL) {
+		dns_rdataset_init(&rdataset);
+		ardataset = &rdataset;
+	}
 	result = dns_ncache_add(message, cache, node, covers, now,
 				maxttl, ardataset);
-	if (result == DNS_R_UNCHANGED) {
+	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
 		/*
-		 * The data in the cache are better than the negative cache
-		 * entry we're trying to add.
+		 * If the cache now contains a negative entry and we
+		 * care about whether it is DNS_R_NCACHENXDOMAIN or
+		 * DNS_R_NCACHENXRRSET then extract it.
 		 */
-		if (ardataset != NULL && ardataset->type == 0) {
+		if (ardataset->type == 0) {
 			/*
-			 * The cache data is also a negative cache
-			 * entry.
+			 * The cache data is a negative cache entry.
 			 */
 			if (NXDOMAIN(ardataset))
 				*eresultp = DNS_R_NCACHENXDOMAIN;
 			else
 				*eresultp = DNS_R_NCACHENXRRSET;
-			result = ISC_R_SUCCESS;
 		} else {
 			/*
 			 * Either we don't care about the nature of the
@@ -3791,14 +3801,11 @@
 			 * XXXRTH  There's a CNAME/DNAME problem here.
 			 */
 			*eresultp = ISC_R_SUCCESS;
-			result = ISC_R_SUCCESS;
 		}
-	} else if (result == ISC_R_SUCCESS) {
-		if (NXDOMAIN(ardataset))
-			*eresultp = DNS_R_NCACHENXDOMAIN;
-		else
-			*eresultp = DNS_R_NCACHENXRRSET;
+		result = ISC_R_SUCCESS;
 	}
+	if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset))
+		dns_rdataset_disassociate(ardataset);
 
 	return (result);
 }

==== //depot/projects/trustedbsd/base/contrib/bind9/version#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.21 2005/12/14 00:43:14 marka Exp $
+# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=3
 PATCHVER=2
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1

==== //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#7 (text+ko) ====

@@ -1,6 +1,17 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.1 2005/07/05 21:04:27 mcr Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL)
+
+Mon. 	September 5, 2005.  ken at xelerance.com. Summary for 0.9.4 libpcap release
+
+	Support for radiotap on Linux (Mike Kershaw)
+	Fixes for HP-UX
+	Support for additional Juniper link-layer types
+	Fixes for filters on MPLS-encapsulated packets
+	"vlan" filter fixed
+	"pppoed" and "pppoes" filters added; the latter modifies later
+	parts of the filter expression to look at the PPP headers and
+	headers in the PPP payload
 
-Tue. 	July 5, 2005.  ken at xelerance.com. Summary for 3.9.x tcpdump
+Tue. 	July 5, 2005.  ken at xelerance.com. Summary for 0.9.3 libpcap release
 
 	Fixes for compiling on nearly every platform,
 		including improved 64bit support
@@ -9,16 +20,12 @@
 	OpenBSD pf format support
 	IrDA capture (Linux only)
 
-Tue.   May 27, 2005. mcr at sandelman.ottawa.on.ca. Summary for 0.9.1 release
-
-	Numerous fixes for 
-
 Tue.   March 30, 2004. mcr at sandelman.ottawa.on.ca. Summary for 3.8.3 release
 
 	Fixed minor problem in gencode.c that would appear on 64-bit
 	platforms.
 	Version number is now sane.
-	
+
 Mon.   March 29, 2004. mcr at sandelman.ottawa.on.ca. Summary for 3.8.2 release
 
 	updates for autoconf 2.5
@@ -31,13 +38,13 @@
 	Win32 patches from NetGroup, Politecnico di Torino (Italy)
 	OpenBSD pf, DLT_PFLOG added
 	Many changes to ATM support.
-	lookup pcap_lookupnet()	
+	lookup pcap_lookupnet()
 	Added DLT_ARCNET_LINUX, DLT_ENC, DLT_IEEE802_11_RADIO, DLT_SUNATM,
 		DLT_IP_OVER_FC, DLT_FRELAY, others.
 	Sigh.  More AIX wonderfulness.
-	Document updates. 
+	Document updates.
 	Changes to API: pcap_next_ex(), pcap_breakloop(), pcap_dump_flush(),
-			pcap_list_datalinks(), pcap_set_datalink(), 
+			pcap_list_datalinks(), pcap_set_datalink(),
 			pcap_lib_version(), pcap_datalink_val_to_name(),
 			pcap_datalink_name_to_val(), new error returns.
 
@@ -58,7 +65,7 @@
 
 	Added pcap_findalldevs() call to get list of interfaces in a MI way.
 
-	pcap_stats() has been documented as to what its counters mean on 
+	pcap_stats() has been documented as to what its counters mean on
 	each platform.
 
 Tuesday January 9, 2001. guy at alum.mit.edu. Summary for 0.6 release
@@ -131,7 +138,7 @@
 - Added a new "pcap_compile_nopcap()", which lets you compile a filter
   expression into a BPF program without having an open live capture or
   capture file.
-  
+
 v0.4 Sat Jul 25 12:40:09 PDT 1998
 
 - Fix endian problem with DLT_NULL devices. From FreeBSD via Bill

==== //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#7 (text+ko) ====

@@ -63,6 +63,7 @@
 	Mark Pizzolato			<List-tcpdump-workers at subscriptions.pizzolato.net>
 	Martin Husemann			<martin at netbsd.org>
 	Matthew Luckie			<mjl at luckie.org.nz>
+	Mike Kershaw			<dragorn at kismetwireless.net>
 	Mike Wiacek			<mike at iroot.net>
 	Monroe Williams			<monroe at pobox.com>
 	Nicolas Dade			<ndade at nsd.dyndns.org>

==== //depot/projects/trustedbsd/base/contrib/libpcap/FREEBSD-upgrade#3 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.5 2002/02/08 19:45:58 obrien Exp $
+$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
@@ -9,28 +9,27 @@
 	   [Do not make ANY changes to the files.]
 
 	2. Use the command:
-		cvs import -m 'Virgin import of LBL libpcap v<version>' \
-			-I SUNOS4 -I linux-include \
-			src/contrib/libpcap LBL v<version>
+		cvs import -m 'Import of libpcap v<version>' \
+			-I SUNOS4 -I msdos -I Win32 -I missing \
+			-I ChmodBPF -I linux-include \
+			src/contrib/libpcap TCPDUMP_ORG v<version>
 
-	   For example, to do the import of version 0.2.1, I typed:
-		cvs import -m 'Virgin import of LBL libpcap v0.2.1' \
-			-I SUNOS4 -I linux-include \
-			src/contrib/libpcap LBL v0_2_1
+	   For example, to do the import of version 0.9.4, I typed:
+		cvs import -m 'Import of libpcap v0.9.4 \
+			-I SUNOS4 -I msdos -I Win32 -I missing \
+			-I ChmodBPF -I linux-include \
+			src/contrib/libpcap TCPDUMP_ORG v0_9_4
 
 	3. Follow the instructions printed out in step 2 to resolve any
 	   conflicts between local FreeBSD changes and the newer version.
+	4. Bump __FreeBSD_version in sys/param.h as appropriate
 
-	4. Update the shared library version number in
-	   src/lib/libpcap/Makefile as described in the
-	   handbook section 18.
-
 Do not, under any circumstances, deviate from this procedure.
 
 To make local changes to libpcap, simply patch and commit to the main
-branch (aka HEAD).  Never make local changes on the LBL branch.
+branch (aka HEAD).  Never make local changes on the TCPDUMP_ORG branch.
 
 All local changes should be submitted to "tcpdump-workers at tcpdump.org" for
 inclusion in the next vendor release of tcpdump and libpcap.
 
-pst at freebsd.org - 19 Aug 1996
+sam at freebsd.org - 4 September 2006

==== //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#3 (text+ko) ====

@@ -37,12 +37,57 @@
 
 ----------------------------------------------------------------------
 
+Libpcap when built for DAG cards against dag-2.5.1 or later releases:
+
+Timeouts are supported. pcap_dispatch() will return after to_ms milliseconds
+regardless of how many packets are received. If to_ms is zero pcap_dispatch()
+will block waiting for data indefinitely.
+
+pcap_dispatch() will block on and process a minimum of 64kB of data (before
+filtering) for efficiency. This can introduce high latencies on quiet
+interfaces unless a timeout value is set. The timeout expiring will override
+the 64kB minimum causing pcap_dispatch() to process any available data and
+return.
+
+pcap_setnonblock is supported. When nonblock is set, pcap_dispatch() will
+check once for available data, process any data available up to count, then
+return immediately.
+
+pcap_findalldevs() is supported, e.g. dag0, dag1...
+
+Some DAG cards can provide more than one 'stream' of received data.
+This can be data from different physical ports, or separated by filtering
+or load balancing mechanisms. Receive streams have even numbers, e.g.
+dag0:0, dag0:2 etc. Specifying transmit streams for capture is not supported.
+
+pcap_setfilter() is supported, BPF programs run in userspace.
+
+pcap_setdirection() is not supported. Only received traffic is captured.
+DAG cards normally do not have IP or link layer addresses assigned as
+they are used to passively monitor links.
+
+pcap_breakloop() is supported.
+
+pcap_datalink() and pcap_list_datalinks() are supported. The DAG card does
+not attempt to set the correct datalink type automatically where more than
+one type is possible.
+
+pcap_stats() is supported. ps_drop is the number of packets dropped due to
+RX stream buffer overflow, this count is before filters are applied (it will
+include packets that would have been dropped by the filter). The RX stream
+buffer size is user configurable outside libpcap, typically 16-512MB.
+
+pcap_get_selectable_fd() is not supported, DAG cards do not support
+poll/select methods.
+
+pcap_inject() and pcap_sendpacket() are not supported.
+
+----------------------------------------------------------------------
+
 Please submit bug reports via <support at endace.com>.
 
-Please also visit our Web pages at:
+Please also visit our Web site at:
 
         http://www.endace.com/
-        http://dag.cs.waikato.ac.nz/
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the trustedbsd-cvs mailing list