Date: Tue, 2 Nov 2004 18:06:38 GMT From: "Andrew R. Reiter" <arr@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 64101 for review Message-ID: <200411021806.iA2I6c29037136@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=64101 Change 64101 by arr@arr_tbsd_base_d400laptop on 2004/11/02 18:06:26 Integ of trustedbsd 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/base/Makefile.inc1#55 integrate .. //depot/projects/trustedbsd/base/UPDATING#49 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#10 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/CREDITS#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/OVERVIEW#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.sub#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/envpass.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/logintest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mdoc2man.awk#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/nchan.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.h#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/README.regress#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/dynamic-forward.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/try-ciphers.sh#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rijndael.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#21 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.h#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/tildexpand.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/tildexpand.h#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/ttymodes.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#16 integrate .. //depot/projects/trustedbsd/base/etc/defaults/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#41 integrate .. //depot/projects/trustedbsd/base/etc/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/namedb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#22 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/natd#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/savecore#7 integrate .. //depot/projects/trustedbsd/base/etc/usbd.conf#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#37 integrate .. //depot/projects/trustedbsd/base/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/trustedbsd/base/games/ppt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/primes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libgroff/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/include/arpa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/include/protocols/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mlock.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/chunk.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/open_disk.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#25 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#22 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/trustedbsd/base/lib/librpcsvc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libsmdb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libsmutil/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libxpg4/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/liby/Makefile#4 integrate .. //depot/projects/trustedbsd/base/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#27 integrate .. //depot/projects/trustedbsd/base/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#11 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#26 integrate .. //depot/projects/trustedbsd/base/release/Makefile#61 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#30 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#26 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/common/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dst/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/minires/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/omapip/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/destroy.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/migrate.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/recover.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/gvinum/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#33 integrate .. //depot/projects/trustedbsd/base/sbin/mca/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/pflogd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/rtsol/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#22 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#14 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/Makefile#9 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/dict/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/IPv6/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/bufbio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/devfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/diskperf/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/jail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/kernmalloc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/kerntune/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/nqnfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/px/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/relengr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/sysperf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/01.cacm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/02.implement/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/05.sysman/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/06.Clang/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/13.rcs/rcs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/15.yacc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/16.lex/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/18.gprof/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/20.ipctut/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/21.ipc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/22.rpcgen/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/23.rpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/24.xdr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/25.xdrrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/26.rpcrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/27.nfsrpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/28.cvs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/01.setup/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/02.config/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/05.fastfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/08.sendmailop/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/12.timed/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/04.csh/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/07.mail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/10.exref/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/11.vitut/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/vi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/13.viref/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/21.troff/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#30 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ppi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/smbfs/print/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/info/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#50 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/divert.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fd.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/inet.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mem.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_device.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#42 integrate .. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#8 integrate .. //depot/projects/trustedbsd/base/share/misc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#19 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#17 integrate .. //depot/projects/trustedbsd/base/share/security/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/sendmail/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/skel/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/snmp/mibs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_trace.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/beastie.4th#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biospci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#54 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#78 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#45 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#32 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#54 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_output.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_variables.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwcrom.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/global.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfsmount.h#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#35 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#37 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_int.h#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#32 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_bmap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_inode.c#13 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_asus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#50 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#27 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/db_trace.c#12 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/sscdisk.c#10 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_bmap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.c#11 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/iso.h#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_physio.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_unit.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_ipc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#22 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#58 integrate .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#26 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_cisco.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#23 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC.hints#10 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#44 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd_cd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_skreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powermac/ata_macio.c#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#32 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/db_trace.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/kernel.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/ktr.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#59 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#29 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#49 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#14 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/inode.h#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#22 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#36 integrate .. //depot/projects/trustedbsd/base/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/diag/localeck/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#13 integrate .. //depot/projects/trustedbsd/base/tools/test/malloc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/aac/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/gdb_regofs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/ministat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#35 integrate .. //depot/projects/trustedbsd/base/usr.bin/dirname/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/du/du.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/elf2aout/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/compat.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.h#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#22 integrate .. //depot/projects/trustedbsd/base/usr.bin/mktemp/mktemp.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/unexpand/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/uudecode/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/libamu/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/bsnmpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/lang.l#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/common/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/libntp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/libparse/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#55 (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/base/UPDATING#49 (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/base/bin/rm/rm.1#10 (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/base/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/base/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) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411021806.iA2I6c29037136>