From owner-p4-projects@FreeBSD.ORG Tue Nov 30 03:34:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0AB316A4D0; Tue, 30 Nov 2004 03:34:39 +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 729E116A4CE for ; Tue, 30 Nov 2004 03:34:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E59F43D2F for ; Tue, 30 Nov 2004 03:34:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU3YdXN053837 for ; Tue, 30 Nov 2004 03:34:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU3Yc2A053834 for perforce@freebsd.org; Tue, 30 Nov 2004 03:34:38 GMT (envelope-from peter@freebsd.org) Date: Tue, 30 Nov 2004 03:34:38 GMT Message-Id: <200411300334.iAU3Yc2A053834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66084 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: Tue, 30 Nov 2004 03:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=66084 Change 66084 by peter@peter_daintree on 2004/11/30 03:34:20 IFC @66082 (update to fresher dogfood) Affected files ... .. //depot/projects/hammer/bin/ps/ps.1#18 integrate .. //depot/projects/hammer/etc/devd.conf#16 integrate .. //depot/projects/hammer/etc/usbd.conf#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#15 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/statfs.2#6 integrate .. //depot/projects/hammer/sbin/devd/devd.8#10 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#5 integrate .. //depot/projects/hammer/sbin/mount/mount.8#13 integrate .. //depot/projects/hammer/sbin/mount/mount.c#15 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.8#6 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#6 integrate .. //depot/projects/hammer/share/man/man4/smp.4#7 integrate .. //depot/projects/hammer/share/man/man7/security.7#10 integrate .. //depot/projects/hammer/share/man/man9/vfs_mount.9#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#110 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#55 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/hammer/sys/boot/i386/loader/loader.rc#3 delete .. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#23 integrate .. //depot/projects/hammer/sys/ia64/include/bootinfo.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#13 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#26 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/sys/pioctl.h#2 integrate .. //depot/projects/hammer/sys/sys/socket.h#15 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Customize/NET4801#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/comconsole#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/default#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/nobeastie#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#6 integrate .. //depot/projects/hammer/tools/tools/nanobsd/customize.sh#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#8 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#9 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#10 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#5 integrate .. //depot/projects/hammer/usr.bin/make/for.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInt.h#2 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsEmpty.c#4 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstLast.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#4 integrate .. //depot/projects/hammer/usr.bin/make/main.c#20 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#15 integrate .. //depot/projects/hammer/usr.sbin/ppp/bundle.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/bundle.h#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/command.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#13 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#12 integrate .. //depot/projects/hammer/usr.sbin/usbd/usbd.c#6 integrate Differences ... ==== //depot/projects/hammer/bin/ps/ps.1#18 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -249,7 +249,9 @@ .Nm will use the one which was specified last. .It Fl Z -Add label to the list of keywords for which +Add +.Xr mac 4 +label to the list of keywords for which .Nm will display information. .El @@ -601,9 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .It Pa /boot/kernel/kernel default system namelist @@ -618,7 +617,7 @@ .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , -.Xr lomac 4 , +.Xr mac 4 , .Xr procfs 5 , .Xr pstat 8 , .Xr sysctl 8 , ==== //depot/projects/hammer/etc/devd.conf#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,6 +66,13 @@ action "kbdcontrol -k /dev/kbd0 < /dev/console"; }; +# The entry below starts moused when a mouse is plugged in. Moused +# stops automatically (actually it bombs :) when the device disappears. +attach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused start $device-name"; +}; + # # Rescan scsi device-names on attach, but not detach. # ==== //depot/projects/hammer/etc/usbd.conf#4 (text+ko) ==== @@ -2,7 +2,7 @@ # # See usbd.conf(5) for the description of the format of the file. # -# $FreeBSD: src/etc/usbd.conf,v 1.13 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/usbd.conf,v 1.15 2004/11/28 23:16:00 iedowse Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -22,15 +22,6 @@ attach "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi" attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}" -# The entry below starts and stops dhclient when an ethernet device is inserted -# Caveat: It does not support multiple interfaces (but neither does pccardd, -# it shouldn't be too big a deal :-) -# -device "USB ethernet" - devname "[ackr]ue[0-9]+" - attach "/etc/pccard_ether ${DEVNAME} start" - detach "/etc/pccard_ether ${DEVNAME} stop" - # This entry starts the ColdSync tool in daemon mode. Make sure you have an up # to date /usr/local/etc/palms. We override the 'listen' settings for port and # type in /usr/local/etc/coldsync.conf. @@ -41,13 +32,6 @@ release 0x0100 attach "/usr/local/bin/coldsync -md -p /dev/${DEVNAME} -t usb" -# The entry below starts moused when a mouse is plugged in. Moused -# stops automatically (actually it bombs :) when the device disappears. -# -device "Mouse" - devname "ums[0-9]+" - attach "/etc/rc.d/moused start ${DEVNAME}" - # The fallthrough entry: Nothing is specified, nothing is done. And it isn't # necessary at all :-). Just for pretty printing in debugging mode. # ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.21 2004/11/15 01:46:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.23 2004/11/28 17:57:11 kientzle Exp $"); #include #include @@ -314,7 +314,8 @@ struct archive_entry *entry_main; const char *linkname, *p; const char *hardlink; - const wchar_t *wp, *wp2, *wname_start; + const wchar_t *wp, *wp2; + const char *suffix_start; int need_extension, r, ret; struct pax *pax; const struct stat *st_main, *st_original; @@ -368,11 +369,11 @@ */ wp = archive_entry_pathname_w(entry_main); p = archive_entry_pathname(entry_main); - if (wcslen(wp) <= 100) /* Short enough for just 'name' field */ - wname_start = wp; /* Record a zero-length prefix */ + if (strlen(p) <= 100) /* Short enough for just 'name' field */ + suffix_start = p; /* Record a zero-length prefix */ else /* Find the largest suffix that fits in 'name' field. */ - wname_start = wcschr(wp + wcslen(wp) - 100 - 1, '/'); + suffix_start = strchr(p + strlen(p) - 100 - 1, '/'); /* Find non-ASCII character, if any. */ wp2 = wp; @@ -383,8 +384,7 @@ * If name is too long, or has non-ASCII characters, add * 'path' to pax extended attrs. */ - if (wname_start == NULL || wname_start - wp > 155 || - *wp2 != L'\0') { + if (suffix_start == NULL || suffix_start - p > 155 || *wp2 != L'\0') { add_pax_attr_w(&(pax->pax_header), "path", wp); archive_entry_set_pathname(entry_main, build_ustar_entry_name(ustar_entry_name, p)); @@ -657,7 +657,7 @@ /* Note that the 'x' header shouldn't ever fail to format */ if (ret != 0) { - const char *msg = "archive_write_header_pax: " + const char *msg = "archive_write_pax_header: " "'x' header failed?! This can't happen.\n"; write(2, msg, strlen(msg)); exit(1); ==== //depot/projects/hammer/lib/libc/sys/mount.2#8 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.2 8.3 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.40 2004/08/13 14:33:03 roam Exp $ +.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.41 2004/11/29 09:56:12 ru Exp $ .\" -.Dd August 13, 2004 +.Dd November 26, 2004 .Dt MOUNT 2 .Os .Sh NAME @@ -130,9 +130,6 @@ This flag is set automatically when the caller is not the super-user. .It Dv MNT_NOATIME Disable update of file access times. -.It Dv MNT_NODEV -Do not interpret special files on the file system. -This flag is set automatically when the caller is not the super-user. .It Dv MNT_SNAPSHOT Create a snapshot of the file system. This is currently only supported on UFS2 file systems, see ==== //depot/projects/hammer/lib/libc/sys/statfs.2#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)statfs.2 8.5 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.25 2004/07/20 19:30:57 csjp Exp $ +.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.26 2004/11/29 09:56:12 ru Exp $ .\" -.Dd November 16, 2003 +.Dd November 26, 2004 .Dt STATFS 2 .Os .Sh NAME @@ -108,8 +108,6 @@ Files may not be executed from the file system. .It Dv MNT_NOSUID Setuid and setgid bits on files are not honored when they are executed. -.It Dv MNT_NODEV -Special files in the file system may not be opened. .It Dv MNT_SYNCHRONOUS All I/O to the file system is done synchronously. .It Dv MNT_ASYNC ==== //depot/projects/hammer/sbin/devd/devd.8#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.8,v 1.12 2004/07/07 19:57:14 ru Exp $ +.\" $FreeBSD: src/sbin/devd/devd.8,v 1.13 2004/11/28 17:44:22 ceri Exp $ .\" .Dd October 17, 2002 .Dt DEVD 8 @@ -103,7 +103,9 @@ .Ic options section, one can define multiple directories to search for config files. -All files in each of these directories are parsed. +All files in these directories whose names match the patten +.Pa *.conf +are parsed. These files are intended to be installed by third party vendors that wish to hook into the .Nm ==== //depot/projects/hammer/sbin/mount/mntopts.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.22 2004/11/25 13:31:46 phk Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.23 2004/11/29 09:35:01 ru Exp $ */ struct mntopt { @@ -40,7 +40,6 @@ /* User-visible MNT_ flags. */ #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 } #define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 } -#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 } #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 } #define MOPT_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 } @@ -76,7 +75,6 @@ MOPT_GROUPQUOTA, \ MOPT_FSTAB_COMPAT, \ MOPT_NOATIME, \ - MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \ MOPT_NOSUID, \ ==== //depot/projects/hammer/sbin/mount/mount.8#13 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.68 2004/05/17 08:35:42 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.69 2004/11/29 09:35:01 ru Exp $ .\" -.Dd April 7, 2003 +.Dd November 26, 2004 .Dt MOUNT 8 .Os .Sh NAME @@ -177,12 +177,6 @@ Disable read clustering. .It Cm noclusterw Disable write clustering. -.It Cm nodev -Do not interpret character or block special devices on the file system. -This option is useful for a server that has file systems containing -special devices for architectures other than its own. -This option is set automatically when the user does not have super-user -privileges. .It Cm noexec Do not allow execution of any binaries on the mounted file system. This option is useful for a server that has file systems containing ==== //depot/projects/hammer/sbin/mount/mount.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.66 2004/04/26 15:13:45 bmilekic Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.67 2004/11/29 09:35:01 ru Exp $"; #endif /* not lint */ #include @@ -93,7 +93,6 @@ { MNT_EXPORTED, "NFS exported" }, { MNT_LOCAL, "local" }, { MNT_NOATIME, "noatime" }, - { MNT_NODEV, "nodev" }, { MNT_NOEXEC, "noexec" }, { MNT_NOSUID, "nosuid" }, { MNT_NOSYMFOLLOW, "nosymfollow" }, @@ -750,7 +749,6 @@ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync"); if (flags & MNT_NOEXEC) res = catopt(res, "noexec"); if (flags & MNT_NOSUID) res = catopt(res, "nosuid"); - if (flags & MNT_NODEV) res = catopt(res, "nodev"); if (flags & MNT_UNION) res = catopt(res, "union"); if (flags & MNT_ASYNC) res = catopt(res, "async"); if (flags & MNT_NOATIME) res = catopt(res, "noatime"); ==== //depot/projects/hammer/sbin/mount_std/mount_std.8#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.22 2004/07/02 21:45:04 ru Exp $ +.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.23 2004/11/29 09:35:01 ru Exp $ .\" -.Dd May 13, 1996 +.Dd November 26, 2004 .Dt MOUNT_STD 8 .Os .Sh NAME @@ -70,7 +70,6 @@ options .Dq ro , .Dq rw , -.Dq nodev , .Dq noexec , .Dq nosuid , and ==== //depot/projects/hammer/sbin/sconfig/sconfig.8#6 (text+ko) ==== @@ -10,7 +10,7 @@ .\" as long as this message is kept with the software, all derivative .\" works or modified versions. .\" -.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.5 2004/05/20 16:40:06 ru Exp $ +.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.6 2004/11/29 15:32:31 rik Exp $ .Dd May 19, 2004 .Dt SCONFIG 8 i386 .Os @@ -572,7 +572,7 @@ .Xr sppp 4 , .Xr ifconfig 8 , .Xr route 8 , -.Xr spppconrol 8 +.Xr spppcontrol 8 .\"-------------------------------------------------------------- .Sh HISTORY This utility is a replacement for the ==== //depot/projects/hammer/share/man/man4/smp.4#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/smp.4,v 1.19 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/smp.4,v 1.20 2004/11/29 19:51:50 ceri Exp $ .\" .Dd December 5, 2002 .Dt SMP 4 @@ -39,7 +39,7 @@ Support for multi-processor systems is present for all Tier-1 architectures on .Fx . -Currently, this includes alpha, i386, ia64, and sparc64. +Currently, this includes alpha, amd64, i386, ia64, and sparc64. Support is enabled using .Cd options SMP . It is permissible to use the SMP kernel configuration on non-SMP equipped ==== //depot/projects/hammer/share/man/man7/security.7#10 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.39 2004/08/07 04:40:20 imp Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.40 2004/11/29 09:56:12 ru Exp $ .\" -.Dd September 18, 1999 +.Dd November 29, 2004 .Dt SECURITY 7 .Os .Sh NAME @@ -630,16 +630,14 @@ If you have a huge amount of user disk space it may take too long to run through every file on those partitions. In this case, setting mount -flags to disallow SUID binaries and devices on those partitions is a good +flags to disallow SUID binaries on those partitions is a good idea. The -.Cm nodev -and .Cm nosuid -options +option (see .Xr mount 8 ) -are what you want to look into. +is what you want to look into. I would scan them anyway at least once a week, since the object of this layer is to detect a break-in whether or not the break-in is effective. ==== //depot/projects/hammer/share/man/man9/vfs_mount.9#4 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.11 2003/10/23 06:17:12 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $ .\" -.Dd July 8, 2001 +.Dd November 26, 2004 .Dt VFS_MOUNT 9 .Os .Sh NAME @@ -70,7 +70,7 @@ .Xr mount 2 for details. .Pp -.Dv MNT_EXPORTED , MNT_NOSUID , MNT_NODEV , MNT_UPDATE , MNT_RELOAD , +.Dv MNT_EXPORTED , MNT_NOSUID , MNT_UPDATE , MNT_RELOAD , .Dv MNT_FORCE , MNT_ASYNC , MNT_SYNCHRONOUS , MNT_UNION , MNT_NOATIME , .Dv MNT_SNAPSHOT , MNT_NOCLUSTERR , MNT_NOCLUSTERW , MNT_IGNORE , .Dv MNT_UNION , MNT_NOSYMFOLLOW ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.63 2004/11/21 06:28:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.64 2004/11/29 14:49:27 scottl Exp $"); #include #include @@ -277,7 +277,7 @@ } if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) - || newtag->alignment > 1 || newtag->boundary > 0) + || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#110 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.625 2004/11/29 23:27:07 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#55 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.239 2004/11/29 23:25:56 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" ==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.76 2004/02/27 14:10:09 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.78 2004/11/29 09:31:04 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -73,13 +73,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th beastie.4th +FILES+= screen.4th frames.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= ${.CURDIR}/loader.rc +FILES+= loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#5 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.19 2004/05/20 20:30:59 markm Exp $ + * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.20 2004/11/29 11:54:42 nyan Exp $ */ /* @@ -1081,8 +1081,9 @@ .set SIO_FMT,SIOFMT # 8N1 .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD +/* * void sio_init(void) - + */ sio_init: movw $SIO_PRT+0x3,%dx # Data format reg movb $SIO_FMT|0x80,%al # Set format outb %al,(%dx) # and DLAB @@ -1098,15 +1099,17 @@ outb %al,(%dx) # DTR incl %edx # Line status reg +/* * void sio_flush(void) - + */ sio_flush.0: call sio_getc.1 # Get character sio_flush: call sio_ischar # Check for character jnz sio_flush.0 # Till none ret # To caller +/* * void sio_putc(int c) - + */ sio_putc: movw $SIO_PRT+0x5,%dx # Line status reg xor %ecx,%ecx # Timeout movb $0x40,%ch # counter @@ -1119,16 +1122,18 @@ outb %al,(%dx) # Write character sio_putc.2: ret $0x4 # To caller +/* * int sio_getc(void) - + */ sio_getc: call sio_ischar # Character available? jz sio_getc # No sio_getc.1: subb $0x5,%dl # Receiver buffer reg inb (%dx),%al # Read character ret # To caller +/* * int sio_ischar(void) - + */ sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register xorl %eax,%eax # Zero inb (%dx),%al # Received data ==== //depot/projects/hammer/sys/boot/pc98/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.36 2004/11/29 11:55:14 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -76,13 +76,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th beastie.4th +FILES+= screen.4th frames.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= ${.CURDIR}/../../i386/loader/loader.rc +FILES+= loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.5 2004/11/15 20:08:44 imp Exp $ + * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.6 2004/11/29 16:40:30 imp Exp $ */ #include "opt_acpi.h" @@ -35,25 +35,25 @@ #include #include #include -#define ACPI_SNC_GET_BRIGHTNESS "GBRT" -#define ACPI_SNC_SET_BRIGHTNESS "SBRT" -#define ACPI_SNC_GET_PID "GPID" +#define ACPI_SONY_GET_BRIGHTNESS "GBRT" +#define ACPI_SONY_SET_BRIGHTNESS "SBRT" +#define ACPI_SONY_GET_PID "GPID" /* * SNY5001 * [GS]BRT [GS]PBR [GS]CTR [GS]PCR [GS]CMI [CDPW GCDP]? GWDP PWAK PWRN * */ -struct acpi_snc_softc { +struct acpi_sony_softc { int pid; }; -static struct acpi_snc_name_list +static struct acpi_sony_name_list { char *nodename; char *getmethod; char *setmethod; char *comment; -} acpi_snc_oids[] = { +} acpi_sony_oids[] = { { "brightness", "GBRT", "SBRT", "Display Brightness"}, { "ctr", "GCTR", "SCTR", "??"}, { "pcr", "GPCR", "SPCR", "???"}, @@ -65,37 +65,37 @@ {NULL, NULL,NULL} }; -static int acpi_snc_probe(device_t dev); -static int acpi_snc_attach(device_t dev); -static int acpi_snc_detach(device_t dev); -static int sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS); +static int acpi_sony_probe(device_t dev); +static int acpi_sony_attach(device_t dev); +static int acpi_sony_detach(device_t dev); +static int sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS); -static device_method_t acpi_snc_methods[] = { +static device_method_t acpi_sony_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, acpi_snc_probe), - DEVMETHOD(device_attach, acpi_snc_attach), - DEVMETHOD(device_detach, acpi_snc_detach), + DEVMETHOD(device_probe, acpi_sony_probe), + DEVMETHOD(device_attach, acpi_sony_attach), + DEVMETHOD(device_detach, acpi_sony_detach), {0, 0} }; -static driver_t acpi_snc_driver = { - "acpi_snc", - acpi_snc_methods, - sizeof(struct acpi_snc_softc), +static driver_t acpi_sony_driver = { + "acpi_sony", + acpi_sony_methods, + sizeof(struct acpi_sony_softc), }; -static devclass_t acpi_snc_devclass; +static devclass_t acpi_sony_devclass; -DRIVER_MODULE(acpi_snc, acpi, acpi_snc_driver, acpi_snc_devclass, +DRIVER_MODULE(acpi_sony, acpi, acpi_sony_driver, acpi_sony_devclass, 0, 0); -MODULE_DEPEND(acpi_snc, acpi, 1, 1, 1); +MODULE_DEPEND(acpi_sony, acpi, 1, 1, 1); static char *sny_id[] = {"SNY5001", NULL}; static int -acpi_snc_probe(device_t dev) +acpi_sony_probe(device_t dev) { - struct acpi_snc_softc *sc; + struct acpi_sony_softc *sc; int ret = ENXIO; sc = device_get_softc(dev); @@ -108,59 +108,59 @@ } static int -acpi_snc_attach(device_t dev) +acpi_sony_attach(device_t dev) { - struct acpi_snc_softc *sc; + struct acpi_sony_softc *sc; int i; sc = device_get_softc(dev); - acpi_GetInteger(acpi_get_handle(dev), ACPI_SNC_GET_PID, &sc->pid); + acpi_GetInteger(acpi_get_handle(dev), ACPI_SONY_GET_PID, &sc->pid); device_printf(dev, "PID %x\n", sc->pid); - for (i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){ + for (i = 0 ; acpi_sony_oids[i].nodename != NULL; i++){ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - i, acpi_snc_oids[i].nodename , CTLTYPE_INT | - ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD), - dev, i, sysctl_acpi_snc_gen_handler, "I", - acpi_snc_oids[i].comment); + i, acpi_sony_oids[i].nodename , CTLTYPE_INT | + ((acpi_sony_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD), + dev, i, sysctl_acpi_sony_gen_handler, "I", + acpi_sony_oids[i].comment); } return (0); } static int -acpi_snc_detach(device_t dev) +acpi_sony_detach(device_t dev) { return (0); } #if 0 static int -acpi_snc_suspend(device_t dev) +acpi_sony_suspend(device_t dev) { - struct acpi_snc_softc *sc = device_get_softc(dev); + struct acpi_sony_softc *sc = device_get_softc(dev); return (0); } static int -acpi_snc_resume(device_t dev) +acpi_sony_resume(device_t dev) { return (0); } #endif static int -sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS) +sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS) { device_t dev = arg1; int function = oidp->oid_arg2; int error = 0, val; acpi_GetInteger(acpi_get_handle(dev), - acpi_snc_oids[function].getmethod, &val); + acpi_sony_oids[function].getmethod, &val); error = sysctl_handle_int(oidp, &val, 0, req); - if (error || !req->newptr || !acpi_snc_oids[function].setmethod) + if (error || !req->newptr || !acpi_sony_oids[function].setmethod) return (error); acpi_SetInteger(acpi_get_handle(dev), - acpi_snc_oids[function].setmethod, val); + acpi_sony_oids[function].setmethod, val); return (0); } ==== //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.24 2004/09/22 15:46:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.25 2004/11/29 18:48:51 njl Exp $"); #include #include @@ -59,6 +59,12 @@ ACPI_SERIAL_DECL(pci_powerstate, "ACPI PCI power methods"); +/* Be sure that ACPI and PCI power states are equivalent. */ +CTASSERT(ACPI_STATE_D0 == PCI_POWERSTATE_D0); +CTASSERT(ACPI_STATE_D1 == PCI_POWERSTATE_D1); +CTASSERT(ACPI_STATE_D2 == PCI_POWERSTATE_D2); +CTASSERT(ACPI_STATE_D3 == PCI_POWERSTATE_D3); + static int acpi_pci_attach(device_t dev); static int acpi_pci_child_location_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); @@ -183,25 +189,11 @@ { ACPI_HANDLE h; ACPI_STATUS status; - int acpi_state, old_state, error; + int old_state, error; error = 0; - switch (state) { - case PCI_POWERSTATE_D0: - acpi_state = ACPI_STATE_D0; - break; - case PCI_POWERSTATE_D1: - acpi_state = ACPI_STATE_D1; - break; - case PCI_POWERSTATE_D2: - acpi_state = ACPI_STATE_D2; - break; - case PCI_POWERSTATE_D3: - acpi_state = ACPI_STATE_D3; - break; - default: + if (state < ACPI_STATE_D0 || state > ACPI_STATE_D3) return (EINVAL); - } /* * We set the state using PCI Power Management outside of setting @@ -220,11 +212,11 @@ goto out; } h = acpi_get_handle(child); - status = acpi_pwr_switch_consumer(h, acpi_state); + status = acpi_pwr_switch_consumer(h, state); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) device_printf(dev, "Failed to set ACPI power state D%d on %s: %s\n", - acpi_state, acpi_name(h), AcpiFormatException(status)); + state, acpi_name(h), AcpiFormatException(status)); if (old_state > state) error = pci_set_powerstate_method(dev, child, state); ==== //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.14 2004/11/17 20:01:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.15 2004/11/28 16:00:36 marius Exp $"); #include #include @@ -44,6 +44,14 @@ static struct bus_space_tag bst_store[3]; +/* + * Determine which channel of a SCC a device referenced by an alias is. + * The information present in the OF device tree only allows to do this + * for "ttyX" aliases. If a device is a channel of a SCC its property + * in the /aliases node looks like one of these: + * ttya: '/central/fhc/zs@0,902000:a' + * ttyc: '/pci@1f,0/pci@1,1/ebus@1/se@14,400000:a' + */ static int uart_cpu_channel(char *dev) { @@ -69,9 +77,9 @@ } /* - * Get the address of the UART that is selected as the console, if the - * console is an UART of course. Note that we enforce that both stdin and - * stdout are selected. + * Get the package handle of the UART that is selected as the console, if + * the console is an UART of course. Note that we enforce that both stdin + * and stdout are selected. * Note that the currently active console (i.e. /chosen/stdout and * /chosen/stdin) may not be the same as the device selected in the * environment (ie /options/output-device and /options/input-device) because @@ -115,8 +123,8 @@ } /* - * Get the address of the UART that's selected as the debug port. Since >>> TRUNCATED FOR MAIL (1000 lines) <<<