Date: Sun, 31 Oct 2004 17:16:00 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 64019 for review Message-ID: <200410311716.i9VHG0We053965@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=64019 Change 64019 by peter@peter_overcee on 2004/10/31 17:15:50 IFC @64018 Affected files ... .. //depot/projects/hammer/Makefile.inc1#67 integrate .. //depot/projects/hammer/bin/rm/rm.1#7 integrate .. //depot/projects/hammer/bin/rm/rm.c#9 integrate .. //depot/projects/hammer/crypto/openssh/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/CREDITS#5 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#7 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#5 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/hammer/crypto/openssh/README#5 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#2 integrate .. //depot/projects/hammer/crypto/openssh/README.privsep#5 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#7 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#8 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#6 integrate .. //depot/projects/hammer/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/hammer/crypto/openssh/canohost.c#8 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#8 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#5 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#7 integrate .. //depot/projects/hammer/crypto/openssh/cipher.h#3 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#6 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.h#3 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#7 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#5 integrate .. //depot/projects/hammer/crypto/openssh/config.h#7 integrate .. //depot/projects/hammer/crypto/openssh/config.sub#5 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#7 integrate .. //depot/projects/hammer/crypto/openssh/contrib/Makefile#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/buildbff.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/inventory.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/pam.conf#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/ssh-host-keygen#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.init#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.pam#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/Makefile#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-host-config#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-user-config#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/findssl.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass1.c#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass2.c#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd.rc#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd.rc#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.init#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.pam#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/buildpkg.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/opensshd.in#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id.1#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.freebsd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.generic#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.config.sshd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.sshd#2 delete .. //depot/projects/hammer/crypto/openssh/defines.h#7 integrate .. //depot/projects/hammer/crypto/openssh/dh.c#7 integrate .. //depot/projects/hammer/crypto/openssh/dh.h#2 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#3 integrate .. //depot/projects/hammer/crypto/openssh/envpass.sh#1 branch .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#6 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#4 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#4 integrate .. //depot/projects/hammer/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/hammer/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/hammer/crypto/openssh/key.c#7 integrate .. //depot/projects/hammer/crypto/openssh/log.c#6 integrate .. //depot/projects/hammer/crypto/openssh/log.h#7 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#7 integrate .. //depot/projects/hammer/crypto/openssh/logintest.c#3 integrate .. //depot/projects/hammer/crypto/openssh/mdoc2man.awk#3 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#6 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#3 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#3 integrate .. //depot/projects/hammer/crypto/openssh/moduli.h#2 delete .. //depot/projects/hammer/crypto/openssh/monitor.c#9 integrate .. //depot/projects/hammer/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#7 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#6 integrate .. //depot/projects/hammer/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/hammer/crypto/openssh/nchan.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/hammer/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/hammer/crypto/openssh/packet.c#7 integrate .. //depot/projects/hammer/crypto/openssh/packet.h#4 integrate .. //depot/projects/hammer/crypto/openssh/pathnames.h#3 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#5 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#7 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#6 integrate .. //depot/projects/hammer/crypto/openssh/readpass.c#3 integrate .. //depot/projects/hammer/crypto/openssh/readpass.h#2 delete .. //depot/projects/hammer/crypto/openssh/regress/Makefile#6 integrate .. //depot/projects/hammer/crypto/openssh/regress/README.regress#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/dynamic-forward.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/login-timeout.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#5 integrate .. //depot/projects/hammer/crypto/openssh/regress/try-ciphers.sh#4 integrate .. //depot/projects/hammer/crypto/openssh/rijndael.c#5 integrate .. //depot/projects/hammer/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/hammer/crypto/openssh/scard.c#3 integrate .. //depot/projects/hammer/crypto/openssh/scard/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/scp.1#6 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#7 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#7 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#5 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#7 integrate .. //depot/projects/hammer/crypto/openssh/session.c#10 integrate .. //depot/projects/hammer/crypto/openssh/session.h#6 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#9 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#7 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#9 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#10 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.h#3 delete .. //depot/projects/hammer/crypto/openssh/tildexpand.c#2 integrate .. //depot/projects/hammer/crypto/openssh/tildexpand.h#2 delete .. //depot/projects/hammer/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/hammer/crypto/openssh/version.c#3 integrate .. //depot/projects/hammer/crypto/openssh/version.h#10 integrate .. //depot/projects/hammer/etc/defaults/Makefile#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#39 integrate .. //depot/projects/hammer/etc/mtree/Makefile#3 integrate .. //depot/projects/hammer/etc/namedb/Makefile#2 integrate .. //depot/projects/hammer/etc/network.subr#8 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#5 integrate .. //depot/projects/hammer/etc/rc.d/netif#10 integrate .. //depot/projects/hammer/etc/rc.d/pf#6 integrate .. //depot/projects/hammer/etc/rc.d/savecore#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#30 integrate .. //depot/projects/hammer/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/hammer/games/ppt/Makefile#3 integrate .. //depot/projects/hammer/games/primes/Makefile#2 integrate .. //depot/projects/hammer/gnu/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/hammer/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdbreplay/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#11 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1plus/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/TESTS/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grohtml/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libbib/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libdriver/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/html/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/man/lib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/rcs/lib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/libtxi/Makefile#3 integrate .. //depot/projects/hammer/include/arpa/Makefile#2 integrate .. //depot/projects/hammer/include/protocols/Makefile#2 integrate .. //depot/projects/hammer/lib/bind/config.mk#4 integrate .. //depot/projects/hammer/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/hammer/lib/libalias/Makefile#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#17 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/Makefile#18 integrate .. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#8 integrate .. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sys/mlock.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#7 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#8 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#5 integrate .. //depot/projects/hammer/lib/libdisk/Makefile#8 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#11 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#7 integrate .. //depot/projects/hammer/lib/libio/Makefile#2 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#14 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#13 integrate .. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#16 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/hammer/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/hammer/lib/libsm/Makefile#5 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#4 integrate .. //depot/projects/hammer/lib/libsmdb/Makefile#3 integrate .. //depot/projects/hammer/lib/libsmutil/Makefile#3 integrate .. //depot/projects/hammer/lib/libstand/Makefile#10 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#5 integrate .. //depot/projects/hammer/lib/libthr/Makefile#7 integrate .. //depot/projects/hammer/lib/libxpg4/Makefile#3 integrate .. //depot/projects/hammer/lib/liby/Makefile#4 integrate .. //depot/projects/hammer/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#18 integrate .. //depot/projects/hammer/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#13 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/hammer/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#4 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#17 integrate .. //depot/projects/hammer/sbin/Makefile#29 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#7 integrate .. //depot/projects/hammer/sbin/dhclient/common/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/dst/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/minires/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/omapip/Makefile#2 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#8 integrate .. //depot/projects/hammer/sbin/gpt/add.c#7 integrate .. //depot/projects/hammer/sbin/gpt/create.c#5 integrate .. //depot/projects/hammer/sbin/gpt/destroy.c#4 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#5 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#6 integrate .. //depot/projects/hammer/sbin/gpt/gpt.h#5 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#7 integrate .. //depot/projects/hammer/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/hammer/sbin/gpt/recover.c#6 integrate .. //depot/projects/hammer/sbin/gpt/remove.c#2 integrate .. //depot/projects/hammer/sbin/gpt/show.c#7 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#6 integrate .. //depot/projects/hammer/sbin/gvinum/Makefile#2 integrate .. //depot/projects/hammer/sbin/mca/Makefile#3 integrate .. //depot/projects/hammer/sbin/pflogd/Makefile#3 integrate .. //depot/projects/hammer/sbin/rtsol/Makefile#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#13 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#8 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#9 integrate .. //depot/projects/hammer/share/dict/Makefile#2 integrate .. //depot/projects/hammer/share/doc/IPv6/Makefile#2 integrate .. //depot/projects/hammer/share/doc/bind9/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/bufbio/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/devfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/diskperf/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/jail/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/kernmalloc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/kerntune/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/nqnfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/px/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/relengr/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/sysperf/Makefile#4 integrate .. //depot/projects/hammer/share/doc/papers/timecounter/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/01.cacm/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/02.implement/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/05.sysman/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/06.Clang/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/13.rcs/rcs/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/15.yacc/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/16.lex/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/18.gprof/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/20.ipctut/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/21.ipc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/22.rpcgen/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/23.rpc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/24.xdr/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/25.xdrrfc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/26.rpcrfc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/27.nfsrpc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/28.cvs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/01.setup/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/02.config/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/05.fastfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/08.sendmailop/Makefile#4 integrate .. //depot/projects/hammer/share/doc/smm/12.timed/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/04.csh/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/07.mail/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/10.exref/summary/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/11.vitut/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/summary/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/vi/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/13.viref/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/21.troff/Makefile#3 integrate .. //depot/projects/hammer/share/examples/Makefile#7 integrate .. //depot/projects/hammer/share/examples/autofs/driver/Makefile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#4 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#28 integrate .. //depot/projects/hammer/share/examples/ipfilter/Makefile#2 integrate .. //depot/projects/hammer/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/hammer/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/hammer/share/examples/pf/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ppi/Makefile#2 integrate .. //depot/projects/hammer/share/examples/smbfs/Makefile#2 integrate .. //depot/projects/hammer/share/examples/smbfs/print/Makefile#2 integrate .. //depot/projects/hammer/share/info/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/fd.4#2 integrate .. //depot/projects/hammer/share/man/man4/mem.4#6 integrate .. //depot/projects/hammer/share/man/man4/uftdi.4#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#40 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#7 integrate .. //depot/projects/hammer/share/misc/Makefile#3 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#19 integrate .. //depot/projects/hammer/share/mk/Makefile#4 integrate .. //depot/projects/hammer/share/mk/sys.mk#16 integrate .. //depot/projects/hammer/share/security/Makefile#3 integrate .. //depot/projects/hammer/share/sendmail/Makefile#4 integrate .. //depot/projects/hammer/share/skel/Makefile#3 integrate .. //depot/projects/hammer/share/snmp/mibs/Makefile#2 integrate .. //depot/projects/hammer/share/syscons/fonts/Makefile#5 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#104 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#22 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#25 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/common/Makefile.inc#10 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#14 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#70 integrate .. //depot/projects/hammer/sys/conf/files#89 integrate .. //depot/projects/hammer/sys/conf/files.i386#42 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#23 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#33 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#37 integrate .. //depot/projects/hammer/sys/conf/options#61 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/hammer/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#22 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#11 integrate .. //depot/projects/hammer/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#51 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#18 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#23 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#8 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#7 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#16 integrate .. //depot/projects/hammer/sys/geom/geom.h#30 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#11 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#32 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#1 branch .. //depot/projects/hammer/sys/geom/geom_vfs.h#1 branch .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bmap.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#9 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_subr.c#4 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#20 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#56 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#41 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#60 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_bmap.c#4 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.c#9 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.h#6 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#15 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#5 integrate .. //depot/projects/hammer/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#51 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#2 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#28 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#59 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#23 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#10 integrate .. //depot/projects/hammer/sys/modules/Makefile#57 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/smbfs/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#34 integrate .. //depot/projects/hammer/sys/net/if_var.h#23 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#12 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#16 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#13 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#10 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#23 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#9 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#35 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd_cd.c#9 integrate .. //depot/projects/hammer/sys/pci/agp.c#16 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#16 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#27 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/hammer/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/hammer/sys/sys/buf.h#17 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#2 integrate .. //depot/projects/hammer/sys/sys/conf.h#25 integrate .. //depot/projects/hammer/sys/sys/kernel.h#11 integrate .. //depot/projects/hammer/sys/sys/mount.h#24 integrate .. //depot/projects/hammer/sys/sys/systm.h#26 integrate .. //depot/projects/hammer/sys/sys/vnode.h#33 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#26 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#26 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#9 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#32 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#34 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#31 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#15 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#22 integrate .. //depot/projects/hammer/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/hammer/tools/diag/localeck/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/geom/ConfCmp/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/ttls1/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/tls/ttls2/Makefile#3 integrate .. //depot/projects/hammer/tools/test/malloc/Makefile#2 integrate .. //depot/projects/hammer/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/aac/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/gdb_regofs/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ministat/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#6 integrate .. //depot/projects/hammer/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#27 integrate .. //depot/projects/hammer/usr.bin/dirname/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/elf2aout/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/truss/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/unexpand/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#8 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#8 integrate .. //depot/projects/hammer/usr.sbin/cron/lib/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#11 integrate .. //depot/projects/hammer/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/lpr/common_source/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/mrouted/common/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/libntp/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/libparse/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Doc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Etc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#67 (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 @@ -565,7 +565,7 @@ .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif ==== //depot/projects/hammer/bin/rm/rm.1#7 (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.32 2004/10/28 08:25:30 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 then 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/hammer/bin/rm/rm.c#9 (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/hammer/crypto/openssh/CREDITS#5 (text+ko) ==== @@ -31,6 +31,7 @@ David Del Piero <David.DelPiero@qed.qld.gov.au> - bug fixes David Hesprich <darkgrue@gue-tech.org> - Configure fixes David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes +Dag-Erling Smørgrav <des at freebsd.org> - Challenge-Response PAM code. Ed Eden <ede370@stl.rural.usda.gov> - configure fixes Garrick James <garrick@james.net> - configure fixes Gary E. Miller <gem@rellim.com> - SCO support @@ -43,7 +44,7 @@ IWAMURO Motonori <iwa@mmp.fujitsu.co.jp> - bugfixes Jani Hakala <jahakala@cc.jyu.fi> - Patches Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes -Jim Knoble <jmknoble@jmknoble.cx> - Many patches +Jim Knoble <jmknoble@pobox.com> - Many patches Jonchen (email unknown) - the original author of PAM support of SSH Juergen Keil <jk@tools.de> - scp bugfixing KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes @@ -61,6 +62,7 @@ Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes Mark Miller <markm@swoon.net> - Bugfixes Matt Richards <v2matt@btv.ibm.com> - AIX patches +Michael Steffens <michael_steffens at hp.com> - HP-UX fixes Michael Stone <mstone@cs.loyola.edu> - Irix enhancements Nakaji Hiroyuki <nakaji@tutrp.tut.ac.jp> - Sony News-OS patch Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch @@ -76,6 +78,7 @@ Philippe WILLEM <Philippe.WILLEM@urssaf.fr> - Bugfixes Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix Rip Loomis <loomisg@cist.saic.com> - Solaris package support, fixes +Robert Dahlem <Robert.Dahlem at siemens.com> - Reliant Unix fixes Roumen Petrov <openssh@roumenpetrov.info> - Compile & configure fixes SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes, Compat with MIT KrbV @@ -95,5 +98,5 @@ Damien Miller <djm@mindrot.org> -$Id: CREDITS,v 1.77 2004/01/30 04:00:50 dtucker Exp $ +$Id: CREDITS,v 1.79 2004/05/26 23:59:31 dtucker Exp $ ==== //depot/projects/hammer/crypto/openssh/ChangeLog#7 (text+ko) ==== @@ -1,10 +1,681 @@ +20040817 + - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/08/16 08:17:01 + [version.h] + 3.9 + - (djm) Crank RPM spec version numbers + - (djm) Release 3.9p1 + +20040816 + - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root + to convince Solaris PAM to honour password complexity rules. ok djm@ + +20040815 + - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since + it does the right thing on all platforms. ok djm@ + - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in + openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c + openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter + closefrom() replacement from sudo; ok dtucker@ + - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker + - (dtucker) [Makefile.in] Fix typo. + +20040814 + - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c] + Explicitly set umask for mkstemp; ok djm@ + - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise + prot.h and shadow.h provide conflicting declarations of getspnam. ok djm@ + - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] + Plug AIX login recording into login_write so logins will be recorded for + all auth types. + +20040813 + - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at + redhat.com +- (dtucker) OpenBSD CVS Sync + - avsm@cvs.openbsd.org 2004/08/11 21:43:05 + [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c] + some signed/unsigned int comparison cleanups; markus@ ok + - avsm@cvs.openbsd.org 2004/08/11 21:44:32 + [authfd.c scp.c ssh-keyscan.c] + use atomicio instead of homegrown equivalents or read/write. + markus@ ok + - djm@cvs.openbsd.org 2004/08/12 09:18:24 + [sshlogin.c] + typo in error message, spotted by moritz AT jodeit.org (Id sync only) + - jakob@cvs.openbsd.org 2004/08/12 21:41:13 + [ssh-keygen.1 ssh.1] + improve SSHFP documentation; ok deraadt@ + - jmc@cvs.openbsd.org 2004/08/13 00:01:43 + [ssh-keygen.1] + kill whitespace at eol; + - djm@cvs.openbsd.org 2004/08/13 02:51:48 + [monitor_fdpass.c] + extra check for no message case; ok markus, deraadt, hshoexer, henning + - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 + [servconf.c] + Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr + ok markus@, djm@ + +20040812 + - (dtucker) [sshd.c] Remove duplicate variable imported during sync. + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/28 08:56:22 + [sshd.c] + call setsid() _before_ re-exec + - markus@cvs.openbsd.org 2004/07/28 09:40:29 + [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c + sshconnect1.c] + more s/illegal/invalid/ + - djm@cvs.openbsd.org 2004/08/04 10:37:52 + [dh.c] + return group14 when no primes found - fixes hang on empty /etc/moduli; + ok markus@ + - dtucker@cvs.openbsd.org 2004/08/11 11:09:54 + [servconf.c] + Fix minor leak; "looks right" deraadt@ + - dtucker@cvs.openbsd.org 2004/08/11 11:50:09 + [sshd.c] + Don't try to close startup_pipe if it's not open; ok djm@ + - djm@cvs.openbsd.org 2004/08/11 11:59:22 + [sshlogin.c] + check that lseek went were we told it to; ok markus@ + (Id sync only, but similar changes are needed in loginrec.c) + - djm@cvs.openbsd.org 2004/08/11 12:01:16 + [sshlogin.c] + make store_lastlog_message() static to appease -Wall; ok markus + - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling + messages generated before the postauth privsep split. + +20040720 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/21 08:56:12 + [auth.c] + s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, + miod, ... + - djm@cvs.openbsd.org 2004/07/21 10:33:31 + [auth1.c auth2.c] + bz#899: Don't display invalid usernames in setproctitle + from peak AT argo.troja.mff.cuni.cz; ok markus@ + - djm@cvs.openbsd.org 2004/07/21 10:36:23 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410311716.i9VHG0We053965>