Date: Mon, 22 Mar 2004 19:05:53 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49562 for review Message-ID: <200403230305.i2N35rLb048254@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49562 Change 49562 by marcel@marcel_nfs on 2004/03/22 19:05:11 IFC @49560 Affected files ... .. //depot/projects/gdb/UPDATING#7 integrate .. //depot/projects/gdb/bin/cat/cat.1#2 integrate .. //depot/projects/gdb/bin/ls/ls.1#2 integrate .. //depot/projects/gdb/bin/mv/mv.c#2 integrate .. //depot/projects/gdb/bin/ps/ps.1#4 integrate .. //depot/projects/gdb/bin/rmail/Makefile#3 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/gdb/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/gdb/etc/rc.d/ntpdate#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/gdb/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/gdb/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/vis.3#2 integrate .. //depot/projects/gdb/release/picobsd/build/picobsd#2 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/gdb/sbin/reboot/Makefile#2 integrate .. //depot/projects/gdb/share/man/man4/aac.4#2 integrate .. //depot/projects/gdb/share/man/man5/passwd.5#2 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/gdb/sys/conf/files.i386#7 integrate .. //depot/projects/gdb/sys/conf/files.pc98#6 integrate .. //depot/projects/gdb/sys/conf/files.sparc64#3 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#5 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#5 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_witness.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_gif.c#2 integrate .. //depot/projects/gdb/sys/net/if_gre.c#3 integrate .. //depot/projects/gdb/sys/net/if_gre.h#3 integrate .. //depot/projects/gdb/sys/netatalk/aarp.c#3 integrate .. //depot/projects/gdb/sys/netatalk/at_control.c#3 integrate .. //depot/projects/gdb/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/gdb/sys/netatalk/at_var.h#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/gdb/sys/netatalk/ddp_var.h#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/gdb/sys/netinet/if_ether.c#3 integrate .. //depot/projects/gdb/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/sys/param.h#7 integrate .. //depot/projects/gdb/usr.bin/csplit/csplit.c#2 integrate .. //depot/projects/gdb/usr.bin/indent/args.c#3 integrate .. //depot/projects/gdb/usr.bin/talk/ctl.c#2 integrate .. //depot/projects/gdb/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/gdb/usr.sbin/mountd/exports.5#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#7 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20040322: + The debug.mpsafenet tunable controls whether the kernel Giant + lock is held across the lower levels of the network stack, and + by default is turned off. In the few days following 20040322, + the behavior of debug.mpsafenet will change such that this + tunable controls Giant over all levels of the network stack. + If you are currently setting debug.mpsafenet to 1, you should + set it back to 0 (the default) again during the change-over. + An additional note will be added to UPDATING when sufficient + locking is merged to permit this to take place. + 20040310: The FreeBSD/sparc64 platform is changing time_t from 32-bits to 64-bits. This is a very major incompatible change, so people @@ -1548,4 +1559,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.301 2004/03/22 16:37:32 rwatson Exp $ ==== //depot/projects/gdb/bin/cat/cat.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.19 2001/09/25 18:10:18 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.21 2004/03/21 11:04:59 tjr Exp $ .\" -.Dd September 15, 2001 +.Dd March 21, 2004 .Dt CAT 1 .Os .Sh NAME @@ -93,9 +93,7 @@ option), and display tab characters as .Ql ^I . .It Fl u -The -.Fl u -option guarantees that the output is unbuffered. +Disable output buffering. .It Fl v Display non-printing characters so they are visible. Control characters print as @@ -199,3 +197,11 @@ redirection, the command .Dq Li cat file1 file2 > file1 will cause the original data in file1 to be destroyed! +.Pp +The +.Nm +utility does not recognize multibyte characters when the +.Fl t +or +.Fl v +option is in effect. ==== //depot/projects/gdb/bin/ls/ls.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.78 2004/03/21 11:16:24 tjr Exp $ .\" -.Dd May 19, 2002 +.Dd March 21, 2004 .Dt LS 1 .Os .Sh NAME @@ -677,3 +677,7 @@ .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. +.Pp +The +.Nm +utility does not recognize multibyte characters in filenames. ==== //depot/projects/gdb/bin/mv/mv.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.42 2004/03/21 13:38:37 pjd Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -210,14 +210,25 @@ struct statfs sfs; char path[PATH_MAX]; - /* Can't mv(1) a mount point. */ - if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + /* + * If the source is a symbolic link and is on another + * filesystem, it can be recreated at the destination. + */ + if (lstat(from, &sb) == -1) { + warn("%s", from); return (1); } - if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) { - warnx("cannot rename a mount point"); - return (1); + if (!S_ISLNK(sb.st_mode)) { + /* Can't mv(1) a mount point. */ + if (realpath(from, path) == NULL) { + warnx("cannot resolve %s: %s", from, path); + return (1); + } + if (!statfs(path, &sfs) && + !strcmp(path, sfs.f_mntonname)) { + warnx("cannot rename a mount point"); + return (1); + } } } else { warn("rename %s to %s", from, to); ==== //depot/projects/gdb/bin/ps/ps.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.68 2004/03/21 11:24:06 tjr Exp $ .\" -.Dd April 18, 1994 +.Dd March 21, 2004 .Dt PS 1 .Os .Sh NAME @@ -559,3 +559,8 @@ .Nm cannot run faster than the system and is run as any other scheduled process, the information it displays can never be exact. +.Pp +The +.Nm +utility does not correctly display argument lists containing multibyte +characters. ==== //depot/projects/gdb/bin/rmail/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.19 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail +# Not much point this being static. It calls a shared sendmail... +NOSHARED?= NO + PROG= rmail SRCS= rmail.c MAN= rmail.8 + +WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -WARNS?= 0 -WFORMAT=0 .if exists(${.OBJDIR}/../../lib/libsm) LIBSMDIR:= ${.OBJDIR}/../../lib/libsm @@ -34,9 +37,6 @@ # following: # CFLAGS+= -DQUEUE_ONLY -# Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO - sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h ==== //depot/projects/gdb/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.9 2000/11/20 11:39:40 ru Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.10 2004/03/21 04:56:06 des Exp $ .\" -.Dd May 31, 1993 +.Dd March 21, 2004 .Dt RMDIR 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd remove directories .Sh SYNOPSIS .Nm -.Op Fl p +.Op Fl pv .Ar directory ... .Sh DESCRIPTION The @@ -72,6 +72,8 @@ (See .Xr rm 1 for fully non-discriminant recursive removal.) +.It Fl v +Be verbose, listing each directory as it is removed. .El .Pp The ==== //depot/projects/gdb/bin/rmdir/rmdir.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.15 2004/03/21 04:56:06 des Exp $"); #include <err.h> #include <errno.h> @@ -52,21 +52,25 @@ #include <string.h> #include <unistd.h> -int rm_path(char *); -void usage(void); +static int rm_path(char *); +static void usage(void); + +static int pflag; +static int vflag; int main(int argc, char *argv[]) { int ch, errors; - int pflag; - pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) + while ((ch = getopt(argc, argv, "pv")) != -1) switch(ch) { case 'p': pflag = 1; break; + case 'v': + vflag = 1; + break; case '?': default: usage(); @@ -78,17 +82,22 @@ usage(); for (errors = 0; *argv; argv++) { - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } else if (pflag) + if (pflag) { errors |= rm_path(*argv); + } else { + if (rmdir(*argv) < 0) { + warn("%s", *argv); + errors = 1; + } + if (vflag) + printf("%s\n", *argv); + } } exit(errors); } -int +static int rm_path(char *path) { char *p; @@ -107,12 +116,14 @@ warn("%s", path); return (1); } + if (vflag) + printf("%s\n", path); } return (0); } -void +static void usage(void) { ==== //depot/projects/gdb/etc/rc.d/ntpdate#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ntpdate,v 1.7 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ntpdate,v 1.8 2004/03/22 16:35:35 des Exp $ # # PROVIDE: ntpdate @@ -12,9 +12,8 @@ name="ntpdate" rcvar=`set_rcvar` -command="/usr/sbin/${name}" -command_args=">/dev/null 2>&1" -pidfile="/var/run/${name}.pid" +stop_cmd=":" +start_cmd="ntpdate_start" ntpdate_start() { @@ -26,7 +25,7 @@ fi if [ -n "$ntpdate_hosts" ]; then echo "Setting date via ntp." - ntpdate $rc_flags $ntpdate_hosts + ${ntpdate_command:-ntpdate} $rc_flags $ntpdate_hosts fi } ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.126 2004/02/09 18:45:25 wes Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.127 2004/03/22 05:02:01 grog Exp $ % -- Gifts for Children -- @@ -15408,6 +15408,23 @@ What is a magician but a practicing theorist? -- Obi-Wan Kenobi % +What is actually happening, I am afraid, is that we all tell each +other and ourselves that software engineering techniques should be +improved considerably, because there is a crisis. But there are a few +boundary conditions which apparently have to be satisfied: + + 1. We may not change our thinking habits. + 2. We may not change our programming tools. + 3. We may not change our hardware. + 4. We may not change our tasks. + 5. We may not change the organizational set-up + in which the work has to be done. + +Now under these five immutable boundary conditions, we have to try to +improve matters. This is utterly ridiculous. + +Edsger W. Dijkstra, on receiving the ACM Turing Award in 1972 +% What is mind? No matter. What is matter? Never mind. -- Thomas Hewitt Key, 1799-1875 ==== //depot/projects/gdb/gnu/lib/libregex/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.27 2004/02/25 02:41:15 ache Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28 2004/03/22 14:44:00 ache Exp $ SUBDIR+= doc ==== //depot/projects/gdb/gnu/lib/libregex/regex.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.11 2004/02/25 02:39:10 ache Exp $ */ +/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.12 2004/03/22 14:44:00 ache Exp $ */ /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the ==== //depot/projects/gdb/lib/libarchive/archive_platform.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.3 2004/03/20 22:35:33 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.4 2004/03/22 05:17:23 kientzle Exp $ */ /* @@ -49,7 +49,7 @@ #define HAVE_CHFLAGS 1 #define HAVE_LUTIMES 1 #define HAVE_LCHMOD 1 -#define HAVE_POSIX_STRERROR_R 1 +#define HAVE_STRERROR_R 1 #define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE #define ARCHIVE_ERRNO_PROGRAMMER EINVAL #define ARCHIVE_ERRNO_MISC (-1) @@ -86,7 +86,8 @@ #define st_atimespec st_atim #define st_mtimespec st_mtim #define st_ctimespec st_ctim -#define HAVE_GLIBC_STRERROR_R 1 +#define HAVE_STRERROR_R 1 +#define STRERROR_R_CHAR_P 1 #endif /* ==== //depot/projects/gdb/lib/libarchive/archive_util.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.3 2004/03/20 22:35:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.4 2004/03/22 05:17:23 kientzle Exp $"); #include <sys/types.h> @@ -83,7 +83,9 @@ archive_set_error(struct archive *a, int error_number, const char *fmt, ...) { va_list ap; +#ifdef HAVE_STRERROR_R char errbuff[512]; +#endif char *errp; a->archive_error_number = error_number; @@ -96,11 +98,13 @@ archive_string_vsprintf(&(a->error_string), fmt, ap); if(error_number > 0) { archive_strcat(&(a->error_string), ": "); -#if defined(HAVE_GLIBC_STRERROR_R) +#ifdef HAVE_STRERROR_R +#ifdef STRERROR_R_CHAR_P errp = strerror_r(error_number, errbuff, sizeof(errbuff)); -#elif defined(HAVE_POSIX_STRERROR_R) +#else strerror_r(error_number, errbuff, sizeof(errbuff)); errp = errbuff; +#endif #else /* Note: this is not threadsafe! */ errp = strerror(error_number); ==== //depot/projects/gdb/lib/libc/gen/vis.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.22 2003/10/30 12:41:50 phk Exp $ +.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.23 2004/03/21 11:31:37 tjr Exp $ .\" -.Dd July 25, 1996 +.Dd March 21, 2004 .Dt VIS 3 .Os .Sh NAME @@ -282,3 +282,9 @@ .Sh HISTORY These functions first appeared in .Bx 4.4 . +.Sh BUGS +The +.Nm +family of functions do not recognize multibyte characters, and thus +may consider them to be non-printable when they are in fact printable +(and vice versa.) ==== //depot/projects/gdb/release/picobsd/build/picobsd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/release/picobsd/build/picobsd,v 1.28 2003/11/07 12:49:55 simokawa Exp $ +# $FreeBSD: src/release/picobsd/build/picobsd,v 1.29 2004/03/21 10:46:13 luigi Exp $ # # The new PicoBSD build script. Invoked as # @@ -83,6 +83,8 @@ } logverbose() { + local foo + printf "\n*** %s\n" "$*" read -p "=== Press enter to continue" foo } @@ -112,8 +114,7 @@ c_startdir=`pwd` # directory where we start # used to lookup config and create BUILDDIR - c_boot=/boot/boot # boot blocks (in case you want custom ones) - c_boot1=/boot/boot1 + c_boot1=/boot/boot1 # boot blocks (in case you want custom ones) c_boot2=/boot/boot2 c_reply=${c_reply:-`mktemp "/tmp/reply.XXXXXXXXXX"`} @@ -132,7 +133,9 @@ *) l_vn="vn" l_makedev="/dev/MAKEDEV" + ;; esac + l_newfs="-m 0 -o space -f 512 -b 4096" # Find a suitable vnode l_vnum=`mount | awk "/${l_vn}/ { num++ } END { printf \"%d\", num }"` l_vndev=${l_vn}${l_vnum} @@ -156,21 +159,28 @@ } create_includes_and_libraries() { + local e i + log "create_includes_and_libraries() for ${SRC}" # Optionally creates include directory and libraries. mkdir -p ${l_usrtree}/include # the include directory... mkdir -p ${l_usrtree}/share/misc # a few things go here mkdir -p ${l_usrtree}/lib # libraries mkdir -p ${l_usrtree}/sbin # some binaries - (cd ${SRC}; INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ - make -m ${SRC}/share/mk includes ) || fail $? includes + # override variables for ownershiip and destinations + # BINOWN:BINGRP are also used for include files + (cd ${SRC}; \ + BINOWN=`id -un` BINGRP=`id -gn` \ + DESTDIR=${l_usrtree}/.. \ + make -m ${SRC}/share/mk includes ) || fail $? includes # Pick up the correct headers for libraries. CFLAGS="-nostdinc -I${l_usrtree}/include" ; export CFLAGS (cd ${SRC} # $e is the invocation of make with correct environment e="MAKEOBJDIRPREFIX=${l_objtree}/picobsd/libraries \ - INCOWN=`id -un` BINOWN=`id -un` DESTDIR=${l_usrtree}/.. \ + BINOWN=`id -un` BINGRP=`id -gn` \ + DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk \ -DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG " log "do a 'make obj' in a few places." @@ -194,7 +204,7 @@ # file. Also sets MY_TREE and BUILDDIR and SITE set_type() { - local a + local a i log "set_type()" THETYPE=$1 @@ -534,12 +544,11 @@ # installed so you have more space on the disk... # For small image sizes, use std disktypes if [ ${MFS_SIZE} -lt 1024 ] ; then - disklabel -w ${l_vndev} fd${MFS_SIZE} || fail $? mfs_disklabel + disklabel -rw ${l_vndev} fd${MFS_SIZE} || fail $? mfs_disklabel else - disklabel -w ${l_vndev} auto || fail $? mfs_disklabel + disklabel -rw ${l_vndev} auto || fail $? mfs_disklabel fi - newfs -i ${mfs_inodes} -m 0 -o space -f 512 -b 4096 \ - /dev/${l_vndev}c > /dev/null + newfs -i ${mfs_inodes} ${l_newfs} /dev/${l_vndev}c > /dev/null mount /dev/${l_vndev}c ${c_mnt} || fail $? no_mount log "`df /dev/${l_vndev}c`" } @@ -610,7 +619,7 @@ log "Using existing host key" else log "Generating new host key" - ssh-keygen -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \ + ssh-keygen -t rsa1 -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \ -N "" -C "root@picobsd" gzip -9 ${BUILDDIR}/floppy.tree/etc/ssh_host_key* || true fi @@ -792,11 +801,15 @@ init_fs_image ${BUILDDIR}/${c_img} ${blocks} log "Labeling floppy image" - b=${BUILDDIR}/boot # modified boot - perl -pne 's/\/boot\/loader/\/kernel\0\0\0\0\0/' ${c_boot} > ${b} + b2=${BUILDDIR}/boot2 # modified boot2 + cp ${c_boot2} ${b2} + chmod 0644 ${b2} + set `strings -at d ${b2} | grep "/boot/loader"` + echo -e "/kernel\0\0\0\0\0" | dd of=${b2} obs=$1 oseek=1 conv=notrunc + chmod 0444 ${b2} # create a disklabel ... - disklabel -Bw -b ${b} ${l_vndev} auto || \ + disklabel -Brw -b ${c_boot1} -s ${b2} ${l_vndev} auto || \ fail $? floppy_disklabel # and copy partition c: into partition a: using some sed magic @@ -804,8 +817,7 @@ disklabel -R ${l_vndev} /dev/stdin log "Newfs floppy image" - newfs -i ${fd_inodes} -m 0 -o space -f 512 -b 4096 \ - /dev/${l_vndev}a > /dev/null + newfs -i ${fd_inodes} ${l_newfs} /dev/${l_vndev}a > /dev/null log "Mounting floppy image" mount /dev/${l_vndev}a ${dst} ==== //depot/projects/gdb/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.139 2004/01/23 06:37:19 mtm Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.140 2004/03/22 21:24:38 ceri Exp $ .\" .Dd December 1, 2003 .Dt IPFW 8 @@ -885,7 +885,8 @@ Matches IP packets whose destination port is one of the port(s) specified as argument. .It Cm established -Matches TCP packets that have the RST or ACK bits set. +Matches TCP packets that either do not have the SYN bit set, or +that also have one of the RST or ACK bits set. .It Cm frag Matches packets that are fragments and not the first fragment of an IP datagram. Note that these packets will not have ==== //depot/projects/gdb/sbin/reboot/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/reboot/Makefile,v 1.12 2002/11/04 17:39:54 gordon Exp $ +# $FreeBSD: src/sbin/reboot/Makefile,v 1.13 2004/03/22 00:52:27 obrien Exp $ PROG= reboot DPADD= ${LIBUTIL} @@ -10,6 +10,9 @@ .if exists(${.CURDIR}/boot_${MACHINE}.8) MLINKS+= boot_${MACHINE}.8 boot.8 .endif +.if ${MACHINE} == "amd64" +MLINKS+= boot_i386.8 boot.8 +.endif LINKS= ${BINDIR}/reboot ${BINDIR}/halt ${BINDIR}/reboot ${BINDIR}/fastboot \ ${BINDIR}/reboot ${BINDIR}/fasthalt ==== //depot/projects/gdb/share/man/man4/aac.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.22 2003/11/11 08:40:43 scottl Exp $ +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.23 2004/03/21 15:25:20 hrs Exp $ .Dd February 22, 2001 .Dt AAC 4 .Os @@ -50,9 +50,11 @@ .It Adaptec SCSI RAID 2410SA .It +Adaptec SCSI RAID 2810SA +.It Adaptec SCSI RAID 5400S .It -HP NetRAID 4M +Dell CERC SATA RAID 2 .It Dell PERC 2/Si .It @@ -61,6 +63,10 @@ Dell PERC 3/Si .It Dell PERC 3/Di +.It +Dell PERC 320/DC +.It +HP NetRAID 4M .Pp .El Access to RAID containers is available via the ==== //depot/projects/gdb/share/man/man5/passwd.5#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)passwd.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.40 2003/01/15 08:24:45 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.41 2004/03/21 19:36:16 dannyboy Exp $ .\" .Dd January 16, 1999 .Dt PASSWD 5 @@ -79,7 +79,7 @@ .It gid User's login group id. .It class -User's general classification (unused). +User's login class. .It change Password change time. .It expire @@ -311,6 +311,7 @@ .Xr login 1 , .Xr passwd 1 , .Xr getpwent 3 , +.Xr login.conf 5 , .Xr netgroup 5 , .Xr adduser 8 , .Xr pwd_mkdb 8 , ==== //depot/projects/gdb/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.35 2004/03/14 01:29:05 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.36 2004/03/21 04:57:24 marcel Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -37,10 +37,11 @@ # Logic to set up correct gcc optimization flag. This must be included # after /etc/make.conf so it can react to the local value of CPUTYPE # defined therein. Consult: -# http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html # http://gcc.gnu.org/onlinedocs/gcc/DEC-Alpha-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/IA-64-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html # http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html -# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ ==== //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.43 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.45 2004/03/22 18:34:37 wpaul Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -150,7 +150,7 @@ case MOD_SHUTDOWN: /* stop kthreads */ ndis_destroy_kthreads(); - if (TAILQ_FIRST(&ndis_devhead) != NULL) { + if (TAILQ_FIRST(&ndis_devhead) == NULL) { /* Shut down subsystems */ ndis_libfini(); ntoskrnl_libfini(); @@ -268,14 +268,16 @@ ndis_tproc.np_q = &ndis_ttodo; ndis_tproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_tproc, - &ndis_tproc.np_p, RFHIGHPID, 0, "ndis taskqueue"); + &ndis_tproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis taskqueue"); } if (error == 0) { ndis_iproc.np_q = &ndis_itodo; ndis_iproc.np_state = NDIS_PSTATE_SLEEPING; error = kthread_create(ndis_runq, &ndis_iproc, - &ndis_iproc.np_p, RFHIGHPID, 0, "ndis swi"); + &ndis_iproc.np_p, RFHIGHPID, + NDIS_KSTACK_PAGES, "ndis swi"); } if (error) { ==== //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.10 2004/03/20 23:39:43 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.11 2004/03/22 00:41:41 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -466,6 +466,13 @@ #define STATUS_WAIT_0 0x00000000 +/* + * FreeBSD's kernel stack is 2 pages in size by default. The + * Windows stack is larger, so we need to give our threads more + * stack pages. 4 should be enough, we use 8 just to extra safe. + */ +#define NDIS_KSTACK_PAGES 8 + extern image_patch_table ntoskrnl_functbl[]; extern struct mtx *ntoskrnl_dispatchlock; ==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.29 2004/03/20 23:39:43 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.31 2004/03/22 22:46:22 wpaul Exp $"); #include <sys/ctype.h> #include <sys/unistd.h> @@ -86,6 +86,7 @@ int64_t *, wait_block *); static void ntoskrnl_wakeup(void *); static void ntoskrnl_timercall(void *); +static void ntoskrnl_timersched(void *); __stdcall static void ntoskrnl_writereg_ushort(uint16_t *, uint16_t); __stdcall static uint16_t ntoskrnl_readreg_ushort(uint16_t *); __stdcall static void ntoskrnl_writereg_ulong(uint32_t *, uint32_t); @@ -1586,7 +1587,7 @@ sprintf(tname, "windows kthread %d", ntoskrnl_kth); error = kthread_create(ntoskrnl_thrfunc, tc, &p, - RFHIGHPID, 0, tname); + RFHIGHPID, NDIS_KSTACK_PAGES, tname); *handle = p; ntoskrnl_kth++; @@ -1617,7 +1618,6 @@ ntoskrnl_kth--; - mtx_lock(&Giant); kthread_exit(0); return(0); /* notreached */ } @@ -1642,9 +1642,23 @@ kdb_enter("ntoskrnl_debugger(): breakpoint"); } +/* + * We run all timer callouts in the ndis swi thread to take + * advantage of its larger stack size. If we don't do this, + * the callout will run in the clock ithread context. + */ + +static void +ntoskrnl_timersched(arg) + void *arg; +{ + ndis_sched(ntoskrnl_timercall, arg, NDIS_SWI); + return; +} + static void ntoskrnl_timercall(arg) - void *arg; + void *arg; { ktimer *timer; __stdcall kdpc_func timerfunc; @@ -1667,7 +1681,7 @@ tv.tv_sec = 0; tv.tv_usec = timer->k_period * 1000; timer->k_handle = - timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); } if (dpc != NULL) { @@ -1745,7 +1759,7 @@ if (timer->k_handle.callout != NULL && callout_pending(timer->k_handle.callout)) { - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); pending = TRUE; } else pending = FALSE; @@ -1770,7 +1784,7 @@ } } - timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + timer->k_handle = timeout(ntoskrnl_timersched, timer, tvtohz(&tv)); return(pending); } @@ -1799,7 +1813,7 @@ else pending = FALSE; - untimeout(ntoskrnl_timercall, timer, timer->k_handle); + untimeout(ntoskrnl_timersched, timer, timer->k_handle); return(pending); } ==== //depot/projects/gdb/sys/conf/files.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.479 2004/03/15 22:24:27 fjoe Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.481 2004/03/22 18:00:39 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403230305.i2N35rLb048254>