From owner-p4-projects@FreeBSD.ORG Wed Nov 3 01:56:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6E6C16A4D0; Wed, 3 Nov 2004 01:56:40 +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 ADD1D16A4CF for ; Wed, 3 Nov 2004 01:56:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D2543D2F for ; Wed, 3 Nov 2004 01:56:40 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA31uefn069311 for ; Wed, 3 Nov 2004 01:56:40 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA31udNK069307 for perforce@freebsd.org; Wed, 3 Nov 2004 01:56:39 GMT (envelope-from peter@freebsd.org) Date: Wed, 3 Nov 2004 01:56:39 GMT Message-Id: <200411030156.iA31udNK069307@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 64128 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, 03 Nov 2004 01:56:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=64128 Change 64128 by peter@peter_daintree on 2004/11/03 01:56:16 IFC @64125 Affected files ... .. //depot/projects/hammer/UPDATING#65 integrate .. //depot/projects/hammer/bin/rm/rm.1#8 integrate .. //depot/projects/hammer/bin/sh/sh.1#11 integrate .. //depot/projects/hammer/bin/stty/key.c#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#40 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#28 integrate .. //depot/projects/hammer/etc/rc.d/moused#7 integrate .. //depot/projects/hammer/etc/usbd.conf#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#30 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#24 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#19 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#24 integrate .. //depot/projects/hammer/release/Makefile#65 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#64 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/hammer/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#53 integrate .. //depot/projects/hammer/share/man/man4/altq.4#2 integrate .. //depot/projects/hammer/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/hammer/share/man/man4/tcp.4#14 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#41 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#20 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#10 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#60 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#7 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/hammer/sys/conf/NOTES#71 integrate .. //depot/projects/hammer/sys/ddb/db_output.c#6 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#15 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_variables.c#4 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#8 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#26 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#35 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#42 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_seq.h#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#36 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#30 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/powerpc/include/elf.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#7 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#9 integrate .. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#17 integrate Differences ... ==== //depot/projects/hammer/UPDATING#65 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1961,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.377 2004/11/02 22:22:22 andre Exp $ ==== //depot/projects/hammer/bin/rm/rm.1#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.32 2004/10/28 08:25:30 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" .Dd October 28, 2004 .Dt RM 1 @@ -77,9 +77,9 @@ .Fl f options. .It Fl I -Request confirmation once if more then three files are being removed or if a -directory is being recursively removed. This is a far less intrusive option -than +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than .Fl i yet provides almost the same level of protection against mistakes. .It Fl P ==== //depot/projects/hammer/bin/sh/sh.1#11 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. .Bl -hang -.It Li * +.It Li $* Expands to the positional parameters, starting from one. When the expansion occurs within a double-quoted string @@ -965,7 +969,7 @@ if .Ev IFS is unset. -.It Li @ +.It Li $@ Expands to the positional parameters, starting from one. When the expansion occurs within double-quotes, each positional @@ -988,26 +992,26 @@ .Bd -literal -offset indent "abc" "def ghi" .Ed -.It Li # +.It Li $# Expands to the number of positional parameters. -.It Li \&? +.It Li $\&? Expands to the exit status of the most recent pipeline. -.It Li - +.It Li $- (hyphen) Expands to the current option flags (the single-letter option names concatenated into a string) as specified on invocation, by the set built-in command, or implicitly by the shell. -.It Li $ +.It Li $$ Expands to the process ID of the invoked shell. A subshell retains the same value of $ as its parent. -.It Li \&! +.It Li $\&! Expands to the process ID of the most recent background command executed from the current shell. For a pipeline, the process ID is that of the last command in the pipeline. -.It Li 0 +.It Li $0 (zero) Expands to the name of the shell or shell script. .El .Ss Word Expansions ==== //depot/projects/hammer/bin/stty/key.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.18 2004/04/06 20:06:53 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $"); #include @@ -263,7 +263,7 @@ ip->t.c_iflag |= ICRNL; /* preserve user-preference flags in lflag */ #define LKEEP (ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH) - ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP); + ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP); ip->t.c_oflag = TTYDEF_OFLAG; ip->set = 1; } ==== //depot/projects/hammer/etc/defaults/rc.conf#40 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.227 2004/10/30 13:44:05 pjd Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -362,6 +362,8 @@ font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO). blanktime="300" # blank time (in seconds) or "NO" to turn it off. saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko +moused_nondefault_enable="YES" # Treat non-default mice as enabled unless + # specifically overriden in rc.conf(5). moused_enable="NO" # Run the mouse daemon. moused_type="auto" # See man page for rc.conf(5) for available settings. moused_port="/dev/psm0" # Set to your mouse port. ==== //depot/projects/hammer/etc/rc.d/Makefile#28 (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.44 2004/09/29 00:12:28 trhodes Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -25,8 +25,8 @@ network_ipv6 nfsclient nfsd \ nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ - pccard pcvt pf pflog preseedrandom \ - power_profile ppp-user pppoed pwcheck \ + pccard pcvt pf pflog \ + power_profile ppp-user pppoed preseedrandom pwcheck \ quota \ random rarpd rcconf.sh resolv root \ route6d routed routing rpcbind rtadvd rwho \ ==== //depot/projects/hammer/etc/rc.d/moused#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.7 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.8 2004/11/01 18:05:40 mtm Exp $ # # PROVIDE: moused @@ -14,11 +14,47 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" start_cmd="moused_start" +_pidprefix="/var/run/moused" +pidfile="${_pidprefix}.pid" +_pidarg= +load_rc_config $name +# Set the pid file and variable name. The second argument, if it exists, is +# expected to be the mouse device. +# +if [ -n "$2" ]; then + checkyesno moused_nondefault_enable && + eval moused_$2_enable=\${moused_$2_enable-YES} + rcvar=`set_rcvar moused_$2` + pidfile="${_pidprefix}.$2.pid" + _pidarg="-I $pidfile" +fi + moused_start() { - echo -n 'Starting moused:' - /usr/sbin/moused ${moused_flags} -p ${moused_port} -t ${moused_type} + local ms myflags myport mytype + + # Set the mouse device and get any related variables. If + # a moused device has been specified on the commandline, then + # rc.conf(5) variables defined for that device take precedence + # over the generic moused_* variables. The only exception is + # the moused_port variable, which if not defined sets it to the + # passed in device name. + # + ms=$1 + if [ -n "$ms" ]; then + eval myflags=\${moused_${ms}_flags-$moused_flags} + eval myport=\${moused_${ms}_port-/dev/$ms} + eval mytype=\${moused_${ms}_type-$moused_type} + else + ms="default" + myflags="$moused_flags" + myport="$moused_port" + mytype="$moused_type" + fi + + echo -n "Starting ${ms} moused:" + /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${_pidarg} _mousechar_arg= case ${mousechar_start} in @@ -36,5 +72,4 @@ echo '.' } -load_rc_config $name -run_rc_command "$1" +run_rc_command $* ==== //depot/projects/hammer/etc/usbd.conf#3 (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.12 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/usbd.conf,v 1.13 2004/11/01 18:05:40 mtm Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -46,7 +46,7 @@ # device "Mouse" devname "ums[0-9]+" - attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid ; /usr/sbin/vidcontrol -m on" + 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/libpthread/thread/thr_private.h#30 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.119 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -563,6 +563,7 @@ struct pthread_sigframe { int psf_valid; int psf_flags; + int psf_cancelflags; int psf_interrupted; int psf_timeout; int psf_signo; ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#24 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.81 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.82 2004/11/01 10:49:34 davidxu Exp $ */ #include #include @@ -1188,6 +1188,7 @@ if (psf->psf_valid == 0) PANIC("invalid pthread_sigframe\n"); thread->flags = psf->psf_flags; + thread->cancelflags = psf->psf_cancelflags; thread->interrupted = psf->psf_interrupted; thread->timeout = psf->psf_timeout; thread->state = psf->psf_state; @@ -1200,6 +1201,7 @@ { /* This has to initialize all members of the sigframe. */ psf->psf_flags = thread->flags & THR_FLAGS_PRIVATE; + psf->psf_cancelflags = thread->cancelflags; psf->psf_interrupted = thread->interrupted; psf->psf_timeout = thread->timeout; psf->psf_state = thread->state; ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#19 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.171 2004/10/30 17:30:56 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.174 2004/11/02 18:48:44 yar Exp $"; #endif /* not lint */ /* @@ -1258,8 +1258,11 @@ e = pam_start("ftpd", (*ppw)->pw_name, &conv, &pamh); if (e != PAM_SUCCESS) { - /* pamh is NULL, cannot use pam_strerror() */ - syslog(LOG_ERR, "pam_start failed"); + /* + * In OpenPAM, it's OK to pass NULL to pam_strerror() + * if context creation has failed in the first place. + */ + syslog(LOG_ERR, "pam_start: %s", pam_strerror(NULL, e)); return -1; } @@ -3172,9 +3175,9 @@ if (statfd >= 0 && getwd(path) != NULL) { time(&now); - snprintf(buf, sizeof(buf), "%.20s!%s!%s!%s/%s!%qd!%ld\n", + snprintf(buf, sizeof(buf), "%.20s!%s!%s!%s/%s!%jd!%ld\n", ctime(&now)+4, ident, remotehost, - path, name, (long long)size, + path, name, (intmax_t)size, (long)(now - start + (now == start))); write(statfd, buf, strlen(buf)); } ==== //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#5 (text+ko) ==== @@ -26,7 +26,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/libexec/rtld-elf/powerpc/reloc.c,v 1.4 2004/08/04 19:12:14 dfr Exp $ + * $FreeBSD: src/libexec/rtld-elf/powerpc/reloc.c,v 1.5 2004/11/02 09:47:01 ssouhlal Exp $ */ #include @@ -206,6 +206,58 @@ */ break; + case R_PPC_DTPMOD32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + *where = (Elf_Addr) defobj->tlsindex; + + break; + + case R_PPC_TPREL32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + return (-1); + } + } + + *(Elf_Addr **)where = *where * sizeof(Elf_Addr) + + (Elf_Addr *)(def->st_value + rela->r_addend + + defobj->tlsoffset - TLS_TP_OFFSET - TLS_TCB_SIZE); + + break; + + case R_PPC_DTPREL32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + *where += (Elf_Addr)(def->st_value + rela->r_addend + - TLS_DTV_OFFSET); + + break; + default: _rtld_error("%s: Unsupported relocation type %d" " in non-PLT relocations\n", obj->path, @@ -494,6 +546,7 @@ allocate_initial_tls(Obj_Entry *list) { register Elf_Addr **tp __asm__("r2"); + Elf_Addr **_tp; /* * Fix the size of the static TLS block by using the maximum @@ -503,7 +556,14 @@ tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; - tp = (Elf_Addr **) ((char *) allocate_tls(list, 0, 8, 8) + 0x7008); + _tp = (Elf_Addr **) ((char *) allocate_tls(list, 0, 8, 8) + + TLS_TP_OFFSET + TLS_TCB_SIZE); + + /* + * XXX gcc seems to ignore 'tp = _tp;' + */ + + __asm __volatile("mr %0,%1" : "=r"(tp) : "r"(_tp)); } void* @@ -512,6 +572,8 @@ register Elf_Addr **tp __asm__("r2"); char *p; - p = tls_get_addr_common(tp, ti->ti_module, ti->ti_offset); - return p + 0x8000; + p = tls_get_addr_common((Elf_Addr**)((Elf_Addr)tp - TLS_TP_OFFSET + - TLS_TCB_SIZE), ti->ti_module, ti->ti_offset); + + return (p + TLS_DTV_OFFSET); } ==== //depot/projects/hammer/libexec/rtld-elf/powerpc/rtld_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.3 2004/08/04 19:12:14 dfr Exp $ + * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.4 2004/11/02 09:47:01 ssouhlal Exp $ */ #ifndef RTLD_MACHDEP_H @@ -62,6 +62,14 @@ void _rtld_powerpc_pltresolve(void); void _rtld_powerpc_pltcall(void); +/* + * TLS + */ + +#define TLS_TP_OFFSET 0x7000 +#define TLS_DTV_OFFSET 0x8000 +#define TLS_TCB_SIZE 8 + #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#24 (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/libexec/rtld-elf/rtld.c,v 1.100 2004/09/23 23:04:52 cognet Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $ */ /* @@ -390,6 +390,17 @@ exit (0); } + /* setup TLS for main thread */ + dbg("initializing initial thread local storage"); + STAILQ_FOREACH(entry, &list_main, link) { + /* + * Allocate all the initial objects out of the static TLS + * block even if they didn't ask for it. + */ + allocate_tls_offset(entry->obj); + } + allocate_initial_tls(obj_list); + if (relocate_objects(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld) == -1) die(); @@ -410,17 +421,6 @@ dbg("initializing thread locks"); lockdflt_init(); - /* setup TLS for main thread */ - dbg("initializing initial thread local storage"); - STAILQ_FOREACH(entry, &list_main, link) { - /* - * Allocate all the initial objects out of the static TLS - * block even if they didn't ask for it. - */ - allocate_tls_offset(entry->obj); - } - allocate_initial_tls(obj_list); - /* Make a list of init functions to call. */ objlist_init(&initlist); initlist_add_objects(obj_list, preload_tail, &initlist); ==== //depot/projects/hammer/release/Makefile#65 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.866 2004/10/21 08:54:10 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.867 2004/11/02 11:59:27 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -951,9 +951,10 @@ @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf -.if exists(${HINTSFILE}) +.if exists(${RD}/trees/base/boot/device.hints) # Break the link to device.hints so we can modify it - @cp -f ${HINTSFILE} ${CD_DISC2}/boot/device.hints + @rm -f ${CD_DISC2}/boot/device.hints + @cp ${RD}/trees/base/boot/device.hints ${CD_DISC2}/boot/device.hints .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints .endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#64 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.259 2004/09/26 19:13:37 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.260 2004/11/02 22:31:29 simon Exp $ Supported Devices @@ -195,6 +195,9 @@ driver) + The hptmv(4) driver supports the HighPoint + RocketRAID 182x SATA controllers. + &hwlist.ips; &hwlist.mpt; ==== //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.4 2004/08/22 16:22:20 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.5 2004/11/01 15:46:21 pjd Exp $ .\" .Dd Aug 22, 2004 .Dt GRAID3 8 @@ -112,7 +112,7 @@ when device is in complete state. With this option specified random I/O read operations are even 40% faster, but sequential reads are slower. -One cannot not use this options if +One cannot use this options if .Fl w option is also specified. .It Fl w ==== //depot/projects/hammer/share/examples/netgraph/bluetooth/rc.bluetooth#2 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # $Id: rc.bluetooth,v 1.5 2003/03/30 04:03:16 max Exp $ -# $FreeBSD: src/share/examples/netgraph/bluetooth/rc.bluetooth,v 1.1 2003/05/10 21:53:43 julian Exp $ +# $FreeBSD: src/share/examples/netgraph/bluetooth/rc.bluetooth,v 1.2 2004/11/02 20:06:33 emax Exp $ # logger="/usr/bin/logger -i -s -p user.err" @@ -182,7 +182,7 @@ exit 1 fi - ${hcseriald} -f /dev/cuaa${unit} -n ${dev} + ${hcseriald} -f /dev/cuad${unit} -n ${dev} sleep 1 # wait a little bit if [ ! -f "/var/run/hcseriald.${dev}.pid" ]; then ==== //depot/projects/hammer/share/man/man4/Makefile#53 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.287 2004/10/12 23:38:22 emax Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.288 2004/11/02 10:46:28 harti Exp $ MAN= aac.4 \ acpi.4 \ @@ -155,6 +155,7 @@ netintro.4 \ ng_async.4 \ ng_atm.4 \ + ngatmbase.4 \ ng_atmllc.4 \ ng_atmpif.4 \ ng_bluetooth.4 \ ==== //depot/projects/hammer/share/man/man4/altq.4#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/share/man/man4/altq.4,v 1.2 2004/10/08 03:33:31 green Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.3 2004/11/01 11:43:07 mlaier Exp $ .\" .Dd October 7, 2004 .Dt ALTQ 4 @@ -110,6 +110,7 @@ .Xr ath 4 , .Xr awi 4 , .Xr bfe 4 , +.Xr bge 4 , .Xr dc 4 , .Xr em 4 , .Xr fxp 4 , ==== //depot/projects/hammer/share/man/man4/tcp.4#14 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.50 2004/10/23 18:37:23 andre Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.51 2004/11/02 22:22:22 andre Exp $ .\" -.Dd October 23, 2004 +.Dd November 2, 2004 .Dt TCP 4 .Os .Sh NAME @@ -233,16 +233,11 @@ branch of the .Xr sysctl 3 MIB. -.Bl -tag -width ".Va TCPCTL_DO_RFC1644" +.Bl -tag -width ".Va TCPCTL_DO_RFC1323" .It Dv TCPCTL_DO_RFC1323 .Pq Va rfc1323 Implement the window scaling and timestamp options of RFC 1323 (default is true). -.It Dv TCPCTL_DO_RFC1644 -.Pq Va rfc1644 -Implement Transaction -.Tn TCP , -as described in RFC 1644. .It Dv TCPCTL_MSSDFLT .Pq Va mssdflt The default value used for the maximum segment size @@ -517,7 +512,6 @@ .Xr intro 4 , .Xr ip 4 , .Xr syncache 4 , -.Xr ttcp 4 , .Xr setkey 8 .Rs .%A "V. Jacobson" @@ -527,11 +521,6 @@ .%O "RFC 1323" .Re .Rs -.%A "R. Braden" -.%T "T/TCP - TCP Extensions for Transactions" -.%O "RFC 1644" -.Re -.Rs .%A "A. Heffernan" .%T "Protection of BGP Sessions via the TCP MD5 Signature Option" .%O "RFC 2385" ==== //depot/projects/hammer/share/man/man5/rc.conf.5#41 (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/man5/rc.conf.5,v 1.233 2004/10/30 13:44:06 pjd Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.234 2004/11/01 18:05:41 mtm Exp $ .\" .Dd October 23, 2004 .Dt RC.CONF 5 @@ -2223,6 +2223,21 @@ this is the actual screen saver to use .Li ( blank , snake , daemon , etc). +.It Va moused_nondefault_enable +.Pq Vt str +If set to +.Dq Li NO +the mouse device specified on +the command line is not automatically treated as enabled by the +.Pa /etc/rc.d/moused +script. +Having this variable set to +.Dq Li YES +allows a +.Xr usb 4 +mouse, +for example, +to be enabled as soon as it is plugged in. .It Va moused_enable .Pq Vt str If set to ==== //depot/projects/hammer/share/misc/bsd-family-tree#20 (text+ko) ==== @@ -172,7 +172,7 @@ | | | | \ FreeBSD 5.0 | | | | | | | | | -FreeBSD 5.1 | NetBSD -current OpenBSD -current DragonFly 1.0 +FreeBSD 5.1 | | | DragonFly 1.0 | \ | | | | | ----- Mac OS X | | | | 10.3 | | | @@ -181,10 +181,10 @@ | FreeBSD 5.2.1 | | | | | | | | | *---FreeBSD 5.3 | | | | - | | | | | | + | | | | OpenBSD 3.6 | | v | | | | | | | | | -FreeBSD 6 -current | | | | +FreeBSD 6 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -410,6 +410,7 @@ FreeBSD 4.10 2004-05-27 [FBD] DragonFly 1.0 2004-07-12 [DFD] FreeBSD 5.3 2004-10-24 [FBD] +OpenBSD 3.6 2004-10-29 [OBD] Bibliography ------------------------ @@ -470,4 +471,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.84 2004/10/24 10:09:20 scottl Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.85 2004/11/02 09:40:57 maxim Exp $ ==== //depot/projects/hammer/sys/alpha/alpha/db_trace.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -221,7 +221,7 @@ last_ipl = ~0L; tf = NULL; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) ==== //depot/projects/hammer/sys/alpha/conf/GENERIC#24 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -381,7 +381,7 @@ first = TRUE; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.10 2004/11/01 22:15:13 jhb Exp $ */ /* @@ -313,7 +313,7 @@ else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) if (*isrc != NULL) db_dump_ithread((*isrc)->is_ithread, verbose); ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#60 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/hammer/sys/arm/arm/db_trace.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -138,7 +138,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<