PERFORCE change 42601 for review

Robert Watson rwatson at FreeBSD.org
Mon Nov 17 00:39:43 GMT 2003


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

Change 42601 by rwatson at rwatson_tislabs on 2003/11/16 16:38:48

	Integ the TrustedBSD MAC tree from the TrustedBSD base branch:
	
	statfs() 64-bit changes.  Be absolutely-sure to upgrade the kernel
	before upgrading userspace.  Applications using statfs() will need
	to be rebuilt.
	
	WITH_DYNAMICROOT flag inverted to be NO_DYNAMICROOT.  FreeBSD now
	uses a dynamically linked / by default.  COMPAT_FREEBSD4 option
	considered particularly useful for older aplications.
	
	New device apic, interrupt code.  SMP now the default for GENERIC.
	
	Default mac.conf entries includes a "socket" entry.
	
	New interface to retrieve multicast membership per-interface.
	
	libnetgraph.
	
	snmp bits required for ATM.
	
	New locales
	
	Loopback of libc/posix1e changes to make sure mac_prepare_type()
	initializes the /etc/mac.conf cache.
	
	Loopback of mac_get_peer(), mac_get.3 and mac_set.3 documentation
	changes.
	
	Loopback of mac_text.3 fixes.
	
	Loopback of Giant pushdown in kern_mac.c for VFS labels.
	
	Lookback of socket support for mac_get_fd() and mac_set_fd().
	
	Loopback of sockopt MAC entry point name simplification.        
	
	M:N threading fixes.
	
	Release note updates.
	
	ACPI cpu driver.
	
	DRI/DRM fixes.
	
	More network locking enhancements/fixes/etc.
	
	Ethernet multicast hash function unification.
	
	fifofs bug fixes.
	
	NFSv4 client support.
	
	Linux emulation system call additions of various sorts.
	
	Turnstile bugfixes.
	
	System V semaphore bugfixes.
	
	802.11 AP scanning bugfixes.
	
	IP fast forwarding cleanup/rewrite.
	
	Many routing cleanups/updates.
	
	KAME updates galore.
	
	bde style fixes for mac_internal.h
	
	sendfile() fixes.
	
	Lots of driver updates, documentation updates.

Affected files ...

.. //depot/projects/trustedbsd/mac/Makefile.inc1#44 integrate
.. //depot/projects/trustedbsd/mac/UPDATING#34 integrate
.. //depot/projects/trustedbsd/mac/bin/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/mac/bin/cp/utils.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/df/df.c#17 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#13 integrate
.. //depot/projects/trustedbsd/mac/etc/mac.conf#12 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#28 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#6 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#8 integrate
.. //depot/projects/trustedbsd/mac/include/ifaddrs.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/Makefile#27 integrate
.. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/setjmp.S#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#16 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/big5.5#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.4#3 delete
.. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.5#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/gb18030.5#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/gb2312.5#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/gbk.5#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrune.3#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mskanji.5#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/utf2.4#4 delete
.. //depot/projects/trustedbsd/mac/lib/libc/locale/utf2.5#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/utf8.5#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/net/getifmaddrs.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/net/getifmaddrs.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/net/ip6opt.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#15 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#12 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#14 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#15 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/msync.2#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/statfs.2#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#18 integrate
.. //depot/projects/trustedbsd/mac/lib/libnetgraph/internal.h#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libnetgraph/msg.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libnetgraph/netgraph.3#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libnetgraph/sock.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_radius/pam_radius.8#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_radius/pam_radius.c#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#8 integrate
.. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#21 integrate
.. //depot/projects/trustedbsd/mac/libexec/pppoed/pppoed.c#7 integrate
.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#17 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile#52 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#43 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 integrate
.. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#18 integrate
.. //depot/projects/trustedbsd/mac/sbin/Makefile.inc#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/dump/Makefile#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/dump/dumprmt.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/dump/main.c#18 integrate
.. //depot/projects/trustedbsd/mac/sbin/dumpfs/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#13 integrate
.. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#15 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#18 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsdb/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdbutil.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/idmapd/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sbin/idmapd/idmapd.8#1 branch
.. //depot/projects/trustedbsd/mac/sbin/idmapd/idmapd.c#1 branch
.. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs4/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs4/mount_nfs4.8#1 branch
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs4/mount_nfs4.c#1 branch
.. //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#19 integrate
.. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.c#15 integrate
.. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.h#9 integrate
.. //depot/projects/trustedbsd/mac/sbin/umount/umount.c#9 integrate
.. //depot/projects/trustedbsd/mac/share/examples/cvsup/cvs-supfile#6 integrate
.. //depot/projects/trustedbsd/mac/share/examples/cvsup/ports-supfile#5 integrate
.. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse#7 integrate
.. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse.README#8 integrate
.. //depot/projects/trustedbsd/mac/share/examples/netgraph/ngctl#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#37 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#11 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/dc.4#8 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/gx.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/idt.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/netgraph.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_atm.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_bpf.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_etf.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_pppoe.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/pcm.4#7 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/rue.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/sk.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/uplcom.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#25 integrate
.. //depot/projects/trustedbsd/mac/share/man/man7/build.7#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#11 integrate
.. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#12 integrate
.. //depot/projects/trustedbsd/mac/share/man/man9/style.9#22 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#26 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/exception.S#6 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/vm_machdep.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/ia32/ia32_exception.S#2 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/isa/icu_vector.S#3 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/isa/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/boot2.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/i386/btx/btx/btx.s#3 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate
.. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#49 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#99 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#26 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#22 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options#60 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#19 integrate
.. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-api.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael.c#2 delete
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdInterrupt.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cpu.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_package.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pci_link.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#21 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aha/aha.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_isa.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aha/ahareg.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/an/if_anreg.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_bufs.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_ioctl.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_irq.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_os_freebsd.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_dma.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_cce.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_cp.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drm.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_state.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#21 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwe.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp_targ.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/idt/idt.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_ioctl.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/owi/if_owi.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/owi/if_wivar.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_axe.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/if_rue.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/umct.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#28 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#28 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#28 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/wl/if_wl.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vfsops.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_ccd.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#38 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mptable.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/clock.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/mptable.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/i386/include/smptests.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/atpic_vector.s#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/cy.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/icu.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_dummy.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_proto.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_syscall.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysent.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/linux/syscalls.master#6 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#39 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/md_var.h#8 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/pcpu.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#58 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#35 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#436 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_timeout.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#41 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#58 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#55 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#57 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#38 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#34 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#34 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#112 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/acpi/Makefile#11 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/if_gre/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/nfs4client/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/uplcom/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ef.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#37 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/net/pfkeyv2.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_vcm.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/atm/ng_atm.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/atm/ng_sscop.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/atm/ngatmbase.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_misc.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_prse.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_bluetooth.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_h4.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/include/ng_hci.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/netgraph.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_message.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_rmx.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_flow.c#7 delete
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_flow.h#3 delete
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#40 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#33 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#20 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#46 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/ah.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/esp_core.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netkey/key.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/nfs/nfsproto.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/nfs/rpcv2.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_dev.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_dev.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_idmap.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_idmap.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_socket.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_subs.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfs.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfs_subs.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vn.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vn_subs.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4m_subs.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/krpc_subr.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_diskless.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#24 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsargs.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsm_subs.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#9 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#36 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#33 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_dcreg.h#14 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_pcnreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_rlreg.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sfreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sisreg.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_skreg.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_stereg.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tireg.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tlreg.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_vrreg.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_wbreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_xlreg.h#11 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/vm_machdep.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/rpc/rpcclnt.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/rpc/rpcclnt.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/rpc/rpcm_subs.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/rpc/rpcv2.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_label.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#236 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#79 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#190 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#124 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#31 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#36 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/vm_machdep.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/buf.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#255 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#204 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#33 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mount.h#31 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/param.h#30 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#51 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/reboot.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/sched.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/mac/sys/sys/socket.h#16 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#36 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#58 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#57 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#17 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#59 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#22 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#42 integrate
.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/fs.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#32 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#27 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#26 integrate
.. //depot/projects/trustedbsd/mac/tools/tools/README#12 integrate
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/README#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/kttcp.c#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/sys/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/sys/kttcp.c#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/kttcp/sys/kttcpio.h#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/releng_4.rc#3 integrate
.. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/index.cgi#6 integrate
.. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/tb.css#3 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/mklocale/mklocale.1#8 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#12 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/IPXrouted.8#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/af.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/if.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/input.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/main.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/output.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/sap_tables.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/startup.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/tables.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/timer.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/IPXrouted/trace.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ancontrol/ancontrol.c#10 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#6 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/config/config.y#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/README#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/faithd.8#6 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/faithd.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/faithd.h#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/ftp.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/prefix.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/rsh.c#3 delete
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/tcp.c#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/faithd/test/faithd.rb#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/mtree/test/test04.sh#1 branch
.. //depot/projects/trustedbsd/mac/usr.sbin/ndp/ndp.8#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ndp/ndp.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ngctl/list.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ngctl/main.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ngctl/msg.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/netgraph.c#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/tty.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/route6d/misc/chkrt#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/route6d/route6d.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/route6d/route6d.h#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#22 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/traceroute6/traceroute6.8#3 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/traceroute6/traceroute6.c#6 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/Makefile.inc1#44 (text+ko) ====

@@ -1,7 +1,8 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.395 2003/11/10 09:00:08 harti Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.397 2003/11/16 21:17:43 gordon Exp $
 #
 # Make command line options:
+#	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
 #	-DNO_KERBEROS Do not build Heimdal (Kerberos 5)
 #	-DNO_RESCUE do not build rescue binaries
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -52,7 +53,7 @@
 # When upgrading to a dynamically linked root, install the runtime
 # linker early into its new location before make(1) has a chance
 # to run the dynamically linked /bin/sh.
-.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \
+.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \
     (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
     !defined(DISTDIR) && \
     (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \
@@ -818,8 +819,8 @@
 
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
 		lib/libkvm lib/libmd \
-		lib/libncurses lib/libopie lib/libpam lib/libradius \
-		lib/librpcsvc \
+		lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
+		lib/libradius lib/librpcsvc \
 		lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
 		lib/libz lib/msun
 

==== //depot/projects/trustedbsd/mac/UPDATING#34 (text+ko) ====

@@ -17,9 +17,42 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20031112:
+	The statfs structure has been updated with 64-bit fields to
+	allow accurate reporting of multi-terabyte filesystem
+	sizes. You should build and boot a new kernel BEFORE doing a
+	`make world' as the new kernel will know about binaries using
+	the old statfs structure, but an old kernel will not know
+	about the new system calls that support the new statfs
+	structure.
+	Note that the backwards compatibility is only present when the
+	kernel is configured with the COMPAT_FREEBSD4 option. Since
+	even /bin/sh will not run with a new kernel without said option
+	you're pretty much dead in the water without it. Make sure you
+	have COMPAT_FREEBSD4!
+	Running an old kernel after a `make world' will cause programs
+	such as `df' that do a statfs system call to fail with a bad
+	system call. Marco Wertejuk <wertejuk at mwcis.com> also reports
+	that cfsd (ports/security/cfs) needs to be recompiled after
+	these changes are installed.
+
+	****************************DANGER*******************************
+
+	DO NOT make installworld after the buildworld w/o building and
+	installing a new kernel FIRST.  You will be unable to build a
+	new kernel otherwise on a system with new binaries and an old
+	kernel.
+
+20031112:
+	Some netgraph string length constants have been changed. This
+	change requires the netgraph kernel modules and all netgraph
+	userland components to be in sync. Especially users who require
+	netgraph to boot need to make sure to have world and kernel in
+	sync before rebooting.
+
 20031103:
 	The i386 APIC_IO kernel option has been replaced by
-        'device apic'.  The ACPI module has also been temporarily
+	'device apic'.  The ACPI module has also been temporarily
 	disabled, so ACPI must be statically compiled into your
 	kernel using 'device acpi' if you wish to use the ACPI driver.
 
@@ -1398,4 +1431,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.276 2003/11/04 19:42:55 ceri Exp $
+$FreeBSD: src/UPDATING,v 1.281 2003/11/14 22:11:44 marcel Exp $

==== //depot/projects/trustedbsd/mac/bin/Makefile.inc#10 (text+ko) ====

@@ -1,9 +1,9 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.18 2003/11/02 06:47:38 ru Exp $
+# $FreeBSD: src/bin/Makefile.inc,v 1.19 2003/11/16 04:57:28 gordon Exp $
 
 BINDIR?=	/bin
 WARNS?=		6
 
-.if !defined(WITH_DYNAMICROOT)
+.if defined(NO_DYNAMICROOT)
 NOSHARED?=	YES
 .endif

==== //depot/projects/trustedbsd/mac/bin/cp/utils.c#11 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.41 2003/06/22 07:02:17 jmg Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.42 2003/11/13 05:26:55 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -133,7 +133,8 @@
 	 * wins some CPU back.
 	 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
-	if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576) {
+	if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
+	    fs->st_size <= 8 * 1048576) {
 		if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
 		    MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
 			warn("%s", entp->fts_path);

==== //depot/projects/trustedbsd/mac/bin/df/df.c#17 (text+ko) ====

@@ -48,7 +48,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.51 2003/09/13 20:46:58 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.53 2003/11/12 21:47:42 kris Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -120,9 +120,9 @@
 static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };
 
 static char	 *getmntpt(const char *);
-static size_t	  longwidth(long);
+static size_t	  int64width(int64_t);
 static char	 *makenetvfslist(void);
-static void	  prthuman(const struct statfs *, size_t);
+static void	  prthuman(const struct statfs *, int64_t);
 static void	  prthumanval(double);
 static void	  prtstat(struct statfs *, struct maxwidths *);
 static size_t	  regetmntinfo(struct statfs **, long, const char **);
@@ -371,7 +371,7 @@
 }
 
 static void
-prthuman(const struct statfs *sfsp, size_t used)
+prthuman(const struct statfs *sfsp, int64_t used)
 {
 
 	prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize);
@@ -408,10 +408,10 @@
 static void
 prtstat(struct statfs *sfsp, struct maxwidths *mwp)
 {
-	static long blocksize;
+	static u_long blocksize;
 	static int headerlen, timesthrough = 0;
 	static const char *header;
-	size_t used, availblks, inodes;
+	int64_t used, availblks, inodes;
 
 	if (++timesthrough == 1) {
 		mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem"));
@@ -445,21 +445,23 @@
 	if (hflag) {
 		prthuman(sfsp, used);
 	} else {
-		(void)printf(" %*ld %*ld %*ld",
-		    (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
-		    (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize),
-	            (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize,
-		    blocksize));
+		(void)printf(" %*jd %*jd %*jd",
+		  (u_int)mwp->total,
+		  (intmax_t)fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
+		  (u_int)mwp->used,
+		  (intmax_t)fsbtoblk(used, sfsp->f_bsize, blocksize),
+	          (u_int)mwp->avail,
+	          (intmax_t)fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize));
 	}
 	(void)printf(" %5.0f%%",
 	    availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0);
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*lu %*lu %4.0f%% ",
-		    (u_int)mwp->iused, (u_long)used,
-		    (u_int)mwp->ifree, sfsp->f_ffree,
-		    inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0);
+		(void)printf(" %*jd %*jd %4.0f%% ",
+		   (u_int)mwp->iused, (intmax_t)used,
+		   (u_int)mwp->ifree, (intmax_t)sfsp->f_ffree,
+		   inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");
 	(void)printf("  %s\n", sfsp->f_mntonname);
@@ -472,27 +474,27 @@
 static void
 update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp)
 {
-	static long blocksize = 0;
+	static u_long blocksize = 0;
 	int dummy;
 
 	if (blocksize == 0)
 		getbsize(&dummy, &blocksize);
 
 	mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname));
-	mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks,
+	mwp->total = max(mwp->total, int64width(
+	    fsbtoblk((int64_t)sfsp->f_blocks, sfsp->f_bsize, blocksize)));
+	mwp->used = max(mwp->used, int64width(fsbtoblk((int64_t)sfsp->f_blocks -
+	    (int64_t)sfsp->f_bfree, sfsp->f_bsize, blocksize)));
+	mwp->avail = max(mwp->avail, int64width(fsbtoblk(sfsp->f_bavail,
 	    sfsp->f_bsize, blocksize)));
-	mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks -
-	    sfsp->f_bfree, sfsp->f_bsize, blocksize)));
-	mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail,
-	    sfsp->f_bsize, blocksize)));
-	mwp->iused = max(mwp->iused, longwidth(sfsp->f_files -
+	mwp->iused = max(mwp->iused, int64width((int64_t)sfsp->f_files -
 	    sfsp->f_ffree));
-	mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree));
+	mwp->ifree = max(mwp->ifree, int64width(sfsp->f_ffree));
 }
 
 /* Return the width in characters of the specified long. */
 static size_t
-longwidth(long val)
+int64width(int64_t val)
 {
 	size_t len;
 

==== //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#5 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.19 2002/09/02 05:57:13 peter Exp $
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.20 2003/11/13 17:57:53 obrien Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
@@ -2123,6 +2123,13 @@
 .BR vi )
 is used.
 .TP
+.SM CVS_CLIENT_PORT
+If this variable is set then
+.B cvs
+will use this port in
+\fIpserver mode\fP
+rather than the default port (cvspserver 2401).
+.TP
 .SM CVS_IGNORE_REMOTE_ROOT
 If this variable is set then
 .B cvs

==== //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#13 (text+ko) ====

@@ -22,7 +22,7 @@
 This paragraph is here to try to keep Sun CC from dying.
 The number of chars here seems crucial!!!!  */
 
-/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.37 2003/11/07 03:23:43 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.38 2003/11/13 22:40:05 kan Exp $ */
 
 /* This program is the user interface to the C compiler and possibly to
 other compilers.  It is used because compilation is a complicated procedure
@@ -3671,7 +3671,7 @@
      as well as trying the machine and the version.  */
 #ifdef FREEBSD_NATIVE
       add_prefix (&exec_prefixes, PREFIX"/bin/", "BINUTILS",
-		  0, 0, warn_std_ptr, 0);
+		  PREFIX_PRIORITY_LAST, 0, warn_std_ptr, 0);
 #endif	/* FREEBSD_NATIVE */
 #ifndef OS2
   add_prefix (&exec_prefixes, standard_exec_prefix, "GCC",

==== //depot/projects/trustedbsd/mac/etc/mac.conf#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/mac.conf,v 1.4 2003/11/11 03:30:29 rwatson Exp $
+# $FreeBSD: src/etc/mac.conf,v 1.5 2003/11/15 02:08:01 rwatson Exp $
 #
 # TrustedBSD MAC userland policy configuration file.  Kernel modules
 # export label information, and mac.conf indicates to userland
@@ -14,3 +14,4 @@
 default_labels file ?biba,?lomac,?mls,?sebsd
 default_labels ifnet ?biba,?lomac,?mls,?sebsd
 default_labels process ?biba,?lomac,?mls,?partition,?sebsd
+default_labels socket ?biba,?lomac,?mls

==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#28 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.119 2003/10/20 21:22:41 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.120 2003/11/12 20:08:47 phk Exp $
 %
 			-- Gifts for Children --
 
@@ -5687,6 +5687,17 @@
 achieve "super shuttle diplomacy" between cool data, perhaps earned by
 HOST COMPUTER, and warm heart of human being.
 %
+From the Pointless Comparison Collection:
+
+	To give you an idea of how sensitive these antennas are,
+	if we were to "listen" to one spacecraft in the outer solar
+	system by Jupiter or Saturn for 1 billion years and add up
+	all the signal we collected, it would be enough power to
+	set off the flash bulb on your camera once.
+
+		-- Peter Doms, manager of the Deep Space Network
+		               systems program at JPL.
+%
 From the Pro 350 Pocket Service Guide, p. 49, Step 5 of the
 instructions on removing an I/O board from the card cage, comes a new
 experience in sound:

==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#6 (text+ko) ====

@@ -1,4 +1,3 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.10 2003/01/04 17:35:54 fjoe Exp $ */
 /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger.
    Copyright 1996, 1999 Free Software Foundation, Inc.
 
@@ -18,6 +17,8 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.11 2003/11/12 08:33:18 obrien Exp $ */
+
 /* This module implements a sort of half target that sits between the
    machine-independent parts of GDB and the ptrace interface (infptrace.c) to
    provide access to the FreeBSD user-mode thread implementation.

==== //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#8 (text+ko) ====

@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.34 2003/11/02 17:35:33 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.35 2003/11/12 23:08:23 ceri Exp $
 
 # The version of this send-pr.
 VERSION=3.113
@@ -262,7 +262,7 @@
 # Catch some signals. ($xs kludge needed by Sun /bin/sh)
 xs=0
 trap 'rm -f $REF $TEMP; exit $xs' 0
-trap 'echo "$COMMAND: Aborting ..."; rm -f $REF $TEMP; xs=1; exit' 1 2 3 13 15
+trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15
 
 # If they told us to use a specific file, then do so.
 if [ -n "$IN_FILE" ]; then

==== //depot/projects/trustedbsd/mac/include/ifaddrs.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/include/ifaddrs.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
+/*	$FreeBSD: src/include/ifaddrs.h,v 1.3 2003/11/14 18:53:22 bms Exp $	*/
 
 /*
  * Copyright (c) 1995, 1999
@@ -46,11 +46,20 @@
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 #endif
 
+struct ifmaddrs {
+	struct ifmaddrs	*ifma_next;
+	struct sockaddr	*ifma_name;
+	struct sockaddr	*ifma_addr;
+	struct sockaddr	*ifma_lladdr;
+};
+
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 extern int getifaddrs(struct ifaddrs **);
 extern void freeifaddrs(struct ifaddrs *);
+extern int getifmaddrs(struct ifmaddrs **);
+extern void freeifmaddrs(struct ifmaddrs *);
 __END_DECLS
 
 #endif

==== //depot/projects/trustedbsd/mac/lib/Makefile#27 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.175 2003/11/10 09:18:04 harti Exp $
+# $FreeBSD: src/lib/Makefile,v 1.176 2003/11/12 17:09:13 harti Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -11,6 +11,7 @@
 # msun must be built before libg++ and libstdc++.
 # libmd must be built before libatm, libopie, libradius, and libtacplus.
 # libncurses must be built before libdialog, libedit and libreadline.
+# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
 # libopie must be built before libpam.
 # libradius must be built before libpam.
 # librpcsvc must be built before libpam.
@@ -21,14 +22,14 @@
 #
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
-SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd \
-	libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \
+SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
+	libnetgraph libradius librpcsvc libsbuf libtacplus libutil libypclnt \
 	${_compat} libalias ${_libatm} ${_libbind} \
 	${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
 	libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
 	libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \
-	libnetgraph ${_libngatm} libopie libpam libpanel libpcap \
+	${_libngatm} libopie libpam libpanel libpcap \
 	${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
 	${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \
 	${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz

==== //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_mibII/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libbsnmp/modules/snmp_mibII/Makefile,v 1.2 2003/11/10 13:43:26 harti Exp $
+# $FreeBSD: src/lib/libbsnmp/modules/snmp_mibII/Makefile,v 1.3 2003/11/13 10:18:16 harti Exp $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list