Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Sep 2005 04:17:37 GMT
From:      soc-andrew <soc-andrew@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 84270 for review
Message-ID:  <200509260417.j8Q4HbtO049329@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=84270

Change 84270 by soc-andrew@soc-andrew_serv on 2005/09/26 04:16:53

	Integrate From Current

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#4 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#14 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#6 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.206 2005/07/14 17:59:50 rwatson Exp $
+# $FreeBSD: src/lib/Makefile,v 1.207 2005/09/19 08:13:43 imura Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -93,6 +93,10 @@
 _libsmb=	libsmb
 .endif
 
+.if ${MACHINE_ARCH} == "powerpc"
+_libsmb=	libsmb
+.endif
+
 .if !defined(NO_LIBPTHREAD)
 _libpthread=	libpthread
 .endif

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#14 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.888 2005/07/11 15:50:29 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.889 2005/09/07 04:34:11 marcel Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -354,9 +354,8 @@
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_INFO \
-	    -DNO_LIB32 -DNO_MAN -DNO_NLS -DNO_PROFILE installworld \
-	    DESTDIR=${CHROOTDIR}
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_LIB32 \
+	    -DNO_MAN -DNO_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
 		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml,v 1.5 2004/09/12 18:36:22 hrs Exp $
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml,v 1.6 2005/09/24 07:07:55 brueffer Exp $
 -->
 <sect1 id="proc">
   <title>Supported Processors and Motherboards</title>
@@ -14,7 +14,7 @@
   <para>Note that there are two names for this architecture,
     AMD64 (AMD) and Intel EM64T (Extended Memory 64-bit Technology).
     64-bit mode of the two architectures are almost compatible
-    with each other, and &os;/&arch; should support the both.</para>
+    with each other, and &os;/&arch; should support them both.</para>
 
   <para>As of this writing, the following processors are
     supported:</para>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.282 2005/06/27 14:54:49 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.289 2005/09/18 16:22:20 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -64,7 +64,11 @@
       </itemizedlist>
     </para>
 
-    &hwlist.aic;
+    &hwlist.aac;
+
+    &hwlist.adv;
+
+    &hwlist.adw;
 
     &hwlist.aha;
 
@@ -74,21 +78,23 @@
 
     &hwlist.ahd;
 
-    &hwlist.aac;
+    &hwlist.aic;
+
+    &hwlist.amd;
 
-    &hwlist.ct;
+    &hwlist.amr;
 
-    &hwlist.adv;
+    &hwlist.arcmsr;
 
-    &hwlist.adw;
+    &hwlist.asr;
 
     &hwlist.bt;
 
-    &hwlist.dpt;
+    &hwlist.ciss;
 
-    &hwlist.asr;
+    &hwlist.ct;
 
-    &hwlist.amr;
+    &hwlist.dpt;
       <note>
 	<para arch="i386,amd64">Booting from these controllers is supported.  EISA
 	adapters are not supported.</para>
@@ -97,7 +103,17 @@
 	supported due to SRM limitations.</para>
       </note>
 
-    &hwlist.arcmsr;
+    &hwlist.esp;
+
+    &hwlist.hptmv;
+
+    &hwlist.ida;
+
+    &hwlist.iir;
+
+    &hwlist.ips;
+
+    &hwlist.isp;
 
     &hwlist.mlx;
 
@@ -115,42 +131,28 @@
 
     &hwlist.mly;
 
-    &hwlist.twe;
+    &hwlist.mpt;
 
-    &hwlist.twa;
-
     &hwlist.ncr;
 
-    &hwlist.sym;
-
     &hwlist.ncv;
 
-    &hwlist.stg;
-
-    &hwlist.isp;
-
-    &hwlist.amd;
-
     &hwlist.nsp;
 
-    &hwlist.vpo;
+    &hwlist.pst;
 
-    &hwlist.ida;
+    &hwlist.stg;
 
-    &hwlist.ciss;
+    &hwlist.sym;
 
-    &hwlist.iir;
+    &hwlist.trm;
 
-    &hwlist.pst;
+    &hwlist.twa;
 
-    &hwlist.hptmv;
+    &hwlist.twe;
 
-    &hwlist.ips;
-
-    &hwlist.mpt;
+    &hwlist.vpo;
 
-    &hwlist.trm;
-
     <para arch="i386">The wds(4) driver supports the WD7000 SCSI
       controller.</para>
 
@@ -173,11 +175,6 @@
 	</listitem>
 
 	<listitem arch="i386">
-	  <para>Matsushita CR-562, CR-563, and compatibles
-	    (&man.matcd.4; driver)</para>
-	</listitem>
-
-	<listitem arch="i386">
 	  <para>Sony proprietary interface (all models) (&man.scd.4;)</para>
 	</listitem>
 
@@ -200,101 +197,101 @@
   <sect2 id="ethernet">
     <title>Ethernet Interfaces</title>
 
-    &hwlist.sf;
+    &hwlist.aue;
+
+    &hwlist.axe;
 
-    &hwlist.ti;
+    <para arch="i386,amd64">Broadcom BCM4401 based Fast Ethernet adapters
+      (&man.bfe.4; driver)</para>
 
-    &hwlist.pcn;
+    &hwlist.bge;
 
-    &hwlist.lnc;
+    &hwlist.cdce;
 
-    <para arch="i386,pc98,amd64">SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver)
+    <para arch="i386,amd64">Crystal Semiconductor CS89x0-based NICs 
+    (&man.cs.4; driver)
     </para>
 
-    &hwlist.ed;
+    &hwlist.cue;
+
+    &hwlist.dc;
 
-    &hwlist.rl;
+    &hwlist.de;
 
-    &hwlist.wb;
+    &hwlist.ed;
 
-    &hwlist.vr;
+    &hwlist.em;
 
-    &hwlist.sis;
+    &hwlist.ep;
 
-    &hwlist.nge;
+    &hwlist.ex;
 
-    &hwlist.ste;
+    &hwlist.fe;
 
-    &hwlist.sk;
+    &hwlist.fxp;
 
-    &hwlist.tl;
+    &hwlist.gem;
 
-    &hwlist.dc;
+    &hwlist.hme;
 
-    &hwlist.aue;
+    &hwlist.ie;
 
-    &hwlist.cue;
+    &hwlist.ixgb;
 
     &hwlist.kue;
 
-    &hwlist.axe;
+    &hwlist.lge;
 
-    &hwlist.rue;
+    &hwlist.lnc;
 
-    &hwlist.udav;
+    &hwlist.my;
 
-    &hwlist.de;
+    &hwlist.nge;
 
-    &hwlist.fe;
+    &hwlist.nve;
 
-    &hwlist.fxp;
+    &hwlist.pcn;
 
-    &hwlist.ex;
+    &hwlist.re;
 
-    &hwlist.ie;
+    &hwlist.rl;
 
-    &hwlist.ep;
+    &hwlist.rue;
 
-    &hwlist.el;
+    &hwlist.sf;
 
-    &hwlist.xl;
+    &hwlist.sis;
 
-    &hwlist.vx;
+    &hwlist.sk;
 
-    <para arch="i386,amd64">Crystal Semiconductor CS89x0-based NICs 
-    (&man.cs.4; driver)
-    </para>
-
     &hwlist.sn;
 
-    &hwlist.xe;
-
     &hwlist.snc;
 
-    &hwlist.lge;
+    &hwlist.ste;
 
-    &hwlist.txp;
+    &hwlist.ti;
 
-    &hwlist.bge;
+    &hwlist.tl;
 
-    &hwlist.em;
+    <para arch="i386,pc98,amd64">SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver)
+    </para>
 
-    &hwlist.hme;
+    &hwlist.txp;
 
-    &hwlist.gem;
+    &hwlist.udav;
 
-    &hwlist.my;
+    &hwlist.vge;
 
-    <para arch="i386,amd64">Broadcom BCM4401 based Fast Ethernet adapters
-      (&man.bfe.4; driver)</para>
+    &hwlist.vr;
 
-    &hwlist.re;
+    &hwlist.vx;
 
-    &hwlist.ixgb;
+    &hwlist.wb;
 
-    &hwlist.vge;
+    &hwlist.xe;
 
-    &hwlist.nve;
+    &hwlist.xl;
 
   </sect2>
 
@@ -700,6 +697,8 @@
 
     &hwlist.snd.solo;
 
+    &hwlist.snd.t4dwave;
+
     &hwlist.snd.via8233;
 
     &hwlist.snd.via82c686;

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.885 2005/07/15 16:38:52 hrs Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.890 2005/09/14 05:50:09 brueffer Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -139,7 +139,9 @@
     <sect3 id="proc">
       <title>Hardware Support</title>
 
-      <para></para>
+      <para>Support for the PadLock Security Co-processor in VIA C3
+	processors has been added to the &man.crypto.9; subsystem.
+	&merged;</para>
 
       <sect4 id="mm">
 	<title>Multimedia Support</title>
@@ -150,7 +152,22 @@
       <sect4 id="net-if">
 	<title>Network Interface Support</title>
 
-	<para></para>
+	<para>The &man.dc.4; driver is now MPSAFE. &merged;</para>
+
+	<para>The &man.de.4; driver has been converted to the &man.bus.dma.9;
+	  API and is now MPSAFE.</para>
+
+	<para>The &man.ed.4; driver is now MPSAFE.</para>
+
+	<para>The &man.el.4; driver has been removed.</para>
+
+	<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
+
+	<para>The &man.pcn.4; driver is now MPSAFE. &merged;</para>
+
+	<para>The &man.sf.4; driver is now MPSAFE. &merged;</para>
+
+	<para>The &man.ste.4; driver is now MPSAFE.</para>
       </sect4>
     </sect3>
 
@@ -169,6 +186,11 @@
 	status reporting, and sysctl variables for volume
 	re-synchronization rate, volume member write cache status,
 	and volume transaction queue depth.</para>
+
+      <para>A new GEOM-based disk encryption facility, GEOM_ELI, has been
+	added.  It uses the &man.crypto.9; framework for hardware acceleration
+	and supports different cryptographic algorithms.  See &man.geli.8; for
+	more information. &merged;</para>
     </sect3>
 
     <sect3 id="fs">
@@ -197,7 +219,7 @@
       in tracking kernel memory statistics.  It provides an
       abstracted interface to &man.uma.9; and &man.malloc.9;
       statistics, wrapped around the binary stream sysctl variables
-      for the allocators.</para>
+      for the allocators. &merged;</para>
 
     <sect3 id="rc-scripts">
       <title><filename>/etc/rc.d</filename> Scripts</title>
@@ -212,6 +234,9 @@
     <para><application>libpcap</application> has been updated
       to v0.9.1 (release).</para>
 
+    <para><application>sendmail</application> has been updated from
+      version 8.13.3 to version 8.13.4.</para>
+
     <para><application>tcpdump</application> has been updated
       to v3.9.1 (release).</para>
   </sect2>
@@ -231,7 +256,9 @@
   <sect2 id="doc">
     <title>Documentation</title>
 
-    <para></para>
+    <para>Documentation of existing functionality has been improved by
+      the addition of the following manual pages:
+      &man.acpi.sony.4;, &man.snd.t4dwave.4;.</para>
   </sect2>
 </sect1>
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 (text+ko) ====

@@ -26,13 +26,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $
         Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -265,8 +265,6 @@
 
     &hwlist.ep;
 
-    &hwlist.el;
-
     &hwlist.xl;
 
     &hwlist.vx;

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.15 2005/08/28 08:20:41 simon Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
 
      Original revision: 1.282
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.15 2005/08/28 08:20:41 simon Exp $</pubdate>
   </sect1info>
 
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
@@ -269,8 +269,6 @@
 
     &hwlist.ep;
 
-    &hwlist.el;
-
     &hwlist.xl;
 
     &hwlist.vx;

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.62 2005/05/22 17:04:04 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.68 2005/09/18 16:22:20 brueffer Exp $
 #
 
 #
@@ -52,6 +52,7 @@
 bge	i386,pc98,ia64,amd64
 bktr	i386,pc98
 bt	i386,amd64
+cdce	i386,pc98,ia64,amd64
 ciss	i386,ia64,amd64
 cm	i386
 cnw	i386,pc98,amd64
@@ -63,15 +64,15 @@
 de	i386,pc98,alpha,ia64,amd64
 dpt	i386,ia64,amd64
 ed	i386,pc98
-el	i386
 em	i386,pc98,alpha,ia64,amd64
 ep	i386,pc98,amd64
+esp	sparc64
 ex	i386,amd64
 fe	i386,pc98,amd64
 fwohci	i386,sparc64,ia64,amd64
 gem	sparc64
 hifn	i386,pc98,amd64
-hptmv	i386
+hptmv	i386,amd64
 ida	i386
 ie	i386
 iir	i386,ia64,amd64
@@ -121,7 +122,8 @@
 snd_neomagic	i386,amd64
 snd_sbc	i386,alpha,amd64
 snd_solo	i386,amd64
-snd_via8233	i386
+snd_t4dwave	i386,amd64
+snd_via8233	i386,amd64
 snd_via82c686	i386,amd64
 snd_vibes	i386,amd64
 sound	i386,alpha,amd64

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 (text+ko) ====

@@ -35,7 +35,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.3 2005/04/03 16:48:22 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.4 2005/08/28 08:20:41 simon Exp $</pubdate>
   </sect1info>
 
   <title>Ö§³ÖµÄÓ²¼þ</title>
@@ -296,8 +296,6 @@
 
     &hwlist.ep;
 
-    &hwlist.el;
-
     &hwlist.xl;
 
     &hwlist.vx;

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.335 2005/08/08 20:10:05 cperciva Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.336 2005/09/19 08:13:43 imura Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
@@ -344,6 +344,10 @@
 _zzz=		zzz
 .endif
 
+.if ${MACHINE_ARCH} == "powerpc"
+_mount_smbfs=	mount_smbfs
+.endif
+
 .if ${MACHINE_ARCH} == "sparc64"
 _eeprom=	eeprom
 _ofwdump=	ofwdump



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509260417.j8Q4HbtO049329>