PERFORCE change 35045 for review
Robert Watson
rwatson at FreeBSD.org
Sat Jul 26 17:26:13 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=35045
Change 35045 by rwatson at rwatson_tislabs on 2003/07/26 10:25:28
Integrate the TrustedBSD base branch a bit further -- various
fixes for gcc 3.3, threading fixes, etc, etc.
Affected files ...
.. //depot/projects/trustedbsd/base/MAINTAINERS#19 integrate
.. //depot/projects/trustedbsd/base/Makefile#25 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#42 integrate
.. //depot/projects/trustedbsd/base/UPDATING#34 integrate
.. //depot/projects/trustedbsd/base/bin/ed/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/bin/ed/re.c#4 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#12 integrate
.. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/kiconv.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rap.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/top/commands.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/top/machine.h#3 integrate
.. //depot/projects/trustedbsd/base/contrib/top/top.c#3 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#17 integrate
.. //depot/projects/trustedbsd/base/etc/rc.subr#12 integrate
.. //depot/projects/trustedbsd/base/games/factor/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#28 integrate
.. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libgssapi/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libkadm5clnt/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libkadm5srv/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libkrb5/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libroken/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libsl/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libvers/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/hprop/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/kadmind/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/kerberos5/libexec/kpasswdd/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kadmin/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kdestroy/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kinit/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/klist/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kpasswd/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/krb5-config/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/kstash/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/lib/Makefile#21 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ioctl_subr.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ip_checksum.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetmask.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetprec.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetround.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetsticky.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetmask.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetprec.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetround.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetsticky.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/makecontext.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/signalcontext.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/raise.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/time.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/time.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/ip6opt.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_to_text.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/Makefile.inc#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_kqueue.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/lib/libgeom/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/lib/libncp/ncpl_conn.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libncp/ncpl_subr.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_radius/pam_radius.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/ksd.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/ksd.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#10 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_raise.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/lib/msun/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_acos.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_asin.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_atan2.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_exp.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_fmod.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_log.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_log10.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_remainder.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_scalb.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/e_sqrt.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/get_hw_float.c#3 delete
.. //depot/projects/trustedbsd/base/lib/msun/src/math_private.h#7 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_atan.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_ceil.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_copysign.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_copysignf.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_cos.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_finite.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_floor.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_ilogb.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_logb.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_rint.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_scalbn.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_significand.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_sin.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_tan.c#3 integrate
.. //depot/projects/trustedbsd/base/libexec/getty/main.c#7 integrate
.. //depot/projects/trustedbsd/base/libexec/telnetd/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#46 integrate
.. //depot/projects/trustedbsd/base/release/amd64/dokern.sh#2 delete
.. //depot/projects/trustedbsd/base/release/amd64/fixit_crunch.conf#2 delete
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#69 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#25 integrate
.. //depot/projects/trustedbsd/base/release/i386/drivers.conf#16 integrate
.. //depot/projects/trustedbsd/base/release/i386/mkisoimages.sh#4 integrate
.. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sbin/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/fore_dnld.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/ilmid/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#7 integrate
.. //depot/projects/trustedbsd/base/sbin/devd/token.l#4 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck/fsck.8#7 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck/fsck.c#11 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#25 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#18 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#10 integrate
.. //depot/projects/trustedbsd/base/sbin/ping6/ping6.c#9 integrate
.. //depot/projects/trustedbsd/base/sbin/umount/umount.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/umount/umount.c#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#35 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/an.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ath.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/harp.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/npx.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/patm.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/safe.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/sbp.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/wi.4#15 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/wlan.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/release.7#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/rescue.7#1 branch
.. //depot/projects/trustedbsd/base/share/man/man9/Makefile#31 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/zone.9#9 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/support.s#7 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#24 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/alpha_cpu.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/acpica/OsdEnvironment.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/amd64-gdbstub.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/atomic.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/autoconf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/critical.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_disasm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/in_cksum.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/sys_machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_misc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/npx.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/intr_machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/isa.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/ithread.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/npx.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#38 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#62 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.alpha#16 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#32 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#30 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#27 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#19 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#20 integrate
.. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#38 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.i386#18 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.pc98#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_button.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_isab.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdma.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/harp/if_harp.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_rx.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_tx.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/raidframe/rf_freebsdkintf.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/rp/rp.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/safe/safereg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/safe/safevar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/syscons/dragon/dragon_saver.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/fire/fire_saver.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/logo/logo_saver.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/warp/warp_saver.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_subr.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/Changelog#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/README#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/control_w.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/div_small.s#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/errors.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/exception.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_arith.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_asm.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_aux.c#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_emu.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_entry.c#4 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_etc.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_proto.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_system.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_trig.c#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/get_address.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/load_store.c#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/math_emu.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_2xm1.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_atan.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_div.s#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_l2.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_mul64.s#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_sin.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_tan.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/polynomial.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_add_sub.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_compare.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_constant.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_constant.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_div.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_ld_str.c#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_mul.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_norm.s#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_round.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_add.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_div.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_mul.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_sub.s#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/status_w.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/version.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/wm_shrx.s#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/wm_sqrt.s#3 delete
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#38 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/math_emu.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/i386/math_emulate.c#7 delete
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mpapic.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/apic.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/asm.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/cpufunc.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/frame.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_lli.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#13 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/_regset.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/cpu.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_main.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/md5c.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_autoconf.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_subr.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_export.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#17 integrate
.. //depot/projects/trustedbsd/base/sys/libkern/scanc.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#47 integrate
.. //depot/projects/trustedbsd/base/sys/modules/fpu/Makefile#3 delete
.. //depot/projects/trustedbsd/base/sys/modules/gnufpu/Makefile#3 delete
.. //depot/projects/trustedbsd/base/sys/modules/harp/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/safe/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/net/if.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_atm.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_media.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/net/route.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_cm.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_device.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_if.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_ioctl.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_proto.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_socket.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_if.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_input.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_load.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_output.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_usrreq.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_vcm.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/sigpvc/sigpvc_if.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_arp.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_cls.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_if.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_proto.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni_lower.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni_var.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_pdu.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_cache.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_input.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_vcm.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip_var.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_decode.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_if.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_msg.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_proto.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_subr.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_vc_state.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_ncp.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_usr.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#27 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#6 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98gdc.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_dcreg.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sisreg.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/cache.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sys/cdefs.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/sys/kse.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#44 integrate
.. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#34 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#34 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#35 integrate
.. //depot/projects/trustedbsd/base/sys/sys/systm.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_swap.c#16 delete
.. //depot/projects/trustedbsd/base/tools/tools/crypto/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/tools/tools/crypto/safestats.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/ada.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/current.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/default.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dsa.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dwp.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/releng_4.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/stanley.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#10 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/Makefile#30 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#26 integrate
.. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/find/find.1#12 integrate
.. //depot/projects/trustedbsd/base/usr.bin/getconf/getconf.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sed/TEST/sed.test#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sed/sed.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/telnet/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/top/top.local.1#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#28 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.8#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#15 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mount_nwfs/mount_nwfs.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardc/enabler.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pppd/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/tcpdchk/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/tcpdump/tcpdump/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/traceroute6/traceroute6.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/zzz/zzz.sh#2 integrate
Differences ...
==== //depot/projects/trustedbsd/base/MAINTAINERS#19 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $
+$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $
subsystem login notes
-----------------------------
@@ -13,9 +13,8 @@
NEWCARD imp Pre-commit review requested.
OLDCARD imp Pre-commit review requested.
wi imp Pre-commit review requested.
-telnet markm commits _must_ be made to src/crypto/telnet
- first, only then to "base" telnet via "make
- unifdef". The "base" commit _must_ be made.
+telnet markm please ensure that a security-aware person
+ sanity-checks your work.
secure/* markm please ensure that a security-aware person
sanity-checks your work.
kerberos5/* markm please ensure that a security-aware person
==== //depot/projects/trustedbsd/base/Makefile#25 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $
+# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $
#
# The user-driven targets are:
#
@@ -65,7 +65,7 @@
hierarchy install installcheck installkernel installkernel.debug\
reinstallkernel reinstallkernel.debug installmost installworld \
libraries lint maninstall \
- mk most obj objlink regress rerelease tags update
+ most obj objlink regress rerelease tags update
BITGTS= files includes
BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
@@ -141,7 +141,7 @@
#
upgrade_checks:
@if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \
- PATH=${PATH} ${MAKE} >/dev/null 2>&1); \
+ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
(cd ${.CURDIR} && make make); \
fi
==== //depot/projects/trustedbsd/base/Makefile.inc1#42 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -339,7 +339,8 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 4: building libraries"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries
+ cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \
+ libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
==== //depot/projects/trustedbsd/base/UPDATING#34 (text+ko) ====
@@ -17,6 +17,18 @@
developers choose to disable these features on build machines
to maximize performance.
+20030722:
+ FPU-less support has been removed from FreeBSD. Chances are you won't
+ notice. 386+387 support should still work after this change, but
+ it is now a minimum requirement for the i386 port that you have real
+ FPU hardware.
+
+20030714:
+ Some people are having problems with changes related to /rescue.
+ If you are building -j N, you will need to define NO_RESCUE. Others
+ will need to define it if /rescue has issues with their environment.
+ People should report those issues to current at .
+
20030711:
gcc was upgraded to 3.3. You are advised to not build -DNOCLEAN
across this point. Further, it might be a good idea to remove
@@ -1314,4 +1326,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.258 2003/07/12 01:16:54 ceri Exp $
+$FreeBSD: src/UPDATING,v 1.259 2003/07/22 11:08:41 imp Exp $
==== //depot/projects/trustedbsd/base/bin/ed/Makefile#8 (text+ko) ====
@@ -1,14 +1,14 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION=crypto
CFLAGS+=-DDES
-WARNS= 2
+WARNS?= 2
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
.endif
==== //depot/projects/trustedbsd/base/bin/ed/re.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.19 2002/06/30 05:13:53 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $");
#include "ed.h"
@@ -41,10 +41,10 @@
pattern_t *
get_compiled_pattern(void)
{
- static pattern_t *exp = NULL;
+ static pattern_t *expr = NULL;
static char error[1024];
- char *exps;
+ char *exprs;
char delimiter;
int n;
@@ -52,27 +52,27 @@
errmsg = "invalid pattern delimiter";
return NULL;
} else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) {
- if (!exp)
+ if (!expr)
errmsg = "no previous pattern";
- return exp;
- } else if ((exps = extract_pattern(delimiter)) == NULL)
+ return expr;
+ } else if ((exprs = extract_pattern(delimiter)) == NULL)
return NULL;
/* buffer alloc'd && not reserved */
- if (exp && !patlock)
- regfree(exp);
- else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
+ if (expr && !patlock)
+ regfree(expr);
+ else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
fprintf(stderr, "%s\n", strerror(errno));
errmsg = "out of memory";
return NULL;
}
patlock = 0;
- if ((n = regcomp(exp, exps, 0))) {
- regerror(n, exp, error, sizeof error);
+ if ((n = regcomp(expr, exprs, 0))) {
+ regerror(n, expr, error, sizeof error);
errmsg = error;
- free(exp);
- return exp = NULL;
+ free(expr);
+ return expr = NULL;
}
- return exp;
+ return expr;
}
==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.8 2003/07/18 16:00:26 rwatson Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -153,7 +153,7 @@
entry = zmalloc(sizeof(struct sf_entry));
entry->acl = acl_from_text(optarg);
if (entry->acl == NULL)
- err(1, "acl_from_text() failed");
+ err(1, "%s", optarg);
entry->op = OP_MERGE_ACL;
TAILQ_INSERT_TAIL(&entrylist, entry, next);
break;
@@ -164,7 +164,7 @@
entry = zmalloc(sizeof(struct sf_entry));
entry->acl = acl_from_text(optarg);
if (entry->acl == NULL)
- err(1, "acl_from_text() failed");
+ err(1, "%s", optarg);
entry->op = OP_REMOVE_ACL;
TAILQ_INSERT_TAIL(&entrylist, entry, next);
break;
==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#12 (text) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $
+ * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $
*/
#ifndef _PAM_TYPES_H_INCLUDED
@@ -47,22 +47,22 @@
* XSSO 5.1.1
*/
struct pam_message {
- int msg_style;
- const char *msg;
+ int msg_style;
+ char *msg;
};
struct pam_response {
- char *resp;
- int resp_retcode;
+ char *resp;
+ int resp_retcode;
};
/*
* XSSO 5.1.2
*/
struct pam_conv {
- int (*conv)(int, const struct pam_message **,
- struct pam_response **, void *);
- void *appdata_ptr;
+ int (*conv)(int, const struct pam_message **,
+ struct pam_response **, void *);
+ void *appdata_ptr;
};
/*
@@ -75,9 +75,9 @@
* Solaris 9
*/
typedef struct pam_repository {
- char *type;
- void *scope;
- size_t scope_len;
+ char *type;
+ void *scope;
+ size_t scope_len;
} pam_repository_t;
#ifdef __cplusplus
==== //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/kiconv.c#3 (text+ko) ====
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
* $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $
*/
#include <sys/types.h>
@@ -48,7 +49,7 @@
{
struct iconv_add_in din;
struct iconv_add_out dout;
- int olen;
+ size_t olen;
if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN)
return EINVAL;
==== //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ====
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
* $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $
*
* This is very simple implementation of RAP protocol.
*/
@@ -40,7 +41,7 @@
#include <err.h>
#include <stdio.h>
#include <unistd.h>
-#include <strings.h>
+#include <string.h>
#include <stdlib.h>
#include <sysexits.h>
==== //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 (text+ko) ====
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
* $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $
*/
#include <sys/param.h>
#include <sys/stat.h>
@@ -75,7 +76,7 @@
extern void dropsuid();
extern int loadsmbvfs();
#else
- struct vfsconf vfc;
+ struct xvfsconf vfc;
#endif /* APPLE */
char *next;
int opt, error, mntflags, caseopt;
==== //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#2 (text+ko) ====
@@ -19,7 +19,7 @@
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */
+/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.3 2003/07/24 00:04:01 peter Exp $ */
#include "system.h"
@@ -549,7 +549,7 @@
/* Allocate a new argument array, and copy program name in it. */
new_argc = argc - 1 + strlen (argv[1]);
- new_argv = xmalloc (new_argc * sizeof (char *));
+ new_argv = xmalloc ((new_argc + 1) * sizeof (char *));
in = argv;
out = new_argv;
*out++ = *in++;
@@ -577,6 +577,9 @@
while (in < argv + argc)
*out++ = *in++;
+ /* And NULL terminate the argv[] array */
+ *out++ = NULL;
+
/* Replace the old option list by the new one. */
argc = new_argc;
==== //depot/projects/trustedbsd/base/contrib/top/commands.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/commands.c,v 1.5 2002/01/24 17:52:26 dwmalone Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.6 2003/07/17 23:56:40 julian Exp $
*/
/*
@@ -71,6 +71,7 @@
d - change number of displays to show\n\
e - list errors generated by last \"kill\" or \"renice\" command\n\
i - toggle the displaying of idle processes\n\
+H - toggle the displaying of threads\n\
I - same as 'i'\n\
k - kill processes; send a signal to a list of processes\n\
n or # - change number of processes to display\n", stdout);
==== //depot/projects/trustedbsd/base/contrib/top/machine.h#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/machine.h,v 1.5 2002/01/24 17:58:42 dwmalone Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $
*/
/*
@@ -59,6 +59,7 @@
int idle; /* show idle processes */
int self; /* show self */
int system; /* show system processes */
+ int thread; /* show threads */
int uid; /* only this uid (unless uid == -1) */
char *command; /* only this command (unless == NULL) */
};
==== //depot/projects/trustedbsd/base/contrib/top/top.c#3 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.9 2002/01/24 17:55:40 dwmalone Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $
*/
/*
@@ -192,9 +192,9 @@
fd_set readfds;
#ifdef ORDER
- static char command_chars[] = "\f qh?en#sdkriIuto";
+ static char command_chars[] = "\f qh?en#sdkriIutHo";
#else
- static char command_chars[] = "\f qh?en#sdkriIut";
+ static char command_chars[] = "\f qh?en#sdkriIutH";
#endif
/* these defines enumerate the "strchr"s of the commands in command_chars */
#define CMD_redraw 0
@@ -214,8 +214,9 @@
#define CMD_idletog2 13
#define CMD_user 14
#define CMD_selftog 15
+#define CMD_thrtog 16
#ifdef ORDER
-#define CMD_order 16
+#define CMD_order 17
#endif
/* set the buffer for stdout */
@@ -245,6 +246,7 @@
ps.self = -1;
ps.system = No;
ps.uid = -1;
+ ps.thread = No;
ps.command = NULL;
/* get preset options from the environment */
@@ -270,7 +272,7 @@
optind = 1;
}
- while ((i = getopt(ac, av, "SIbinquvs:d:U:o:t")) != EOF)
+ while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF)
{
switch(i)
{
@@ -365,10 +367,14 @@
ps.self = (ps.self == -1) ? getpid() : -1;
break;
+ case 'H':
+ ps.thread = !ps.thread;
+ break;
+
default:
fprintf(stderr, "\
Top version %s\n\
-Usage: %s [-ISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n",
+Usage: %s [-HISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n",
version_string(), myname);
exit(1);
}
@@ -955,6 +961,13 @@
}
break;
>>> 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