Date: Sat, 13 Nov 2004 14:51:03 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 65016 for review Message-ID: <200411131451.iADEp3oY000127@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=65016 Change 65016 by rwatson@rwatson_tislabs on 2004/11/13 14:50:11 Integrate TrustedBSD MAC branch from TrustedBSD base branch, including OpenSSH upgrade. Loop back System V IPC ABI cleanup. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#51 integrate .. //depot/projects/trustedbsd/mac/UPDATING#42 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/stty/key.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.1#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/buildbff.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/inventory.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/aix/pam.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/ssh-host-keygen#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/sshd.init#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/caldera/sshd.pam#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/ssh-host-config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/cygwin/ssh-user-config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/findssl.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/gnome-ssh-askpass1.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/gnome-ssh-askpass2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/egd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/egd.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/hpux/sshd.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/sshd.init#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/redhat/sshd.pam#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/buildpkg.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/solaris/opensshd.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/ssh-copy-id#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/ssh-copy-id.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/sshd.pam.freebsd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/sshd.pam.generic#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/openssh.spec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/rc.config.sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/contrib/suse/rc.sshd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/scard/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/etc/defaults/pccard.conf#20 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#38 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#11 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.conf#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#15 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/swap1#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/tmp#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/var#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/vinum#4 delete .. //depot/projects/trustedbsd/mac/etc/rc.subr#17 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#23 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.1#9 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#44 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/ksu/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string_sprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libbegemot/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/_ctx_start.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/alloca.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/divsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/signalcontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memcmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memmove.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/strcmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/fork.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/getcontext.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/rand.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#30 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/arm/context.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#18 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#27 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/popen.c#5 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/alpha/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/arm/lockdflt.c#2 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/ia64/lockdflt.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/lockdflt.c#2 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/sparc64/lockdflt.c#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#21 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#49 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#73 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#13 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#28 integrate .. //depot/projects/trustedbsd/mac/sbin/comcontrol/comcontrol.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/rule.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/concat/gconcat.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/stripe/gstripe.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#25 integrate .. //depot/projects/trustedbsd/mac/sbin/init/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#29 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.8#13 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/route/route.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/slattach/slattach.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/Makefile#5 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#14 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/list.c#8 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/v.c#8 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/vext.h#6 delete .. //depot/projects/trustedbsd/mac/sbin/vinum/vinum.8#14 delete .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#28 integrate .. //depot/projects/trustedbsd/mac/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi_video.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/em.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gdb.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gx.4#7 delete .. //depot/projects/trustedbsd/mac/share/man/man4/ixgb.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_asus.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_panasonic.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mouse.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/route.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ste.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#29 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/remote.5#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/tuning.7#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/condvar.9#6 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#18 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#19 integrate .. //depot/projects/trustedbsd/mac/share/mk/sys.mk#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#31 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/smp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/critical.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/locore.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/mem.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/arm/nexus_io_asm.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/support.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/asm.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/endian.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/memdev.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/commands.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#26 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf.5#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#57 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#109 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#40 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#68 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_snc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854.c#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/esp/lsi64854var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwmem.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#15 delete .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxvar.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/maestro.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/request.h#3 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinum.c#13 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumconfig.c#17 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumdaemon.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumext.h#10 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumhdr.h#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.c#19 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#17 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumkw.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumlock.c#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinummemory.c#7 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumobj.h#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumparser.c#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#15 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrevive.c#11 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumstate.c#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumvar.h#6 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs.h#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_util.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_vfsops.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/autofs/autofs_vnops.c#2 delete .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#32 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/autoconf.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/atomic.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/sysarch.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pbio.c#2 delete .. //depot/projects/trustedbsd/mac/sys/isa/vga_isa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#74 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#442 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_param.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_jumbo.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#117 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#72 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/arm/divsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#73 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/acpi_snc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/autofs/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/modules/esp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/gx/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/modules/vinum/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_pppvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/raw_usrreq.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_aal5.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_usrreq.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_socket.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_seq.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/keysock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_usrreq.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/spx_usrreq.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/key.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/key.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/keydb.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#34 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/fd.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sfreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#36 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/vm_machdep.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_types.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/buf.h#24 integrate .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/fdcio.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/filedesc.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#219 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mdioctl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/msg.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#35 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pbioio.h#2 delete .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/resource.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/rman.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sem.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sf_buf.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/shm.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syslog.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#69 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#74 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#31 integrate .. //depot/projects/trustedbsd/mac/tools/debugscripts/dot.gdbinit#4 integrate .. //depot/projects/trustedbsd/mac/tools/debugscripts/gdbinit.vinum#3 delete .. //depot/projects/trustedbsd/mac/tools/regression/README#9 integrate .. //depot/projects/trustedbsd/mac/tools/regression/TODO#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom/RunTest.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_concat/test-1.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_concat/test-2.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-1.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-2.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-3.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/tgmath.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mblen.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbtowc.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-sputrune.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-towctrans.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wctomb.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-perror.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/string/test-strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-fenv.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-ilogb.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/pipe/bigpipetest.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/kqueue/kqueue.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/m4/regress.sh#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/regress.m4#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.t#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/genericize/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/tools/raidtest/README#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/raidtest/raidtest.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/releng_5.rc#5 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/cut/cut.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ee/ee.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fstat/fstat.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ipcs/ipcs.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/limits/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/config.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#21 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/make.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/opieinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/opiepasswd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rlogin/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rsh/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/forward.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/read.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/reverse.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tail/tail.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/write.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpiconf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpiconf/acpiconf.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ancontrol/ancontrol.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.8#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/diskinfo/diskinfo.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fdread/fdutil.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.8#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/nfsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.8#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpcbind/rpcbind.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpcbind/rpcbind.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#20 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/index.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#33 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.8#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#25 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ +# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ # # The user-driven targets are: # @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + build32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/trustedbsd/mac/Makefile.inc1#51 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,7 +83,7 @@ .endif CVS?= cvs -CVSFLAGS?= -A -P -d +CVSFLAGS?= -A -P -d -I! SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -201,6 +201,46 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +.if ${MACHINE_ARCH} == "amd64" +# 32 bit world +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 + +LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ + -L${LIB32TMP}/usr/lib32 \ + -B${LIB32TMP}/usr/lib32 +LIB32CC= ${LIB32PREFLAGS} \ + ${LIB32POSTFLAGS} +LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ + ${LIB32POSTFLAGS} +LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ + ${LIB32POSTFLAGS} + +# Yes, the flags are redundant. +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE_ARCH=i386 \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 + +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 +.endif + # install stage .if empty(.MAKEFLAGS:M-n) IMAKEENV= ${CROSSENV} \ @@ -338,6 +378,53 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +.if ${MACHINE_ARCH} == "amd64" +build32: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 5.1: building 32 bit shim libraries" + @echo "--------------------------------------------------------------" +.for _dir in \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ + usr/libexec usr/sbin usr/share/misc \ + usr/share/snmp/defs usr/share/snmp/mibs + mkdir -p ${LIB32TMP}/${_dir} +.endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${LIB32TMP}/usr/include >/dev/null + ln -sf ${.CURDIR}/sys ${WORLDTMP} +.for _t in obj includes + cd ${.CURDIR}/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/gnu/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif +.endfor +.for _dir in lib/libncurses lib/libmagic + cd ${.CURDIR}/${_dir}; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools +.endfor + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endfor + +install32: + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + cd ${.CURDIR}/lib; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install +.endif + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif WMAKE_TGTS= @@ -349,6 +436,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) +WMAKE_TGTS+= build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -479,6 +569,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.endif redistribute: @echo "--------------------------------------------------------------" ==== //depot/projects/trustedbsd/mac/UPDATING#42 (text+ko) ==== @@ -23,6 +23,19 @@ developers choose to disable these features on build machines to maximize performance. +20041110: + We have had a hack which would mount the root filesystem + R/W if the device were named 'md*'. As part of the vnode + work I'm doing I have had to remove this hack. People + building systems which use preloaded MD root filesystems + may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in + their /etc/rc scripts. + +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ ==== //depot/projects/trustedbsd/mac/bin/pax/tar.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -387,7 +387,13 @@ * copy out the name and values in the stat buffer */ hd = (HD_TAR *)buf; - arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1); + /* + * old tar format specifies the name always be null-terminated, + * but let's be robust to broken archives. + * the same applies to handling links below. + */ + arcn->nlen = l_strncpy(arcn->name, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name)) - 1); arcn->name[arcn->nlen] = '\0'; arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) & 0xfff); @@ -417,7 +423,7 @@ */ arcn->type = PAX_SLK; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; arcn->sb.st_mode |= S_IFLNK; break; @@ -429,7 +435,7 @@ arcn->type = PAX_HLK; arcn->sb.st_nlink = 2; arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1); arcn->ln_name[arcn->ln_nlen] = '\0'; /* @@ -533,7 +539,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { + if (arcn->ln_nlen >= (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -749,12 +755,19 @@ */ dest = arcn->name; if (*(hd->prefix) != '\0') { - cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2); + cnt = l_strncpy(dest, hd->prefix, + MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2)); dest += cnt; *dest++ = '/'; cnt++; } - arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt); + /* + * ustar format specifies the name may be unterminated + * if it fills the entire field. this also applies to + * the prefix and the linkname. + */ + arcn->nlen = cnt + l_strncpy(dest, hd->name, + MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1)); arcn->name[arcn->nlen] = '\0'; /* @@ -848,7 +861,7 @@ * copy the link name */ arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname, - sizeof(arcn->ln_name) - 1); + MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1)); arcn->ln_name[arcn->ln_nlen] = '\0'; break; case CONTTYPE: @@ -900,7 +913,7 @@ */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || (arcn->type == PAX_HRG)) && - (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { + (arcn->ln_nlen > (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } @@ -925,17 +938,16 @@ * occur, we remove the / and copy the first part to the prefix >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411131451.iADEp3oY000127>