PERFORCE change 64142 for review
Andrew R. Reiter
arr at watson.org
Wed Nov 3 10:34:20 PST 2004
D'oh,.. if you catch me doing an integ of tbsd related branches, ping me
to update this tree too if you want it done. Sorry I did not offer
yesterday.
Cheers,
Andrew
On Wed, 3 Nov 2004, Robert Watson wrote:
:http://perforce.freebsd.org/chv.cgi?CH=64142
:
:Change 64142 by rwatson at rwatson_tislabs on 2004/11/03 13:05:19
:
: Integ of trustedbsd mac branch:
: - struct tcpcb has changed size
: - rm(1) now has a -I option
: - openssh update
: - various rc.d startup script changes
: - libphtread fixes
: - amd64 fixes by peter
: - placeholders for audit syscalls
: - some minor ddb beautification
: - bfe device locking fixes
: - usb ehci enhancements
: - many fs changes related to the vfs / geom changes by phk
: - HighPoint RocketRAID 182x support default in config
: - Adding tracing to bus dma
: - VM hacking by alc
:
:Affected files ...
:
:.. //depot/projects/trustedbsd/mac/Makefile.inc1#50 integrate
:.. //depot/projects/trustedbsd/mac/UPDATING#41 integrate
:.. //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 integrate
:.. //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 integrate
:.. //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/OVERVIEW#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/README#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#2 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#12 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#12 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.h#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.h#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/envpass.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#2 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#2 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/logintest.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.h#2 delete
:.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/opensshd.init.in#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/pathnames.h#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#11 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.h#4 delete
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/envpass.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/login-timeout.sh#2 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#1 branch
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/rijndael.c#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#12 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#21 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#8 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#12 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#6 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#11 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh1.h#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#15 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#11 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#7 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#11 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#11 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#13 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#16 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#13 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshlogin.c#10 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#9 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.h#3 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#5 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.h#4 delete
:.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.h#3 delete
:.. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.h#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/version.c#4 integrate
:.. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#15 integrate
:.. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#37 integrate
:.. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/etc/namedb/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/etc/network.subr#6 integrate
:.. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#20 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#8 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/moused#6 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/natd#3 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/netif#7 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/pf#4 integrate
:.. //depot/projects/trustedbsd/mac/etc/rc.d/savecore#7 integrate
:.. //depot/projects/trustedbsd/mac/etc/usbd.conf#6 integrate
:.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#33 integrate
:.. //depot/projects/trustedbsd/mac/games/fortune/unstr/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/games/ppt/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/games/primes/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/Makefile.inc#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#12 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#12 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libgroff/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/lib/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/rcs/lib/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/include/arpa/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/include/protocols/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/bind/config.mk#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#4 integrate
:.. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile.inc#4 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#16 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/brk.S#3 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#3 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/sys/mlock.2#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#7 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#7 integrate
:.. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#13 integrate
:.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#18 integrate
:.. //depot/projects/trustedbsd/mac/lib/libdisk/open_disk.c#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libio/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#12 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#23 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#8 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#10 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#11 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#6 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_find_thread.c#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#19 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#11 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#18 integrate
:.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#14 integrate
:.. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/lib/libsmdb/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libsmutil/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#13 integrate
:.. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/lib/libxpg4/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/lib/liby/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpgw/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#26 integrate
:.. //depot/projects/trustedbsd/mac/libexec/pt_chown/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#10 integrate
:.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/reloc.c#5 integrate
:.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate
:.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#22 integrate
:.. //depot/projects/trustedbsd/mac/release/Makefile#58 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate
:.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/aps/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/help/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msg/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/ns/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/oinit/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/sps/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/view/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/vm/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#27 integrate
:.. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/sbin/Makefile#27 integrate
:.. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#11 integrate
:.. //depot/projects/trustedbsd/mac/sbin/dhclient/common/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/dhclient/dhcpctl/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/sbin/dhclient/dst/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/dhclient/minires/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/dhclient/omapip/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#2 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/destroy.c#4 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#4 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#8 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#6 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#8 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/mkdisk.sh#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#6 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#8 integrate
:.. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/sbin/gvinum/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#28 integrate
:.. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/pflogd/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sbin/rtsol/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#21 integrate
:.. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#13 integrate
:.. //depot/projects/trustedbsd/mac/secure/lib/libssl/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#13 integrate
:.. //depot/projects/trustedbsd/mac/share/dict/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/IPv6/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/bind9/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/bufbio/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/devfs/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/diskperf/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/jail/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/kernmalloc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/kerntune/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/nqnfs/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/px/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/relengr/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/sysperf/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/05.sysman/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/06.Clang/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/13.rcs/rcs/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/18.gprof/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/20.ipctut/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/21.ipc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/22.rpcgen/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/23.rpc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/24.xdr/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/25.xdrrfc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/26.rpcrfc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/27.nfsrpc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/psd/28.cvs/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/smm/01.setup/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/smm/02.config/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/smm/05.fastfs/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/smm/08.sendmailop/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/smm/12.timed/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/04.csh/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/07.mail/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/summary/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/11.vitut/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/summary/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/vi/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/13.viref/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/doc/usd/21.troff/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/autofs/driver/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/cvsup/stable-supfile#5 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#27 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/isdn/v21/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/libvgl/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/pf/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/ppi/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/smbfs/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/examples/smbfs/print/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/share/info/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#44 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#2 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/divert.4#5 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/fd.4#2 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#10 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/mem.4#7 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/ng_device.4#3 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/ngatmbase.4#1 branch
:.. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#15 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#3 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#34 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#9 integrate
:.. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#7 integrate
:.. //depot/projects/trustedbsd/mac/share/misc/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#17 integrate
:.. //depot/projects/trustedbsd/mac/share/mk/Makefile#11 integrate
:.. //depot/projects/trustedbsd/mac/share/mk/sys.mk#15 integrate
:.. //depot/projects/trustedbsd/mac/share/security/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/share/sendmail/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/share/skel/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/share/snmp/mibs/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/share/syscons/fonts/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/share/syscons/keymaps/Makefile#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#14 integrate
:.. //depot/projects/trustedbsd/mac/sys/amd64/include/vmparam.h#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/arm/arm/db_trace.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/common/Makefile.inc#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biospci.c#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/conf.c#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/main.c#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#13 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#56 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/files#108 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#39 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#30 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#25 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/conf/options#67 integrate
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/access601.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/array.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/atapi.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/command.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/gui_lib.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/hptproc.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/ioctl.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvSata.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/raid5n.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/readme.txt#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/vdevice.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/ddb/db_output.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/ddb/db_thread.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/ddb/db_variables.c#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfereg.h#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#33 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.h#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwcrom.c#8 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/firewire/iec13213.h#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/entry.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/global.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/hptintf.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mv.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mvOs.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/osbsd.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#13 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#36 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/patm/genrtab/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#31 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/apcdmareg.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcivar.h#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#27 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#35 integrate
:.. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#18 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#51 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs.h#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#17 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfsmount.h#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#18 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#24 integrate
:.. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom.h#31 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#13 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#32 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#17 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_int.h#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#29 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_plex.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_var.h#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_inode.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_subr.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate
:.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#20 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#3 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#38 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#48 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/db_trace.c#14 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#43 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#32 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#43 integrate
:.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#24 integrate
:.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/db_trace.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sscdisk.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_bmap.c#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.h#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/iso.h#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#63 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#22 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#39 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#30 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#441 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#13 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#42 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/kern_xxx.c#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#15 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#35 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/subr_unit.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#63 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#60 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#62 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#43 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#44 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#37 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#39 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#24 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#32 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#67 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#71 integrate
:.. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#72 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/hptmv/Makefile#1 branch
:.. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/audiocs/Makefile#1 branch
:.. //depot/projects/trustedbsd/mac/sys/net/if.c#39 integrate
:.. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#20 integrate
:.. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/net/if_var.h#27 integrate
:.. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/netflow.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#25 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#25 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#29 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#26 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#21 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#27 integrate
:.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#8 integrate
:.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#9 integrate
:.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#40 integrate
:.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd.c#14 integrate
:.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd_cd.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/pci/agp.c#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#23 integrate
:.. //depot/projects/trustedbsd/mac/sys/pci/if_skreg.h#7 integrate
:.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#27 integrate
:.. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#22 integrate
:.. //depot/projects/trustedbsd/mac/sys/powerpc/include/elf.h#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_kauai.c#4 integrate
:.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_macio.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/db_trace.c#5 integrate
:.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#138 integrate
:.. //depot/projects/trustedbsd/mac/sys/sparc64/conf/NOTES#6 integrate
:.. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebusreg.h#1 branch
:.. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa_dma.c#1 branch
:.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/buf.h#23 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/bufobj.h#2 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/conf.h#22 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#19 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/mount.h#35 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#57 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#63 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#62 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#64 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/systm.h#26 integrate
:.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#68 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#13 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#18 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#30 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#26 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#47 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#32 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/inode.h#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_bmap.c#12 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#73 integrate
:.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#10 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#28 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#29 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#18 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#33 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#24 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#32 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#41 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#25 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#27 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#16 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#11 integrate
:.. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#30 integrate
:.. //depot/projects/trustedbsd/mac/tools/diag/dumpvfscache/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/diag/localeck/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/fsx/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/gaithrstress/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/geom/MdLoad/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/ia64_unaligned/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test1/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test2/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/pipe/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/security/access/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/security/proc_to_proc/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sockets/socketpair/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls1/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls2/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#13 integrate
:.. //depot/projects/trustedbsd/mac/tools/test/malloc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/tools/test/ppsapi/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/aac/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/gdb_regofs/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/ministat/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/localfiles#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#4 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netblast/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netreceive/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netsend/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/pirtool/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/raidtest/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/recoverdisk.c#2 integrate
:.. //depot/projects/trustedbsd/mac/tools/tools/syscall_timing/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#31 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/dirname/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/du/du.1#6 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/locate/bigram/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/locate/code/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#9 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#13 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#8 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#20 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/mktemp/mktemp.1#5 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#7 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#9 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/unexpand/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/uudecode/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/usr.bin/vgrind/RETEST/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/amd/libamu/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/callbootd/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/config/config.y#7 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/config/lang.l#7 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/crunch/examples/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_smail/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/mkCTM/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.8#10 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.c#10 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/SMM.doc/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/common/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/testrsrr/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libntp/Makefile#5 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libparse/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdate/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#4 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptime/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptrace/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/sntp/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/demo/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/kbdio/Makefile#2 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#6 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/Makefile#8 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypupdated/Makefile#3 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#19 integrate
:.. //depot/projects/trustedbsd/mac/usr.sbin/vnconfig/Makefile#2 integrate
:
:Differences ...
:
:==== //depot/projects/trustedbsd/mac/Makefile.inc1#50 (text+ko) ====
:
:@@ -1,5 +1,5 @@
: #
:-# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $
:+# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $
: #
: # Make command line options:
: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
:@@ -502,7 +502,7 @@
:
: .if !defined(KERNCONF) && defined(KERNEL)
: KERNCONF= ${KERNEL}
:-KERNWARN= yes
:+KERNWARN=
: .else
: KERNCONF?= GENERIC
: .endif
:
:==== //depot/projects/trustedbsd/mac/UPDATING#41 (text+ko) ====
:
:@@ -23,6 +23,11 @@
: developers choose to disable these features on build machines
: to maximize performance.
:
:+20041022:
:+ The size of struct tcpcb has changed. You have to recompile
:+ userland programs that read kmem for tcp sockets directly
:+ (netstat, sockstat, etc.)
:+
: 20041018:
: A major sweep over the tty drivers to elimnate approx 3100
: lines of copy&pasted code have been performed. As a part of
:@@ -1951,4 +1956,4 @@
: Contact Warner Losh if you have any questions about your use of
: this document.
:
:-$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $
:+$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $
:
:==== //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 (text+ko) ====
:
:@@ -29,9 +29,9 @@
: .\" SUCH DAMAGE.
: .\"
: .\" @(#)rm.1 8.5 (Berkeley) 12/5/94
:-.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $
:+.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $
: .\"
:-.Dd October 4, 2004
:+.Dd October 28, 2004
: .Dt RM 1
: .Os
: .Sh NAME
:@@ -40,7 +40,7 @@
: .Nd remove directory entries
: .Sh SYNOPSIS
: .Nm
:-.Op Fl dfiPRrvW
:+.Op Fl dfiIPRrvW
: .Ar
: .Nm unlink
: .Ar file
:@@ -76,6 +76,12 @@
: option overrides any previous
: .Fl f
: options.
:+.It Fl I
:+Request confirmation once if more than three files are being removed or if a
:+directory is being recursively removed.
:+This is a far less intrusive option than
:+.Fl i
:+yet provides almost the same level of protection against mistakes.
: .It Fl P
: Overwrite regular files before deleting them.
: Files are overwritten three times, first with the byte pattern 0xff,
:
:==== //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 (text+ko) ====
:
:@@ -39,7 +39,7 @@
: #endif /* not lint */
: #endif
: #include <sys/cdefs.h>
:-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $");
:+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $");
:
: #include <sys/stat.h>
: #include <sys/param.h>
:@@ -58,9 +58,11 @@
: #include <unistd.h>
:
: int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
:+int rflag, Iflag;
: uid_t uid;
:
: int check(char *, char *, struct stat *);
:+int check2(char **);
: void checkdot(char **);
: void checkslash(char **);
: void rm_file(char **);
:@@ -78,7 +80,7 @@
: int
: main(int argc, char *argv[])
: {
:- int ch, rflag;
:+ int ch;
: char *p;
:
: /*
:@@ -102,7 +104,7 @@
: }
:
: Pflag = rflag = 0;
:- while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1)
:+ while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1)
: switch(ch) {
: case 'd':
: dflag = 1;
:@@ -115,6 +117,9 @@
: fflag = 0;
: iflag = 1;
: break;
:+ case 'I':
:+ Iflag = 1;
:+ break;
: case 'P':
: Pflag = 1;
: break;
:@@ -148,6 +153,10 @@
: if (*argv) {
: stdin_ok = isatty(STDIN_FILENO);
:
:+ if (Iflag) {
:+ if (check2(argv) == 0)
:+ exit (1);
:+ }
: if (rflag)
: rm_tree(argv);
: else
:@@ -489,6 +498,56 @@
: }
: }
:
:+int
:+check2(char **argv)
:+{
:+ struct stat st;
:+ int first;
:+ int ch;
:+ int fcount = 0;
:+ int dcount = 0;
:+ int i;
:+ const char *dname = NULL;
:+
:+ for (i = 0; argv[i]; ++i) {
:+ if (lstat(argv[i], &st) == 0) {
:+ if (S_ISDIR(st.st_mode)) {
:+ ++dcount;
:+ dname = argv[i]; /* only used if 1 dir */
:+ } else {
:+ ++fcount;
:+ }
:+ }
:+ }
:+ first = 0;
:+ while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') {
:+ if (dcount && rflag) {
:+ fprintf(stderr, "recursively remove");
:+ if (dcount == 1)
:+ fprintf(stderr, " %s", dname);
:+ else
:+ fprintf(stderr, " %d dirs", dcount);
:+ if (fcount == 1)
:+ fprintf(stderr, " and 1 file");
:+ else if (fcount > 1)
:+ fprintf(stderr, " and %d files", fcount);
:+ } else if (dcount + fcount > 3) {
:+ fprintf(stderr, "remove %d files", dcount + fcount);
:+ } else {
:+ return(1);
:+ }
:+ fprintf(stderr, "? ");
:+ fflush(stderr);
:+
:+ first = ch = getchar();
:+ while (ch != '\n' && ch != EOF)
:+ ch = getchar();
:+ if (ch == EOF)
:+ break;
:+ }
:+ return (first == 'y' || first == 'Y');
:+}
:+
: #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
: void
: checkdot(char **argv)
:@@ -519,7 +578,7 @@
: {
:
: (void)fprintf(stderr, "%s\n%s\n",
:- "usage: rm [-f | -i] [-dPRrvW] file ...",
:+ "usage: rm [-f | -i] [-dIPRrvW] file ...",
: " unlink file");
: exit(EX_USAGE);
: }
:
:==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 (text+ko) ====
:
:@@ -29,7 +29,7 @@
: .\" SUCH DAMAGE.
: .\"
: .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
:-.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $
:+.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $
: .\"
: .Dd July 3, 2004
: .Dt SH 1
:@@ -947,12 +947,16 @@
: .Ic set
: built-in command can also be used to set or reset them.
: .Ss Special Parameters
:-A special parameter is a parameter denoted by one of the following
:-special characters.
:-The value of the parameter is listed
:-next to its character.
:+A special parameter is a parameter denoted by a special one-character
:+name.
:+The special parameters recognized by the
:+.Nm
:+shell of
:+.Fx
:+are shown in the following list, exactly as they would appear in input
:+typed by the user or in the source of a shell script.
:
:>>> TRUNCATED FOR MAIL (1000 lines) <<<
:
:
--
Andrew R. Reiter
arr at watson.org
arr at FreeBSD.org
More information about the p4-projects
mailing list