PERFORCE change 92726 for review

Robert Watson rwatson at FreeBSD.org
Sat Mar 4 07:42:33 PST 2006


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

Change 92726 by rwatson at rwatson_zoo on 2006/03/04 15:42:03

	Integrate TrustedBSD base branch from FreeBSD CVS:
	
	- bsnmp upgrade
	- resolver update
	- lots of proc lock fixes
	- more explicit interrupt routing on smp
	- freebsd32_sendfile fixes
	- alpha tsc
	- tdfx_linux module/option
	- ata locking fixes
	- kbdmux now default + fixes
	- fdescfs fixes
	- further calcru fixes
	- lots of sundry vfs locking fixes
	- loop back auditing of vfs system call paths
	- bridge monitor mode and bpf
	- softupdates queues made per-mount rather than global
	- netrate http/httpd learn about multi-process operation

Affected files ...

.. //depot/projects/trustedbsd/base/MAINTAINERS#35 integrate
.. //depot/projects/trustedbsd/base/Makefile#42 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#69 integrate
.. //depot/projects/trustedbsd/base/README#5 integrate
.. //depot/projects/trustedbsd/base/UPDATING#63 integrate
.. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#8 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#8 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#9 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/csup/GNUmakefile#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/Makefile#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/README#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/TODO#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/attrstack.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/attrstack.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/config.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/config.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/csup.1#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/detailer.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/detailer.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/diff.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/diff.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fattr.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fattr.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fattr_bsd.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fattr_posix.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fixups.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fixups.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/globtree.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/globtree.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/keyword.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/keyword.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/lister.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/lister.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/main.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/main.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/misc.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/misc.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/mux.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/mux.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/parse.y#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/proto.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/proto.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/queue.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/status.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/status.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/stream.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/stream.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/threads.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/threads.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/token.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/token.l#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/updater.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/csup/updater.h#1 branch
.. //depot/projects/trustedbsd/base/contrib/ipfilter/man/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/contrib/ipfilter/man/mkfilters.1#3 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#18 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#11 integrate
.. //depot/projects/trustedbsd/base/etc/periodic/daily/407.status-graid3#1 branch
.. //depot/projects/trustedbsd/base/etc/periodic/daily/408.status-gstripe#1 branch
.. //depot/projects/trustedbsd/base/etc/periodic/daily/409.status-gconcat#1 branch
.. //depot/projects/trustedbsd/base/etc/periodic/daily/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#12 integrate
.. //depot/projects/trustedbsd/base/etc/snmpd.config#4 integrate
.. //depot/projects/trustedbsd/base/include/printf.h#3 integrate
.. //depot/projects/trustedbsd/base/include/resolv.h#8 integrate
.. //depot/projects/trustedbsd/base/include/rpc/auth.h#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#22 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/inet_net.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_ntop.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_pton.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_comp.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_debug.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_des.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_none.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_unix.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_simple.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/getpublickey.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_com.h#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_generic.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_auth.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_generic.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_run.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_simple.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#12 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_quote.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#19 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/librt/Makefile#1 branch
.. //depot/projects/trustedbsd/base/lib/librt/aio.c#1 branch
.. //depot/projects/trustedbsd/base/lib/librt/mq.c#1 branch
.. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#1 branch
.. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.h#1 branch
.. //depot/projects/trustedbsd/base/lib/librt/timer.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#15 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#32 integrate
.. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#18 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#98 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#28 integrate
.. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#6 integrate
.. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#17 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#12 integrate
.. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#12 integrate
.. //depot/projects/trustedbsd/base/sbin/dump/dump.8#26 integrate
.. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#15 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#14 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#37 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#18 integrate
.. //depot/projects/trustedbsd/base/sbin/init/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/sbin/kldunload/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.8#5 integrate
.. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.c#6 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.8#21 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#20 integrate
.. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#41 integrate
.. //depot/projects/trustedbsd/base/share/examples/ipfilter/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#64 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#24 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/altq.4#9 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/tdfx.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#39 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#18 integrate
.. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#13 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/sleep.9#13 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/time.9#7 integrate
.. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#27 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/ko_KR.eucKR.src#3 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GBK.src#2 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.eucCN.src#3 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/zh_TW.Big5.src#4 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/intr_machdep.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/mptable.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/atpic.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_aau.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_dma.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#68 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#97 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#41 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#68 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.i386#33 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.pc98#34 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/de/dc21040reg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/de/if_devar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ic/z8530.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iir/iir.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/kbdmux/kbdmux.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_type.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_reg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mse/mse.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pcf/envctrl.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_ebus.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_isa.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppbus/lpt.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sr/if_sr.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_linux.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_ebus.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_sab82532.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#49 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_subr.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#64 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/cpufreq/est.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/io_apic.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/apicvar.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/intr_machdep.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/mptable.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/atpic.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/isa/syscons_isa.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#53 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_timeout.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#53 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#52 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#72 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#67 integrate
.. //depot/projects/trustedbsd/base/sys/modules/3dfx/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/3dfx_linux/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#73 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/modules/crypto/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/de/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/modules/if_ef/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/sys/modules/kbdmux/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/uart/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/net/ppp_deflate.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#30 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/mld6.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/pckbd.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/ppc.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/sio.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#33 integrate
.. //depot/projects/trustedbsd/base/sys/pci/dc21040reg.h#3 delete
.. //depot/projects/trustedbsd/base/sys/pci/if_de.c#24 delete
.. //depot/projects/trustedbsd/base/sys/pci/if_devar.h#11 delete
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_process.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/sys/_types.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/bio.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mount.h#36 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#73 integrate
.. //depot/projects/trustedbsd/base/sys/sys/queue.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/sys/serial.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#53 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#53 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#54 integrate
.. //depot/projects/trustedbsd/base/sys/sys/timers.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#61 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/softdep.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#46 integrate
.. //depot/projects/trustedbsd/base/tools/tools/README#23 integrate
.. //depot/projects/trustedbsd/base/tools/tools/ministat/ministat.c#6 integrate
.. //depot/projects/trustedbsd/base/tools/tools/ncpus/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpi.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpidump.h#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/ncpus/biosmptable.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/ncpus/ncpus.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/netrate/http/http.c#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/netrate/httpd/httpd.c#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/.cvsignore#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#13 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#22 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#9 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.pl#16 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/.cvsignore#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#11 integrate
.. //depot/projects/trustedbsd/base/usr.bin/Makefile#46 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#46 integrate
.. //depot/projects/trustedbsd/base/usr.bin/csup/Makefile#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/tar/tree.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#48 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.h#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/info.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_control.c#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/util.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pmccontrol/pmccontrol.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#26 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#21 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#21 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#31 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dmenu.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/http.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/index.c#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/installUpgrade.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/keymap.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#25 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/main.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/media.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#47 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/options.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/package.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#30 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/system.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/user.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/wizard.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslog.conf.5#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/base/MAINTAINERS#35 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $
+$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -26,6 +26,8 @@
 UFS EAs		rwatson	Pre-commit review requested.
 MAC Framework	rwatson	Pre-commit review requested.
 MAC Modules	rwatson	Pre-commit review requested.
+contrib/openbsm	rwatson	Pre-commit review requested.
+sys/security/audit	rwatson	Pre-commit review requested.
 ATA/IDE		sos	Pre-commit review requested.
 ahc(4)		gibbs	Pre-commit review requested.
 ahd(4)		gibbs	Pre-commit review requested.

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $
+# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $
 #
 # The user-driven targets are:
 #
@@ -93,11 +93,11 @@
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
 _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
-    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \
+    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
     -f /dev/null -V MAKEOBJDIRPREFIX dummy
 .if !empty(_MAKEOBJDIRPREFIX)
 .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
-	(in /etc/make.conf) or command-line variable.
+	(in make.conf(5)) or command-line variable.
 .endif
 MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
 BINMAKE= \

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -506,7 +506,7 @@
 # Check for missing UIDs/GIDs.
 #
 CHECK_UIDS=
-CHECK_GIDS=
+CHECK_GIDS=	audit
 .if !defined(NO_SENDMAIL)
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp

==== //depot/projects/trustedbsd/base/README#5 (text+ko) ====

@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $
+$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -59,6 +59,8 @@
 
 release		Release building Makefile & associated tools.
 
+rescue		Build system for statically linked /rescue utilities.
+
 sbin		System commands.
 
 secure		Cryptographic libraries and commands.

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

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20060303:
+	The TDFX_LINUX kernel option was retired and replaced by the
+	tdfx_linux device.  The latter can be loaded as a kernel module.
+	Loading it alone should suffice to get 3dfx support for Linux
+	apps because it will pull in tdfx.ko and linux.ko through its
+	dependencies.
+
 20060201:
 	The kernel ABI to file system modules was changed on i386.
 	Please make sure that your kernel and modules are in sync.
@@ -510,4 +517,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $
+$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $

==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $
 .\"
-.Dd May 14, 2005
+.Dd March 3, 2006
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -120,6 +120,39 @@
 clear the nodump flag (owner or super-user only)
 .El
 .Pp
+A few of the octal values include:
+.Bl -tag -offset indent -width ".Ar 10"
+.It Li 0
+Clear all file flags.
+.It Li 1
+Translates to the
+.Ar nodump
+keyword.
+.It Li 2
+Translates to the
+.Ar uchg
+keyword.
+.It Li 3
+Translates to the
+.Ar uchg , nodump
+keywords.
+.It Li 4
+Translates to the
+.Ar uappnd
+keyword.
+.It Li 10
+Translates to the
+.Ar opaque
+keyword.
+.It Li 20
+translates to the
+uunlnk
+keyword.
+.El
+.Pp
+Other combinations of keywords may be placed by using
+the octets assigned; however, these are the most notable.
+.Pp
 Unless the
 .Fl H ,
 .Fl L ,
@@ -140,6 +173,14 @@
 command's actions are determined by the last one specified.
 .Pp
 You can use "ls -lo" to see the flags of existing files.
+.Pp
+Note that the ability to change certain flags is dependent
+on the current kernel
+.Em securelevel
+setting.
+See
+.Xr security 7
+for more information on this setting.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
@@ -147,6 +188,7 @@
 .Xr chflags 2 ,
 .Xr stat 2 ,
 .Xr fts 3 ,
+.Xr security 7 ,
 .Xr symlink 7
 .Sh HISTORY
 The

==== //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 (text+ko) ====

@@ -1,3 +1,29 @@
+1.12
+	A couple of man page fixes from various submitters.
+
+	Make default communities NULL for security.
+
+	Fix a core dump when -d tracing suboption has no argument (thanks
+	to Shteryana Shopova).
+
+	Fix bug in parsing the include path in the daemon.
+
+	Fix an uninitialize structure field in gensnmptree (thanks to
+	jasone at freebsdorg)
+
+	64bit HC counters in the IF-MIB by polling the OS periodically.
+
+	Fix link traps to be more RFC conform (thanks to glebius at freebsd.org)
+
+	Add fallback definition for SA_SIZE() to support.h.
+
+	Move the porting definitions for U?INT32_{MIN,MAX} into support.h.
+
+	Include a sys/tree.h from FreeBSD-current and add autoconf
+	check for it.
+
+1.11a	Fix build of modules when stdint.h is included after asn1.h
+
 1.11	Make the Mib2 routing table use red-black tree. This vastly
 	reduces loading and access time. Load the table only every 10
 	minutes. In the meantime process message from the routing socket

==== //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 (text+ko) ====

@@ -1,6 +1,3 @@
-snmpd_mibII:
-	- handle HC counters by periodically polling the kernel counters.
-
 snmpd:
 	- rethink transports a little bit: make them loadable and make
 	a private subtree for transports:

==== //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 (text+ko) ====

@@ -1,1 +1,1 @@
-1.11
+1.12

==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $
+.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $
 .\"
-.Dd June 14, 2005
+.Dd February 27, 2006
 .Dt GENSNMPTREE 1
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 utility is used to either generate C language tables and header files from
 a MIB description or to numeric OIDs from MIB descriptions.
 The first form is used only for maintaining the
-.Xr snmpd 1
+.Xr bsnmpd 1
 daemon or for module writers.
 The second form may be used by SNMP client program writers.
 .Pp
@@ -57,7 +57,7 @@
 C-file
 .Ar prefix Ns tree.c
 containing a table used by
-.Xr snmpd 1
+.Xr bsnmpd 1
 during PDU processing
 and a header file
 .Ar prefix Ns tree.h
@@ -70,14 +70,19 @@
 .Nm
 expects MIB variable names (only the last component) on its command line.
 It reads a MIB specification from standard input and for each MIB variable
-name emits two C preprocessor defines on its standard output.
-One define
-.Va OID_ Ns Ar name
-can be used as an array initialized to initialize a
-.Va struct asn_oid .
-The other define
-.Va OIDLEN_ Ns Ar name
-contains the length of the OID.
+name emits three C preprocessor defines on its standard output:
+.Bl -tag -width ".Va OIDLEN_ Ns Ar Name"
+.It Va OIDX_ Ns Ar name
+This define can be used to initialize a
+.Va struct asn_oid
+in the following way:
+.Pp
+.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr;
+.It Va OIDLEN_ Ns Ar name
+is the length of the OID.
+.It Va OID_ Ns Ar name
+is the last component of the OID.
+.El
 .Pp
 The options are as follows:
 .Bl -tag -width ".Fl d Ar argument"
@@ -88,7 +93,7 @@
 .It Fl l
 Generate local preprocessor includes.
 This is used for bootstrapping
-.Xr snmpd 1 .
+.Xr bsnmpd 1 .
 .It Fl t
 Instead of normal output print the resulting tree.
 .It Fl p Ar prefix
@@ -187,6 +192,6 @@
 )
 .Ed
 .Sh SEE ALSO
-.Xr snmpd 1
+.Xr bsnmpd 1
 .Sh AUTHORS
 .An Hartmut Brandt Aq harti at freebsd.org

==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $
+ * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $
  *
  * Generate OID table from table description.
  *

==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $
+ * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $
  *
  * ASN.1 for SNMP.
  */
@@ -41,18 +41,10 @@
 #include <inttypes.h>
 #endif
 #include <assert.h>
+
+#include "support.h"
 #include "asn1.h"
 
-#if !defined(INT32_MIN)
-#define	INT32_MIN	(-0x7fffffff-1)
-#endif
-#if !defined(INT32_MAX)
-#define	INT32_MAX	(0x7fffffff)
-#endif
-#if !defined(UINT32_MAX)
-#define	UINT32_MAX	(0xffffffff)
-#endif
-
 static void asn_error_func(const struct asn_buf *, const char *, ...);
 
 void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func;

==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $
+ * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $
  *
  * ASN.1 for SNMP
  */

==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $
+ * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $
  *
  * Support functions for SNMP clients.
  */
@@ -64,14 +64,6 @@
 #include "snmpclient.h"
 #include "snmppriv.h"
 
-#if !defined(INT32_MAX)
-#define	INT32_MAX	(0x7fffffff)
-#endif
-#if !defined(UINT32_MAX)
-#define	UINT32_MAX	(0xffffffff)
-#endif
-
-
 /* global context */
 struct snmp_client snmp_client;
 

==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004
+ * Copyright (C) 2004-2005
  *	Hartmut Brandt.
  *	All rights reserved.
  *
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $
+ * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $
  *
  * Functions that are missing on certain systems. This header file is not
  * to be installed.
@@ -68,4 +68,29 @@
 
 #endif
 
+/*
+ * For systems with missing stdint.h or inttypes.h
+ */
+#if !defined(INT32_MIN)
+#define	INT32_MIN	(-0x7fffffff-1)
+#endif
+#if !defined(INT32_MAX)
+#define	INT32_MAX	(0x7fffffff)
+#endif
+#if !defined(UINT32_MAX)
+#define	UINT32_MAX	(0xffffffff)
+#endif
+
+/*
+ * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63
+ */
+#ifndef SA_SIZE
+
+#define SA_SIZE(sa)						\
+    (  (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ?	\
+	sizeof(long)		:				\
+	1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) )
+
+#endif
+
 #endif

==== //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 (text+ko) ====

@@ -1,4 +1,4 @@
-$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $
+$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $
 
 This file documents the OID assignments under BSNMP's private OID.
 
@@ -11,11 +11,12 @@
     1		BEGEMOT
       1		BEGEMOT-SNMPD
       2		BEGEMOT-NETGRAPH	snmpd netgraph module
-      3		BEGEMOT-IP		snmpd mibII module
+      3		BEGEMOT-IP		snmpd IP related stuff.
       100	BEGEMOT-ILMID		snmpd ILMID module
       101	BEGEMOT-ATM		snmpd ATM module
       200	BEGEMOT-PF		snmpd PF module (phillip at freebsd.org)
       201	BEGEMOT-NTP		snmpd NTP module
+      202	BEGEMOT-HOSTRES		snmpd HOSTRES module private stuff
       300	BEGEMOT-ACM		DLR ACM project
 
 If you need an OID and don't know where to stuck it in, I can assign you one -

==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $
  *
  * Implementation of the standard interfaces and ip MIB.
  */

==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $
  *
  * Implementation of the interfaces and IP groups of MIB-II.
  */

==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $
  *
  * Interfaces group.
  */

==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 (text+ko) ====

@@ -26,11 +26,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $
  *
  * Routing table

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


More information about the trustedbsd-cvs mailing list