From owner-p4-projects@FreeBSD.ORG Wed Nov 17 14:44:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1A9B16A4DE; Wed, 17 Nov 2004 14:44:01 +0000 (GMT) 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 9756216A4CE for ; Wed, 17 Nov 2004 14:44:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3846843D2F for ; Wed, 17 Nov 2004 14:44:01 +0000 (GMT) (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.11/8.12.11) with ESMTP id iAHEi1mq070243 for ; Wed, 17 Nov 2004 14:44:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAHEi0iA070238 for perforce@freebsd.org; Wed, 17 Nov 2004 14:44:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Nov 2004 14:44:00 GMT Message-Id: <200411171444.iAHEi0iA070238@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 65330 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: Wed, 17 Nov 2004 14:44:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=65330 Change 65330 by rwatson@rwatson_tislabs on 2004/11/17 14:43:43 Integrate TrustedBSD base branch from FreeBSD CVS HEAD; primarily to loop back System V IPC labels and MAC Framework entry point implementations for System V IPC. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#57 integrate .. //depot/projects/trustedbsd/base/UPDATING#51 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#11 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#20 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#24 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ramdisk-own#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/serial#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#33 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/net/htonl.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohl.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmd.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/netnamer.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_getprocs.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/librpcsvc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libxpg4/Makefile#4 delete .. //depot/projects/trustedbsd/base/lib/libxpg4/fakelib.c#3 delete .. //depot/projects/trustedbsd/base/libexec/Makefile#16 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#20 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#29 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#13 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/lockdflt.c#5 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld_lock.c#3 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/PICOBSD#5 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.c#10 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#32 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#52 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vkbd.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#23 integrate .. //depot/projects/trustedbsd/base/share/man/man9/get_cyclecount.9#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#19 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#23 integrate .. //depot/projects/trustedbsd/base/share/numericdef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/commands.c#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#80 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#47 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#37 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#24 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#26 integrate .. //depot/projects/trustedbsd/base/sys/crypto/blowfish/arch/i386/bf_enc.S#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_sony.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_toshiba.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_snc.c#2 delete .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/mc146818/mc146818reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txxreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txxvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#34 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_bmap.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_asus.c#7 delete .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_panasonic.c#4 delete .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_toshiba.c#7 delete .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#51 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#46 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#37 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#52 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/atomic.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/cpu.h#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/endian.h#14 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC.hints#6 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_bmap.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#23 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#60 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/Makefile#19 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_asus/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_sony/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/vkbd/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/in.c#17 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#16 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#37 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#45 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#25 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_skreg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_msg.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_sem.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac/mac_sysv_shm.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#41 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/eeprom.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/eeprom.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/eeprom_ebus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/eeprom_sbus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#28 integrate .. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#23 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#40 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#38 integrate .. //depot/projects/trustedbsd/base/sys/sys/msg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/sem.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/shm.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#51 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#38 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#39 integrate .. //depot/projects/trustedbsd/base/usr.bin/chkey/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/config.h#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#24 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/newkey/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/pkill/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/pkill/pkill.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tr/str.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#37 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpiconf/acpiconf.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/include/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bootparamd/bootparamd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#22 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#57 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.454 2004/11/12 13:22:22 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -404,11 +404,21 @@ cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) + cd ${.CURDIR}/kerberos5/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif .endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools .endfor +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.for _t in obj depend all + cd ${.CURDIR}/kerberos5/tools; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} +.endfor +.endif cd ${.CURDIR}; \ ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries .for _t in obj depend all @@ -992,7 +1002,7 @@ lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ + lib/libsbuf lib/libtacplus lib/libutil \ lib/libz lib/msun lib/libopie__L lib/libtacplus__L: lib/libmd__L @@ -1029,6 +1039,10 @@ lib/libradius__L: lib/libmd__L .endif +.if !defined(NO_NIS) +_prebuild_libs+= lib/libypclnt +.endif + _generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/trustedbsd/base/UPDATING#51 (text+ko) ==== @@ -23,6 +23,10 @@ developers choose to disable these features on build machines to maximize performance. +20041116: + Support for systems with an 80386 CPU has been removed. Please + use FreeBSD 5.x or earlier on systems with an 80386. + 20041110: We have had a hack which would mount the root filesystem R/W if the device were named 'md*'. As part of the vnode @@ -1969,4 +1973,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.378 2004/11/10 07:39:27 phk Exp $ +$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ ==== //depot/projects/trustedbsd/base/bin/ps/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.25 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.26 2004/11/13 17:12:22 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -13,7 +13,5 @@ CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} LDADD= -lm -lkvm -#BINGRP= kmem -#BINMODE=2555 .include ==== //depot/projects/trustedbsd/base/bin/ps/ps.c#20 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.108 2004/11/14 19:30:02 csjp Exp $"); #include #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,7 @@ } l; }; +static int check_procfs(void); static int addelem_gid(struct listinfo *, const char *); static int addelem_pid(struct listinfo *, const char *); static int addelem_tty(struct listinfo *, const char *); @@ -171,7 +173,7 @@ struct winsize ws; const char *nlistf, *memf; char *cols; - int all, ch, dropgid, elem, flag, _fmt, i, lineno; + int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; @@ -196,7 +198,7 @@ if (argc > 1) argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]); - all = dropgid = _fmt = nselectors = optfatal = 0; + all = _fmt = nselectors = optfatal = 0; prtheader = showthreads = wflag = xkeep_implied = 0; xkeep = -1; /* Neither -x nor -X. */ init_list(&gidlist, addelem_gid, sizeof(gid_t), "group"); @@ -278,14 +280,12 @@ break; case 'M': memf = optarg; - dropgid = 1; break; case 'm': sortby = SORTMEM; break; case 'N': nlistf = optarg; - dropgid = 1; break; case 'O': parsefmt(o1, 1); @@ -404,6 +404,14 @@ argv += optind; /* + * If the user specified ps -e then they want a copy of the process + * environment kvm_getenvv(3) attempts to open /proc//mem. + * Check to make sure that procfs is mounted on /proc, otherwise + * print a warning informing the user that output will be incomplete. + */ + if (needenv == 1 && check_procfs() == 0) + warnx("Process environment requires procfs(5)"); + /* * If there arguments after processing all the options, attempt * to treat them as a list of process ids. */ @@ -423,14 +431,6 @@ if (xkeep < 0) /* Neither -X nor -x was specified. */ xkeep = xkeep_implied; - - /* - * Discard setgid privileges if not the running kernel so that bad - * guys can't print interesting stuff from kernel memory. - */ - if (dropgid) - setgid(getgid()); - kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (kd == 0) errx(1, "%s", errbuf); @@ -1176,6 +1176,21 @@ return (newopts); } +static int +check_procfs(void) +{ + struct statfs *mntbuf; + size_t mntsize, i; + + mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + for (i = 0; i < mntsize; i++) + if (strcmp(mntbuf[i].f_mntonname, "/proc") == 0 && + strcmp(mntbuf[i].f_fstypename, "procfs") == 0) { + return (1); + } + return (0); +} + static void usage(void) { ==== //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.4 2004/10/07 15:39:02 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.5 2004/11/14 17:05:54 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -349,7 +349,7 @@ .It Ar set limit Sets hard limits on the memory pools used by the packet filter. See -.Xr pool 9 +.Xr zone 9 for an explanation of memory pools. .Pp For example, ==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.47 2004/11/16 04:20:09 wes Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -28,7 +28,7 @@ pccard pcvt pf pflog \ power_profile ppp-user pppoed preseedrandom pwcheck \ quota \ - random rarpd rcconf.sh resolv root \ + ramdisk ramdisk-own random rarpd rcconf.sh resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore securelevel sendmail \ serial sppp sshd swap1 \ ==== //depot/projects/trustedbsd/base/etc/rc.d/ramdisk-own#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.4 2004/11/16 04:14:28 wes Exp $ # # PROVIDE: ramdisk-own @@ -39,7 +39,6 @@ ramdisk_own_start() { -set -x for unit in $ramdisk_units; do device="/dev/md$unit" dir=`mount | grep $device | cut -d' ' -f3` ==== //depot/projects/trustedbsd/base/etc/rc.d/serial#7 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.22 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.24 2004/11/14 19:51:34 obrien Exp $ # # PROVIDE: serial @@ -45,73 +45,69 @@ default() { # Reset everything changed by the other functions to initial defaults. - ci=$1; shift # call in device identifier - co=$1; shift # call out device identifier + dc=$1; shift # device name character drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait - stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 - stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/cual${co}${i} -clocal -crtscts -hupcl 0 + comcontrol /dev/tty${dc}${i} dtrwait 300 drainwait $drainwait + stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/tty${dc}${i}.lock -clocal -crtscts -hupcl 0 + stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/cua${dc}${i}.lock -clocal -crtscts -hupcl 0 done } maybe() { # Special settings. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # Don't use ^R; it breaks bash's ^R when typed ahead. - stty < /dev/ttyi${ci}${i} reprint undef - stty < /dev/cuai${co}${i} reprint undef + stty < /dev/tty${dc}${i}.init reprint undef + stty < /dev/cua${dc}${i}.init reprint undef # Lock clocal off on dialin device for security. - stty < /dev/ttyl${ci}${i} clocal + stty < /dev/tty${dc}${i}.lock clocal # Lock the speeds to use old binaries that don't support them. # Any legal speed works to lock the initial speed. - stty < /dev/ttyl${ci}${i} 300 - stty < /dev/cual${co}${i} 300 + stty < /dev/tty${dc}${i}.lock 300 + stty < /dev/cua${dc}${i}.lock 300 done } modem() { # Modem that supports CTS and perhaps RTS handshaking. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # may depend on modem - comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 + comcontrol /dev/tty${dc}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 115200 - stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 115200 - stty < /dev/cual${co}${i} crtscts + stty < /dev/tty${dc}${i}.init crtscts 115200 + stty < /dev/tty${dc}${i}.lock crtscts + stty < /dev/cua${dc}${i}.init crtscts 115200 + stty < /dev/cua${dc}${i}.lock crtscts done } mouse() { # Mouse on either callin or callout port. - ci=$1; shift - co=$1; shift + dc=$1; shift for i in $* do # Lock clocal on, hupcl off. # Standard speed for Microsoft mouse. - stty < /dev/ttyi${ci}${i} clocal -hupcl 1200 - stty < /dev/ttyl${ci}${i} clocal hupcl - stty < /dev/cuai${co}${i} clocal -hupcl 1200 - stty < /dev/cual${co}${i} clocal hupcl + stty < /dev/tty${dc}${i}.init clocal -hupcl 1200 + stty < /dev/tty${dc}${i}.lock clocal hupcl + stty < /dev/cua${dc}${i}.init clocal -hupcl 1200 + stty < /dev/cua${dc}${i}.lock clocal hupcl done } @@ -123,15 +119,14 @@ # provided at most one side runs getty. # Same as modem() except we want a faster speed and no dtrwait. - ci=$1; shift - co=$1; shift + dc=$1; shift - modem ${ci} ${co} $* + modem ${dc} $* for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 0 - stty < /dev/ttyi${ci}${i} 115200 - stty < /dev/cuai${co}${i} 115200 + comcontrol /dev/tty${dc}${i} dtrwait 0 + stty < /dev/tty${dc}${i}.init 115200 + stty < /dev/cua${dc}${i}.init 115200 done } @@ -143,16 +138,16 @@ # and the remainder of the line lists the device numbers. # Initialize assorted 8250-16550 (sio) ports. -# maybe d a 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v -# mouse d a 2 -# modem d a 1 -# terminal d a 0 +# maybe d 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v +# mouse d 2 +# modem d 1 +# terminal d 0 # Initialize all ports on a Cyclades-8yo. -# modem c c 00 01 02 03 04 05 06 07 +# modem c 00 01 02 03 04 05 06 07 # Initialize all ports on a Cyclades-16ye. -# modem c c 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f +# modem c 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f # Initialize all ports on a Digiboard 8. -# modem D D 00 01 02 03 04 05 06 07 +# modem D 00 01 02 03 04 05 06 07 ==== //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.7 2004/08/22 09:05:57 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.8 2004/11/15 13:06:01 davidxu Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -294,8 +294,8 @@ if (!in_thread_list (ptid)) { add_thread (ptid); - inferior_ptid = ptid; } + inferior_ptid = ptid; } static void ==== //depot/projects/trustedbsd/base/lib/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.195 2004/11/10 22:16:37 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.197 2004/11/13 23:54:30 tjr Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -32,7 +32,7 @@ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} + libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -107,7 +107,7 @@ _libusbhid= libusbhid .endif -.if !defined(NO_YP_LIBC) +.if !defined(NO_NIS) _libypclnt= libypclnt .endif ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.19 2004/11/05 05:26:30 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.21 2004/11/15 01:46:33 kientzle Exp $"); #include #include @@ -315,7 +315,7 @@ const char *linkname, *p; const char *hardlink; const wchar_t *wp, *wp2, *wname_start; - int need_extension, oldstate, r, ret; + int need_extension, r, ret; struct pax *pax; const struct stat *st_main, *st_original; @@ -672,17 +672,19 @@ pax->entry_bytes_remaining = archive_strlen(&(pax->pax_header)); pax->entry_padding = 0x1ff & (- pax->entry_bytes_remaining); - oldstate = a->state; - a->state = ARCHIVE_STATE_DATA; - r = archive_write_data(a, pax->pax_header.s, + r = (a->compression_write)(a, pax->pax_header.s, archive_strlen(&(pax->pax_header))); - a->state = oldstate; + if (r != ARCHIVE_OK) { + /* If a write fails, we're pretty much toast. */ + return (ARCHIVE_FATAL); + } + /* Pad out the end of the entry. */ + r = write_nulls(a, pax->entry_padding); if (r != ARCHIVE_OK) { /* If a write fails, we're pretty much toast. */ return (ARCHIVE_FATAL); } - - archive_write_pax_finish_entry(a); + pax->entry_bytes_remaining = pax->entry_padding = 0; } /* Write the header for main entry. */ ==== //depot/projects/trustedbsd/base/lib/libc/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.54 2004/10/24 15:32:30 ru Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.55 2004/11/13 20:40:28 bz Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -60,7 +60,7 @@ .if ${MACHINE_ARCH} == "arm" .include "${.CURDIR}/softfloat/Makefile.inc" .endif -.if !defined(NO_YP_LIBC) +.if !defined(NO_NIS) CFLAGS+= -DYP .include "${.CURDIR}/yp/Makefile.inc" .endif ==== //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.31 2004/07/28 11:56:03 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.32 2004/11/13 20:40:28 bz Exp $"); #include #include @@ -202,7 +202,7 @@ return; } #else - if (netf = fopen(_PATH_NETGROUP, "r")) { + if ((netf = fopen(_PATH_NETGROUP, "r"))) { #endif if (parse_netgrp(group)) endnetgrent(); ==== //depot/projects/trustedbsd/base/lib/libc/i386/net/htonl.S#5 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)htonl.s 5.3 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.10 2004/10/18 17:19:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $"); /* netorder = htonl(hostorder) */ @@ -46,11 +46,5 @@ .set CNAME(htonl),CNAME(__htonl) ENTRY(__htonl) movl 4(%esp),%eax -#ifdef I386_CPU - xchgb %al,%ah - roll $16,%eax - xchgb %al,%ah -#else bswap %eax -#endif ret ==== //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohl.S#5 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)ntohl.s 5.2 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.10 2004/10/18 17:19:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $"); /* hostorder = ntohl(netorder) */ @@ -46,11 +46,5 @@ .set CNAME(ntohl),CNAME(__ntohl) ENTRY(__ntohl) movl 4(%esp),%eax -#ifdef I386_CPU - xchgb %al,%ah - roll $16,%eax - xchgb %al,%ah -#else bswap %eax -#endif ret ==== //depot/projects/trustedbsd/base/lib/libc/net/rcmd.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.38 2003/02/18 13:39:52 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.39 2004/11/13 20:40:28 bz Exp $"); #include "namespace.h" #include @@ -55,8 +55,8 @@ #include #include #include +#include #ifdef YP -#include #include #include #endif ==== //depot/projects/trustedbsd/base/lib/libc/rpc/netnamer.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.10 2004/10/16 06:11:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.11 2004/11/13 20:40:28 bz Exp $"); /* * netname utility routines convert from unix names to network names and @@ -58,7 +58,9 @@ #include "un-namespace.h" static char *OPSYS = "unix"; +#ifdef YP static char *NETID = "netid.byname"; +#endif static char *NETIDFILE = "/etc/netid"; static int getnetid( char *, char * ); ==== //depot/projects/trustedbsd/base/lib/libc/sys/read.2#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.27 2004/10/25 13:35:03 yar Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.28 2004/11/15 13:55:33 yar Exp $ .\" .Dd October 16, 2004 .Dt READ 2 @@ -207,7 +207,7 @@ .It Bq Er EFAULT Part of the .Fa iov -points outside the process's allocated address space. +array points outside the process's allocated address space. .El .Pp The ==== //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#9 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 -.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.36 2003/12/10 15:08:41 dds Exp $ +.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.40 2004/11/15 14:16:31 yar Exp $ .\" -.Dd February 15, 2002 +.Dd November 15, 2004 .Dt STAT 2 .Os .Sh NAME @@ -87,8 +87,26 @@ .In sys/stat.h and into which information is placed concerning the file. .Pp +The fields of +.Vt "struct stat" +related to the file system are as follows: +.Bl -tag -width ".Va st_nlink" +.It Va st_dev +The numeric ID of the device containing the file. +.It Va st_ino +The file's inode number. +.It Va st_nlink +The number of hard links to the file. +.El +.Pp +The +.Va st_dev +and +.Va st_ino +fields together identify the file uniquely within the system. +.Pp The time-related fields of -.Fa struct stat +.Vt "struct stat" are as follows: .Bl -tag -width ".Va st_birthtime" .It Va st_atime @@ -150,15 +168,29 @@ The size-related fields of the .Vt "struct stat" are as follows: -.Bl -tag -width XXXst_blksize -.It st_blksize +.Bl -tag -width ".Va st_blksize" +.It Va st_size +The file size in bytes. +.It Va st_blksize The optimal I/O block size for the file. -.It st_blocks +.It Va st_blocks The actual number of blocks allocated for the file in 512-byte units. As short symbolic links are stored in the inode, this number may be zero. .El .Pp +The access-related fields of +.Vt "struct stat" +are as follows: +.Bl -tag -width ".Va st_mode" +.It Va st_uid +The user ID of the file's owner. +.It Va st_gid +The group ID of the file. +.It Va st_mode +Status of the file (see below). +.El +.Pp The status information word .Fa st_mode has the following bits: @@ -185,18 +217,44 @@ .Xr access 2 and .Xr chmod 2 . +The following macros are available to test whether a +.Va st_mode +value passed in the +.Ar m +argument corresponds to a file of the specified type: +.Bl -tag -width ".Fn S_ISFIFO m" +.It Fn S_ISBLK m +Test for a block special file. +.It Fn S_ISCHR m +Test for a character special file. +.It Fn S_ISDIR m +Test for a directory. +.It Fn S_ISFIFO m +Test for a pipe or FIFO special file. +.It Fn S_ISLNK m +Test for a symbolic link. +.It Fn S_ISREG m +Test for a regular file. +.It Fn S_ISSOCK m +Test for a socket. +.It Fn S_ISWHT m +Test for a whiteout. +.El +.Pp +The macros evaluate to a non-zero value if the test is true +or to the value 0 if the test is false. .Sh RETURN VALUES .Rv -std .Sh COMPATIBILITY Previous versions of the system used different types for the -.Li st_dev , -.Li st_uid , -.Li st_gid , -.Li st_rdev , -.Li st_size , -.Li st_blksize +.Va st_dev , +.Va st_uid , +.Va st_gid , +.Va st_rdev , +.Va st_size , +.Va st_blksize and -.Li st_blocks +.Va st_blocks fields. .Sh ERRORS The ==== //depot/projects/trustedbsd/base/lib/libkvm/kvm_getprocs.3#7 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.18 2004/07/02 23:52:16 ru Exp $ +.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.19 2004/11/13 14:26:13 csjp Exp $ .\" .Dd September 27, 2003 .Dt KVM_GETPROCS 3 @@ -167,6 +167,13 @@ on failure. .Sh BUGS These routines do not belong in the kvm interface. +.Pp +In order for +.Xr kvm_getenvv 3 +to function correctly, +.Xr procfs 5 +must be mounted on >>> TRUNCATED FOR MAIL (1000 lines) <<<