From owner-p4-projects@FreeBSD.ORG Mon May 5 09:34:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4377037B404; Mon, 5 May 2003 09:34:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0FC637B401 for ; Mon, 5 May 2003 09:34:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A2EA43F85 for ; Mon, 5 May 2003 09:34:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45GYe0U083129 for ; Mon, 5 May 2003 09:34:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45GYbws083126 for perforce@freebsd.org; Mon, 5 May 2003 09:34:37 -0700 (PDT) Date: Mon, 5 May 2003 09:34:37 -0700 (PDT) Message-Id: <200305051634.h45GYbws083126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 16:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30604 Change 30604 by rwatson@rwatson_tislabs on 2003/05/05 09:33:41 Further integrate the TrustedBSD base tree to pick up a variety of useful fixes from the last integ: OpenPAM update, groff fix, fix for a VM/VFS sign bug with disastrous consequences, and also improved support for AMD64. Assuming this boots and runs properly on my crash machines, I'll integ the MAC branch in the next day or two. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#37 integrate .. //depot/projects/trustedbsd/base/UPDATING#30 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#14 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#19 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/extern.h#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/getoldopt.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#9 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.h#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#8 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#6 integrate .. //depot/projects/trustedbsd/base/bin/stty/gfmt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#11 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/libtelnet/auth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/libtelnet/enc_des.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/authenc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/commands.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/main.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/network.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/ring.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/sys_bsd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/telnet.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/terminal.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/utilities.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/authenc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/slc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/state.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/sys_term.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/termstat.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/utility.c#3 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#29 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#25 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.alpha/rc.alpha#3 delete .. //depot/projects/trustedbsd/base/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/trustedbsd/base/etc/etc.i386/rc.i386#3 delete .. //depot/projects/trustedbsd/base/etc/etc.ia64/rc.ia64#3 delete .. //depot/projects/trustedbsd/base/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/trustedbsd/base/etc/rc#23 integrate .. //depot/projects/trustedbsd/base/etc/rc.atm#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/apm#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/serial#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/virecover#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.devfs#5 delete .. //depot/projects/trustedbsd/base/etc/rc.diskless1#10 delete .. //depot/projects/trustedbsd/base/etc/rc.diskless2#10 delete .. //depot/projects/trustedbsd/base/etc/rc.isdn#3 delete .. //depot/projects/trustedbsd/base/etc/rc.network#19 delete .. //depot/projects/trustedbsd/base/etc/rc.network6#8 delete .. //depot/projects/trustedbsd/base/etc/rc.pccard#3 delete .. //depot/projects/trustedbsd/base/etc/rc.sendmail#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.serial#4 delete .. //depot/projects/trustedbsd/base/etc/rc.syscons#5 delete .. //depot/projects/trustedbsd/base/etc/rc.sysctl#4 delete .. //depot/projects/trustedbsd/base/etc/usbd.conf#5 integrate .. //depot/projects/trustedbsd/base/games/caesar/caesar.c#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/trustedbsd/base/games/pom/pom.c#3 integrate .. //depot/projects/trustedbsd/base/games/random/random.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/notify.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/raw_popen.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/textbox.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#28 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/mount.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/pmap_prot.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rex.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/sm_inter.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/spray.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/yp.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/yppasswd.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/modules.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#8 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#9 integrate .. //depot/projects/trustedbsd/base/libexec/rlogind/rlogind.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/yp_dbwrite.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_getmap.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_misc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#41 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#17 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#38 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#63 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#18 integrate .. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#11 integrate .. //depot/projects/trustedbsd/base/sbin/adjkerntz/adjkerntz.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/badsect/badsect.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/util.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/clri/clri.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#5 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/dir.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1b.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass3.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass4.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/utilities.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldload/kldload.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/md5/md5.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount/vfslist.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/quotacheck.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/reboot.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/spppcontrol/spppcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/sunlabel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/list.c#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/trustedbsd/base/secure/libexec/Makefile#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/dict/web2#3 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#30 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rue.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#22 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#26 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#12 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#14 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/isa/vector.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/vector.s#2 delete .. //depot/projects/trustedbsd/base/sys/arm/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#18 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#58 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/hwregs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.reg#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_inline.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/snc/dp83932subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumconfig.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_dbregs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_fpregs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_regs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_work.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_apple.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mirror.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/locore.s#11 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#31 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/md5c.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#43 integrate .. //depot/projects/trustedbsd/base/sys/modules/mii/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/rue/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/ata.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/disklabel.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/soundcard.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#31 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.h#8 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#25 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/table.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cut/cut.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/nohup/nohup.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/uudecode/uudecode.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/uuencode/uuencode.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/xlint/xlint/xlint.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/accton/accton.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/boot0cfg/boot0cfg.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.8#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chown/chown.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chroot/chroot.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/dev_mkdb/dev_mkdb.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fdcontrol/fdcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kbdcontrol/kbdcontrol.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lptcontrol/lptcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/compare.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/create.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/excludes.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/mtree.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/verify.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quotaon/quotaon.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rarpd/rarpd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/repquota/repquota.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rmt/rmt.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/yp_dbdelete.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/yp_dbupdate.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/ypupdated_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/ypupdated_server.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/pdb.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/usrdb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/slstat/slstat.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#24 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/trpt/trpt.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/usbd/usbd.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vipw/vipw.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yp_mkdb/yp_mkdb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/yp_ping.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppoll/yppoll.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_access.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dblookup.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dnslookup.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_error.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_svc_udp.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypset/ypset.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#37 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/trustedbsd/base/UPDATING#30 (text+ko) ==== @@ -17,11 +17,19 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/trustedbsd/base/bin/csh/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/trustedbsd/base/bin/df/df.c#14 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/trustedbsd/base/bin/ed/ed.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/trustedbsd/base/bin/ls/extern.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); >>> TRUNCATED FOR MAIL (1000 lines) <<<