PERFORCE change 48189 for review

Peter Wemm peter at FreeBSD.org
Thu Mar 4 22:00:04 PST 2004


http://perforce.freebsd.org/chv.cgi?CH=48189

Change 48189 by peter at peter_daintree on 2004/03/04 21:59:55

	IFC @48179

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#39 integrate
.. //depot/projects/hammer/bin/date/date.c#5 integrate
.. //depot/projects/hammer/contrib/diff/diff.h#4 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#16 integrate
.. //depot/projects/hammer/gnu/lib/libregex/regex.c#5 integrate
.. //depot/projects/hammer/gnu/lib/libregex/regex.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/search.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#15 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#57 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#12 integrate
.. //depot/projects/hammer/share/man/man4/re.4#4 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#20 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#27 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_crypto.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_input.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_ioctl.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_node.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_output.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_proto.9#1 branch
.. //depot/projects/hammer/share/man/man9/ieee80211_radiotap.9#1 branch
.. //depot/projects/hammer/sys/amd64/conf/NOTES#14 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#7 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#28 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#16 integrate
.. //depot/projects/hammer/sys/dev/ctau/ctau.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#28 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#27 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#27 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.c#7 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.h#3 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_tc.c#13 integrate
.. //depot/projects/hammer/sys/modules/ndis/Makefile#4 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#10 integrate
.. //depot/projects/hammer/sys/netinet6/mld6.c#7 integrate
.. //depot/projects/hammer/sys/sys/filedesc.h#7 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#14 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_zeroidle.c#10 integrate
.. //depot/projects/hammer/usr.bin/c99/c99.1#3 integrate
.. //depot/projects/hammer/usr.bin/yacc/main.c#2 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.1#3 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#4 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#39 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.407 2004/03/03 22:56:41 gad Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.409 2004/03/04 18:41:35 gad Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -221,7 +221,7 @@
 	@echo
 	@echo "*** Error: path to source tree contains a comma ','"
 	@echo
-	@false
+	false
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -355,49 +355,50 @@
 .if ${TARGET_ARCH} == "sparc64"
 SPECIAL_INSTALLCHECKS+=sparc64_installcheck
 
-CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
-SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}'
-NEWSPARC_TIMETYPE?=${CUR_TIMETYPE}
-THISHOST!= hostname -s
-.if ${THISHOST} == ""
+CUR_TIMET!=	grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
+SRC_TIMET!=	grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \
+		awk '{print $$2}'
+NEWSPARC_TIMETYPE?=${CUR_TIMET}
+THISHOST!=	hostname -s
+.if empty(THISHOST)
 THISHOST="name not set yet"
 .endif
 
 sparc64_installcheck:
-.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo ""
-.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo "***  ERROR: This target would change the type used for time_t!  ***"
+.if ${CUR_TIMET} != ${SRC_TIMET}
+	@echo
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
+	@echo "***  ERROR: This target would change the type used for time_t!"
 .else
-	@echo "* Note: This installation changes the type used for time_t"
+	@echo "* Note: This installation changes the type used for time_t."
 .endif
 	@echo "* "
-	@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE},"
-	@echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}."
-.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
+	@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMET},"
+	@echo "* and this installation will switch time_t to be type ${SRC_TIMET}."
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
 	@echo "* "
 	@echo "* If that is *NOT* what you wanted, then you need to change the"
-	@echo "* typedef for __time_t in:   ${.CURDIR}/sys/sparc64/include/_types.h"
-	@echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'.  After that you *MUST* do a"
-	@echo "* complete cleanworld, buildworld, buildkernel before you retry"
-	@echo "* your 'make' command.  Also read /usr/src/UPDATING.64BTT."
+	@echo "* typedef of __time_t in ${.CURDIR}/sys/sparc64/include/_types.h"
+	@echo "* from '${SRC_TIMET}' to '${CUR_TIMET}'.  After that you *MUST*"
+	@echo "* do a complete cleanworld, buildworld, buildkernel before you"
+	@echo "* retry the 'make' command.  Also read /usr/src/UPDATING.64BTT."
 	@echo "* "
 	@echo "* If that *is* what you want, then enter the commands:"
-	@echo "      NEWSPARC_TIMETYPE=${SRC_TIMETYPE}"
+	@echo "      NEWSPARC_TIMETYPE=${SRC_TIMET}"
 	@echo "      export NEWSPARC_TIMETYPE"
 	@echo "* and repeat your 'make' command."
-	@echo ""
-	@false
+	@echo
+	false
 .endif
-	@echo ""
-.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo ""
-	@echo "***  ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
+	@echo
+.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
+	@echo
+	@echo "***  ERROR: NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
 	@echo "***         but ${.CURDIR}/sys/sparc64/include/_types.h"
-	@echo "***         has __time_t defined as:  '${SRC_TIMETYPE}'"
-	@false
+	@echo "***         has __time_t defined as '${SRC_TIMET}'."
+	false
 .else
-	@# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}'
+	@# in sparc64_installcheck, all TIMETYPEs == '${CUR_TIMET}'
 .endif
 .endif
 
@@ -508,7 +509,7 @@
 buildkernel:
 .if empty(BUILDKERNELS)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF}).";
-	@false
+	false
 .endif
 .if defined(KERNWARN)
 	@echo "--------------------------------------------------------------"
@@ -558,7 +559,7 @@
 .endfor
 
 #
-# installkernel
+# installkernel, etc.
 #
 # Install the kernel defined by INSTALLKERNEL
 #
@@ -566,7 +567,7 @@
 reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."
-	@false
+	false
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \

==== //depot/projects/hammer/bin/date/date.c#5 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.44 2003/10/04 07:16:40 dds Exp $");
+__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.45 2004/03/04 15:46:14 mtm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -234,9 +234,9 @@
 		case 10:				/* yy */
 			if (century)
 				lt->tm_year += ATOI2(p);
-			else {				/* hack for 2000 ;-} */
+			else {
 				lt->tm_year = ATOI2(p);
-				if (lt->tm_year < 69)
+				if (lt->tm_year < 69)	/* hack for 2000 ;-} */
 					lt->tm_year += 2000 - TM_YEAR_BASE;
 				else
 					lt->tm_year += 1900 - TM_YEAR_BASE;

==== //depot/projects/hammer/contrib/diff/diff.h#4 (text+ko) ====

@@ -16,6 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* $FreeBSD: src/contrib/diff/diff.h,v 1.3 2004/02/16 22:54:45 ache Exp $ */
 
 #include "system.h"
 #include <stdio.h>

==== //depot/projects/hammer/etc/rc.d/Makefile#16 (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.31 2004/02/07 15:46:20 imp Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.32 2004/03/04 21:03:36 bms Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,7 @@
 	fsck \
 	gbde gbde_swap \
 	hostname \
+	ike \
 	inetd initdiskless initrandom \
 	ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted isdnd \

==== //depot/projects/hammer/gnu/lib/libregex/regex.c#5 (text+ko) ====

@@ -1,3 +1,4 @@
+/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.11 2004/02/25 02:39:10 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/hammer/gnu/lib/libregex/regex.h#4 (text+ko) ====

@@ -1,3 +1,4 @@
+/* $FreeBSD: src/gnu/lib/libregex/regex.h,v 1.5 2004/02/25 02:39:10 ache Exp $ */
 #ifndef _REGEX_H
 #include <posix/regex.h>
 

==== //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.33 2004/02/24 19:23:28 johan Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.34 2004/03/04 20:36:18 ache Exp $
 #
 # This is included explicitly at the top of each sub-Makefile.  We can't
 # use the normal "Makefile.inc" mechanism, because we need some of these
@@ -24,6 +24,8 @@
 .endif
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH}
+# to pick right getopt.h
+CFLAGS+= -I${DESTDIR}/usr/include	
 CFLAGS+= -I${SRCDIR}/include
 
 .if exists(${.CURDIR}/${TARGET_ARCH})

==== //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#5 (text+ko) ====

@@ -1,4 +1,7 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.15 2004/02/24 19:23:29 johan Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.16 2004/03/05 01:47:02 ache Exp $
+
+# must be before -I${DESTDIR}/usr/include
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
 
 .include "../Makefile.inc0"
 
@@ -10,7 +13,6 @@
 CFLAGS+= -DBFD_ASSEMBLER
 CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as
 CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${DESTDIR}/usr/include/gnu
 CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config
 DPADD=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}

==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#8 (text+ko) ====

@@ -1,5 +1,8 @@
 # ex:ts=8
-# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.76 2004/02/24 19:23:29 johan Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.77 2004/03/05 01:47:03 ache Exp $
+
+# must be before -I${DESTDIR}/usr/include
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
 
 .include "../Makefile.inc0"
 
@@ -58,7 +61,6 @@
 CFLAGS+=	-I${.CURDIR}/${TARGET_ARCH}
 CFLAGS+=	-I${SRCDIR}/binutils -I${SRCDIR}/bfd
 CFLAGS+=	-I${GDBDIR}/gdb -I${GDBDIR}/gdb/config
-CFLAGS+=	-I${DESTDIR}/usr/include/gnu
 CFLAGS+=        -I$(.CURDIR)
 
 YFLAGS=

==== //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#4 (text+ko) ====

@@ -18,6 +18,8 @@
 /* Written June, 1988 by Mike Haertel
    Modified July, 1988 by Arthur David Olson to assist BMG speedups  */
 
+/* $FreeBSD: src/gnu/usr.bin/grep/dfa.c,v 1.14 2004/03/01 08:37:20 ache Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

==== //depot/projects/hammer/gnu/usr.bin/grep/search.c#4 (text+ko) ====

@@ -18,6 +18,8 @@
 
 /* Written August 1992 by Mike Haertel. */
 
+/* $FreeBSD: src/gnu/usr.bin/grep/search.c,v 1.12 2004/03/01 08:37:20 ache Exp $ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.1 2004/02/09 23:22:54 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.2 2004/03/05 00:09:53 kientzle Exp $");
 
 #include <sys/stat.h>
 #ifdef DMALLOC
@@ -701,6 +701,8 @@
 			    tar_atol10(value, strlen(value)));
 		else if (strcmp(key, "SCHILY.fflags")==0)
 			archive_entry_set_fflags(entry, value);
+		else if (strcmp(key, "SCHILY.nlink")==0)
+			st->st_nlink = tar_atol10(value, strlen(value));
 		break;
 	case 'a':
 		if (strcmp(key, "atime")==0)

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#15 (text+ko) ====

@@ -42,7 +42,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.64 2004/02/28 22:49:15 bmah Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.66 2004/03/05 04:19:06 bmah Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -146,7 +146,7 @@
       <option>-L</option> option, which uses &man.mksnap.ffs.8;.  Note
       that &man.mksnap.ffs.8; is normally only available to the
       superuser and members of the <groupname>operator</groupname>
-      group.  This bug has been fixed on the &os; &release.current;
+      group.  This bug has been fixed on the &os; &release.prev;
       security fix branch and in &os; &release.bugfix;.  For more information, see security advisory <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:01.mksnap_ffs.asc">FreeBSD-SA-04:01</ulink>.</para>
 
@@ -157,7 +157,7 @@
       attacker to gain unauthorized access to parts of kernel memory,
       possibly resulting in disclosure of sensitive information,
       bypass of access control mechanisms, or privilege escalation.
-      This bug has been fixed on the &os; &release.current;
+      This bug has been fixed on the &os; &release.prev;
       security fix branch and in &os; &release.bugfix;.
       More details, including bugfix and workaround information,
       can be found in security advisory <ulink
@@ -168,10 +168,21 @@
       environment to change its root directory to a different jail,
       giving it read and write access to the files and directories
       within.  This vulnerability has been closed on the &os;
-      &release.current; security fix branch and in &os;
+      &release.prev; security fix branch and in &os;
       &release.bugfix;.  Information on the bug fix can be found in
       security advisory <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.mail.asc">FreeBSD-SA-04:03</ulink>.</para>
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.jail.asc">FreeBSD-SA-04:03</ulink>.</para>
+
+    <para>(4 Mar 2004) It is possible for a remote attacker to conduct
+      a low-bandwidth denial-of-service attack against a machine
+      providing TCP-based services, filling up the target's memory
+      buffers and potentially leading to a system crash.  This
+      vulnerability has been addressed on the &os; &release.prev;
+      security fix branch, but is present in both &os; &release.prev;
+      and &release.bugfix;.  Security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:04.tcp.asc">FreeBSD-SA-04:04</ulink>
+      contains more details, as well as information on patching
+      existing systems.</para>
 
 ]]>
 

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#57 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.685 2004/02/29 02:20:21 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.686 2004/03/04 17:06:30 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -148,6 +148,13 @@
       jail.  More information can be found in security advisory <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.jail.asc">FreeBSD-SA-04:03</ulink>.</para>
 
+    <para>A potential low-bandwidth denial-of-service attack against
+      the &os; TCP stack has been prevented by limiting the number of
+      out-of-sequence TCP segments that can be held at one time.  More
+      details can be found in security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:04.tcp.asc">FreeBSD-SA-04:04</ulink>.
+      &merged;</para>
+
   </sect2>
 
   <sect2 id="kernel">
@@ -289,13 +296,6 @@
 	support for the TCP-MD5 class of security associations.
 	&merged;</para>
 
-      <para>The TCP segment reassembly queue now uses the UMA kernel
-	memory allocator and limits the maximum number of segments it
-	will hold, thus preventing a certain class of denial of
-	service attack.  Its behavior is controlled by the
-	<varname>net.inet.tcp.reass</varname> hierarchy of sysctl
-	variables.</para>
-
     </sect3>
 
     <sect3 id="disks">

==== //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#12 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.29 2004/01/30 05:42:22 hrs Exp $
-    Original revision: 1.61
+    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.30 2004/03/05 04:14:21 rushani Exp $
+    Original revision: 1.65
 -->
 
 <!--
@@ -34,6 +34,8 @@
 %release;
 <!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %misc;
+
+<!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
 
 <article>
@@ -50,7 +52,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.29 2004/01/30 05:42:22 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.30 2004/03/05 04:14:21 rushani Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -95,6 +97,13 @@
 ]]>
       ÍѤΠerrata ʸ½ñ¤Ç¤¹¡£&os; &release.next; ¤Î¸ø³«¤Þ¤Ç¤Î´Ö¡¢Êݼ餵¤ì¤Þ¤¹¡£</para>
 
+    <para>¤Þ¤¿¡¢¤³¤Îʸ½ñ¤Ë¤Ï
+      &os; &release.prev; ¤ÎÌó°ì¥«·î¸å¤Ë¸ø³«¤µ¤ì¤¿
+      <quote>¥Ý¥¤¥ó¥È¥ê¥ê¡¼¥¹</quote> ¤Ç¤¢¤ë
+      &os; &release.bugfix; ¤Î errata ¥ê¥¹¥È¤âµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      ÆäËÃíµ­¤¬¤Ê¤¤¸Â¤ê¡¢¤¹¤Ù¤Æ¤Î¹àÌܤÏ
+      &release.prev; ¤È &release.bugfix; ¤ÎξÊý¤Ë³ºÅö¤·¤Þ¤¹¡£</para>
+
     <para>&release.branch;
       ¥Ö¥é¥ó¥Á¤ÏºÇ¿·¤Î¥Ö¥é¥ó¥Á¥Ý¥¤¥ó¥È¤Ç¤¢¤ê¡¢
       ¤³¤³¤«¤é¤Ï¤Þ¤À¥ê¥ê¡¼¥¹ÈǤ¬¸ø³«¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
@@ -152,7 +161,51 @@
 ]]>
 
 <![ %release.type.snapshot [
-    <para>¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Ïȯ¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
+
+    <para>(2004 ǯ 1 ·î 30 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
+      &man.mksnap.ffs.8; ¤Î¥Ð¥°¤¬¸¶°ø¤Ç¡¢
+      ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤òºîÀ®¤¹¤ë¤È¡¢
+      Âоݥե¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥é¥°¤¬½é´üÃͤËÌá¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
+      ¤³¤ì¤Ë¤è¤ë±Æ¶Á¤ÎÂç¾®¤Ï¥·¥¹¥Æ¥à¤ÎÍøÍÑ·ÁÂ֤ˤè¤ê¤Þ¤¹¤¬¡¢
+      ³ÈÄ¥¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È¤ò̵¸ú¤Ë¤·¤¿¤ê¡¢¿®Íê¤Ç¤­¤Ê¤¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë
+      ÃÖ¤«¤ì¤Æ¤¤¤ë setuid ¼Â¹Ô¥Õ¥¡¥¤¥ë¤Î¼Â¹Ô¤¬²Äǽ¤Ë¤Ê¤ë¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
+      &man.dump.8; ¤Î <option>-L</option> ¥ª¥×¥·¥ç¥ó¤â¡¢
+      &man.mksnap.ffs.8; ¤òÍøÍѤ¹¤ë¤¿¤á¡¢¤³¤Î¥Ð¥°¤Ë¤è¤ë±Æ¶Á¤ò¼õ¤±¤Þ¤¹¡£
+      ¤¿¤À¤·Ä̾&man.mksnap.ffs.8; ¤ò¼Â¹Ô²Äǽ¤Ê¤Î¤Ï
+      ¥¹¡¼¥Ñ¥æ¡¼¥¶¤È <groupname>operator</groupname> ¤Î¥á¥ó¥Ð¤Î¤ß¤Ç¤¹¡£
+      ¤³¤Î¥Ð¥°¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
+      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
+      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:01.mksnap_ffs.asc">FreeBSD-SA-04:01</ulink>
+      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+    <para>(2004 ǯ 2 ·î 8Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
+      System V ¶¦Í­¥á¥â¥ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹
+      (¤Î¤¦¤Á &man.shmat.2; ¥·¥¹¥Æ¥à¥³¡¼¥ë) ¤Ë¥Ð¥°¤¬¤¢¤ê¡¢
+      ̤³äÅö¤Î¥«¡¼¥Í¥ë¥á¥â¥ê¤ò»²¾È¤¹¤ë¶¦Í­¥á¥â¥ê¥»¥°¥á¥ó¥È¤ò¤Ä¤¯¤ë¤³¤È¤¬
+      ¤Ç¤­¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
+      ¥í¡¼¥«¥ë¤Î¹¶·â¼Ô¤¬¤³¤ì¤ò°­ÍѤ¹¤ë¤È¡¢¥«¡¼¥Í¥ë¥á¥â¥ê¤Î°ìÉô¤ËÉÔÀµ¤Ë
+      ¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ë¤¿¤á¡¢·ë²Ì¤È¤·¤Æ¥»¥­¥å¥ê¥Æ¥£¾å½ÅÍפÊ
+      ¾ðÊó¤Îϳ±Ì¡¢¥¢¥¯¥»¥¹À©¸æµ¡¹½¤Î±ª²ó¤ä
+      ¹â¤¤¸¢¸Â¤ÎÉÔÀµ¤Ê³ÍÆÀ¤Ê¤É¤ËÍøÍѤµ¤ì¤ë¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
+      ¤³¤Î¥Ð¥°¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
+      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
+      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:02.shmat.asc">FreeBSD-SA-04:02</ulink>
+      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+    <para>(2004 ǯ 2 ·î 28 Æü)
+      ÆÃÄê¤Î¾ò·ï²¼¤Ç¤Ï¡¢&man.jail.8; ´Ä¶­¤ÎÆ⦤Ç
+      ¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤ò»ý¤Ä¥×¥í¥»¥¹¤ò°­ÍѤ·¤Æ
+      ¼«¿È¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò°Û¤Ê¤ë jail ¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      ¤³¤ì¤Ë¤è¤ê¡¢ËÜÍèÆÈΩ¤·¤Æ¤¤¤ë¤Ù¤­³Æ jail ´Ö¤Ç¡¢
+      ¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߽ñ¤­¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
+      ¤³¤Î¤¼¤¤¼åÀ­¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
+      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
+      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.mail.asc">FreeBSD-SA-04:03</ulink>
+      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
 ]]>
 
   </sect1>
@@ -185,7 +238,7 @@
       (<emphasis>Á÷¤ëÁ°</emphasis>¤Ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥¢¡¼¥«¥¤¥Ö¤òÄ´¤Ù¤Þ¤·¤ç¤¦)¡£
       ¤½¤ÎÊó¹ð¤¬¡¢ÌäÂê¤Î¸¶°øµæÌÀ¤ËÌò¤ËΩ¤Ä¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
 
-    <para>(2004 ǯ 1 ·î 9 Æü)
+    <para>(2004 ǯ 1 ·î 9 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       ATA ¥Ç¥Ð¥¤¥¹¡¢ÆÃ¤Ë SATA ¥Ç¥Ð¥¤¥¹¤Î¾ì¹ç¡¢Àµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
       Êó¹ð¤µ¤ì¤Æ¤¤¤ë¾É¾õ¤Ï¡¢¥³¥Þ¥ó¥É¤¬¥¿¥¤¥à¥¢¥¦¥È¤¹¤ë¡¢
       ¤¢¤ë¤¤¤Ï³ä¤ê¹þ¤ß¤¬¤«¤«¤é¤Ê¤¤¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
@@ -211,6 +264,11 @@
       </listitem>
     </itemizedlist>
 
+    <para>¾åµ­¤ÎÌäÂê¤Î¤¤¤¯¤Ä¤«¤Ï¡¢
+      &os; &release.bugfix; ¤Ç¤Ï
+      &release.current; ¤«¤é¿·¤·¤¤ &man.ata.4; ¥É¥é¥¤¥Ð¤òÅý¹ç¤·¤Æ
+      ²ò·è¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
     <para>(2004 ǯ 1 ·î 9 Æü)
       ¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥í¥Ã¥Ô¡¼¤ò»È¤Ã¤Æ NFS ·Ðͳ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢
       3 ËçÌܤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤é
@@ -235,22 +293,23 @@
       ¤ò»È¤Ã¤Æ¡¢APIC ¥ë¡¼¥Æ¥£¥ó¥°¤ò̵¸ú¤Ë¤¹¤ë¤È²þÁ±¤¹¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
       ¤¿¤À¤·¡¢APIC ¤ò̵¸ú¤Ë¤¹¤ë¤È SMP ¥·¥¹¥Æ¥à¤ÎÍøÍѤϤǤ­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
 
-    <para>(2004 ǯ 1 ·î 10 Æü)
+    <para>(2004 ǯ 1 ·î 10 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       NFSv4 ¥¯¥é¥¤¥¢¥ó¥È¤¬ NFSv3 ¤Î¤ß¡¢¤¢¤ë¤¤¤Ï NFSv2 ¤Î¤ß¤ËÂбþ¤·¤¿
       ¥µ¡¼¥Ð¤Ë NFSv4 Áàºî¤ò¤ª¤³¤Ê¤ª¤¦¤È¤·¤¿¾ì¹ç¡¢
       ¥Ñ¥Ë¥Ã¥¯¤¬È¯À¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎÌäÂê¤Ï¡¢
       &os; &release.current; ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë
       <filename>src/sys/rpc/rpcclnt.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó
-      1.4 ¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£</para>
+      1.4 ¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
+      ¤³¤Î½¤Àµ¤Ï &os; &release.bugfix; ¤Ë¤âÅý¹ç¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <para>(2004 ǯ 1 ·î 11 Æü)
+    <para>(2004 ǯ 1 ·î 11 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       <filename>nss_ldap</filename> ¤Ê¤É¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½ NSS
       ¥â¥¸¥å¡¼¥ë¤ò»È¤¤¡¢ÂçÎ̤Υá¥ó¥Ð¥ê¥¹¥È¤ò´Þ¤à¥°¥ë¡¼¥×¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢
       ÌäÂ꤬ȯÀ¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎÌäÂê¤Ï
       &os; &release.current; ¤Ë´Þ¤Þ¤ì¤ë
       <filename>src/include/nss.h</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.2,
       <filename>src/lib/libc/net/nss_compat.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.2 ¤Ç
-      ½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£</para>
+      ½¤Àµ¤µ¤ì¡¢&os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£</para>
 
     <para>(2004 ǯ 1 ·î 13 Æü)
       &os; &release.current; ¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë¤Ï¡¢´Þ¤Þ¤ì¤Æ¤¤¤ë
@@ -258,14 +317,16 @@
       ¤Èµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ì¤Ï¡¢<emphasis>pre-release</emphasis> GCC 3.3.3
       snapshot ¤Î¸í¤ê¤Ç¤¹¡£</para>
 
-    <para>(2004 ǯ 1 ·î 13 Æü)
+    <para>(2004 ǯ 1 ·î 13 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       <filename role="package">sysutils/kdeadmin3</filename> port/package ¤Ë¤Ï¡¢
       <application>KUser</application> ¤ò»È¤¦¤È¥·¥¹¥Æ¥à¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë
       ¤¢¤ë <username>root</username> ¥æ¡¼¥¶¤¬ºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤Î¤¢¤ë
       ¥Ð¥°¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î port/package ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¤¼¤Ò¥Ð¡¼¥¸¥ç¥ó 3.1.4_1 ¤Ø¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤è¤¦¤ª´ê¤¤¤·¤Þ¤¹¡£</para>
+      ¤¼¤Ò¥Ð¡¼¥¸¥ç¥ó 3.1.4_1 ¤Ø¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤è¤¦¤ª´ê¤¤¤·¤Þ¤¹¡£
+      &os; &release.bugfix; ¤Ë¤Ï¤³¤Î¥Ð¥°¤¬½¤Àµ¤µ¤ì¤¿ package ¤¬
+      ¼ýÏ¿¤µ¤ì¤Æ¤Þ¤¹¡£</para>
 
-    <para>(2004 ǯ 1 ·î 21 Æü)
+    <para>(2004 ǯ 1 ·î 21 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       KAME ¥×¥í¥¸¥§¥¯¥È¤«¤éÅý¹ç¤µ¤ì¤¿ IPSec ¼ÂÁõ¤Ë¡¢
       ¤Þ¤À»²¾È¤µ¤ì¤Æ¤¤¤ë¥á¥â¥ê¥ª¥Ö¥¸¥§¥¯¥È¤ò³«Êü¤·¤Æ¤·¤Þ¤¦²ÄǽÀ­¤Î¤¢¤ë¥Ð¥°¤¬
       ȯ¸«¤µ¤ì¤Þ¤·¤¿¡£º£¤Þ¤Ç¡¢¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¥Ç¡¼¥¿¥Ù¡¼¥¹
@@ -275,11 +336,19 @@
       <filename>src/sys/netinet6/ipsec.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.31,
       <filename>src/sys/netinet/in_pcb.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.136,
       <filename>src/sys/netkey/key.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.64
-      ¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£¤³¤ÎÌäÂê¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      ¤Ç½¤Àµ¤µ¤ì¡¢&os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
+      ¤³¤ÎÌäÂê¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
       &a.current; ¤ÎÅê¹Æ¡¢ÆäË
       <ulink url="http://lists.FreeBSD.org/pipermail/freebsd-current/2004-January/thread.html#18084">
 	<quote>[PATCH] IPSec fixes</quote></ulink>
       ¤È¤¤¤¦Âê̾¤Î¤Ä¤¤¤¿¥¹¥ì¥Ã¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+    <para>(2004 ǯ 2 ·î 28 Æü)
+      &os; &release.bugfix; ¤Ë¼ýÏ¿¤µ¤ì¤Æ¤¤¤ë
+      FreeBSD port ºîÀ®¼Ô¤Î¤¿¤á¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ë¡¢&release.bugfix; ¤Î
+      <varname>__FreeBSD_version</varname> ¤ÎÃͤ˸í¤ê¤¬¤¢¤ê¤Þ¤·¤¿¡£
+      Àµ¤·¤¯¤Ï <literal>502010</literal> ¤Ç¤¹¡£</para>
+
 ]]>
 
   <sect1 id="late-news">
@@ -290,7 +359,7 @@
 ]]>
 
 <![ %release.type.snapshot [
-    <para>(2004 ǯ 1 ·î 10 Æü)
+    <para>(2004 ǯ 1 ·î 10 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
       &os; ¤Î TCP ¼ÂÁõ¤Ë TCP ¥»¥°¥á¥ó¥È¤Î¥µ¥¤¥º¤È®ÅÙ¤òÀ©¸Â¤¹¤ë¤È¤¤¤¦·Á¤Ç¡¢
       ¤¢¤ë¼ï¤Î TCP MSS »ñ¸»¸Ï³é¹¶·â¤ËÂФ¹¤ëÂкö¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
       ¤Ò¤È¤ÄÌÜ¤Ï TCP ¥»¥°¥á¥ó¥È¥µ¥¤¥º¤ÎºÇÂç¤ÈºÇ¾®¤òÀ©¸Â¤¹¤ë¤â¤Î¤Ç¡¢
@@ -305,9 +374,9 @@
       ¤³¤Îµ¡Ç½¤Ï &release.prev; ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤Î½ª¤ê¤´¤í¤ËÄɲ䵤줿¤¿¤á¡¢
       ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤³¤ÎÀܳ®ÅÙ¤ÎÀ©¸Â¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢
       <varname>net.inet.tcp.minmssoverload</varname> ¤Ë 0 ¤Ç¤Ê¤¤
-      ÃͤòÀßÄꤹ¤ë¤³¤È¤Ç¡¢¼êÆ°¤ÇÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹
-      (&release.current; ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¼¹É®»þÅÀ¤ÇËèÉÃ
-      <literal>1000</literal> ¥Ñ¥±¥Ã¥È¤Ç¤¹)¡£
+      ÃͤòÀßÄꤹ¤ë¤³¤È¤Ç¡¢¼êÆ°¤ÇÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      ¤³¤Îµ¡Ç½¤Ï &os; &release.prev; ¤Î¥ê¥ê¡¼¥¹¹©Äø¤Î½ªÈפÇÄɲ䵤줿¤¿¤á¡¢
+      ¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£</para>
 ]]>
 
   </sect1>

==== //depot/projects/hammer/share/man/man4/re.4#4 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/re.4,v 1.3 2004/01/09 17:43:37 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/re.4,v 1.4 2004/03/04 06:42:46 sanpei Exp $
 .\"
 .Dd September 4, 2003
 .Dt RE 4
@@ -54,6 +54,8 @@
 .It
 Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S)
 .It
+PLANEX COMMUNICATIONS Inc. GN-1200TC (8169S)
+.It
 Xterasys XN-152 10/100/1000 NIC (8169)
 .El
 .Pp

==== //depot/projects/hammer/share/man/man5/rc.conf.5#20 (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.205 2004/02/03 11:27:34 des Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.206 2004/03/04 08:25:53 mtm Exp $
 .\"
 .Dd March 3, 2002
 .Dt RC.CONF 5
@@ -2789,6 +2789,14 @@
 if
 .Xr shutdown 8
 has not completed within the specified time (in seconds).
+.It Va virecover_enable
+.Pq Vt bool
+Set to
+.Dq Li NO
+to prevent the system from trying to
+recover pre-maturely terminated
+.Xr vi 1
+sessions.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
@@ -2847,6 +2855,7 @@
 .Xr syslogd 8 ,
 .Xr timed 8 ,
 .Xr usbd 8 ,
+.Xr vi 1 ,
 .Xr vinum 8 ,
 .Xr yp 8 ,
 .Xr ypbind 8 ,

==== //depot/projects/hammer/share/man/man9/Makefile#27 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.220 2004/02/28 23:01:20 le Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.224 2004/03/05 02:50:28 bms Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -101,6 +101,14 @@
 	g_provider_by_name.9 \
 	g_wither_geom.9 \
 	hexdump.9 \
+	ieee80211.9 \
+	ieee80211_crypto.9 \
+	ieee80211_input.9 \
+	ieee80211_ioctl.9 \
+	ieee80211_node.9 \
+	ieee80211_output.9 \
+	ieee80211_proto.9 \
+	ieee80211_radiotap.9 \
 	ifnet.9 \
 	inittodr.9 \
 	intro.9 \
@@ -450,6 +458,52 @@
 MLINKS+=g_provider.9 g_destroy_provider.9 \
 	g_provider.9 g_error_provider.9 \
 	g_provider.9 g_new_providerf.9
+MLINKS+=ieee80211.9 ieee80211_attach.9 \
+	ieee80211.9 ieee80211_chan2ieee.9 \
+	ieee80211.9 ieee80211_chan2mode.9 \
+	ieee80211.9 ieee80211_ieee2mhz.9 \
+	ieee80211.9 ieee80211_ifattach.9 \
+	ieee80211.9 ieee80211_ifdetach.9 \
+	ieee80211.9 ieee80211_media2rate.9 \
+	ieee80211.9 ieee80211_media_change.9 \
+	ieee80211.9 ieee80211_media_init.9 \
+	ieee80211.9 ieee80211_media_status.9 \
+	ieee80211.9 ieee80211_mhz2ieee.9 \
+	ieee80211.9 ieee80211_rate2media.9 \
+	ieee80211.9 ieee80211_setmode.9 \
+	ieee80211.9 ieee80211_watchdog.9
+MLINKS+=ieee80211_crypto.9 ieee80211_crypto_attach.9 \
+	ieee80211_crypto.9 ieee80211_crypto_detach.9 \
+	ieee80211_crypto.9 ieee80211_wep_crypt.9
+MLINKS+=ieee80211_input.9 ieee80211_decap.9 \
+	ieee80211_input.9 ieee80211_recv_mgmt.9
+MLINKS+=ieee80211_ioctl.9 ieee80211_cfgget.9 \
+	ieee80211_ioctl.9 ieee80211_cfgset.9
+MLINKS+=ieee80211_node.9 ieee80211_alloc_node.9 \
+	ieee80211_node.9 ieee80211_begin_scan.9 \
+	ieee80211_node.9 ieee80211_create_ibss.9 \
+	ieee80211_node.9 ieee80211_dup_bss.9 \
+	ieee80211_node.9 ieee80211_end_scan.9 \
+	ieee80211_node.9 ieee80211_find_node.9 \
+	ieee80211_node.9 ieee80211_free_allnodes.9 \
+	ieee80211_node.9 ieee80211_free_node.9 \
+	ieee80211_node.9 ieee80211_iterate_nodes.9 \
+	ieee80211_node.9 ieee80211_lookup_node.9 \
+	ieee80211_node.9 ieee80211_next_scan.9 \
+	ieee80211_node.9 ieee80211_node_attach.9 \
+	ieee80211_node.9 ieee80211_node_detach.9 \
+	ieee80211_node.9 ieee80211_node_lateattach.9 \
+	ieee80211_node.9 ieee80211_timeout_nodes.9
+MLINKS+=ieee80211_output.9 ieee80211_add_rates.9 \
+	ieee80211_output.9 ieee80211_add_xrates.9 \
+	ieee80211_output.9 ieee80211_encap.9 \
+	ieee80211_output.9 ieee80211_send_mgmt.9
+MLINKS+=ieee80211_proto.9 ieee80211_dump_pkt.9 \
+	ieee80211_proto.9 ieee80211_fix_rate.9 \
+	ieee80211_proto.9 ieee80211_print_essid.9 \
+	ieee80211_proto.9 ieee80211_proto_attach.9 \
+	ieee80211_proto.9 ieee80211_proto_detach.9
+MLINKS+=ieee80211_radiotap.9 radiotap.9
 MLINKS+=ifnet.9 ifaddr.9 \
 	ifnet.9 if_data.9 \
 	ifnet.9 ifqueue.9

==== //depot/projects/hammer/sys/amd64/conf/NOTES#14 (text+ko) ====

@@ -3,8 +3,9 @@
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
+#
 # (XXX from i386:NOTES,v 1.1132)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.6 2004/03/05 05:08:22 obrien Exp $
 #
 
 # We don't have modules on amd64.

==== //depot/projects/hammer/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.8 2004/02/16 02:50:03 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.9 2004/03/04 23:04:02 wpaul Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
@@ -212,14 +212,35 @@
 #define EVENT_TYPE_NOTIFY	0
 #define EVENT_TYPE_SYNC		1
 
+/*
+ * We need to use the timeout()/untimeout() API for ktimers
+ * since timers can be initialized, but not destroyed (so
+ * malloc()ing our own callout structures would mean a leak,
+ * since there'd be no way to free() them). This means we
+ * need to use struct callout_handle, which is really just a
+ * pointer. To make it easier to deal with, we use a union
+ * to overlay the callout_handle over the k_timerlistentry.
+ * The latter is a list_entry, which is two pointers, so
+ * there's enough space available to hide a callout_handle
+ * there.
+ */
+
 struct ktimer {
 	nt_dispatch_header	k_header;
 	uint64_t		k_duetime;
-	list_entry		k_timerlistentry;
+	union {
+		list_entry		k_timerlistentry;
+		struct callout_handle	k_handle;
+	} u;
 	void			*k_dpc;
 	uint32_t		k_period;
 };
 
+#define k_timerlistentry	u.k_timerlistentry
+#define k_handle		u.k_handle
+
+typedef struct ktimer ktimer;
+
 struct nt_kevent {
 	nt_dispatch_header	k_header;
 };
@@ -243,6 +264,8 @@
 	uint32_t		*k_lock;
 };
 
+typedef struct kdpc kdpc;
+
 /*
  * Note: the acquisition count is BSD-specific. The Microsoft
  * documentation says that mutexes can be acquired recursively
@@ -256,13 +279,18 @@
  */
 struct kmutant {
 	nt_dispatch_header	km_header;
-	list_entry		km_listentry;
+	union {
+		list_entry		km_listentry;
+		uint32_t		km_acquirecnt;
+	} u;
 	void			*km_ownerthread;
 	uint8_t			km_abandoned;
 	uint8_t			km_apcdisable;
-	uint32_t		km_acquirecnt;
 };
 
+#define km_listentry		u.km_listentry
+#define km_acquirecnt		u.km_acquirecnt
+
 typedef struct kmutant kmutant;
 
 #define LOOKASIDE_DEPTH 256

==== //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.25 2004/03/04 00:17:14 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.26 2004/03/04 23:04:02 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/unistd.h>
@@ -64,8 +64,6 @@
 #include <compat/ndis/ntoskrnl_var.h>
 #include <compat/ndis/ndis_var.h>
 
-#include "opt_ddb.h"
-
 #define __regparm __attribute__((regparm(3)))
 
 #define FUNC void(*)(void)
@@ -92,6 +90,15 @@
 __stdcall static uint32_t ntoskrnl_read_event(nt_kevent *);
 __stdcall static uint32_t ntoskrnl_set_event(nt_kevent *, uint32_t, uint8_t);
 __stdcall static uint32_t ntoskrnl_reset_event(nt_kevent *);
+static void ntoskrnl_timercall(void *);
+__stdcall static void ntoskrnl_init_dpc(kdpc *, void *, void *);
+__stdcall static void ntoskrnl_init_timer(ktimer *);
+__stdcall static void ntoskrnl_init_timer_ex(ktimer *, uint32_t);
+__stdcall static uint8_t ntoskrnl_set_timer(ktimer *, int64_t, kdpc *);
+__stdcall static uint8_t ntoskrnl_set_timer_ex(ktimer *, int64_t,
+	uint32_t, kdpc *);
+__stdcall static uint8_t ntoskrnl_cancel_timer(ktimer *);
+__stdcall static uint8_t ntoskrnl_read_timer(ktimer *);
 __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);
@@ -1636,14 +1643,177 @@
 __stdcall static void
 ntoskrnl_debugger(void)
 {
-#ifdef DDB
-	Debugger("debug from winkernel module");
-#else
-	printf("ntoskrnl_debugger(): DDB not present\n");
-#endif
+	Debugger("ntoskrnl_debugger(): breakpoint");
+	return;
+}
+
+static void
+ntoskrnl_timercall(arg)
+	void		*arg;
+{
+	ktimer			*timer;
+	__stdcall kdpc_func	timerfunc;
+	kdpc			*dpc;
+	struct timeval		tv;
+
+        timer = arg;
+	dpc = timer->k_dpc;
+        timerfunc = (kdpc_func)dpc->k_deferedfunc;
+        timerfunc(dpc, dpc->k_deferredctx, dpc->k_sysarg1, dpc->k_sysarg2);
+
+	ntoskrnl_wakeup(&timer->k_header);
+
+	/*
+	 * If this is a periodic timer, re-arm it
+	 * so it will fire again.
+	 */
+
+	if (timer->k_period) {
+		tv.tv_sec = 0;
+		tv.tv_usec = timer->k_period * 1000;
+		timer->k_handle =
+		    timeout(ntoskrnl_timercall, timer, tvtohz(&tv));
+	}
+
+	return;
+}
+
+__stdcall static void
+ntoskrnl_init_timer(timer)
+	ktimer			*timer;
+{
+	if (timer == NULL)
+		return;
+
+	INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead));
+	timer->k_header.dh_sigstate = FALSE;
+	timer->k_header.dh_type = EVENT_TYPE_NOTIFY;
+	timer->k_header.dh_size = OTYPE_TIMER;
+	callout_handle_init(&timer->k_handle);
+
+	return;
+}
+
+__stdcall static void
+ntoskrnl_init_timer_ex(timer, type)
+	ktimer			*timer;
+	uint32_t		type;
+{
+	if (timer == NULL)
+		return;
+
+	INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead));
+	timer->k_header.dh_sigstate = FALSE;
+	timer->k_header.dh_type = type;
+	timer->k_header.dh_size = OTYPE_TIMER;

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list