From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 00:03:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AF0F10656A5; Sun,  4 Oct 2009 00:03:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F8091065692
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 00:03:27 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 255A98FC18
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 00:03:27 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9403Rpu089492
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 00:03:27 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9403RSC089490
	for perforce@freebsd.org; Sun, 4 Oct 2009 00:03:27 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 4 Oct 2009 00:03:27 GMT
Message-Id: <200910040003.n9403RSC089490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169186 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 00:03:27 -0000

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

Change 169186 by rene@rene_self on 2009/10/04 00:02:30

	MFen handbook/cutting-edge 1.244 -> 1.245

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.18 2009/08/26 06:04:09 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
-     %SRCID%	1.244
+     %SRCID%	1.245
 -->
 
 <chapter id="updating-upgrading">
@@ -740,9 +740,9 @@
     <para>Wanneer &man.portsnap.8; succesvol een
       <command>fetch</command>-operatie afrondt, bestaan de
       Portscollectie en de vervolgpatches die de verificatie doorstaan
-      hebben op het plaatselijke systeem.  De bijgewerkte bestanden
-      kunnen ge&iuml;nstalleerd worden door het volgende te
-      typen:</para>
+      hebben op het plaatselijke systeem.  Gebruik de eerste keer dat
+      <command>portsnap</command> wordt uitgevoerd <literal>extract</literal>
+      om de bijgewerkte bestanden te installeren:</para>
 
     <screen>&prompt.root; <userinput>portsnap extract</userinput>
 /usr/ports/.cvsignore
@@ -758,12 +758,18 @@
 /usr/ports/Mk/bsd.cmake.mk
 <replaceable>...</replaceable></screen>
 
+    <para>Bij verder gebruik van <command>portsnap fetch</command> dient
+      <literal>update</literal> gebruikt te worden:</para>
+
+    <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
+
     <para>Het proces is nu compleet, en applicaties kunnen met de
       bijgewerkte Portscollectie worden ge&iuml;nstalleerd of worden
       bijgewerkt.</para>
 
-    <para>Geef het volgende commando om de twee processen achter elkaar
-      te draaien:</para>
+    <para>De bewerkingen <literal>fetch</literal> en <literal>extract</literal>
+      of <literal>update</literal> kunnen achter elkaar uitgevoerd worden, zoals
+      het volgende voorbeeld laat zien:</para>
 
     <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
   </sect1>

From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 08:57:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98BBD1065679; Sun,  4 Oct 2009 08:57:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 438591065672
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 08:57:10 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 319748FC1D
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 08:57:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n948vAlo066220
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 08:57:10 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n948v9Yk066218
	for perforce@freebsd.org; Sun, 4 Oct 2009 08:57:09 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 4 Oct 2009 08:57:09 GMT
Message-Id: <200910040857.n948v9Yk066218@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169189 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 08:57:11 -0000

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

Change 169189 by pgj@beehive on 2009/10/04 08:56:27

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#17 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#17 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/csjp.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/gahr.key#2 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#32 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#30 integrate
.. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#3 integrate
.. //depot/projects/docproj_hu/www/en/donations/donors.sgml#22 integrate
.. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#14 integrate
.. //depot/projects/docproj_hu/www/share/sgml/notices.xml#5 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#9 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml,v 1.8 2009/07/30 07:08:32 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml,v 1.9 2009/09/27 18:26:11 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml,v 1.8 2009/06/19 11:36:05 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml,v 1.9 2009/09/27 18:26:11 pgj Exp $
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>

==== //depot/projects/docproj_hu/doc/share/pgpkeys/gahr.key#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/pgpkeys/gahr.key,v 1.1 2008/02/21 17:22:12 gahr Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/gahr.key,v 1.2 2009/09/29 19:27:07 gahr Exp $ -->
 <!--
 sh addkey.sh gahr 9571F78E;
 -->
@@ -21,30 +21,30 @@
 4eDMA/4najs55j1kz8khhLiAX0SUJj92XpjmpSFLvFB8D4JpeNtWKGx/wt9uwYBr
 GqnFpP7JHUFowTgg4LjgM3r+W+s1TyUZ5cBlgTgp1Qh6y0h98X6Pbppu1GEhTvWP
 9FlvKNK1+bYNKKvUFHc5nLRK+0M7e0IP6yws2O9RN6rkb6UU8rQdUGlldHJvIENl
-cnV0dGkgPGdhaHJAZ2Foci5jaD6IeAQTEQIAOAIbIwYLCQgHAwIEFQIIAwQWAgMB
-Ah4BAheAAhkBFBhodHRwOi8vcGdwLm1pdC5lZHV0BQJFzyOoAAoJEMDCapiVcfeO
-U+oAoIPxcczSTL9IAJnRBUaRvjL8dJNgAJ9wh1Gh1+HpbxqtXsTcEr68ZXKfUYhp
-BBMRAgApAhsjBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEA
-CgkQwMJqmJVx944wAQCggfm9PIqoj6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn
-6d7b+IhfvKh7iH4EExECAD4CGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
-gAIZAQUCRc3QKxQYaHR0cDovL3BncC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9K
-qPCEaiTKejBDeI+ZjLemDPYFogCgvC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRy
-byBDZXJ1dHRpIChUaGUgRnJlZUJTRCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9y
-Zz6IYAQTEQIAIAUCR7xw2AIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDC
-apiVcfeOw5AAoMjUQZiqAGONGzJtT3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9
-kUXqubkCDQREauOLEAgAv+OK9YPB4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM
-8jLtBLqPY5qWlGRrAbh3ZHkOvrrfY/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2
-gm35aluNcHbFutYGrkAThuFst1qJbPowBBmQgR7RH5/lWbn3Qnisthsm6J5Jldjg
-cfXth9usyXsGXCP1zZ10Sj2Q090SuSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn
-/HhT3ed4kkZXkQJvvI/t3Glyp7RY5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtnc
-F/7MTUpib3MvgBpmPRq9yV4LHbhiDbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527F
-enxU4hf0fWG3orqKAI/p3AhPj7l/T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/l
-tzZdhFS67k+Ya/CLy0G3we8KQSqoUTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro
-73vvaFXPwHTxSmRRHg/UgE0B5+tJkuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0Q
-SnhzUcxv+YrV8TX11/NC0FlmhxTzncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9B
-ntWbBPjB1TYa80jYNbLA/KdKEZlK1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4f
-YLrdxYhPBBgRAgAPBQJEauOLAhsMBQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q
-7p39kg5LmO/zsDXCD8wOAKCDV7iQR8Dblj7cX+WKPwwhnrNq0Q==
-=fVQ7
+cnV0dGkgPGdhaHJAZ2Foci5jaD6IYwQTEQIAIwIbIwYLCQgHAwIEFQIIAwQWAgMB
+Ah4BAheAAhkBBQJKwl4hAAoJEMDCapiVcfeOp+oAnR9QXvf5u9vyeU3vnAo7CiyW
+LE6GAJ9Pip8AO5c9BvjTjsRhVH9O+447qohpBBMRAgApAhsjBQkJZgGABgsJCAcD
+AgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEACgkQwMJqmJVx944wAQCggfm9PIqo
+j6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn6d7b+IhfvKh7iH4EExECAD4CGyMF
+CQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCRc3QKxQYaHR0cDovL3Bn
+cC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9KqPCEaiTKejBDeI+ZjLemDPYFogCg
+vC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRybyBDZXJ1dHRpIChUaGUgRnJlZUJT
+RCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9yZz6IYAQTEQIAIAUCR7xw2AIbIwYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDCapiVcfeOw5AAoMjUQZiqAGONGzJt
+T3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9kUXqubkCDQREauOLEAgAv+OK9YPB
+4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM8jLtBLqPY5qWlGRrAbh3ZHkOvrrf
+Y/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2gm35aluNcHbFutYGrkAThuFst1qJ
+bPowBBmQgR7RH5/lWbn3Qnisthsm6J5JldjgcfXth9usyXsGXCP1zZ10Sj2Q090S
+uSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn/HhT3ed4kkZXkQJvvI/t3Glyp7RY
+5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtncF/7MTUpib3MvgBpmPRq9yV4LHbhi
+DbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527FenxU4hf0fWG3orqKAI/p3AhPj7l/
+T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/ltzZdhFS67k+Ya/CLy0G3we8KQSqo
+UTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro73vvaFXPwHTxSmRRHg/UgE0B5+tJ
+kuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0QSnhzUcxv+YrV8TX11/NC0FlmhxTz
+ncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9BntWbBPjB1TYa80jYNbLA/KdKEZlK
+1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4fYLrdxYhPBBgRAgAPBQJEauOLAhsM
+BQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q7p39kg5LmO/zsDXCD8wOAKCDV7iQ
+R8Dblj7cX+WKPwwhnrNq0Q==
+=UXRy
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#32 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.108 2009/08/10 16:55:15 fluffy Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.109 2009/09/30 22:43:26 csjp Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1011,6 +1011,11 @@
       &pgpkey.cperciva;
     </sect2>
 
+    <sect2 id="pgpkey-csjp">
+      <title>&a.csjp;</title>
+      &pgpkey.csjp;
+    </sect2>
+
     <sect2 id="pgpkey-gerald">
       <title>&a.gerald;</title>
       &pgpkey.gerald;

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#30 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.201 2009/08/10 16:55:15 fluffy Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.202 2009/09/30 22:43:26 csjp Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -60,6 +60,7 @@
 <!ENTITY pgpkey.core-secretary SYSTEM "core-secretary.key">
 <!ENTITY pgpkey.cperciva SYSTEM "cperciva.key">
 <!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
+<!ENTITY pgpkey.csjp SYSTEM "csjp.key">
 <!ENTITY pgpkey.daichi SYSTEM "daichi.key">
 <!ENTITY pgpkey.damien SYSTEM "damien.key">
 <!ENTITY pgpkey.danfe SYSTEM "danfe.key">

==== //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#3 (text+ko) ====

@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.65 2008/09/22 19:13:42 wosch Exp $
+# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $
 #
 
 #
@@ -302,6 +302,8 @@
 $PR = int $PR;
 $PR = quotemeta $PR;
 
+# Note: query-pr.web is just a anti DoS wrapper around query-pr which
+# make sure we do not run too many query-pr instances at once.
 if ($category) {
 	$category = quotemeta $category;
 	@query = split /\n/, qx(query-pr.web --full --category=${category} ${PR} 2>&1);

==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#22 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.395 2009/08/27 15:51:47 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.397 2009/10/01 20:37:57 gahr Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2635,6 +2635,21 @@
     <td> lstewart </td>
     <td> Received </td>
   </tr>
+
+  <tr>
+    <td> gavin </td>
+    <td> 3 Zip 100 drives<br>
+	 3 3ware cards</td>
+    <td> mav </td>
+    <td> Received </td>
+  </tr>
+
+  <tr>
+    <td> Gareth Randall </td>
+    <td> HP C1636-00100 SCSI tape drive </td>
+    <td> cracauer </td>
+    <td> Received </td>
+  </tr>
 </table>
 
 &footer;

==== //depot/projects/docproj_hu/www/share/sgml/advisories.xml#14 (text+ko) ====

@@ -2,7 +2,7 @@
 <advisories>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/advisories.xml,v 1.231 2009/07/29 00:50:20 simon Exp $
+      $FreeBSD: www/share/sgml/advisories.xml,v 1.233 2009/10/02 20:27:31 simon Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -10,6 +10,22 @@
     <name>2009</name>
 
     <month>
+      <name>10</name>
+
+      <day>
+	<name>2</name>
+
+	<advisory>
+	  <name>FreeBSD-SA-09:14.devfs</name>
+	</advisory>
+
+	<advisory>
+	  <name>FreeBSD-SA-09:13.pipe</name>
+	</advisory>
+      </day>
+    </month>
+
+    <month>
       <name>7</name>
 
       <day>

==== //depot/projects/docproj_hu/www/share/sgml/notices.xml#5 (text+ko) ====

@@ -2,7 +2,7 @@
 <advisories>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/notices.xml,v 1.14 2009/06/24 05:45:57 cperciva Exp $
+      $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -10,6 +10,18 @@
     <name>2009</name>
 
     <month>
+      <name>10</name>
+
+      <day>
+	<name>2</name>
+
+	<notice>
+	  <name>FreeBSD-EN-09:05.null</name>
+	</notice>
+      </day>
+    </month>
+
+    <month>
       <name>6</name>
 
       <day>

==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#9 (text+ko) ====

@@ -5,7 +5,7 @@
 <usergroups>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.80 2009/06/09 20:45:27 marius Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -325,7 +325,7 @@
   <country code="RS" name="Serbia">
     <entry id="bsd-srbija">
       <name>The Serbian BSD User Group</name>
-      <url>http://www.bsd-srbija.org/</url>
+      <url>http://www.bsdserbia.org/</url>
 
       <description>The Serbian BSD Users Group provides an open forum
         for all things BSD-related in the Serbian language.  Located

From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 09:36:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 309171065672; Sun,  4 Oct 2009 09:36:54 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E91DD106566B
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 09:36:53 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D76F88FC14
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 09:36:53 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n949ar2l069983
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 09:36:53 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n949arku069981
	for perforce@freebsd.org; Sun, 4 Oct 2009 09:36:53 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 4 Oct 2009 09:36:53 GMT
Message-Id: <200910040936.n949arku069981@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169190 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 09:36:54 -0000

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

Change 169190 by pgj@beehive on 2009/10/04 09:36:01

	MFen (doc):
		1.244      -> 1.245      hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml
		1.74       -> 1.75       hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml
		1.134      -> 1.135      hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml
		1.194      -> 1.195      hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#25 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#12 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#12 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#16 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#25 (text+ko) ====

@@ -7,7 +7,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
-     %SRCID%	1.244
+     %SRCID%	1.245
 -->
 
 <chapter id="updating-upgrading" lang="hu">
@@ -956,11 +956,13 @@
     <para>Ahogy a &man.portsnap.8; sikeresen befejezi az im&eacute;nt
       kiadott <command>fetch</command> m&#251;velet
       v&eacute;grehajt&aacute;s&aacute;t, a helyi rendszeren m&aacute;r
-      telep&iacute;t&eacute;sre k&eacute;szen fog v&aacute;rakozni a
+      telep&iacute;t&eacute;sre k&eacute;szen fognak v&aacute;rakozni a
       Portgy&#251;jtem&eacute;ny &eacute;s az hozz&aacute;tartoz&oacute;
       ellen&#245;rz&ouml;tt m&oacute;dos&iacute;t&aacute;sok.  A
-      t&eacute;nyleges telep&iacute;t&eacute;s&uuml;ket a
-      k&ouml;vetkez&#245;k&eacute;ppen k&eacute;rhetj&uuml;k:
+      <command>portsnap</command> els&#245; haszn&aacute;latakor az
+      <literal>extract</literal> parancs
+      seg&iacute;ts&eacute;g&eacute;vel telep&iacute;thetj&uuml;k a
+      friss&iacute;tett &aacute;llom&aacute;nyokat:</para>
 
     <screen>&prompt.root; <userinput>portsnap extract</userinput>
 /usr/ports/.cvsignore
@@ -976,14 +978,22 @@
 /usr/ports/Mk/bsd.cmake.mk
 <replaceable>...</replaceable></screen>
 
+    <para>A <command>portsnap fetch</command> k&eacute;s&#245;bbi
+      futtat&aacute;sakor viszont m&aacute;r az <literal>update</literal>
+      parancsot kell haszn&aacute;lnunk:</para>
+
+    <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
+
     <para>Ezzel lez&aacute;rult a portok friss&iacute;t&eacute;se,
       innent&#245;l m&aacute;r az aktualiz&aacute;lt
       Portgy&#251;jtem&eacute;ny felhaszn&aacute;l&aacute;s&aacute;val
       tetsz&#245;legesen telep&iacute;thet&#245;ek vagy
       friss&iacute;thet&#245;ek az alkalmaz&aacute;sok.</para>
 
-    <para>Az el&#245;bb eml&iacute;tett m&#251;veleteket &iacute;gy
-      tudjuk egyetlen parancsba foglalni:</para>
+    <para>A <literal>fetch</literal>, <literal>extract</literal> vagy
+      <literal>update</literal> m&#251;veletek egyetlen parancsba is
+      &ouml;sszef&#251;zhet&#245;ek, ahogy ezt az al&aacute;bbi
+      p&eacute;ld&aacute;ban is l&aacute;thatjuk:</para>
 
     <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
   </sect1>

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#12 (text+ko) ====

@@ -6,7 +6,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.sgml
-     %SRCID%	1.74
+     %SRCID%	1.75
 -->
 
 <chapter id="mac" lang="hu">
@@ -2676,7 +2676,7 @@
       kib&#245;v&iacute;tj&uuml;k a k&ouml;vetkez&#245;
       m&oacute;don:</para>
 
-    <programlisting>mac_seeotheruids_enabled="YES"</programlisting>
+    <programlisting>mac_seeotheruids_load="YES"</programlisting>
 
     <para>A &man.mac.bsdextended.4; biztons&aacute;gi modul az
       al&aacute;bbi

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#12 (text+ko) ====

@@ -7,7 +7,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
-     %SRCID%	1.134
+     %SRCID%	1.135
 -->
 
 <chapter id="multimedia" lang="hu">
@@ -2258,8 +2258,9 @@
 
       <para>Ezt a kimenetet egy &os;&nbsp;8.<replaceable>X</replaceable>
 	rendszeren kaptuk, ahol a
-	<literal>epson2:libusb:/dev/usb:/dev/ugen0.2</literal> az
-	eszk&ouml;zh&ouml;z tartoz&oacute; backendet &eacute;s
+	<literal>'epson2:libusb:/dev/usb:/dev/ugen0.2'</literal> az
+	eszk&ouml;zh&ouml;z tartoz&oacute; backendet
+	(<literal>epson2</literal>) &eacute;s
 	eszk&ouml;zle&iacute;r&oacute;t
 	(<literal>/dev/ugen0.2</literal>) adja meg.</para>
 
@@ -2318,7 +2319,7 @@
 	  azonos&iacute;tani, &aacute;t kell &iacute;rnunk a
 	  <filename>/usr/local/etc/sane.d/epson2.conf</filename>
 	  &aacute;llom&aacute;nyt.  A haszn&aacute;lt lapolvas&oacute;
-	  t&iacute;pusa &epson.perfection; 1650, ez&eacute;rt
+	  t&iacute;pusa &epson.perfection;&nbsp;1650, ez&eacute;rt
 	  hozz&aacute; az <literal>epson2</literal> backendet fogjuk
 	  haszn&aacute;lni.  Ehhez felt&eacute;tlen&uuml;l olvassuk el a
 	  konfigur&aacute;ci&oacute;s &aacute;llom&aacute;nyban
@@ -2463,10 +2464,10 @@
 add path usb/0.2.0 mode 0660 group usb</programlisting>
 
       <para>A &os;&nbsp;7.<replaceable>X</replaceable> v&aacute;ltozatok
-	eset&eacute;n a k&ouml;vetkez&#245; sorokra lesz
-	sz&uuml;ks&eacute;g&uuml;nk (legt&ouml;bb esetben a
+	eset&eacute;n val&oacute;sz&iacute;n&#251;leg a
+	k&ouml;vetkez&#245; sorokra lesz sz&uuml;ks&eacute;g&uuml;nk a
 	<filename>/dev/uscanner0</filename>
-	eszk&ouml;zle&iacute;r&oacute;hoz):</para>
+	eszk&ouml;zle&iacute;r&oacute;hoz:</para>
 
       <programlisting>[system=5]
 add path uscanner0 mode 0660 group usb</programlisting>

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#16 (text+ko) ====

@@ -7,7 +7,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
-     %SRCID%	1.194
+     %SRCID%	1.195
 -->
 
 <chapter id="x11" lang="hu">
@@ -1655,13 +1655,19 @@
     <sect2>
       <title>Az XDM haszn&aacute;lata</title>
 
-      <para>Az <application>XDM</application>-hez tartoz&oacute;
-	d&eacute;mon a <filename>/usr/local/bin/xdm</filename>
-	&aacute;llom&aacute;ny.  Ezt programot <username>root</username>
-	felhaszn&aacute;l&oacute;k&eacute;nt b&aacute;rmikor tudjuk
-	futtatni, &eacute;s ez veszi kezel&eacute;sbe a helyi
-	g&eacute;pen fut&oacute; X szervert.  Amennyiben az
-	<application>XDM</application>-et a
+      <para>A <application>XDM</application> haszn&aacute;lat&aacute;hoz
+	el&#245;sz&ouml;r telep&iacute;ten&uuml;nk kell rendszer&uuml;nkre
+	a <filename role="package">x11/xdm</filename> portot (mivel az
+	<application>&xorg;</application> &uacute;jabb v&aacute;ltozatai
+	ezt alap&eacute;rtelmez&eacute;s szerint m&aacute;r nem
+	telep&iacute;tik).  Ezt k&ouml;vet&#245;en az
+	<application>XDM</application> d&eacute;mon a
+	<filename>/usr/local/bin/xdm</filename> helyen
+	tal&aacute;lhat&oacute; meg.  A programot
+	<username>root</username> felhaszn&aacute;l&oacute;k&eacute;nt
+	b&aacute;rmikor tudjuk futtatni, &eacute;s ez veszi
+	kezel&eacute;sbe a helyi g&eacute;pen fut&oacute; X szervert.
+	Amennyiben az <application>XDM</application>-et a
 	sz&aacute;m&iacute;t&oacute;g&eacute;p minden egyes
 	indul&aacute;sa sor&aacute;n el akarjuk ind&iacute;tani,
 	egyszer&#251;en csak adjuk hozz&aacute; a megfelel&#245;

From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 20:21:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D776D106568F; Sun,  4 Oct 2009 20:21:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B8031065670
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 20:21:38 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A89D8FC1B
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 20:21:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n94KLcAu048592
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 20:21:38 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n94KLcDA048590
	for perforce@freebsd.org; Sun, 4 Oct 2009 20:21:38 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 4 Oct 2009 20:21:38 GMT
Message-Id: <200910042021.n94KLcDA048590@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169203 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 20:21:39 -0000

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

Change 169203 by rene@rene_self on 2009/10/04 20:20:59

	[website]
	* Rebreak build (!)
	* Add to-be-translated versions of share/sgml/templates.*.xsl
	* Use generic versions of some xsl definitions

Affected files ...

.. //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#7 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#9 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#11 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.entries.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events2ics.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.news-rdf.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.news-rss.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.newsflash.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldnewsflash.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press-rss.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.usergroups.xsl#1 add

Differences ...

==== //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#7 (text+ko) ====

@@ -8,23 +8,3 @@
 
 <!ENTITY url.doc.langcode    'nl_NL.ISO8859-1'>
 <!ENTITY xml.encoding        'iso-8859-1'>
-
-<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
-<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
-
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.early '&enbase;/releases/&rel.current;R/early.html'>
-<!ENTITY u.rel.migration '&enbase;/releases/&rel.current;R/migration.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
-
-<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
-<!ENTITY u.rel2.early '&enbase;/releases/&rel2.current;R/early.html'>
-<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
-

==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#9 (text+ko) ====

@@ -410,29 +410,4 @@
     </xsl:choose>
   </xsl:template>
 
-  <!-- template: "html-index-news-project-items-lastmodified" -->
-  <xsl:template name="html-index-news-project-items-lastmodified">
-    <xsl:param name="news.project.xml-master" select="''" />
-
-    <xsl:call-template name="misc-format-date-string">
-      <xsl:with-param name="year" select="document($news.project.xml-master)/descendant::year[position() = 1]/name" />
-      <xsl:with-param name="month" select="document($news.project.xml-master)/descendant::month[position() = 1]/name" />
-      <xsl:with-param name="day" select="document($news.project.xml-master)/descendant::day[position() = 1]/name" />
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- template: "html-index-news-press-items-lastmodified" -->
-  <xsl:template name="html-index-news-press-items-lastmodified">
-    <xsl:param name="news.press.xml-master" select="''" />
-
-    <xsl:call-template name="misc-format-date-string">
-      <xsl:with-param name="year"
-	select="document($news.press.xml-master)/descendant::year[position() = 1]/name" />
-      <xsl:with-param name="month"
-	select="document($news.press.xml-master)/descendant::month[position() = 1]/name" />
-      <xsl:with-param name="date-format"
-	select="$param-l10n-date-format-YM" />
-    </xsl:call-template>
-  </xsl:template>
-
 </xsl:stylesheet>

==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#11 (text+ko) ====

@@ -42,7 +42,7 @@
     <li><a href="&enbase;/community/irc.html">IRC</a></li>
     <li><a href="&enbase;/community/newsgroups.html">Newsgroepen</a></li>
     <li><a href="&base;/usergroups.html">Gebruikersgroepen</a></li>
-    <li><a href="&enbase;/events/events.html">Evenementen</a></li>
+    <li><a href="&base;/events/events.html">Evenementen</a></li>
     <li><a href="&enbase;/community/webresources.html">Bronnen op het web</a></li>
     <li><a href="&enbase;/community/social.html">Sociale netwerken</a></li>
   </ul>

From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 21:02:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0A1D1065679; Sun,  4 Oct 2009 21:02:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7497C1065670
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 21:02:23 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 618828FC14
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 21:02:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n94L2N2D061690
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 21:02:23 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n94L2Nna061688
	for perforce@freebsd.org; Sun, 4 Oct 2009 21:02:23 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 4 Oct 2009 21:02:23 GMT
Message-Id: <200910042102.n94L2Nna061688@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169205 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 21:02:24 -0000

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

Change 169205 by rene@rene_self on 2009/10/04 21:02:14

	[website] Localize some templates

Affected files ...

.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#2 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#2 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#2 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#2 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#2 (text+ko) ====

@@ -48,7 +48,6 @@
   exclude-result-prefixes="cvs">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/templates.events.xsl"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
@@ -84,7 +83,7 @@
 	generate-id() =
 	generate-id(key('event-by-country', location/country)[1])]">
       <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
-        <xsl:value-of select="location/country/@code" />
+	<xsl:value-of select="location/country/@code" />
     </xsl:for-each>
   </xsl:variable>
 
@@ -93,9 +92,9 @@
 	generate-id() =
 	generate-id(key('event-by-country', location/country)[1])]">
       <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) != 0">100.0</xsl:if>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) = 0"><xsl:value-of select="count(key('event-by-country', location/country))" />.0</xsl:if>
-        <xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
+	<xsl:if test="count(key('upcoming-event-by-country', location/country)) != 0">100.0</xsl:if>
+	<xsl:if test="count(key('upcoming-event-by-country', location/country)) = 0"><xsl:value-of select="count(key('event-by-country', location/country))" />.0</xsl:if>
+	<xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
   </xsl:variable>
 
   <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&amp;chd=t:<xsl:value-of select="$chart-country-counts"/>&amp;chld=<xsl:value-of select="$chart-countries"/></xsl:variable>
@@ -110,27 +109,27 @@
 	  &header2;
 
 	    <div id="content">
-              <div id="SIDEWRAP">
-                &nav;
-                <div id="FEEDLINKS">
-                  <ul>
-                    <li>
-                      <a href="&rsslink;" title="&rsstitle;">
-                        RSS 2.0 Feed
-                      </a>
-                    </li>
-                  </ul>
-                </div> <!-- FEEDLINKS -->
-              </div> <!-- SIDEWRAP -->
+	      <div id="SIDEWRAP">
+		&nav;
+		<div id="FEEDLINKS">
+		  <ul>
+		    <li>
+		      <a href="&rsslink;" title="&rsstitle;">
+			RSS 2.0 Feed
+		      </a>
+		    </li>
+		  </ul>
+		</div> <!-- FEEDLINKS -->
+	      </div> <!-- SIDEWRAP -->
 
 	      <div id="contentwrap">
 		&header3;
- 	<!--
+	<!--
 	     Note the current date to have a reference, if the
 	     upcoming/past events are split incorrectly.
 	-->
 	<xsl:comment>
-	  <xsl:text>Generated on: </xsl:text>
+	  <xsl:text>Gegenereerd op: </xsl:text>
 	  <xsl:value-of select="concat($curdate.year,
 	    format-number($curdate.month, '00'),
 	    format-number($curdate.day, '00'))"/>
@@ -145,7 +144,7 @@
 		<xsl:call-template name="html-events-list-upcoming-heading" />
 
 	<xsl:for-each select="event[generate-id() =
-          generate-id(key('event-by-month',
+	  generate-id(key('event-by-month',
 	    concat(startdate/year, format-number(startdate/month, '00')))[1])
 	  and ((number(enddate/year) &gt; number($curdate.year)) or
 	    (number(enddate/year) = number($curdate.year) and
@@ -160,7 +159,7 @@
 
 	  <h3>
 	    <xsl:attribute name="id">
-	      <xsl:text>month:</xsl:text>
+	      <xsl:text>maand:</xsl:text>
 	      <xsl:value-of select="concat(startdate/year,
 		format-number(startdate/month, '00'))"/>
 	    </xsl:attribute>
@@ -187,7 +186,7 @@
 	  generate-id(key('event-by-month', concat(startdate/year,
 	    format-number(startdate/month, '00')))[1])
 	  and ((number(enddate/year) &gt;= $startyear)) and
-           ((number(enddate/year) &lt; number($curdate.year)) or
+	   ((number(enddate/year) &lt; number($curdate.year)) or
 	    (number(enddate/year) = number($curdate.year) and
 	     number(enddate/month) &lt; number($curdate.month)) or
 	    (number(enddate/year) = number($curdate.year) and
@@ -200,13 +199,13 @@
 
 	  <h3>
 	    <xsl:attribute name="id">
-	      <xsl:text>month:</xsl:text>
+	      <xsl:text>maand:</xsl:text>
 	      <xsl:value-of select="concat(startdate/year,
 		format-number(startdate/month, '00'))"/>
 	    </xsl:attribute>
 	    <xsl:call-template name="gen-long-en-month">
 	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template >
+	    </xsl:call-template>
 	    <xsl:text> </xsl:text>
 	    <xsl:value-of select="startdate/year"/>
 	  </h3>
@@ -221,23 +220,23 @@
 	  </ul>
 	</xsl:for-each>
 
-	<p>Events from past years:</p>
+	<p>Evenementen van voorgaande jaren:</p>
 
-        <ul id="events-past-years">
+	<ul id="events-past-years">
 	<xsl:call-template name="split-string">
-          <xsl:with-param name="seperator" select="' '"/>
-          <xsl:with-param name="text" select="$pastyears"/>
-        </xsl:call-template>
-        </ul>
+	  <xsl:with-param name="seperator" select="' '"/>
+	  <xsl:with-param name="text" select="$pastyears"/>
+	</xsl:call-template>
+	</ul>
 	      </div> <!-- contentwrap -->
 
 	      <br class="clearboth" />
 	    </div> <!-- content -->
 
-            <div id="FOOTER">
-               &copyright;<br />
-               &date;
-            </div> <!-- FOOTER -->
+	    <div id="FOOTER">
+	       &copyright;<br />
+	       &date;
+	    </div> <!-- FOOTER -->
 	  </div> <!-- container -->
 	</div> <!-- containerwrap -->
       </body>
@@ -293,14 +292,14 @@
   <xsl:template match="event" mode="upcoming">
     <li>
       <xsl:call-template name="eventbody"/>
-      <p>Social links: <a rel="nofollow">
+      <p>Sociale koppelingen: <a rel="nofollow">
       <xsl:if test="upcomingurl">
-        <xsl:attribute name="href"><xsl:value-of select="upcomingurl" /></xsl:attribute>
+	<xsl:attribute name="href"><xsl:value-of select="upcomingurl" /></xsl:attribute>
       </xsl:if>
       <xsl:if test="not(upcomingurl)">
-        <xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>        
+	<xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>
       </xsl:if>
-      upcoming</a></p>
+      aanstaand</a></p>
     </li>
   </xsl:template>
 
@@ -321,12 +320,12 @@
 
     <li>
       <xsl:call-template name="eventbody"/>
-      <p>Social links: <a rel="nofollow">
-        <xsl:attribute name="href">http://www.flickr.com/search/?w=all&amp;q=<xsl:value-of select="name" />&amp;m=text</xsl:attribute>
+      <p>Sociale koppelingen: <a rel="nofollow">
+	<xsl:attribute name="href">http://www.flickr.com/search/?w=all&amp;q=<xsl:value-of select="name" />&amp;m=text</xsl:attribute>
       Flickr</a>, <a rel="nofollow">
-        <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon') or contains($lcname, 'dcbsdcon') or contains($lcname, 'asiabsdcon')">,
-        <a rel="nofollow">
-        <xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
+	<xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog zoeken</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon') or contains($lcname, 'dcbsdcon') or contains($lcname, 'asiabsdcon')">,
+	<a rel="nofollow">
+	<xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
     </li>
   </xsl:template>
 
@@ -343,7 +342,7 @@
     <a>
       <xsl:attribute name="href">
 	<xsl:if test="@type='freebsd-website'">&base;</xsl:if>
-        <xsl:value-of select="."/>
+	<xsl:value-of select="."/>
       </xsl:attribute>
       <xsl:value-of select="../name"/>
     </a>
@@ -355,22 +354,22 @@
     <xsl:variable name="first" select="substring-before($text, $seperator)"/>
     <xsl:choose>
       <xsl:when test="$first or substring-after($text,$seperator)">
-        <xsl:if test="$first">
-          <li><a>
+	<xsl:if test="$first">
+	  <li><a>
 	    <xsl:attribute name="href">events<xsl:value-of select="$first"/>.html</xsl:attribute>
-            <xsl:value-of select="$first" />
-          </a></li>    
-        </xsl:if>
-        <xsl:call-template name="split-string">
-          <xsl:with-param name="text" select="substring-after($text,$seperator)"/>
-          <xsl:with-param name="seperator" select="$seperator"/>
-        </xsl:call-template>
+	    <xsl:value-of select="$first" />
+	  </a></li>
+	</xsl:if>
+	<xsl:call-template name="split-string">
+	  <xsl:with-param name="text" select="substring-after($text,$seperator)"/>
+	  <xsl:with-param name="seperator" select="$seperator"/>
+	</xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-          <li><a>
+	  <li><a>
 	    <xsl:attribute name="href">events<xsl:value-of select="$text"/>.html</xsl:attribute>
-            <xsl:value-of select="$text" />
-          </a></li>
+	    <xsl:value-of select="$text" />
+	  </a></li>
       </xsl:otherwise>
     </xsl:choose>
    </xsl:template>

==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#2 (text+ko) ====

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "FreeBSD in the Press">
+<!ENTITY title "&os; in de pers">
 <!ENTITY email "freebsd-www">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.oldpress.xsl,v 1.7 2009/02/15 09:53:50 jkois Exp $ -->
+<!-- $FreeBSD$
+     Vertaald door: Rene Ladan
+     %SOURCE%	share/sgml/templates.oldpress.xsl
+     %SRCID%	1.7
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -20,12 +24,12 @@
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
-  
+
   <xsl:output type="html" encoding="&xml.encoding;"/>
 
   <xsl:template match="press">
     <html>
-      
+
       &header1;
 
       <body>
@@ -45,8 +49,8 @@
 	  &header3;
 
 	<xsl:apply-templates select="//month"/>
-	
-	<p>Other press publications:
+
+	<p>Andere perspublicaties:
 	  <a href="../2008/press.html">2008</a>,
 	  <a href="../2007/press.html">2007</a>,
 	  <a href="../2006/press.html">2006</a>,
@@ -59,16 +63,16 @@
 	  <a href="../1999/press.html">1999</a>,
 	  <a href="../1998/press.html">1998-1996</a></p>
 
-	<a href="&base;/news/news.html">News Home</a>
+	<a href="&base;/news/news.html">Beginpagina Nieuws</a>
 	</div> <!-- CONTENTWRAP -->
 	<br class="clearboth" />
 
 	</div> <!-- CONTENT -->
 
-            <div id="FOOTER">
-               &copyright;<br />
-               &date;
-            </div> <!-- FOOTER -->
+	    <div id="FOOTER">
+	       &copyright;<br />
+	       &date;
+	    </div> <!-- FOOTER -->
 
 	</div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
@@ -78,7 +82,7 @@
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->
-  
+
   <xsl:template match="month">
     <h1>
       <xsl:call-template name="transtable-lookup">
@@ -109,7 +113,7 @@
 
       <p><a href="{$url}"><b><xsl:value-of
       select="name"/></b></a><br/>
-	  
+
 	<a href="{$site-url}"><xsl:value-of
 	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
 	<xsl:copy-of select="p/child::node()"/>

==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#2 (text+ko) ====

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "FreeBSD Past Events">
+<!ENTITY title "Voorgaande &os; evenementen">
 <!ENTITY email "freebsd-www">
 <!ENTITY rsslink "&base;/events/rss.xml">
-<!ENTITY rsstitle "Upcoming FreeBSD Events">
+<!ENTITY rsstitle "Aanstaande &os; evenementen">
 <!ENTITY % navinclude.community "INCLUDE">
 <!ENTITY % header.rss "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.pastevents.xsl,v 1.4 2008/12/28 10:59:06 murray Exp $ -->
+<!-- $FreeBSD$
+     Vertaald door: Rene Ladan
+     %SOURCE%	share/sgml/templates.pastevents.xsl
+     %SRCID%	1.4
+-->
 
 <!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
      Copyright (c) 2008 Murray M Stokely <murray@FreeBSD.org>
@@ -78,7 +82,7 @@
 	generate-id() =
 	generate-id(key('event-by-country', location/country)[1])]">
       <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
-        <xsl:value-of select="location/country/@code" />
+	<xsl:value-of select="location/country/@code" />
     </xsl:for-each>
   </xsl:variable>
 
@@ -87,9 +91,9 @@
 	generate-id() =
 	generate-id(key('event-by-country', location/country)[1])]">
       <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) != 0">100.0</xsl:if>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) = 0"><xsl:value-of select="count(key('event-by-country', location/country))" />.0</xsl:if>
-        <xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
+	<xsl:if test="count(key('upcoming-event-by-country', location/country)) != 0">100.0</xsl:if>
+	<xsl:if test="count(key('upcoming-event-by-country', location/country)) = 0"><xsl:value-of select="count(key('event-by-country', location/country))" />.0</xsl:if>
+	<xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
   </xsl:variable>
 
   <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&amp;chd=t:<xsl:value-of select="$chart-country-counts"/>&amp;chld=<xsl:value-of select="$chart-countries"/></xsl:variable>
@@ -104,27 +108,27 @@
 	  &header2;
 
 	    <div id="content">
-              <div id="SIDEWRAP">
-                &nav;
-                <div id="FEEDLINKS">
-                  <ul>
-                    <li>
-                      <a href="&rsslink;" title="&rsstitle;">
-                        RSS 2.0 Feed
-                      </a>
-                    </li>
-                  </ul>
-                </div> <!-- FEEDLINKS -->
-              </div> <!-- SIDEWRAP -->
+	      <div id="SIDEWRAP">
+		&nav;
+		<div id="FEEDLINKS">
+		  <ul>
+		    <li>
+		      <a href="&rsslink;" title="&rsstitle;">
+			RSS 2.0 Feed
+		      </a>
+		    </li>
+		  </ul>
+		</div> <!-- FEEDLINKS -->
+	      </div> <!-- SIDEWRAP -->
 
 	      <div id="contentwrap">
 		&header3;
- 	<!--
+	<!--
 	     Note the current date to have a reference, if the
 	     upcoming/past events are split incorrectly.
 	-->
 	<xsl:comment>
-	  <xsl:text>Generated on: </xsl:text>
+	  <xsl:text>Gegenereerd op: </xsl:text>
 	  <xsl:value-of select="concat($curdate.year,
 	    format-number($curdate.month, '00'),
 	    format-number($curdate.day, '00'))"/>
@@ -150,13 +154,13 @@
 
 	  <h3>
 	    <xsl:attribute name="id">
-	      <xsl:text>month:</xsl:text>
+	      <xsl:text>maand:</xsl:text>
 	      <xsl:value-of select="concat(startdate/year,
 		format-number(startdate/month, '00'))"/>
 	    </xsl:attribute>
 	    <xsl:call-template name="gen-long-en-month">
 	      <xsl:with-param name="nummonth" select="startdate/month"/>
-	    </xsl:call-template >
+	    </xsl:call-template>
 	    <xsl:text> </xsl:text>
 	    <xsl:value-of select="startdate/year"/>
 	  </h3>
@@ -171,26 +175,26 @@
 	  </ul>
 	</xsl:for-each>
 
-        <p><a href="events.html">Current Events</a></p>
+	<p><a href="events.html">Huidige evenementen</a></p>
 
-	<p>Events from past years:</p>
+	<p>Evenementen van voorgaande jaren:</p>
 
-        <ul id="events-past-years">
+	<ul id="events-past-years">
 	<xsl:call-template name="split-string">
-          <xsl:with-param name="seperator" select="' '"/>
-          <xsl:with-param name="text" select="$pastyears"/>
-        </xsl:call-template>
-        </ul>
+	  <xsl:with-param name="seperator" select="' '"/>
+	  <xsl:with-param name="text" select="$pastyears"/>
+	</xsl:call-template>
+	</ul>
 
 	      </div> <!-- contentwrap -->
 
 	      <br class="clearboth" />
 	    </div> <!-- content -->
 
-            <div id="FOOTER">
-               &copyright;<br />
-               &date;
-            </div> <!-- FOOTER -->
+	    <div id="FOOTER">
+	       &copyright;<br />
+	       &date;
+	    </div> <!-- FOOTER -->
 	  </div> <!-- container -->
 	</div> <!-- containerwrap -->
       </body>
@@ -246,8 +250,8 @@
   <xsl:template match="event" mode="upcoming">
     <li>
       <xsl:call-template name="eventbody"/>
-      <p>Social links: <a rel="nofollow">
-        <xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>
+      <p>Sociale koppelingen: <a rel="nofollow">
+	<xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>
 upcoming</a></p>
     </li>
   </xsl:template>
@@ -261,12 +265,12 @@
 
     <li>
       <xsl:call-template name="eventbody"/>
-      <p>Social links: <a rel="nofollow">
-        <xsl:attribute name="href">http://www.flickr.com/search/?w=all&amp;q=<xsl:value-of select="name" />&amp;m=text</xsl:attribute>
+      <p>Sociale koppelingen: <a rel="nofollow">
+	<xsl:attribute name="href">http://www.flickr.com/search/?w=all&amp;q=<xsl:value-of select="name" />&amp;m=text</xsl:attribute>
       Flickr</a>, <a rel="nofollow">
-        <xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog Search</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon')">,
-        <a rel="nofollow">
-        <xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
+	<xsl:attribute name="href">http://blogsearch.google.com/blogsearch?q=<xsl:value-of select="name" /></xsl:attribute>Blog zoeken</a><xsl:if test="contains($lcname, 'meetbsd') or contains($lcname, 'nycbsdcon')">,
+	<a rel="nofollow">
+	<xsl:attribute name="href">http://www.youtube.com/results?search_query=bsdconferences+<xsl:value-of select="name" /></xsl:attribute>YouTube</a></xsl:if>.</p>
     </li>
   </xsl:template>
 
@@ -283,7 +287,7 @@
     <a>
       <xsl:attribute name="href">
 	<xsl:if test="@type='freebsd-website'">&base;</xsl:if>
-        <xsl:value-of select="."/>
+	<xsl:value-of select="."/>
       </xsl:attribute>
       <xsl:value-of select="../name"/>
     </a>
@@ -295,22 +299,22 @@
     <xsl:variable name="first" select="substring-before($text, $seperator)"/>
     <xsl:choose>
       <xsl:when test="$first or substring-after($text,$seperator)">
-        <xsl:if test="$first">
-          <li><a>
+	<xsl:if test="$first">
+	  <li><a>
 	    <xsl:attribute name="href">events<xsl:value-of select="$first"/>.html</xsl:attribute>
-            <xsl:value-of select="$first" />
-          </a></li>    
-        </xsl:if>
-        <xsl:call-template name="split-string">
-          <xsl:with-param name="text" select="substring-after($text,$seperator)"/>
-          <xsl:with-param name="seperator" select="$seperator"/>
-        </xsl:call-template>
+	    <xsl:value-of select="$first" />
+	  </a></li>
+	</xsl:if>
+	<xsl:call-template name="split-string">
+	  <xsl:with-param name="text" select="substring-after($text,$seperator)"/>
+	  <xsl:with-param name="seperator" select="$seperator"/>
+	</xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-          <li><a>
+	  <li><a>
 	    <xsl:attribute name="href">events<xsl:value-of select="$text"/>.html</xsl:attribute>
-            <xsl:value-of select="$text" />
-          </a></li>
+	    <xsl:value-of select="$text" />
+	  </a></li>
       </xsl:otherwise>
     </xsl:choose>
    </xsl:template>

==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "FreeBSD in the Press">
+<!ENTITY title "&os; in de pers">
 <!ENTITY email "freebsd-www">
 <!ENTITY rsslink "press-rss.xml">
 <!ENTITY rsstitle "&title;">
@@ -9,7 +9,11 @@
 <!ENTITY % header.rss "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.press.xsl,v 1.5 2008/01/18 03:06:05 murray Exp $ -->
+<!-- $FreeBSD$
+     Vertaald door: Rene Ladan
+     %SOURCE% share/sgml/templates.press.xsl
+     %SRCID%  1.5
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -36,18 +40,18 @@
 	&header2;
 
 	<div id="CONTENT">
-              <div id="SIDEWRAP">
-                &nav;
-                <div id="FEEDLINKS">
-                  <ul>
-                    <li>
-                      <a href="&rsslink;" title="FreeBSD in the Press RSS 2.0 Feed">
-                        RSS 2.0 Feed
-                      </a>
-                    </li>
-                  </ul>
-                </div> <!-- FEEDLINKS -->
-              </div> <!-- SIDEWRAP -->
+	      <div id="SIDEWRAP">
+		&nav;
+		<div id="FEEDLINKS">
+		  <ul>
+		    <li>
+		      <a href="&rsslink;" title="&os; in de pers RSS 2.0 Feed">
+			RSS 2.0 Feed
+		      </a>
+		    </li>
+		  </ul>
+		</div> <!-- FEEDLINKS -->
+	      </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
 
@@ -56,25 +60,25 @@
 		<xsl:call-template name="html-news-list-press-preface" />
 
 	<xsl:call-template name="html-news-list-press">
-          <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
-          <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
 	</xsl:call-template>
 
 		<xsl:call-template name="html-press-make-olditems-list" />
 
 		<xsl:call-template name="html-news-list-newsflash-homelink" />
 
-	  	</div> <!-- CONTENTWRAP -->
+		</div> <!-- CONTENTWRAP -->
 		<br class="clearboth" />
 
 	</div> <!-- CONTENT -->
 
-            <div id="FOOTER">
-               &copyright;<br />
-               &date;
-            </div> <!-- FOOTER -->
+	    <div id="FOOTER">
+	       &copyright;<br />
+	       &date;
+	    </div> <!-- FOOTER -->
 
-        </div> <!-- CONTAINER -->
+	</div> <!-- CONTAINER -->
    </div> <!-- CONTAINERWRAP -->
 
       </body>

From owner-p4-projects@FreeBSD.ORG  Sun Oct  4 21:47:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6BE261065696; Sun,  4 Oct 2009 21:47:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F22F106568F
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 21:47:12 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E7B88FC1E
	for <perforce@FreeBSD.org>; Sun,  4 Oct 2009 21:47:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n94LlCpp065873
	for <perforce@FreeBSD.org>; Sun, 4 Oct 2009 21:47:12 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n94LlBfc065871
	for perforce@freebsd.org; Sun, 4 Oct 2009 21:47:11 GMT
	(envelope-from gk@FreeBSD.org)
Date: Sun, 4 Oct 2009 21:47:11 GMT
Message-Id: <200910042147.n94LlBfc065871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169206 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 21:47:12 -0000

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

Change 169206 by gk@gk_h1 on 2009/10/04 21:46:36

	remove unused sysctl
	remove vobject->root != NULL it's not needed
	add MODULE_DEPEND(crypto)

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#12 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#20 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#12 (text+ko) ====

@@ -321,4 +321,6 @@
 };
 
 VFS_SET(pefs_vfsops, pefs, VFCF_LOOPBACK);
+MODULE_DEPEND(pefs, crypto, 1, 1, 1);
 MODULE_DEPEND(pefs, salsa20, 1, 1, 1);
+

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#20 (text+ko) ====

@@ -90,10 +90,6 @@
 #define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN + 1))
 #define DIRENT_MAXSIZE (sizeof(struct dirent))
 
-static int pefs_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
-SYSCTL_INT(_debug, OID_AUTO, pefs_bug_bypass, CTLFLAG_RW,
-	&pefs_bug_bypass, 0, "");
-
 struct pefs_enccn {
 	struct componentname pec_cn;
 	void *pec_buf;
@@ -1563,8 +1559,7 @@
 	if (object == NULL)
 		return (0);
 
-	if (object->resident_page_count > 0 || object->cache != NULL ||
-	    object->root != NULL)
+	if (object->resident_page_count > 0 || object->cache != NULL)
 		return (1);
 	return (0);
 }

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 11:36:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C05931065694; Mon,  5 Oct 2009 11:36:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 833001065679
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 11:36:18 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 717398FC0C
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 11:36:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95BaIap069641
	for <perforce@FreeBSD.org>; Mon, 5 Oct 2009 11:36:18 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95BaIN1069639
	for perforce@freebsd.org; Mon, 5 Oct 2009 11:36:18 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 5 Oct 2009 11:36:18 GMT
Message-Id: <200910051136.n95BaIN1069639@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169217 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 11:36:19 -0000

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

Change 169217 by pgj@beehive on 2009/10/05 11:35:41

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#38 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#26 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#17 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/jh.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#33 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#31 integrate
.. //depot/projects/docproj_hu/src/release/doc/share/misc/man2hwnotes.pl#3 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#32 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#70 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#38 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.489 2009/09/16 14:58:25 wen Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.490 2009/10/04 14:47:10 jh Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -500,6 +500,8 @@
 
 <!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
+<!ENTITY a.jh "Jaakko Heinonen <email>jh@FreeBSD.org</email>">
+
 <!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
 <!ENTITY a.jhb "John Baldwin <email>jhb@FreeBSD.org</email>">

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#26 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml,v 1.11 2009/08/16 00:41:30 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml,v 1.12 2009/10/04 09:46:44 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#13 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml,v 1.6 2008/11/30 17:24:25 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml,v 1.7 2009/10/04 09:46:44 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml,v 1.6 2009/08/16 00:41:30 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml,v 1.7 2009/10/04 09:46:44 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml,v 1.8 2009/08/31 17:38:36 pgj Exp $
+     $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml,v 1.9 2009/10/04 09:46:44 pgj Exp $
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#33 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.109 2009/09/30 22:43:26 csjp Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.110 2009/10/04 14:47:10 jh Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -481,6 +481,11 @@
       &pgpkey.niels;
     </sect2>
 
+    <sect2 id="pgpkey-jh">
+      <title>&a.jh;</title>
+      &pgpkey.jh;
+    </sect2>
+
     <sect2 id="pgpkey-ghelmer">
       <title>&a.ghelmer;</title>
       &pgpkey.ghelmer;

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#31 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.202 2009/09/30 22:43:26 csjp Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.203 2009/10/04 14:47:10 jh Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -127,6 +127,7 @@
 <!ENTITY pgpkey.jdp SYSTEM "jdp.key">
 <!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">
 <!ENTITY pgpkey.jesper SYSTEM "jesper.key">
+<!ENTITY pgpkey.jh SYSTEM "jh.key">
 <!ENTITY pgpkey.jhay SYSTEM "jhay.key">
 <!ENTITY pgpkey.jhb SYSTEM "jhb.key">
 <!ENTITY pgpkey.jilles SYSTEM "jilles.key">

==== //depot/projects/docproj_hu/src/release/doc/share/misc/man2hwnotes.pl#3 (text+ko) ====

@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.15 2008/10/05 09:45:45 simon Exp $
+# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.16 2009/10/04 16:30:33 simon Exp $
 #
 
 # Parse the list of supported hardware out of section 4 manual pages
@@ -252,6 +252,10 @@
 		    $txt =~ s/ Ta /\t/g;
 		    $txt =~ s/([^\t]+)\t.*/$1/;
 		}
+
+		# Remove Li commands
+		$txt =~ s/^Li //g;
+
 		parabuf_addline(\%mdocvars, normalize($txt));
 	    } elsif (/^Bl/) {
 		$mdocvars{isin_list} = 1;

==== //depot/projects/docproj_hu/www/en/developers.sgml#32 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.230 2009/09/16 15:05:12 wen Exp $
+$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $
 
 -->
 
@@ -248,6 +248,7 @@
 <!ENTITY a.jfitz "James FitzGibbon">
 <!ENTITY a.jfv "Jack F. Vogel">
 <!ENTITY a.jgreco "Joe Greco">
+<!ENTITY a.jh "Jaakko Heinonen">
 <!ENTITY a.jhay "John Hay">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jhs "Julian Stacey">

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#70 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.271 2009/09/21 20:05:13 blackend Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.272 2009/10/04 15:00:07 jh Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,18 @@
     <name>2009</name>
 
     <month>
+      <name>10</name>
+      <day>
+        <name>4</name>
+
+        <event>
+          <p>New committer: <a href="mailto:jh@FreeBSD.org">Jaakko
+	    Heinonen</a> (src)</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>9</name>
 
       <day>

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 11:51:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AA6D106568F; Mon,  5 Oct 2009 11:51:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F27C1065676
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 11:51:35 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E88C8FC20
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 11:51:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95BpZZC070707
	for <perforce@FreeBSD.org>; Mon, 5 Oct 2009 11:51:35 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95BpZ4N070705
	for perforce@freebsd.org; Mon, 5 Oct 2009 11:51:35 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 5 Oct 2009 11:51:35 GMT
Message-Id: <200910051151.n95BpZ4N070705@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169218 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 11:51:35 -0000

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

Change 169218 by pgj@beehive on 2009/10/05 11:50:46

	MFen (www):
		1.271      -> 1.272      hu/share/sgml/news.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#54 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#54 (text+ko) ====

@@ -5,7 +5,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%   share/sgml/news.xml
-     %SRCID%    1.271
+     %SRCID%    1.272
 -->
 
 <news>
@@ -19,6 +19,19 @@
     <name>2009</name>
 
     <month>
+      <name>10</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>&Uacute;j tag: <a href="mailto:jh@FreeBSD.org">Jaakko
+	    Heinonen</a> (src)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>9</name>
 
       <day>

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 12:01:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C323F10656B3; Mon,  5 Oct 2009 12:01:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 868551065697
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:01:46 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 75C298FC1E
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:01:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95C1kPu071436
	for <perforce@freebsd.org>; Mon, 5 Oct 2009 12:01:46 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95C1kTT071434
	for perforce@freebsd.org; Mon, 5 Oct 2009 12:01:46 GMT
	(envelope-from stas@freebsd.org)
Date: Mon, 5 Oct 2009 12:01:46 GMT
Message-Id: <200910051201.n95C1kTT071434@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169219 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 12:01:47 -0000

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

Change 169219 by stas@stas_yandex on 2009/10/05 12:00:51

	- Check if SSSE3 tests have been actually built before trying to run them.

Affected files ...

.. //depot/projects/valgrind/none/tests/amd64/insn_ssse3.vgtest#3 edit
.. //depot/projects/valgrind/none/tests/amd64/ssse3_misaligned.vgtest#3 edit

Differences ...

==== //depot/projects/valgrind/none/tests/amd64/insn_ssse3.vgtest#3 (text+ko) ====

@@ -1,3 +1,3 @@
 prog: ../../../none/tests/amd64/insn_ssse3
-prereq: ../../../tests/x86_amd64_features amd64-ssse3
+prereq: ../../../tests/x86_amd64_features amd64-ssse3 && test -e insn_ssse3
 vgopts: -q

==== //depot/projects/valgrind/none/tests/amd64/ssse3_misaligned.vgtest#3 (text+ko) ====

@@ -1,3 +1,3 @@
 prog: ssse3_misaligned
-prereq: ../../../tests/x86_amd64_features amd64-ssse3
+prereq: ../../../tests/x86_amd64_features amd64-ssse3 && test -e ssse3_misaligned
 vgopts: -q

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 12:52:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C6AFA1065694; Mon,  5 Oct 2009 12:52:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 726EB106568B
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:52:42 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 604C68FC1F
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:52:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95CqglK086314
	for <perforce@freebsd.org>; Mon, 5 Oct 2009 12:52:42 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95Cqgx9086312
	for perforce@freebsd.org; Mon, 5 Oct 2009 12:52:42 GMT
	(envelope-from stas@freebsd.org)
Date: Mon, 5 Oct 2009 12:52:42 GMT
Message-Id: <200910051252.n95Cqgx9086312@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169220 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 12:52:43 -0000

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

Change 169220 by stas@stas_yandex on 2009/10/05 12:52:03

	- exp-ptrcheck doesn't work on FreeBSD (yet).

Affected files ...

.. //depot/projects/valgrind/exp-ptrcheck/h_main.c#5 edit
.. //depot/projects/valgrind/exp-ptrcheck/pc_main.c#4 edit

Differences ...

==== //depot/projects/valgrind/exp-ptrcheck/h_main.c#5 (text+ko) ====

@@ -2448,251 +2448,10 @@
       ADD(1, __NR_ipc); /* ppc{32,64}-linux horrors */
 #     endif
 
+   /* --------------- FreeBSD ------------- */
+
 #  elif defined(VGO_freebsd)
 
-#     define ADD(_flag, _syscallname) \
-         do { UWordPair p; p.uw1 = (_syscallname); p.uw2 = (_flag); \
-              VG_(addToXA)( post_syscall_table, &p ); \
-         } while (0)
-
-      /* These ones definitely don't return pointers.  They're not
-         particularly grammatical, either. */
-
-#     if defined(__NR__llseek)
-      ADD(0, __NR__llseek);
-#     endif
-#     if defined(__NR__newselect)
-      ADD(0, __NR__newselect);
-#     endif
-#     if defined(__NR_accept)
-      ADD(0, __NR_accept);
-#     endif
-      ADD(0, __NR_access);
-#     if defined(__NR_bind)
-      ADD(0, __NR_bind);
-#     endif
-#     if defined(__NR_chdir)
-      ADD(0, __NR_chdir);
-#     endif
-      ADD(0, __NR_chmod);
-      ADD(0, __NR_chown);
-#     if defined(__NR_chown32)
-      ADD(0, __NR_chown32);
-#     endif
-      ADD(0, __NR_clock_getres);
-      ADD(0, __NR_clock_gettime);
-      ADD(0, __NR_close);
-#     if defined(__NR_connect)
-      ADD(0, __NR_connect);
-#     endif
-      ADD(0, __NR_dup);
-      ADD(0, __NR_dup2);
-      ADD(0, __NR_execve); /* presumably we see this because the call failed? */
-      ADD(0, __NR_exit); /* hmm, why are we still alive? */
-      ADD(0, __NR_fchmod);
-      ADD(0, __NR_fchown);
-#     if defined(__NR_fchown32)
-      ADD(0, __NR_fchown32);
-#     endif
-      ADD(0, __NR_fcntl);
-#     if defined(__NR_fcntl64)
-      ADD(0, __NR_fcntl64);
-#     endif
-      ADD(0, __NR_flock);
-      ADD(0, __NR_fstat);
-#     if defined(__NR_fstat64)
-      ADD(0, __NR_fstat64);
-#     endif
-      ADD(0, __NR_fstatfs);
- #     if defined(__NR_fstatfs64)
-      ADD(0, __NR_fstatfs64);
-#     endif
-     ADD(0, __NR_fsync);
-      ADD(0, __NR_ftruncate);
-#     if defined(__NR_ftruncate64)
-      ADD(0, __NR_ftruncate64);
-#     endif
-      ADD(0, __NR_getdents); // something to do with teeth
-      ADD(0, __NR_getegid);
-#     if defined(__NR_getegid32)
-      ADD(0, __NR_getegid32);
-#     endif
-      ADD(0, __NR_geteuid);
-#     if defined(__NR_geteuid32)
-      ADD(0, __NR_geteuid32);
-#     endif
-      ADD(0, __NR_getgid);
-#     if defined(__NR_getgid32)
-      ADD(0, __NR_getgid32);
-#     endif
-      ADD(0, __NR_getgroups);
-#     if defined(__NR_getgroups32)
-      ADD(0, __NR_getgroups32);
-#     endif
-      ADD(0, __NR_getitimer);
-#     if defined(__NR_getpeername)
-      ADD(0, __NR_getpeername);
-#     endif
-      ADD(0, __NR_getpid);
-      ADD(0, __NR_getpgrp);
-      ADD(0, __NR_getppid);
-      ADD(0, __NR_getpriority);
-      ADD(0, __NR_getresgid);
-#     if defined(__NR_getresgid32)
-      ADD(0, __NR_getresgid32);
-#     endif
-      ADD(0, __NR_getresuid);
-#     if defined(__NR_getresuid32)
-      ADD(0, __NR_getresuid32);
-#     endif
-      ADD(0, __NR_getrlimit);
-      ADD(0, __NR_getrusage);
-#     if defined(__NR_getsockname)
-      ADD(0, __NR_getsockname);
-#     endif
-#     if defined(__NR_getsockopt)
-      ADD(0, __NR_getsockopt);
-#     endif
-      ADD(0, __NR_gettimeofday);
-      ADD(0, __NR_getuid);
-#     if defined(__NR_getuid32)
-      ADD(0, __NR_getuid32);
-#     endif
-      ADD(0, __NR_ioctl); // ioctl -- assuming no pointers returned
-      ADD(0, __NR_kill);
-      ADD(0, __NR_link);
-#     if defined(__NR_listen)
-      ADD(0, __NR_listen);
-#     endif
-      ADD(0, __NR_lseek);
-      ADD(0, __NR_lstat);
-#     if defined(__NR_lstat64)
-      ADD(0, __NR_lstat64);
-#     endif
-      ADD(0, __NR_madvise);
-      ADD(0, __NR_mkdir);
-      ADD(0, __NR_mlock);
-      ADD(0, __NR_mprotect);
-      ADD(0, __NR_munmap); // die_mem_munmap already called, segment remove);
-      ADD(0, __NR_nanosleep);
-      ADD(0, __NR_open);
-      ADD(0, __NR_pipe);
-      ADD(0, __NR_poll);
-      ADD(0, __NR_read);
-      ADD(0, __NR_readlink);
-      ADD(0, __NR_readv);
-#     if defined(__NR_recvfrom)
-      ADD(0, __NR_recvfrom);
-#     endif
-#     if defined(__NR_recvmsg)
-      ADD(0, __NR_recvmsg);
-#     endif
-      ADD(0, __NR_rename);
-      ADD(0, __NR_rmdir);
-      ADD(0, __NR_sched_get_priority_max);
-      ADD(0, __NR_sched_get_priority_min);
-      ADD(0, __NR_sched_getparam);
-      ADD(0, __NR_sched_getscheduler);
-      ADD(0, __NR_sched_setscheduler);
-      ADD(0, __NR_sched_yield);
-      ADD(0, __NR_select);
-#     if defined(__NR_semctl)
-      ADD(0, __NR_semctl);
-#     endif
-#     if defined(__NR_semget)
-      ADD(0, __NR_semget);
-#     endif
-#     if defined(__NR_semop)
-      ADD(0, __NR_semop);
-#     endif
-#     if defined(__NR_sendto)
-      ADD(0, __NR_sendto);
-#     endif
-#     if defined(__NR_sendmsg)
-      ADD(0, __NR_sendmsg);
-#     endif
-#     if defined(__NR_set_thread_area)
-      ADD(0, __NR_set_thread_area);
-#     endif
-      ADD(0, __NR_setgid);
-      ADD(0, __NR_setitimer);
-      ADD(0, __NR_setpgid);
-      ADD(0, __NR_setpriority);
-      ADD(0, __NR_setregid);
-      ADD(0, __NR_setresgid);
-      ADD(0, __NR_setresuid);
-      ADD(0, __NR_setreuid);
-      ADD(0, __NR_setrlimit);
-      ADD(0, __NR_setsid);
-#     if defined(__NR_setsockopt)
-      ADD(0, __NR_setsockopt);
-#     endif
-      ADD(0, __NR_setuid);
-#     if defined(__NR_shmctl)
-      ADD(0, __NR_shmctl);
-      ADD(0, __NR_shmdt);
-#     endif
-#     if defined(__NR_shutdown)
-      ADD(0, __NR_shutdown);
-#     endif
-      ADD(0, __NR_sigaltstack);
-#     if defined(__NR_socket)
-      ADD(0, __NR_socket);
-#     endif
-#     if defined(__NR_socketcall)
-      ADD(0, __NR_socketcall); /* the nasty x86-linux socket multiplexor */
-#     endif
-#     if defined(__NR_socketpair)
-      ADD(0, __NR_socketpair);
-#     endif
-#     if defined(__NR_statfs64)
-      ADD(0, __NR_statfs64);
-#     endif
-#     if defined(__NR_sigreturn)
-      ADD(0, __NR_sigreturn); /* not sure if we should see this or not */
-#     endif
-#     if defined(__NR_stat64)
-      ADD(0, __NR_stat64);
-#     endif
-      ADD(0, __NR_stat);
-      ADD(0, __NR_statfs);
-      ADD(0, __NR_symlink);
-      ADD(0, __NR_truncate);
-#     if defined(__NR_truncate64)
-      ADD(0, __NR_truncate64);
-#     endif
-#     if defined(__NR_ugetrlimit)
-      ADD(0, __NR_ugetrlimit);
-#     endif
-      ADD(0, __NR_umask);
-      ADD(0, __NR_uname);
-      ADD(0, __NR_unlink);
-      ADD(0, __NR_vfork);
-#     if defined(__NR_waitpid)
-      ADD(0, __NR_waitpid);
-#     endif
-      ADD(0, __NR_wait4);
-      ADD(0, __NR_write);
-      ADD(0, __NR_writev);
-
-      /* Whereas the following need special treatment */
-#     if defined(__NR_arch_prctl)
-      ADD(1, __NR_arch_prctl);
-#     endif
-      ADD(1, __NR_mmap);
-#     if defined(__NR_mmap2)
-      ADD(1, __NR_mmap2);
-#     endif
-#     if defined(__NR_shmat)
-      ADD(1, __NR_shmat);
-#     endif
-#     if defined(__NR_shmget)
-      ADD(1, __NR_shmget);
-#     endif
-#     if defined(__NR_ipc) && defined(VKI_SHMAT)
-      ADD(1, __NR_ipc); /* ppc{32,64}-linux horrors */
-#     endif
-
    /* --------------- AIX5 --------------- */
 
 #  elif defined(VGO_aix5)

==== //depot/projects/valgrind/exp-ptrcheck/pc_main.c#4 (text+ko) ====

@@ -152,6 +152,11 @@
    VG_(printf)("Ptrcheck doesn't work on Darwin yet, sorry.\n");
    VG_(exit)(1);
 #endif
+#if defined(VGO_freebsd)
+   // This makes the (all-failing) regtests run much faster.
+   VG_(printf)("Ptrcheck doesn't work on FreeBSD yet, sorry.\n");
+   VG_(exit)(1);
+#endif
 
    VG_(details_name)            ("exp-ptrcheck");
    VG_(details_version)         (NULL);

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 12:54:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C626A106568B; Mon,  5 Oct 2009 12:54:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A94D1065670
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:54:44 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 79C0A8FC16
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 12:54:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95CsimN086427
	for <perforce@freebsd.org>; Mon, 5 Oct 2009 12:54:44 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95Csiim086425
	for perforce@freebsd.org; Mon, 5 Oct 2009 12:54:44 GMT
	(envelope-from stas@freebsd.org)
Date: Mon, 5 Oct 2009 12:54:44 GMT
Message-Id: <200910051254.n95Csiim086425@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169221 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 12:54:45 -0000

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

Change 169221 by stas@stas_yandex on 2009/10/05 12:54:33

	- Do not try to run SSSE3 tests if SSSE3 support is not available.

Affected files ...

.. //depot/projects/valgrind/none/tests/x86/insn_ssse3.vgtest#3 edit
.. //depot/projects/valgrind/none/tests/x86/ssse3_misaligned.vgtest#3 edit

Differences ...

==== //depot/projects/valgrind/none/tests/x86/insn_ssse3.vgtest#3 (text+ko) ====

@@ -1,3 +1,3 @@
 prog: ../../../none/tests/x86/insn_ssse3
-prereq: ../../../tests/x86_amd64_features x86-ssse3
+prereq: ../../../tests/x86_amd64_features x86-ssse3 && test -e insn_ssse3
 vgopts: -q

==== //depot/projects/valgrind/none/tests/x86/ssse3_misaligned.vgtest#3 (text+ko) ====

@@ -1,3 +1,3 @@
 prog: ssse3_misaligned
-prereq: ../../../tests/x86_amd64_features x86-ssse3
+prereq: ../../../tests/x86_amd64_features x86-ssse3 && test -e ssse3_misaligned
 vgopts: -q

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 14:15:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 26C70106568F; Mon,  5 Oct 2009 14:15:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9AEA106566B
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 14:15:12 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8F4F8FC23
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 14:15:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95EFCLS094370
	for <perforce@freebsd.org>; Mon, 5 Oct 2009 14:15:12 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95EFCq8094368
	for perforce@freebsd.org; Mon, 5 Oct 2009 14:15:12 GMT
	(envelope-from stas@freebsd.org)
Date: Mon, 5 Oct 2009 14:15:12 GMT
Message-Id: <200910051415.n95EFCq8094368@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169225 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 14:15:13 -0000

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

Change 169225 by stas@stas_yandex on 2009/10/05 14:15:05

	- Build "threads" callgrind test on FreeBSD, use right linker
	  flags when building it.

Affected files ...

.. //depot/projects/valgrind/callgrind/tests/Makefile.am#5 edit

Differences ...

==== //depot/projects/valgrind/callgrind/tests/Makefile.am#5 (text+ko) ====

@@ -17,13 +17,9 @@
 	notpower2-use.vgtest notpower2-use.stderr.exp \
 	threads.vgtest threads.stderr.exp
 
-check_PROGRAMS = clreq simwork
-
-if !VGCONF_PLATFORMS_INCLUDE_X86_FREEBSD
-check_PROGRAMS += threads
-endif
+check_PROGRAMS = clreq simwork threads
 
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
-threads_LDADD = -lpthread
+threads_LDFLAGS = -pthread

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 14:59:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44C321065696; Mon,  5 Oct 2009 14:59:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 091BA1065694
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 14:59:01 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EC4208FC12
	for <perforce@freebsd.org>; Mon,  5 Oct 2009 14:59:00 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95Ex0dT097531
	for <perforce@freebsd.org>; Mon, 5 Oct 2009 14:59:00 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95Ex0kd097529
	for perforce@freebsd.org; Mon, 5 Oct 2009 14:59:00 GMT
	(envelope-from stas@freebsd.org)
Date: Mon, 5 Oct 2009 14:59:00 GMT
Message-Id: <200910051459.n95Ex0kd097529@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 14:59:01 -0000

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

Change 169228 by stas@stas_yandex on 2009/10/05 14:58:11

	- Correct the detection of signal source.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_signals.c#14 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_signals.c#14 (text+ko) ====

@@ -1407,7 +1407,7 @@
    // them.
    return ( si_code > VKI_SI_USER ? True : False );
 #elif defined(VGO_freebsd)
-   return ( si_code < VKI_SI_USER ? True : False );
+   return ( (si_code & VKI_SI_USER) == 0 ? True : False );
 #elif defined(VGO_darwin)
    // On Darwin 9.6.0, the si_code is completely unreliable.  It should be the
    // case that 0 means "user", and >0 means "kernel".  But:

From owner-p4-projects@FreeBSD.ORG  Mon Oct  5 22:26:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C103310656A4; Mon,  5 Oct 2009 22:26:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 512B41065692
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 22:26:12 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 40FF58FC16
	for <perforce@FreeBSD.org>; Mon,  5 Oct 2009 22:26:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n95MQCBg058425
	for <perforce@FreeBSD.org>; Mon, 5 Oct 2009 22:26:12 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n95MQCCG058423
	for perforce@freebsd.org; Mon, 5 Oct 2009 22:26:12 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Mon, 5 Oct 2009 22:26:12 GMT
Message-Id: <200910052226.n95MQCCG058423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169251 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Oct 2009 22:26:13 -0000

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

Change 169251 by truncs@aditya on 2009/10/05 22:26:11

	Reflect new location of ext2fs and remove obsolete header files.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#2 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@
 # $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.6 2005/06/15 02:36:11 rodrigc Exp $
 
-.PATH:	${.CURDIR}/../../gnu/fs/ext2fs
+.PATH:	${.CURDIR}/../../fs/ext2fs
 KMOD=	ext2fs
 SRCS=	opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \
 	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \
-	ext2_inode_cnv.c ext2_linux_balloc.c ext2_linux_ialloc.c \
-	ext2_lookup.c ext2_subr.c ext2_vfsops.c ext2_vnops.c
+	ext2_inode_cnv.c ext2_lookup.c ext2_subr.c ext2_vfsops.c \
+	ext2_vnops.c
 
 .include <bsd.kmod.mk>

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 12:47:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A7E71065693; Tue,  6 Oct 2009 12:47:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C2391065692
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:47:57 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47DD58FC28
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:47:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96Clva2074833
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 12:47:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96CluRN074831
	for perforce@freebsd.org; Tue, 6 Oct 2009 12:47:56 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 6 Oct 2009 12:47:56 GMT
Message-Id: <200910061247.n96CluRN074831@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169263 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 12:47:57 -0000

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

Change 169263 by rwatson@rwatson_freebsd_capabilities on 2009/10/06 12:47:23

	Integrate TrustedBSD capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/defines.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/gss-genr.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/includes.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/servconf.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/serverloop.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/session.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.1#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keygen.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.1#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect2.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.8#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshlogin.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/version.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/ftpd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/kde#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/other#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/sshd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/system#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/telnetd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/xdm#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routing#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/static_arp#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/services#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/include/langinfo.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/share/misc/man2hwnotes.pl#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/libexec/sftp-server/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.sbin/sshd/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/de.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/unix.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/zyd.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/fetch.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/store.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_common.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_tty.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/elf_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/vm_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/cpufunc.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/elf_machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_acl_posix1e.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf64_machdep.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/route.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netipsec/xform_esp.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_impl.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/vnode.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/mmap/mmap.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/calendar/calendars/calendar.freebsd#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/main.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/netstat.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/unix.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.c#2 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -82,7 +82,6 @@
 
 
 STATIC struct heredoc *heredoclist;	/* list of here documents to read */
-STATIC int parsebackquote;	/* nonzero if we are inside backquotes */
 STATIC int doprompt;		/* if set, prompt the user */
 STATIC int needprompt;		/* true if interactive and at start of line */
 STATIC int lasttoken;		/* last token read */
@@ -1043,7 +1042,7 @@
 endword:
 	if (syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+	if (syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
 	if (varnest != 0) {
 		startlinno = plinno;
@@ -1303,7 +1302,6 @@
 
 parsebackq: {
 	struct nodelist **nlpp;
-	int savepbq;
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
 	int savelen;
 	int saveprompt;
 
-	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
-		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
 	}
@@ -1397,7 +1393,6 @@
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
-	parsebackquote = oldstyle;
 
 	if (oldstyle) {
 		saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
 		str = NULL;
 		INTON;
 	}
-	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 (text+ko) ====

@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+         [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+   10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
+   from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+   (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+   text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+   causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+   and mention PAM as another provider for ChallengeResponseAuthentication;
+   bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+   in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+    the pty master on Solaris, since it never succeeds and can hang if large
+    amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
+    originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+   size a compile-time option and set it to 64k on Cygwin, since Corinna
+   reports that it makes a significant difference to performance.  ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+   using it since the type conflicts can cause problems on FreeBSD.  Patch
+   from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+   the setpcred call on AIX to immediately before the permanently_set_uid().
+   Ensures that we still have privileges when we call chroot and
+   pam_open_sesson.  Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+   PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+   function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+   fits into 16 bits to work around a bug in glibc's resolver where it masks
+   off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+   prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+   from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+   logout to after the session close.  Patch from Anicka Bernathova,
+   originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+   scripts and fix usage of eval.  Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+   - andreas@cvs.openbsd.org 2009/06/27 09:29:06
+     [packet.h packet.c]
+     packet_bacup_state() and packet_restore_state() will be used to
+     temporarily save the current state ren resuming a suspended connection.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:32:43
+     [roaming_common.c roaming.h]
+     It may be necessary to retransmit some data when resuming, so add it
+     to a buffer when roaming is enabled.
+     Most of this code was written by Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
+   - markus@cvs.openbsd.org 2009/06/30 14:54:40
+     [version.h]
+     crank version; ok deraadt
+   - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
+     [ssh.c]
+     allow for long home dir paths (bz #1615).  ok deraadt
+     (based in part on a patch from jchadima at redhat)
+   - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
+     [clientloop.c]
+     only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+     ok deraadt@ markus@
+
+20090622
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
+     [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
+     alphabetize includes; reduces diff vs portable and style(9).
+     ok stevesk djm
+     (Id sync only; these were already in order in -portable)
+
+20090621
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2009/03/17 21:37:00
+     [ssh.c]
+     pass correct argv[0] to openlog(); ok djm@
+  - jmc@cvs.openbsd.org 2009/03/19 15:15:09
+     [ssh.1]
+     for "Ciphers", just point the reader to the keyword in ssh_config(5), just
+     as we do for "MACs": this stops us getting out of sync when the lists
+     change;
+     fixes documentation/6102, submitted by Peter J. Philipp
+     alternative fix proposed by djm
+     ok markus
+   - tobias@cvs.openbsd.org 2009/03/23 08:31:19
+     [ssh-agent.c]
+     Fixed a possible out-of-bounds memory access if the environment variable
+     SHELL is shorter than 3 characters.
+     with input by and ok dtucker
+   - tobias@cvs.openbsd.org 2009/03/23 19:38:04
+     [ssh-agent.c]
+     My previous commit didn't fix the problem at all, so stick at my first
+     version of the fix presented to dtucker.
+     Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
+     ok dtucker
+   - sobrado@cvs.openbsd.org 2009/03/26 08:38:39
+     [sftp-server.8 sshd.8 ssh-agent.1]
+     fix a few typographical errors found by spell(1).
+     ok dtucker@, jmc@
+   - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
+     [sshd_config.5]
+     fix possessive; ok djm@
+   - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
+     [sftp-server.c]
+     remove unused option character from getopt() optstring; ok markus@
+   - jj@cvs.openbsd.org 2009/04/14 21:10:54
+     [servconf.c]
+     Fixed a few the-the misspellings in comments. Skipped a bunch in
+     binutils,gcc and so on. ok jmc@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:23:06
+     [session.c]
+     use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
+     ok djm@ markus@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
+     [sshd_config.5]
+     clarify that even internal-sftp needs /dev/log for logging to work; ok
+     markus@
+   - jmc@cvs.openbsd.org 2009/04/18 18:39:10
+     [sshd_config.5]
+     tweak previous; ok stevesk
+   - stevesk@cvs.openbsd.org 2009/04/21 15:13:17
+     [sshd_config.5]
+     clarify we cd to user's home after chroot; ok markus@ on
+     earlier version; tweaks and ok jmc@
+   - andreas@cvs.openbsd.org 2009/05/25 06:48:01
+     [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c
+     monitor.c]
+     Put the globals in packet.c into a struct and don't access it directly
+     from other files. No functional changes.
+     ok markus@ djm@
+   - andreas@cvs.openbsd.org 2009/05/27 06:31:25
+     [canohost.h canohost.c]
+     Add clear_cached_addr(), needed for upcoming changes allowing the peer
+     address to change.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:33:39
+     [clientloop.c]
+     Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
+     change from Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:34:36
+     [kex.c kex.h]
+     Move the KEX_COOKIE_LEN define to kex.h
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:36:07
+     [packet.h packet.c]
+     Add packet_put_int64() and packet_get_int64(), part of a larger change
+     from Martin Forssen.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:38:16
+     [sshconnect.h sshconnect.c]
+     Un-static ssh_exchange_identification(), part of a larger change from
+     Martin Forssen and needed for upcoming changes.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/28 16:50:16
+     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+     monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
+     Keep track of number of bytes read and written. Needed for upcoming
+     changes. Most code from Martin Forssen, maf at appgate dot com.
+     ok markus@
+     Also, applied appropriate changes to Makefile.in
+   - andreas@cvs.openbsd.org 2009/06/12 20:43:22
+     [monitor.c packet.c]
+     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+     return type to match atomicio's
+     Diff from djm@, ok markus@
+   - andreas@cvs.openbsd.org 2009/06/12 20:58:32
+     [packet.c]
+     Move some more statics into session_state
+     ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
+     [kexdhs.c kexgexs.c]
+     abort if key_sign fails, preventing possible null deref.  Based on report
+     from Paolo Ganci, ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
+     [roaming.h roaming_common.c roaming_dummy.c]
+     Add  tags for the benefit of the sync scripts
+     Also: pull in the changes for 1.1->1.2 missed in the previous sync.
+ - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
+   header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in
+   ifdef.
+
+20090616
+ - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
+   is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.
+
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+   variable declarations.  Should prevent unused warnings anywhere it's set
+   (only Crays as far as I can tell) and be a no-op everywhere else.
+
+20090318
+ - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
+   that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
+   Based on patch from vinschen at redhat com.
+
+20090308
+ - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
+   auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
+   openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
+   version of Cygwin.  Patch from vinschen at redhat com.
+
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+   has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+   EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+   to use them.  Allows building with older OpenSSL versions.
+ - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
+ - (dtucker) [configure.ac] Missing comma in type list.
+ - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
+   EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
+   in openssl 0.9.6) so add an explicit test for it.
+
+20090306
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2009/03/05 07:18:19
+     [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
+     [sshconnect2.c]
+     refactor the (disabled) Schnorr proof code to make it a little more
+     generally useful
+   - djm@cvs.openbsd.org 2009/03/05 11:30:50
+     [uuencode.c]
+     document what these functions do so I don't ever have to recuse into
+     b64_pton/ntop to remember their return values
+
 20090223
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2009/02/22 23:50:57

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 (text+ko) ====

@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.2 for the release notes.
+See http://www.openssh.com/txt/release-5.3 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
+$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 (text+ko) ====

@@ -56,6 +56,18 @@
 	http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
 
 
+Linux
+-----
+
+Some Linux distributions (including Red Hat/Fedora/CentOS) include
+headers and library links in the -devel RPMs rather than the main
+binary RPMs. If you get an error about headers, or complaining about a
+missing prerequisite then you may need to install the equivalent
+development packages.  On Redhat based distros these may be openssl-devel,
+zlib-devel and pam-devel, on Debian based distros these may be
+libssl-dev, libz-dev and libpam-dev.
+
+
 Solaris
 -------
 If you enable BSM auditing on Solaris, you need to update audit_event(4)
@@ -81,4 +93,4 @@
 return the output from pam_nologin to the client.
 
 
-$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $
+$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 (text+ko) ====

@@ -45,7 +45,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */
 #include "includes.h"
 
 #include <sys/types.h>
@@ -602,16 +602,16 @@
 		return;
 	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+	if (sshpam_session_open) {
+		debug("PAM: closing session");
+		pam_close_session(sshpam_handle, PAM_SILENT);
+		sshpam_session_open = 0;
+	}
 	if (sshpam_cred_established) {
 		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
-	if (sshpam_session_open) {
-		debug("PAM: closing session");
-		pam_close_session(sshpam_handle, PAM_SILENT);
-		sshpam_session_open = 0;
-	}
 	sshpam_authenticated = 0;
 	pam_end(sshpam_handle, sshpam_err);
 	sshpam_handle = NULL;

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 (text+ko) ====

@@ -102,7 +102,7 @@
 	}
 #endif
 #ifdef HAVE_CYGWIN
-	if (is_winnt) {
+	{
 		HANDLE hToken = cygwin_logon_user(pw, password);
 
 		if (hToken == INVALID_HANDLE_VALUE)

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 (text+ko) ====

@@ -34,10 +34,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/security.h>
-#include <prot.h>
-#include <time.h>
 
 #include "ssh.h"
 #include "key.h"
@@ -53,52 +49,6 @@
 extern int saved_argc;
 extern char **saved_argv;
 
-static int
-sia_password_change_required(const char *user)
-{
-	struct es_passwd *acct;
-	time_t pw_life;
-	time_t pw_date;
-
-	set_auth_parameters(saved_argc, saved_argv);
-
-	if ((acct = getespwnam(user)) == NULL) {
-		error("Couldn't access protected database entry for %s", user);
-		endprpwent();
-		return (0);
-	}
-
-	/* If forced password change flag is set, honor it */
-	if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) {
-		endprpwent();
-		return (1);
-	}
-
-	/* Obtain password lifetime; if none, it can't have expired */
-	if (acct->uflg->fg_expire)
-		pw_life = acct->ufld->fd_expire;
-	else if (acct->sflg->fg_expire)
-		pw_life = acct->sfld->fd_expire;
-	else {
-		endprpwent();
-		return (0);
-	}
-
-	/* Offset from last change; if none, it must be expired */
-	if (acct->uflg->fg_schange)
-		pw_date = acct->ufld->fd_schange + pw_life;
-	else {
-		endprpwent();
-		return (1);
-	}
-
-	endprpwent();
-
-	/* If expiration date is prior to now, change password */
-	
-	return (pw_date <= time((time_t *) NULL));
-}
-
 int
 sys_auth_passwd(Authctxt *authctxt, const char *pass)
 {
@@ -126,9 +76,6 @@
 
 	sia_ses_release(&ent);
 
-	authctxt->force_pwchange = sia_password_change_required(
-		authctxt->user);
-
 	return (1);
 }
 

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 (text+ko) ====

@@ -318,15 +318,7 @@
 		}
 #endif /* _UNICOS */
 
-#ifdef HAVE_CYGWIN
-		if (authenticated &&
-		    !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
-		    authctxt->pw)) {
-			packet_disconnect("Authentication rejected for uid %d.",
-			    authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
-			authenticated = 0;
-		}
-#else
+#ifndef HAVE_CYGWIN
 		/* Special handling for root */
 		if (authenticated && authctxt->pw->pw_uid == 0 &&
 		    !auth_root_allowed(meth->name)) {

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */
+/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -42,8 +42,8 @@
 #include "ssh2.h"
 #include "key.h"
 #include "hostfile.h"
+#include "auth.h"
 #include "buffer.h"
-#include "auth.h"
 #include "packet.h"
 #include "dispatch.h"
 #include "log.h"
@@ -55,6 +55,7 @@
 #endif
 #include "monitor_wrap.h"
 
+#include "schnorr.h"
 #include "jpake.h"
 
 /*
@@ -359,7 +360,7 @@
 }
 
 /*
- * Being authentication attempt.
+ * Begin authentication attempt.
  * Note, sets authctxt->postponed while in subprotocol
  */
 static int

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 (text+ko) ====

@@ -58,10 +58,6 @@
 
 	xfree(devs);
 	xfree(lang);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 (text+ko) ====

@@ -61,10 +61,6 @@
 {
 	none_enabled = 0;
 	packet_check_eom();
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		return (0);
-#endif
 	if (options.password_authentication)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 (text+ko) ====

@@ -68,10 +68,6 @@
 		logit("password change not supported");
 	else if (PRIVSEP(auth_password(authctxt, password)) == 1)
 		authenticated = 1;
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	memset(password, 0, len);
 	xfree(password);
 	return authenticated;

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 (text+ko) ====

@@ -170,10 +170,6 @@
 		key_free(key);
 	xfree(pkalg);
 	xfree(pkblob);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,8 +36,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "atomicio.h"
 #include "xmalloc.h"
-#include "atomicio.h"
 #include "ssh2.h"
 #include "packet.h"
 #include "log.h"

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,6 +35,8 @@
 #include "misc.h"
 
 static void check_ip_options(int, char *);
+static char *canonical_host_ip = NULL;
+static int cached_port = -1;
 
 /*
  * Return the canonical name of the host at the other end of the socket. The
@@ -304,6 +306,16 @@
 	return get_socket_address(sock, 0, NI_NAMEREQD);
 }
 
+void
+clear_cached_addr(void)
+{
+	if (canonical_host_ip != NULL) {
+		xfree(canonical_host_ip);
+		canonical_host_ip = NULL;
+	}
+	cached_port = -1;
+}
+
 /*
  * Returns the IP-address of the remote host as a string.  The returned
  * string must not be freed.
@@ -312,8 +324,6 @@
 const char *
 get_remote_ipaddr(void)
 {
-	static char *canonical_host_ip = NULL;
-
 	/* Check whether we have cached the ipaddr. */
 	if (canonical_host_ip == NULL) {
 		if (packet_connection_is_on_socket()) {
@@ -402,13 +412,11 @@
 int
 get_remote_port(void)
 {
-	static int port = -1;
-
 	/* Cache to avoid getpeername() on a dead connection */
-	if (port == -1)
-		port = get_port(0);
+	if (cached_port == -1)
+		cached_port = get_port(0);
 
-	return port;
+	return cached_port;
 }
 
 int

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -24,6 +24,6 @@
 int		 get_remote_port(void);
 int		 get_local_port(void);
 int		 get_sock_port(int, int);
-
+void		 clear_cached_addr(void);
 
 void		 ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *);

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1653,6 +1653,7 @@
 			}
 			return -1;
 		}
+#ifndef BROKEN_TCGETATTR_ICANON
 		if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') {
 			if (tcgetattr(c->wfd, &tio) == 0 &&
 			    !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
@@ -1666,6 +1667,7 @@
 				packet_send();
 			}
 		}
+#endif
 		buffer_consume(&c->output, len);
 		if (compat20 && len > 0) {
 			c->local_consumed += len;
@@ -2431,7 +2433,7 @@
 	int id;
 
 	/* Reset keepalive timeout */
-	keep_alive_timeouts = 0;
+	packet_set_alive_timeouts(0);
 
 	id = packet_get_int();
 	packet_check_eom();

==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -109,6 +109,7 @@
 #include "misc.h"

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

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 12:57:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1AAD1065692; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7616A1065670
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 638FE8FC1E
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96Cv7sM075450
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 12:57:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96Cv7iv075448
	for perforce@freebsd.org; Tue, 6 Oct 2009 12:57:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 6 Oct 2009 12:57:07 GMT
Message-Id: <200910061257.n96Cv7iv075448@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169264 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 12:57:07 -0000

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

Change 169264 by rwatson@rwatson_cinnamon on 2009/10/06 12:56:28

	OpenBSM bits for ENOTCAPABLE on FreeBSD.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 edit
.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. 
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#19 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 $
  */
 
 #include <sys/types.h>
@@ -684,6 +684,13 @@
 	ERRNO_NO_LOCAL_MAPPING,
 #endif
 	ES("Key was rejected by service") },
+	{ BSM_ERRNO_ENOTCAPABLE,
+#ifdef ENOTCAPABLE
+	ENOTCAPABLE,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("Capabilities insufficient") },
 };
 static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]);
 

==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. 
  *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 $
  */
 
 #ifndef _BSM_AUDIT_ERRNO_H_
@@ -204,6 +204,7 @@
 #define	BSM_ERRNO_EKEYEXPIRED		220	/* Linux-specific. */
 #define	BSM_ERRNO_EKEYREVOKED		221	/* Linux-specific. */
 #define	BSM_ERRNO_EKEYREJECTED		222	/* Linux-specific. */
+#define	BSM_ERRNO_ENOTCAPABLE		223	/* FreeBSD-specific. */
 
 /*
  * In the event that OpenBSM doesn't have a file representation of a local

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 12:57:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 771421065757; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 971DC1065672
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 84E2F8FC20
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 12:57:07 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96Cv774075455
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 12:57:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96Cv7T4075453
	for perforce@freebsd.org; Tue, 6 Oct 2009 12:57:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 6 Oct 2009 12:57:07 GMT
Message-Id: <200910061257.n96Cv7T4075453@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169265 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 12:57:08 -0000

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

Change 169265 by rwatson@rwatson_cinnamon on 2009/10/06 12:56:52

	ENOTCAPABLE support for OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#46 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#46 (text+ko) ====

@@ -2,7 +2,8 @@
 
 OpenBSM 1.2 alpha 1
 
-- Add audit events for FreeBSD process descriptor system calls.
+- Add audit events for FreeBSD process descriptor system calls, ENOTCAPABLE
+  BSM errno constant.
 
 OpenBSM 1.1p2
 
@@ -468,4 +469,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#45 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#46 $

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 14:06:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9584E1065747; Tue,  6 Oct 2009 14:06:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59E4F1065742
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 14:06:23 +0000 (UTC)
	(envelope-from remko@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 48BCC8FC1A
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 14:06:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96E6NSU082415
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 14:06:23 GMT
	(envelope-from remko@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96E6NjS082413
	for perforce@freebsd.org; Tue, 6 Oct 2009 14:06:23 GMT
	(envelope-from remko@freebsd.org)
Date: Tue, 6 Oct 2009 14:06:23 GMT
Message-Id: <200910061406.n96E6NjS082413@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	remko@freebsd.org using -f
From: Remko Lodder <remko@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169267 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 14:06:23 -0000

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

Change 169267 by remko@remko_guardian on 2009/10/06 14:05:41

	Submit latest WIP

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#18 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#18 (text+ko) ====

@@ -894,7 +894,7 @@
 		    <row>
 		      <entry><literal>pdf</literal></entry>
 
-		      <entry>Adobe's Porteerbaar Document Formaat</entry>
+		      <entry>Adobe's Porteerbare Document Formaat</entry>
 		    </row>
 
 		    <row>
@@ -919,13 +919,14 @@
 	      </informaltable>
 
 	      <note>
-		<para>Page numbers are not automatically updated when
-		  loading Rich Text Format into Word.  Press <keycombo
+		<para>Pagina nummers worden niet automatisch bijgewerkt
+		  wanneer het Rich Text Format geladen wordt in Word.
+		  Toets <keycombo
 		    action="simul"><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>,
 		  <keycombo
 		    action="simul"><keycap>Ctrl</keycap><keycap>End</keycap></keycombo>,
-		  <keycap>F9</keycap> after loading the document, to
-		  update the page numbers.</para>
+		  <keycap>F9</keycap> na het laden van het document om
+		  de pagina nummers bij te werken.</para>
 	      </note>
 	    </listitem>
 
@@ -1083,7 +1084,7 @@
 	    </listitem>
 
 	    <listitem>
-	      <para>Het kanaal <literal>##FreeBSD</literal> oo <ulink
+	      <para>Het kanaal <literal>##FreeBSD</literal> op <ulink
 		  url="http://freenode.net/">Freenode</ulink> is een
 		generiek help kanaal met ongeveer 300 gebruikers op
 		elk willekeurig moment.  De gesprekken hebben een tijd
@@ -1116,7 +1117,7 @@
 	    </listitem>
 
 	    <listitem>
-	      <para>Het kanaal <literal>#FreeBSD</literal> oo <ulink
+	      <para>Het kanaal <literal>#FreeBSD</literal> op <ulink
 		  url="http://www.undernet.org/">UNDERNET</ulink> is
 		beschikbaar op <hostid>us.undernet.org</hostid> in de VS
 		en <hostid>eu.undernet.org</hostid> in Europa.  Omdat
@@ -1145,12 +1146,12 @@
 	  <para>Elk van deze kanalen zijn uniek en niet met elkaar
 	    verbonden.  De chat stijl verschilt ook per server, dus
 	    het kan voorkomen dat je meerdere servers moet proberen
-	    om te zien welke geschikt is voor jou chat stijl.  Zoals
+	    om te zien welke geschikt is voor jouw stijl.  Zoals
 	    met <emphasis>alle</emphasis> type van IRC verkeer geldt
 	    dat als je snel geraakt bent, of als je niet kan omgaan met
 	    jongere mensen (meer dan de paar oudere die er zitten)
-	    waarbij het equivalent van moddergevechten wordt gedaan,
-	    doe dan maar geen moeite.</para>
+	    waarbij een vorm van moddervechten wordt gevoerd; doe dan
+	    maar geen moeite.</para>
 	</answer>
       </qandaentry>
 
@@ -1824,7 +1825,7 @@
 	</question>
 
 	<answer>
-	  <para>&os; herkent d <application>Ontrack Disk
+	  <para>&os; herkent de <application>Ontrack Disk
 	      Manager</application> en accepteert deze.  Andere schijf
 	    managers worden niet ondersteund.</para>
 
@@ -1870,7 +1871,7 @@
 	</question>
 
 	<answer>
-	  <para>Dit is een ander symptoom van het proleem beschreven in
+	  <para>Dit is een ander symptoom van het probleem beschreven in
 	    voorgaande vraag.  Uw BIOS geometrie en &os; geometrie
 	    instellingen komen niet overeen!  Als uw controller of BIOS
 	    cylinder translation ondersteund (veelal gemarkeerd als
@@ -1946,24 +1947,25 @@
 	</question>
 
 	<answer>
-	  <para>Het standaard wachtwoord formaat op &os; is door
-	    gebruik te maken van <emphasis>MD5</emphasis>
-	    gebaseerde wachtwoorden.  Deze worden geacht veiliger te
-	    zijn dan het traditionele &unix; wachtwoord formaat welke
-	    gebruik maakt van een schema gebaseerd op het
-	    <emphasis>DES</emphasis> algorithme.  DES wachtwoorden zijn
+	  <para>Het standaard wachtwoord formaat op &os; is op
+	    <emphasis>MD5</emphasis> gebaseerde wachtwoorden.  Deze
+	    worden geacht veiliger te zijn dan het traditionele
+	    &unix; wachtwoord formaat welke gebruik maakt van een
+	    schema dat gebaseerd is op het <emphasis>DES</emphasis>
+	    algorithme.  DES wachtwoorden zijn
 	    nog steeds beschikbaar als u uw wachtwoord bestand moet
 	    delen met oudere besturingssystemen, welke nog gebruik maken
 	    van het minder veilige wachtwoord formaat.  &os; stelt u ook
-	    in staat om gebruik te maken van het Blowfish wachtwoord
-	    formaat, welke veiliger is.  Welk wachtwoord formaat er
-	    gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld
-	    door de <literal>passwd_format</literal> login mogelijkheden
-	    in <filename>/etc/login.conf</filename>, welke de waardes
-	    <literal>des</literal>, <literal>blf</literal> (als deze
-	    beschikbaar is) of <literal>md5</literal> accepteert.  Zie
-	    de &man.login.conf.5; handleiding voor meer informatie over
-	    login mogelijkheden.</para>
+	    in staat om gebruik te maken van het Blowfish format welke
+	    veiliger is.
+	    Welk wachtwoord formaat er
+	    gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld door
+	    de <literal>passwd_format</literal> variable in
+	    <filename>/etc/login.conf</filename>, welke ingesteld kan
+	    worden met de waardes <literal>des</literal>,
+	    <literal>blf</literal> (mits beschikbaar) of
+	    <literal>md5</literal>. Zie de &man.login.conf.5; handleiding
+	    voor meer informatie over diverse login mogelijkheden.</para>
 	</answer>
       </qandaentry>
 

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 16:41:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 085401065676; Tue,  6 Oct 2009 16:41:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFC0D106566B
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 16:41:13 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AD0C58FC0C
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 16:41:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96GfDFW095665
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 16:41:13 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96GfCfD095663
	for perforce@freebsd.org; Tue, 6 Oct 2009 16:41:12 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 6 Oct 2009 16:41:12 GMT
Message-Id: <200910061641.n96GfCfD095663@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169270 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 16:41:14 -0000

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

Change 169270 by mav@mav_mavbook on 2009/10/06 16:40:16

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/README#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/README.platform#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth-pam.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth1.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-kbdint.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/auth2.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/canohost.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/canohost.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/channels.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/clientloop.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/config.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/config.h.in#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/defines.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/gss-genr.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/includes.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/kex.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/kex.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/monitor.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_wrap.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_wrap.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/packet.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/packet.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/readconf.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/roaming.h#1 branch
.. //depot/projects/scottl-camlock/src/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/scottl-camlock/src/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/scottl-camlock/src/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/scottl-camlock/src/crypto/openssh/servconf.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/serverloop.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/session.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-server.8#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-agent.1#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.1#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config.5#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect2.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.8#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config.5#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshlogin.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/version.h#3 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#9 integrate
.. //depot/projects/scottl-camlock/src/etc/network.subr#9 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/ftpd#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/kde#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/other#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/sshd#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/system#2 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/telnetd#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/xdm#3 integrate
.. //depot/projects/scottl-camlock/src/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/scottl-camlock/src/etc/periodic/security/200.chkmounts#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/faith#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/routing#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/static_arp#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/stf#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#6 integrate
.. //depot/projects/scottl-camlock/src/etc/services#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#6 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes.sp.ok#3 integrate
.. //depot/projects/scottl-camlock/src/include/langinfo.h#2 integrate
.. //depot/projects/scottl-camlock/src/include/libgen.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/basename.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fts.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fts.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/radlib.c#4 integrate
.. //depot/projects/scottl-camlock/src/release/doc/share/misc/man2hwnotes.pl#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/growfs/growfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/scottl-camlock/src/secure/libexec/sftp-server/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.sbin/sshd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/de.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/unix.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/urtw.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/zyd.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#9 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/tuning.7#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#10 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/fetch.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/store.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#6 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#7 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#27 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#48 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_regs.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_irq.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phyreg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hda_reg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdcereg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#30 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_ebr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_init.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#26 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/elf64_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#14 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/cxgb/cxgb/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#10 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/elf_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/elf_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/fcntl.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/rwlock.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sx.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#14 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/mmap/mmap.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/unix.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lp/lp.sh#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -82,7 +82,6 @@
 
 
 STATIC struct heredoc *heredoclist;	/* list of here documents to read */
-STATIC int parsebackquote;	/* nonzero if we are inside backquotes */
 STATIC int doprompt;		/* if set, prompt the user */
 STATIC int needprompt;		/* true if interactive and at start of line */
 STATIC int lasttoken;		/* last token read */
@@ -1043,7 +1042,7 @@
 endword:
 	if (syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+	if (syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
 	if (varnest != 0) {
 		startlinno = plinno;
@@ -1303,7 +1302,6 @@
 
 parsebackq: {
 	struct nodelist **nlpp;
-	int savepbq;
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
 	int savelen;
 	int saveprompt;
 
-	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
-		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
 	}
@@ -1397,7 +1393,6 @@
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
-	parsebackquote = oldstyle;
 
 	if (oldstyle) {
 		saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
 		str = NULL;
 		INTON;
 	}
-	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);

==== //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#3 (text+ko) ====

@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+         [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+   10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
+   from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+   (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+   text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+   causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+   and mention PAM as another provider for ChallengeResponseAuthentication;
+   bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+   in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+    the pty master on Solaris, since it never succeeds and can hang if large
+    amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
+    originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+   size a compile-time option and set it to 64k on Cygwin, since Corinna
+   reports that it makes a significant difference to performance.  ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+   using it since the type conflicts can cause problems on FreeBSD.  Patch
+   from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+   the setpcred call on AIX to immediately before the permanently_set_uid().
+   Ensures that we still have privileges when we call chroot and
+   pam_open_sesson.  Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+   PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+   function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+   fits into 16 bits to work around a bug in glibc's resolver where it masks
+   off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+   prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+   from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+   logout to after the session close.  Patch from Anicka Bernathova,
+   originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+   scripts and fix usage of eval.  Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+   - andreas@cvs.openbsd.org 2009/06/27 09:29:06
+     [packet.h packet.c]
+     packet_bacup_state() and packet_restore_state() will be used to
+     temporarily save the current state ren resuming a suspended connection.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:32:43
+     [roaming_common.c roaming.h]
+     It may be necessary to retransmit some data when resuming, so add it
+     to a buffer when roaming is enabled.
+     Most of this code was written by Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
+   - markus@cvs.openbsd.org 2009/06/30 14:54:40
+     [version.h]
+     crank version; ok deraadt
+   - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
+     [ssh.c]
+     allow for long home dir paths (bz #1615).  ok deraadt
+     (based in part on a patch from jchadima at redhat)
+   - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
+     [clientloop.c]
+     only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+     ok deraadt@ markus@
+
+20090622
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
+     [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
+     alphabetize includes; reduces diff vs portable and style(9).
+     ok stevesk djm
+     (Id sync only; these were already in order in -portable)
+
+20090621
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2009/03/17 21:37:00
+     [ssh.c]
+     pass correct argv[0] to openlog(); ok djm@
+  - jmc@cvs.openbsd.org 2009/03/19 15:15:09
+     [ssh.1]
+     for "Ciphers", just point the reader to the keyword in ssh_config(5), just
+     as we do for "MACs": this stops us getting out of sync when the lists
+     change;
+     fixes documentation/6102, submitted by Peter J. Philipp
+     alternative fix proposed by djm
+     ok markus
+   - tobias@cvs.openbsd.org 2009/03/23 08:31:19
+     [ssh-agent.c]
+     Fixed a possible out-of-bounds memory access if the environment variable
+     SHELL is shorter than 3 characters.
+     with input by and ok dtucker
+   - tobias@cvs.openbsd.org 2009/03/23 19:38:04
+     [ssh-agent.c]
+     My previous commit didn't fix the problem at all, so stick at my first
+     version of the fix presented to dtucker.
+     Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
+     ok dtucker
+   - sobrado@cvs.openbsd.org 2009/03/26 08:38:39
+     [sftp-server.8 sshd.8 ssh-agent.1]
+     fix a few typographical errors found by spell(1).
+     ok dtucker@, jmc@
+   - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
+     [sshd_config.5]
+     fix possessive; ok djm@
+   - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
+     [sftp-server.c]
+     remove unused option character from getopt() optstring; ok markus@
+   - jj@cvs.openbsd.org 2009/04/14 21:10:54
+     [servconf.c]
+     Fixed a few the-the misspellings in comments. Skipped a bunch in
+     binutils,gcc and so on. ok jmc@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:23:06
+     [session.c]
+     use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
+     ok djm@ markus@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
+     [sshd_config.5]
+     clarify that even internal-sftp needs /dev/log for logging to work; ok
+     markus@
+   - jmc@cvs.openbsd.org 2009/04/18 18:39:10
+     [sshd_config.5]
+     tweak previous; ok stevesk
+   - stevesk@cvs.openbsd.org 2009/04/21 15:13:17
+     [sshd_config.5]
+     clarify we cd to user's home after chroot; ok markus@ on
+     earlier version; tweaks and ok jmc@
+   - andreas@cvs.openbsd.org 2009/05/25 06:48:01
+     [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c
+     monitor.c]
+     Put the globals in packet.c into a struct and don't access it directly
+     from other files. No functional changes.
+     ok markus@ djm@
+   - andreas@cvs.openbsd.org 2009/05/27 06:31:25
+     [canohost.h canohost.c]
+     Add clear_cached_addr(), needed for upcoming changes allowing the peer
+     address to change.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:33:39
+     [clientloop.c]
+     Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
+     change from Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:34:36
+     [kex.c kex.h]
+     Move the KEX_COOKIE_LEN define to kex.h
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:36:07
+     [packet.h packet.c]
+     Add packet_put_int64() and packet_get_int64(), part of a larger change
+     from Martin Forssen.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:38:16
+     [sshconnect.h sshconnect.c]
+     Un-static ssh_exchange_identification(), part of a larger change from
+     Martin Forssen and needed for upcoming changes.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/28 16:50:16
+     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+     monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
+     Keep track of number of bytes read and written. Needed for upcoming
+     changes. Most code from Martin Forssen, maf at appgate dot com.
+     ok markus@
+     Also, applied appropriate changes to Makefile.in
+   - andreas@cvs.openbsd.org 2009/06/12 20:43:22
+     [monitor.c packet.c]
+     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+     return type to match atomicio's
+     Diff from djm@, ok markus@
+   - andreas@cvs.openbsd.org 2009/06/12 20:58:32
+     [packet.c]
+     Move some more statics into session_state
+     ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
+     [kexdhs.c kexgexs.c]
+     abort if key_sign fails, preventing possible null deref.  Based on report
+     from Paolo Ganci, ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
+     [roaming.h roaming_common.c roaming_dummy.c]
+     Add  tags for the benefit of the sync scripts
+     Also: pull in the changes for 1.1->1.2 missed in the previous sync.
+ - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
+   header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in
+   ifdef.
+
+20090616
+ - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
+   is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.
+
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+   variable declarations.  Should prevent unused warnings anywhere it's set
+   (only Crays as far as I can tell) and be a no-op everywhere else.
+
+20090318
+ - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
+   that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
+   Based on patch from vinschen at redhat com.
+
+20090308
+ - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
+   auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
+   openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
+   version of Cygwin.  Patch from vinschen at redhat com.
+
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+   has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+   EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+   to use them.  Allows building with older OpenSSL versions.
+ - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
+ - (dtucker) [configure.ac] Missing comma in type list.
+ - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
+   EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
+   in openssl 0.9.6) so add an explicit test for it.
+
+20090306
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2009/03/05 07:18:19
+     [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
+     [sshconnect2.c]
+     refactor the (disabled) Schnorr proof code to make it a little more
+     generally useful
+   - djm@cvs.openbsd.org 2009/03/05 11:30:50
+     [uuencode.c]
+     document what these functions do so I don't ever have to recuse into
+     b64_pton/ntop to remember their return values
+
 20090223
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2009/02/22 23:50:57

==== //depot/projects/scottl-camlock/src/crypto/openssh/README#3 (text+ko) ====

@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.2 for the release notes.
+See http://www.openssh.com/txt/release-5.3 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
+$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $

==== //depot/projects/scottl-camlock/src/crypto/openssh/README.platform#3 (text+ko) ====

@@ -56,6 +56,18 @@
 	http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
 
 
+Linux
+-----
+
+Some Linux distributions (including Red Hat/Fedora/CentOS) include
+headers and library links in the -devel RPMs rather than the main
+binary RPMs. If you get an error about headers, or complaining about a
+missing prerequisite then you may need to install the equivalent
+development packages.  On Redhat based distros these may be openssl-devel,
+zlib-devel and pam-devel, on Debian based distros these may be
+libssl-dev, libz-dev and libpam-dev.
+
+
 Solaris
 -------
 If you enable BSM auditing on Solaris, you need to update audit_event(4)
@@ -81,4 +93,4 @@
 return the output from pam_nologin to the client.
 
 
-$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $
+$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-pam.c#3 (text+ko) ====

@@ -45,7 +45,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */
 #include "includes.h"
 
 #include <sys/types.h>
@@ -602,16 +602,16 @@
 		return;
 	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+	if (sshpam_session_open) {
+		debug("PAM: closing session");
+		pam_close_session(sshpam_handle, PAM_SILENT);
+		sshpam_session_open = 0;
+	}
 	if (sshpam_cred_established) {
 		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
-	if (sshpam_session_open) {
-		debug("PAM: closing session");
-		pam_close_session(sshpam_handle, PAM_SILENT);
-		sshpam_session_open = 0;
-	}
 	sshpam_authenticated = 0;
 	pam_end(sshpam_handle, sshpam_err);
 	sshpam_handle = NULL;

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-passwd.c#3 (text+ko) ====

@@ -102,7 +102,7 @@
 	}
 #endif
 #ifdef HAVE_CYGWIN
-	if (is_winnt) {
+	{
 		HANDLE hToken = cygwin_logon_user(pw, password);
 
 		if (hToken == INVALID_HANDLE_VALUE)

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-sia.c#3 (text+ko) ====

@@ -34,10 +34,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/security.h>
-#include <prot.h>
-#include <time.h>
 
 #include "ssh.h"
 #include "key.h"
@@ -53,52 +49,6 @@
 extern int saved_argc;
 extern char **saved_argv;
 
-static int
-sia_password_change_required(const char *user)
-{
-	struct es_passwd *acct;
-	time_t pw_life;
-	time_t pw_date;
-
-	set_auth_parameters(saved_argc, saved_argv);
-
-	if ((acct = getespwnam(user)) == NULL) {
-		error("Couldn't access protected database entry for %s", user);
-		endprpwent();
-		return (0);
-	}
-
-	/* If forced password change flag is set, honor it */
-	if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) {
-		endprpwent();
-		return (1);
-	}
-
-	/* Obtain password lifetime; if none, it can't have expired */
-	if (acct->uflg->fg_expire)
-		pw_life = acct->ufld->fd_expire;
-	else if (acct->sflg->fg_expire)
-		pw_life = acct->sfld->fd_expire;
-	else {
-		endprpwent();
-		return (0);
-	}
-
-	/* Offset from last change; if none, it must be expired */
-	if (acct->uflg->fg_schange)
-		pw_date = acct->ufld->fd_schange + pw_life;
-	else {
-		endprpwent();
-		return (1);
-	}
-
-	endprpwent();
-
-	/* If expiration date is prior to now, change password */
-	
-	return (pw_date <= time((time_t *) NULL));
-}
-
 int
 sys_auth_passwd(Authctxt *authctxt, const char *pass)
 {
@@ -126,9 +76,6 @@
 
 	sia_ses_release(&ent);
 
-	authctxt->force_pwchange = sia_password_change_required(
-		authctxt->user);
-
 	return (1);
 }
 

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth1.c#3 (text+ko) ====

@@ -318,15 +318,7 @@
 		}
 #endif /* _UNICOS */
 
-#ifdef HAVE_CYGWIN
-		if (authenticated &&
-		    !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
-		    authctxt->pw)) {
-			packet_disconnect("Authentication rejected for uid %d.",
-			    authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
-			authenticated = 0;
-		}
-#else
+#ifndef HAVE_CYGWIN
 		/* Special handling for root */
 		if (authenticated && authctxt->pw->pw_uid == 0 &&
 		    !auth_root_allowed(meth->name)) {

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-jpake.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */
+/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -42,8 +42,8 @@
 #include "ssh2.h"
 #include "key.h"
 #include "hostfile.h"
+#include "auth.h"
 #include "buffer.h"
-#include "auth.h"
 #include "packet.h"
 #include "dispatch.h"
 #include "log.h"
@@ -55,6 +55,7 @@
 #endif
 #include "monitor_wrap.h"
 
+#include "schnorr.h"
 #include "jpake.h"
 
 /*
@@ -359,7 +360,7 @@
 }
 
 /*
- * Being authentication attempt.
+ * Begin authentication attempt.
  * Note, sets authctxt->postponed while in subprotocol
  */
 static int

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-kbdint.c#3 (text+ko) ====

@@ -58,10 +58,6 @@
 
 	xfree(devs);
 	xfree(lang);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-none.c#3 (text+ko) ====

@@ -61,10 +61,6 @@
 {
 	none_enabled = 0;
 	packet_check_eom();
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		return (0);
-#endif
 	if (options.password_authentication)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-passwd.c#2 (text+ko) ====

@@ -68,10 +68,6 @@
 		logit("password change not supported");
 	else if (PRIVSEP(auth_password(authctxt, password)) == 1)
 		authenticated = 1;
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	memset(password, 0, len);
 	xfree(password);
 	return authenticated;

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#3 (text+ko) ====

@@ -170,10 +170,6 @@
 		key_free(key);
 	xfree(pkalg);
 	xfree(pkblob);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,8 +36,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "atomicio.h"
 #include "xmalloc.h"
-#include "atomicio.h"
 #include "ssh2.h"
 #include "packet.h"
 #include "log.h"

==== //depot/projects/scottl-camlock/src/crypto/openssh/canohost.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland

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

From owner-p4-projects@FreeBSD.ORG  Tue Oct  6 17:18:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 479281065694; Tue,  6 Oct 2009 17:18:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C562106568F
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 17:18:55 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EECDD8FC15
	for <perforce@freebsd.org>; Tue,  6 Oct 2009 17:18:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n96HIshG009565
	for <perforce@freebsd.org>; Tue, 6 Oct 2009 17:18:54 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n96HIsq4009563
	for perforce@freebsd.org; Tue, 6 Oct 2009 17:18:54 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 6 Oct 2009 17:18:54 GMT
Message-Id: <200910061718.n96HIsq4009563@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169271 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 17:18:55 -0000

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

Change 169271 by rwatson@rwatson_cinnamon on 2009/10/06 17:18:32

	libcapabilitym no longer required; we now use the same library
	both inside and outside of sandboxes.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#9 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#9 (text+ko) ====

@@ -31,7 +31,6 @@
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
 LIBCAPABILITY?=	${DESTDIR}${LIBDIR}/libcapability.a
-LIBCAPABILITYM?=	${DESTDIR}${LIBDIR}/libcapabilitym.a
 LIBCOM_ERR?=	${DESTDIR}${LIBDIR}/libcom_err.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 05:25:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 37D9E1065679; Wed,  7 Oct 2009 05:25:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4F2D1065670
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 05:25:08 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D43048FC18
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 05:25:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n975P8un008843
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 05:25:08 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n975P82g008841
	for perforce@freebsd.org; Wed, 7 Oct 2009 05:25:08 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 7 Oct 2009 05:25:08 GMT
Message-Id: <200910070525.n975P82g008841@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169283 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 05:25:09 -0000

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

Change 169283 by mav@mav_mavbook on 2009/10/07 05:25:04

	Now 48bit commands should also be mentioned here.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#10 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#10 (text+ko) ====

@@ -355,7 +355,9 @@
 
     /* only DMA R/W goes through the EMDA machine */
     if (request->u.ata.command != ATA_READ_DMA &&
-	request->u.ata.command != ATA_WRITE_DMA) {
+	request->u.ata.command != ATA_WRITE_DMA &&
+	request->u.ata.command != ATA_READ_DMA48 &&
+	request->u.ata.command != ATA_WRITE_DMA48) {
 
 	/* disable the EDMA machinery */
 	if (ATA_INL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch)) & 0x00000001)

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 08:46:49 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 139DB10656A3; Wed,  7 Oct 2009 08:46:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C96451065697
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 08:46:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B592E8FC24
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 08:46:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n978km5s026348
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 08:46:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n978km9Q026346
	for perforce@freebsd.org; Wed, 7 Oct 2009 08:46:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 08:46:48 GMT
Message-Id: <200910070846.n978km9Q026346@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169285 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 08:46:49 -0000

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

Change 169285 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 08:46:43

	Integrate TrustedBSD capabilities -- including loop-back of
	pread(2) change for rtld, basename_r(3).

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/sh.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/include/libgen.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/execution/unknown1.0#1 branch

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#9 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -713,12 +713,7 @@
 				do_clearcmdentry = 1;
 			}
 
-		find_command(argv[0], &cmdentry, 1, path);
-		if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
-			exitstatus = 127;
-			flushout(&errout);
-			return;
-		}
+		find_command(argv[0], &cmdentry, 0, path);
 		/* implement the bltin builtin here */
 		if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
 			for (;;) {
@@ -740,7 +735,7 @@
 
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd
-	 || (cmdentry.cmdtype == CMDNORMAL
+	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
 	    && ((flags & EV_EXIT) == 0 || have_traps()))
 	 || ((flags & EV_BACKCMD) != 0
 	    && (cmdentry.cmdtype != CMDBUILTIN

==== //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -429,6 +429,7 @@
 			outfmt(out2, "%s: %s\n", name, strerror(e));
 	}
 	entry->cmdtype = CMDUNKNOWN;
+	entry->u.index = 0;
 	return;
 
 success:

==== //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/sh.c#4 (text+ko) ====

@@ -1291,6 +1291,8 @@
     /*
      * Mop-up.
      */
+    /* Take care of these (especially HUP) here instead of inside flush. */
+    handle_pending_signals();
     if (intty) {
 	if (loginsh) {
 	    xprintf("logout\n");

==== //depot/projects/trustedbsd/capabilities/src/include/libgen.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
+/*	$FreeBSD: src/include/libgen.h,v 1.3 2009/10/06 14:05:57 rwatson Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#12 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $
  */
 
 FBSD_1.0 {
@@ -370,6 +370,7 @@
 };
 
 FBSD_1.2 {
+	basename_r;
 	getpagesizes;
 };
 

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.3#3 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.9 2009/10/06 14:05:57 rwatson Exp $
 .\"
-.Dd October 12, 2006
+.Dd October 6, 2009
 .Dt BASENAME 3
 .Os
 .Sh NAME

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.8 2009/10/06 14:05:57 rwatson Exp $");
 
 #include <errno.h>
 #include <libgen.h>

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#7 (text+ko) ====

@@ -22,7 +22,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/map_object.c,v 1.22 2009/07/17 19:32:04 kib Exp $
+ * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.23 2009/10/06 17:14:39 rwatson Exp $
  */
 
 #include <sys/param.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.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/sys/amd64/include/atomic.h,v 1.46 2008/11/22 05:55:56 kmacy Exp $
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
@@ -73,10 +73,13 @@
  */
 #if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM)
 #define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)			\
-void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
+void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v);	\
+void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
 
 int	atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src);
 int	atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src);
+int	atomic_cmpset_barr_int(volatile u_int *dst, u_int exp, u_int src);
+int	atomic_cmpset_barr_long(volatile u_long *dst, u_long exp, u_long src);
 u_int	atomic_fetchadd_int(volatile u_int *p, u_int v);
 u_long	atomic_fetchadd_long(volatile u_long *p, u_long v);
 
@@ -97,8 +100,9 @@
 #endif
 
 /*
- * The assembly is volatilized to demark potential before-and-after side
- * effects if an interrupt or SMP collision were to occur.
+ * The assembly is volatilized to avoid code chunk removal by the compiler.
+ * GCC aggressively reorders operations and memory clobbering is necessary
+ * in order to avoid that for memory barriers.
  */
 #define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)		\
 static __inline void					\
@@ -108,6 +112,15 @@
 	: "=m" (*p)					\
 	: CONS (V), "m" (*p));				\
 }							\
+							\
+static __inline void					\
+atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
+{							\
+	__asm __volatile(MPLOCKED OP			\
+	: "=m" (*p)					\
+	: CONS (V), "m" (*p)				\
+	: "memory");					\
+}							\
 struct __hack
 
 /*
@@ -160,6 +173,9 @@
 	return (res);
 }
 
+#define	atomic_cmpset_barr_int	atomic_cmpset_int
+#define	atomic_cmpset_barr_long	atomic_cmpset_long
+
 /*
  * Atomically add the value of v to the integer pointed to by p and return
  * the previous value of *p.
@@ -205,18 +221,23 @@
  * PentiumPro or higher, reads may pass writes, so for that case we have
  * to use a serializing instruction (i.e. with LOCK) to do the load in
  * SMP kernels.  For UP kernels, however, the cache of the single processor
- * is always consistent, so we don't need any memory barriers.
+ * is always consistent, so we only need to take care of compiler.
  */
 #define	ATOMIC_STORE_LOAD(TYPE, LOP, SOP)		\
 static __inline u_##TYPE				\
 atomic_load_acq_##TYPE(volatile u_##TYPE *p)		\
 {							\
-	return (*p);					\
+	u_##TYPE tmp;					\
+							\
+	tmp = *p;					\
+	__asm __volatile ("" : : : "memory");		\
+	return (tmp);					\
 }							\
 							\
 static __inline void					\
 atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
 {							\
+	__asm __volatile ("" : : : "memory");		\
 	*p = v;						\
 }							\
 struct __hack
@@ -247,7 +268,8 @@
 	__asm __volatile(SOP				\
 	: "=m" (*p),			/* 0 */		\
 	  "+r" (v)			/* 1 */		\
-	: "m" (*p));			/* 2 */		\
+	: "m" (*p)			/* 2 */		\
+	: "memory");					\
 }							\
 struct __hack
 
@@ -327,46 +349,45 @@
 
 #endif /* __GNUCLIKE_ASM */
 
-/* Acquire and release variants are identical to the normal ones. */
-#define	atomic_set_acq_char		atomic_set_char
-#define	atomic_set_rel_char		atomic_set_char
-#define	atomic_clear_acq_char		atomic_clear_char
-#define	atomic_clear_rel_char		atomic_clear_char
-#define	atomic_add_acq_char		atomic_add_char
-#define	atomic_add_rel_char		atomic_add_char
-#define	atomic_subtract_acq_char	atomic_subtract_char
-#define	atomic_subtract_rel_char	atomic_subtract_char
+#define	atomic_set_acq_char		atomic_set_barr_char
+#define	atomic_set_rel_char		atomic_set_barr_char
+#define	atomic_clear_acq_char		atomic_clear_barr_char
+#define	atomic_clear_rel_char		atomic_clear_barr_char
+#define	atomic_add_acq_char		atomic_add_barr_char
+#define	atomic_add_rel_char		atomic_add_barr_char
+#define	atomic_subtract_acq_char	atomic_subtract_barr_char
+#define	atomic_subtract_rel_char	atomic_subtract_barr_char
 
-#define	atomic_set_acq_short		atomic_set_short
-#define	atomic_set_rel_short		atomic_set_short
-#define	atomic_clear_acq_short		atomic_clear_short
-#define	atomic_clear_rel_short		atomic_clear_short
-#define	atomic_add_acq_short		atomic_add_short
-#define	atomic_add_rel_short		atomic_add_short
-#define	atomic_subtract_acq_short	atomic_subtract_short
-#define	atomic_subtract_rel_short	atomic_subtract_short
+#define	atomic_set_acq_short		atomic_set_barr_short
+#define	atomic_set_rel_short		atomic_set_barr_short
+#define	atomic_clear_acq_short		atomic_clear_barr_short
+#define	atomic_clear_rel_short		atomic_clear_barr_short
+#define	atomic_add_acq_short		atomic_add_barr_short
+#define	atomic_add_rel_short		atomic_add_barr_short
+#define	atomic_subtract_acq_short	atomic_subtract_barr_short
+#define	atomic_subtract_rel_short	atomic_subtract_barr_short
 
-#define	atomic_set_acq_int		atomic_set_int
-#define	atomic_set_rel_int		atomic_set_int
-#define	atomic_clear_acq_int		atomic_clear_int
-#define	atomic_clear_rel_int		atomic_clear_int
-#define	atomic_add_acq_int		atomic_add_int
-#define	atomic_add_rel_int		atomic_add_int
-#define	atomic_subtract_acq_int		atomic_subtract_int
-#define	atomic_subtract_rel_int		atomic_subtract_int
-#define	atomic_cmpset_acq_int		atomic_cmpset_int
-#define	atomic_cmpset_rel_int		atomic_cmpset_int
+#define	atomic_set_acq_int		atomic_set_barr_int
+#define	atomic_set_rel_int		atomic_set_barr_int
+#define	atomic_clear_acq_int		atomic_clear_barr_int
+#define	atomic_clear_rel_int		atomic_clear_barr_int
+#define	atomic_add_acq_int		atomic_add_barr_int
+#define	atomic_add_rel_int		atomic_add_barr_int
+#define	atomic_subtract_acq_int		atomic_subtract_barr_int
+#define	atomic_subtract_rel_int		atomic_subtract_barr_int
+#define	atomic_cmpset_acq_int		atomic_cmpset_barr_int
+#define	atomic_cmpset_rel_int		atomic_cmpset_barr_int
 
-#define	atomic_set_acq_long		atomic_set_long
-#define	atomic_set_rel_long		atomic_set_long
-#define	atomic_clear_acq_long		atomic_clear_long
-#define	atomic_clear_rel_long		atomic_clear_long
-#define	atomic_add_acq_long		atomic_add_long
-#define	atomic_add_rel_long		atomic_add_long
-#define	atomic_subtract_acq_long	atomic_subtract_long
-#define	atomic_subtract_rel_long	atomic_subtract_long
-#define	atomic_cmpset_acq_long		atomic_cmpset_long
-#define	atomic_cmpset_rel_long		atomic_cmpset_long
+#define	atomic_set_acq_long		atomic_set_barr_long
+#define	atomic_set_rel_long		atomic_set_barr_long
+#define	atomic_clear_acq_long		atomic_clear_barr_long
+#define	atomic_clear_rel_long		atomic_clear_barr_long
+#define	atomic_add_acq_long		atomic_add_barr_long
+#define	atomic_add_rel_long		atomic_add_barr_long
+#define	atomic_subtract_acq_long	atomic_subtract_barr_long
+#define	atomic_subtract_rel_long	atomic_subtract_barr_long
+#define	atomic_cmpset_acq_long		atomic_cmpset_barr_long
+#define	atomic_cmpset_rel_long		atomic_cmpset_barr_long
 
 /* Operations on 8-bit bytes. */
 #define	atomic_set_8		atomic_set_char

==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 (text+ko) ====

@@ -1821,6 +1821,12 @@
 #endif
 
 #ifdef _KERNEL
+	if (needfree)
+		return (1);
+	if (arc_size > arc_c_max)
+		return (1);
+	if (arc_size <= arc_c_min)
+		return (0);
 
 	/*
 	 * If pages are needed or we're within 2048 pages 
@@ -1829,9 +1835,6 @@
 	if (vm_pages_needed || (vm_paging_target() > -2048))
 		return (1);
 
-	if (needfree)
-		return (1);
-
 #if 0
 	/*
 	 * take 'desfree' extra pages, so we reclaim sooner, rather than later

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.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/sys/i386/include/atomic.h,v 1.51 2008/12/06 21:33:44 kib Exp $
+ * $FreeBSD: src/sys/i386/include/atomic.h,v 1.52 2009/10/06 13:45:49 attilio Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
@@ -73,9 +73,11 @@
  */
 #if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM)
 #define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)			\
-void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
+void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v);	\
+void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
 
 int	atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src);
+int	atomic_cmpset_barr_int(volatile u_int *dst, u_int exp, u_int src);
 u_int	atomic_fetchadd_int(volatile u_int *p, u_int v);
 
 #define	ATOMIC_STORE_LOAD(TYPE, LOP, SOP)			\
@@ -95,8 +97,9 @@
 #endif
 
 /*
- * The assembly is volatilized to demark potential before-and-after side
- * effects if an interrupt or SMP collision were to occur.
+ * The assembly is volatilized to avoid code chunk removal by the compiler.
+ * GCC aggressively reorders operations and memory clobbering is necessary
+ * in order to avoid that for memory barriers.
  */
 #define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)		\
 static __inline void					\
@@ -106,6 +109,15 @@
 	: "=m" (*p)					\
 	: CONS (V), "m" (*p));				\
 }							\
+							\
+static __inline void					\
+atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
+{							\
+	__asm __volatile(MPLOCKED OP			\
+	: "=m" (*p)					\
+	: CONS (V), "m" (*p)				\
+	: "memory");					\
+}							\
 struct __hack
 
 /*
@@ -168,6 +180,8 @@
 
 #endif /* CPU_DISABLE_CMPXCHG */
 
+#define	atomic_cmpset_barr_int		atomic_cmpset_int
+
 /*
  * Atomically add the value of v to the integer pointed to by p and return
  * the previous value of *p.
@@ -194,18 +208,23 @@
  * PentiumPro or higher, reads may pass writes, so for that case we have
  * to use a serializing instruction (i.e. with LOCK) to do the load in
  * SMP kernels.  For UP kernels, however, the cache of the single processor
- * is always consistent, so we don't need any memory barriers.
+ * is always consistent, so we only need to take care of compiler.
  */
 #define	ATOMIC_STORE_LOAD(TYPE, LOP, SOP)		\
 static __inline u_##TYPE				\
 atomic_load_acq_##TYPE(volatile u_##TYPE *p)		\
 {							\
-	return (*p);					\
+	u_##TYPE tmp;					\
+							\
+	tmp = *p;					\
+	__asm __volatile("" : : : "memory");		\
+	return (tmp);					\
 }							\
 							\
 static __inline void					\
 atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
 {							\
+	__asm __volatile("" : : : "memory");		\
 	*p = v;						\
 }							\
 struct __hack
@@ -236,7 +255,8 @@
 	__asm __volatile(SOP				\
 	: "=m" (*p),			/* 0 */		\
 	  "+r" (v)			/* 1 */		\
-	: "m" (*p));			/* 2 */		\
+	: "m" (*p)			/* 2 */		\
+	: "memory");					\
 }							\
 struct __hack
 
@@ -282,6 +302,14 @@
 	    (u_int)src));
 }
 
+static __inline int
+atomic_cmpset_barr_long(volatile u_long *dst, u_long exp, u_long src)
+{
+
+	return (atomic_cmpset_barr_int((volatile u_int *)dst, (u_int)exp,
+	    (u_int)src));
+}
+
 static __inline u_long
 atomic_fetchadd_long(volatile u_long *p, u_long v)
 {
@@ -331,46 +359,45 @@
 
 #endif /* __GNUCLIKE_ASM */
 
-/* Acquire and release variants are identical to the normal ones. */
-#define	atomic_set_acq_char		atomic_set_char
-#define	atomic_set_rel_char		atomic_set_char
-#define	atomic_clear_acq_char		atomic_clear_char
-#define	atomic_clear_rel_char		atomic_clear_char
-#define	atomic_add_acq_char		atomic_add_char
-#define	atomic_add_rel_char		atomic_add_char
-#define	atomic_subtract_acq_char	atomic_subtract_char
-#define	atomic_subtract_rel_char	atomic_subtract_char
+#define	atomic_set_acq_char		atomic_set_barr_char
+#define	atomic_set_rel_char		atomic_set_barr_char
+#define	atomic_clear_acq_char		atomic_clear_barr_char
+#define	atomic_clear_rel_char		atomic_clear_barr_char
+#define	atomic_add_acq_char		atomic_add_barr_char
+#define	atomic_add_rel_char		atomic_add_barr_char
+#define	atomic_subtract_acq_char	atomic_subtract_barr_char
+#define	atomic_subtract_rel_char	atomic_subtract_barr_char
 
-#define	atomic_set_acq_short		atomic_set_short
-#define	atomic_set_rel_short		atomic_set_short
-#define	atomic_clear_acq_short		atomic_clear_short
-#define	atomic_clear_rel_short		atomic_clear_short
-#define	atomic_add_acq_short		atomic_add_short
-#define	atomic_add_rel_short		atomic_add_short
-#define	atomic_subtract_acq_short	atomic_subtract_short
-#define	atomic_subtract_rel_short	atomic_subtract_short
+#define	atomic_set_acq_short		atomic_set_barr_short
+#define	atomic_set_rel_short		atomic_set_barr_short
+#define	atomic_clear_acq_short		atomic_clear_barr_short
+#define	atomic_clear_rel_short		atomic_clear_barr_short
+#define	atomic_add_acq_short		atomic_add_barr_short
+#define	atomic_add_rel_short		atomic_add_barr_short
+#define	atomic_subtract_acq_short	atomic_subtract_barr_short
+#define	atomic_subtract_rel_short	atomic_subtract_barr_short
 
-#define	atomic_set_acq_int		atomic_set_int
-#define	atomic_set_rel_int		atomic_set_int
-#define	atomic_clear_acq_int		atomic_clear_int
-#define	atomic_clear_rel_int		atomic_clear_int
-#define	atomic_add_acq_int		atomic_add_int
-#define	atomic_add_rel_int		atomic_add_int
-#define	atomic_subtract_acq_int		atomic_subtract_int
-#define	atomic_subtract_rel_int		atomic_subtract_int
-#define	atomic_cmpset_acq_int		atomic_cmpset_int
-#define	atomic_cmpset_rel_int		atomic_cmpset_int
+#define	atomic_set_acq_int		atomic_set_barr_int
+#define	atomic_set_rel_int		atomic_set_barr_int
+#define	atomic_clear_acq_int		atomic_clear_barr_int
+#define	atomic_clear_rel_int		atomic_clear_barr_int
+#define	atomic_add_acq_int		atomic_add_barr_int
+#define	atomic_add_rel_int		atomic_add_barr_int
+#define	atomic_subtract_acq_int		atomic_subtract_barr_int
+#define	atomic_subtract_rel_int		atomic_subtract_barr_int
+#define	atomic_cmpset_acq_int		atomic_cmpset_barr_int
+#define	atomic_cmpset_rel_int		atomic_cmpset_barr_int
 
-#define	atomic_set_acq_long		atomic_set_long
-#define	atomic_set_rel_long		atomic_set_long
-#define	atomic_clear_acq_long		atomic_clear_long
-#define	atomic_clear_rel_long		atomic_clear_long
-#define	atomic_add_acq_long		atomic_add_long
-#define	atomic_add_rel_long		atomic_add_long
-#define	atomic_subtract_acq_long	atomic_subtract_long
-#define	atomic_subtract_rel_long	atomic_subtract_long
-#define	atomic_cmpset_acq_long		atomic_cmpset_long
-#define	atomic_cmpset_rel_long		atomic_cmpset_long
+#define	atomic_set_acq_long		atomic_set_barr_long
+#define	atomic_set_rel_long		atomic_set_barr_long
+#define	atomic_clear_acq_long		atomic_clear_barr_long
+#define	atomic_clear_rel_long		atomic_clear_barr_long
+#define	atomic_add_acq_long		atomic_add_barr_long
+#define	atomic_add_rel_long		atomic_add_barr_long
+#define	atomic_subtract_acq_long	atomic_subtract_barr_long
+#define	atomic_subtract_rel_long	atomic_subtract_barr_long
+#define	atomic_cmpset_acq_long		atomic_cmpset_barr_long
+#define	atomic_cmpset_rel_long		atomic_cmpset_barr_long
 
 /* Operations on 8-bit bytes. */
 #define	atomic_set_8		atomic_set_char

==== //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#13 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.412 2009/10/05 22:24:13 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.413 2009/10/06 20:35:41 rwatson Exp $");
 
 #include "opt_ipfw.h"		/* for ipfw_fwd	*/
 #include "opt_inet.h"
@@ -180,26 +180,6 @@
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, read_locking, CTLFLAG_RW,
     &tcp_read_locking, 0, "Enable read locking strategy");
 
-int	tcp_rlock_atfirst;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, rlock_atfirst, CTLFLAG_RD,
-    &tcp_rlock_atfirst, 0, "");
-
-int	tcp_wlock_atfirst;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_wlock_atfirst, CTLFLAG_RD,
-    &tcp_wlock_atfirst, 0, "");
-
-int	tcp_wlock_upgraded;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_upgraded, CTLFLAG_RD,
-    &tcp_wlock_upgraded, 0, "");
-
-int	tcp_wlock_relocked;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_relocked, CTLFLAG_RD,
-    &tcp_wlock_relocked, 0, "");
-
-int	tcp_wlock_looped;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_looped, CTLFLAG_RD,
-    &tcp_wlock_looped, 0, "");
-
 VNET_DEFINE(struct inpcbhead, tcb);
 VNET_DEFINE(struct inpcbinfo, tcbinfo);
 #define	tcb6	tcb  /* for KAME src sync over BSD*'s */
@@ -505,11 +485,9 @@
 	    tcp_read_locking == 0) {
 		INP_INFO_WLOCK(&V_tcbinfo);
 		ti_locked = TI_WLOCKED;
-		tcp_wlock_atfirst++;
 	} else {
 		INP_INFO_RLOCK(&V_tcbinfo);
 		ti_locked = TI_RLOCKED;
-		tcp_rlock_atfirst++;
 	}
 
 findpcb:
@@ -662,15 +640,11 @@
 				ti_locked = TI_WLOCKED;
 				INP_WLOCK(inp);
 				if (in_pcbrele(inp)) {
-					tcp_wlock_looped++;
 					inp = NULL;
 					goto findpcb;
 				}
-				tcp_wlock_relocked++;
-			} else {
+			} else
 				ti_locked = TI_WLOCKED;
-				tcp_wlock_upgraded++;
-			}
 		}
 		INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 
@@ -717,16 +691,12 @@
 				ti_locked = TI_WLOCKED;
 				INP_WLOCK(inp);
 				if (in_pcbrele(inp)) {
-					tcp_wlock_looped++;
 					inp = NULL;
 					goto findpcb;
 				}
-				tcp_wlock_relocked++;
 				goto relocked;
-			} else {
+			} else
 				ti_locked = TI_WLOCKED;
-				tcp_wlock_upgraded++;
-			}
 		}
 		INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 	}

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 14:10:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D868106568B; Wed,  7 Oct 2009 14:10:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A02141065676
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:10:42 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CDA38FC26
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:10:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97EAgU1076245
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 14:10:42 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97EAgYC076243
	for perforce@freebsd.org; Wed, 7 Oct 2009 14:10:42 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 14:10:42 GMT
Message-Id: <200910071410.n97EAgYC076243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169291 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:10:43 -0000

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

Change 169291 by rwatson@rwatson_cinnamon on 2009/10/07 14:10:37

	Integrate TrustedBSD capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tcp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcp.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/cdcontrol/cdcontrol.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ====

@@ -124,6 +124,7 @@
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
+        { TCPOPT_UTO, "uto" },
         { 0, NULL }
 };
 
@@ -613,6 +614,17 @@
                                  */
                                 break;
 
+                        case TCPOPT_UTO:
+                                datalen = 2;
+                                LENCHECK(datalen);
+                                uint utoval = EXTRACT_16BITS(cp);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
+                                else
+                                        utoval >>= 1;
+                                (void)printf(" %u", utoval);
+                                break;
+
                         default:
                                 datalen = len - 2;
                                 for (i = 0; i < datalen; ++i) {

==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcp.h#3 (text+ko) ====

@@ -83,6 +83,8 @@
 #define    TCPOLEN_SIGNATURE		18
 #define TCP_SIGLEN 16			/* length of an option 19 digest */
 #define TCPOPT_AUTH             20      /* Enhanced AUTH option */
+#define	TCPOPT_UTO		28	/* tcp user timeout (rfc5482) */
+#define	   TCPOLEN_UTO			4
 
 #define TCPOPT_TSTAMP_HDR	\
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)

==== //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#4 (text+ko) ====

@@ -29,14 +29,14 @@
 .\" 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/bge.4,v 1.35 2009/05/19 17:17:53 joel Exp $
+.\" $FreeBSD: src/share/man/man4/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $
 .\"
-.Dd May 19, 2009
+.Dd Oct 7, 2009
 .Dt BGE 4
 .Os
 .Sh NAME
 .Nm bge
-.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver"
+.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -56,8 +56,8 @@
 The
 .Nm
 driver provides support for various NICs based on the Broadcom BCM570x,
-5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet
-controller chips.
+5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families
+of Gigabit Ethernet controller chips.
 .Pp
 All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5
 copper cable, except for the SysKonnect SK-9D41 which supports only

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.48 2009/10/06 23:48:28 attilio Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
@@ -32,9 +32,9 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#define mb()	__asm__ __volatile__ ("mfence;": : :"memory")
-#define wmb()	__asm__ __volatile__ ("sfence;": : :"memory")
-#define rmb()	__asm__ __volatile__ ("lfence;": : :"memory")
+#define	mb()	__asm __volatile("mfence;" : : : "memory")
+#define	wmb()	__asm __volatile("sfence;" : : : "memory")
+#define	rmb()	__asm __volatile("lfence;" : : : "memory")
 
 /*
  * Various simple operations on memory, each of which is atomic in the
@@ -131,50 +131,33 @@
  * Returns 0 on failure, non-zero on success
  */
 
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src)
-{
-	u_char res;
+#define	DEFINE_CMPSET_GEN(NAME, TYPE, OP)		\
+static __inline int					\
+atomic_cmpset_##NAME(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\
+{							\
+	u_char res;					\
+							\
+	__asm __volatile(				\
+	"	" MPLOCKED "		"		\
+	"	" OP "	%2,%1 ;		"		\
+	"       sete	%0 ;		"		\
+	"1:				"		\
+	"# atomic_cmpset_##NAME"			\
+	: "=a" (res),			/* 0 */		\
+	  "=m" (*dst)			/* 1 */		\
+	: "r" (src),			/* 2 */		\
+	  "a" (exp),			/* 3 */		\
+	  "m" (*dst)			/* 4 */		\
+	: "memory");					\
+							\
+	return (res);					\
+}							\
+struct __hack
 
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgl %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# atomic_cmpset_int"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
-
-	return (res);
-}
-
-static __inline int
-atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgq %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# atomic_cmpset_long"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
-
-	return (res);
-}
-
-#define	atomic_cmpset_barr_int	atomic_cmpset_int
-#define	atomic_cmpset_barr_long	atomic_cmpset_long
+DEFINE_CMPSET_GEN(int, int, "cmpxchgl");
+DEFINE_CMPSET_GEN(long, long, "cmpxchgq");
+DEFINE_CMPSET_GEN(barr_int, int, "cmpxchgl");
+DEFINE_CMPSET_GEN(barr_long, long, "cmpxchgq");
 
 /*
  * Atomically add the value of v to the integer pointed to by p and return

==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 (text+ko) ====

@@ -2538,6 +2538,7 @@
 	vattr_t		oldva;
 	uint_t		mask = vap->va_mask;
 	uint_t		saved_mask;
+	uint64_t	saved_mode;
 	int		trim_mask = 0;
 	uint64_t	new_mode;
 	znode_t		*attrzp;
@@ -2766,6 +2767,13 @@
 		if (trim_mask) {
 			saved_mask = vap->va_mask;
 			vap->va_mask &= ~trim_mask;
+			if (trim_mask & AT_MODE) {
+				/*
+				 * Save the mode, as secpolicy_vnode_setattr()
+				 * will overwrite it with ova.va_mode.
+				 */
+				saved_mode = vap->va_mode;
+			}
 		}
 		err = secpolicy_vnode_setattr(cr, vp, vap, &oldva, flags,
 		    (int (*)(void *, int, cred_t *))zfs_zaccess_unix, zp);
@@ -2774,8 +2782,16 @@
 			return (err);
 		}
 
-		if (trim_mask)
+		if (trim_mask) {
 			vap->va_mask |= saved_mask;
+			if (trim_mask & AT_MODE) {
+				/*
+				 * Recover the mode after
+				 * secpolicy_vnode_setattr().
+				 */
+				vap->va_mode = saved_mode;
+			}
+		}
 	}
 
 	/*

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#8 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.227 2009/08/18 21:07:39 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -170,6 +170,7 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5720 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5721 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5722 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5723 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5750 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5750M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5751 },
@@ -184,12 +185,21 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5754M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761E },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761S },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761SE },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5764 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5780 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5780S },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5781 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5782 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5784 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5785F },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5785G },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5786 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787F },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5788 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5789 },
@@ -198,11 +208,19 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5903M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57760 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57780 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57788 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57790 },
 
 	{ SK_VENDORID,		SK_DEVICEID_ALTIMA },
 
 	{ TC_VENDORID,		TC_DEVICEID_3C996 },
 
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PW008GE4 },
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PW008GE5 },
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PP250450 },
+
 	{ 0, 0 }
 };
 
@@ -216,6 +234,7 @@
 	{ BCOM_VENDORID,	"Broadcom" },
 	{ SK_VENDORID,		"SysKonnect" },
 	{ TC_VENDORID,		"3Com" },
+	{ FJTSU_VENDORID,	"Fujitsu" },
 
 	{ 0, NULL }
 };
@@ -271,12 +290,18 @@
 	{ BGE_CHIPID_BCM5755_A1,	"BCM5755 A1" },
 	{ BGE_CHIPID_BCM5755_A2,	"BCM5755 A2" },
 	{ BGE_CHIPID_BCM5722_A0,	"BCM5722 A0" },
+	{ BGE_CHIPID_BCM5761_A0,	"BCM5761 A0" },
+	{ BGE_CHIPID_BCM5761_A1,	"BCM5761 A1" },
+	{ BGE_CHIPID_BCM5784_A0,	"BCM5784 A0" },
+	{ BGE_CHIPID_BCM5784_A1,	"BCM5784 A1" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_CHIPID_BCM5787_A0,	"BCM5754/5787 A0" }, 
 	{ BGE_CHIPID_BCM5787_A1,	"BCM5754/5787 A1" },
 	{ BGE_CHIPID_BCM5787_A2,	"BCM5754/5787 A2" },
 	{ BGE_CHIPID_BCM5906_A1,	"BCM5906 A1" },
 	{ BGE_CHIPID_BCM5906_A2,	"BCM5906 A2" },
+	{ BGE_CHIPID_BCM57780_A0,	"BCM57780 A0" },
+	{ BGE_CHIPID_BCM57780_A1,	"BCM57780 A1" },
 
 	{ 0, NULL }
 };
@@ -297,9 +322,13 @@
 	{ BGE_ASICREV_BCM5780,		"unknown BCM5780" },
 	{ BGE_ASICREV_BCM5714,		"unknown BCM5714" },
 	{ BGE_ASICREV_BCM5755,		"unknown BCM5755" },
+	{ BGE_ASICREV_BCM5761,		"unknown BCM5761" },
+	{ BGE_ASICREV_BCM5784,		"unknown BCM5784" },
+	{ BGE_ASICREV_BCM5785,		"unknown BCM5785" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_ASICREV_BCM5787,		"unknown BCM5754/5787" },
 	{ BGE_ASICREV_BCM5906,		"unknown BCM5906" },
+	{ BGE_ASICREV_BCM57780,		"unknown BCM57780" },
 
 	{ 0, NULL }
 };
@@ -309,6 +338,7 @@
 #define	BGE_IS_5705_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_5705_PLUS)
 #define	BGE_IS_5714_FAMILY(sc)		((sc)->bge_flags & BGE_FLAG_5714_FAMILY)
 #define	BGE_IS_575X_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_575X_PLUS)
+#define	BGE_IS_5755_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_5755_PLUS)
 
 const struct bge_revision * bge_lookup_rev(uint32_t);
 const struct bge_vendor * bge_lookup_vendor(uint16_t);
@@ -1758,8 +1788,7 @@
 	val = BGE_WDMAMODE_ENABLE | BGE_WDMAMODE_ALL_ATTNS;
 
 	/* Enable host coalescing bug fix. */
-	if (sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5787)
+	if (BGE_IS_5755_PLUS(sc))
 		val |= 1 << 29;
 
 	/* Turn on write DMA state machine */
@@ -1768,6 +1797,12 @@
 
 	/* Turn on read DMA state machine */
 	val = BGE_RDMAMODE_ENABLE | BGE_RDMAMODE_ALL_ATTNS;
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5784 ||
+	    sc->bge_asicrev == BGE_ASICREV_BCM5785 ||
+	    sc->bge_asicrev == BGE_ASICREV_BCM57780)
+		val |= BGE_RDMAMODE_BD_SBD_CRPT_ATTN |
+		    BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN |
+		    BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN;
 	if (sc->bge_flags & BGE_FLAG_PCIE)
 		val |= BGE_RDMAMODE_FIFO_LONG_BURST;
 	CSR_WRITE_4(sc, BGE_RDMA_MODE, val);
@@ -1790,7 +1825,10 @@
 	CSR_WRITE_4(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE);
 
 	/* Turn on send data completion state machine */
-	CSR_WRITE_4(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE);
+	val = BGE_SDCMODE_ENABLE;
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5761)
+		val |= BGE_SDCMODE_CDELAY;
+	CSR_WRITE_4(sc, BGE_SDC_MODE, val);
 
 	/* Turn on send data initiator state machine */
 	CSR_WRITE_4(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE);
@@ -1897,8 +1935,11 @@
 			const struct bge_vendor *v;
 			uint32_t id;
 
-			id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) &
-			    BGE_PCIMISCCTL_ASICREV;
+			id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >>
+			    BGE_PCIMISCCTL_ASICREV_SHIFT;
+			if (BGE_ASICREV(id) == BGE_ASICREV_USE_PRODID_REG)
+				id = pci_read_config(dev,
+				    BGE_PCI_PRODID_ASICREV, 4);
 			br = bge_lookup_rev(id);
 			v = bge_lookup_vendor(vid);
 			{
@@ -1915,8 +1956,8 @@
 					    br != NULL ? br->br_name :
 					    "NetXtreme Ethernet Controller");
 			}
-			snprintf(buf, 96, "%s, %sASIC rev. %#04x", model,
-			    br != NULL ? "" : "unknown ", id >> 16);
+			snprintf(buf, 96, "%s, %sASIC rev. %#08x", model,
+			    br != NULL ? "" : "unknown ", id);
 			device_set_desc_copy(dev, buf);
 			if (pci_get_subvendor(dev) == DELL_VENDORID)
 				sc->bge_flags |= BGE_FLAG_NO_3LED;
@@ -2411,8 +2452,11 @@
 
 	/* Save various chip information. */
 	sc->bge_chipid =
-	    pci_read_config(dev, BGE_PCI_MISC_CTL, 4) &
-	    BGE_PCIMISCCTL_ASICREV;
+	    pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >>
+	    BGE_PCIMISCCTL_ASICREV_SHIFT;
+	if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_USE_PRODID_REG)
+		sc->bge_chipid = pci_read_config(dev, BGE_PCI_PRODID_ASICREV,
+		    4);
 	sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid);
 	sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid);
 
@@ -2431,6 +2475,15 @@
 
 	/* Save chipset family. */
 	switch (sc->bge_asicrev) {
+	case BGE_ASICREV_BCM5755:
+	case BGE_ASICREV_BCM5761:
+	case BGE_ASICREV_BCM5784:
+	case BGE_ASICREV_BCM5785:
+	case BGE_ASICREV_BCM5787:
+	case BGE_ASICREV_BCM57780:
+		sc->bge_flags |= BGE_FLAG_5755_PLUS | BGE_FLAG_575X_PLUS |
+		    BGE_FLAG_5705_PLUS;
+		break;
 	case BGE_ASICREV_BCM5700:
 	case BGE_ASICREV_BCM5701:
 	case BGE_ASICREV_BCM5703:
@@ -2444,8 +2497,6 @@
 		/* FALLTHROUGH */
 	case BGE_ASICREV_BCM5750:
 	case BGE_ASICREV_BCM5752:
-	case BGE_ASICREV_BCM5755:
-	case BGE_ASICREV_BCM5787:
 	case BGE_ASICREV_BCM5906:
 		sc->bge_flags |= BGE_FLAG_575X_PLUS;
 		/* FALLTHROUGH */
@@ -2466,6 +2517,8 @@
 	if (BGE_IS_5705_PLUS(sc) &&
 	    !(sc->bge_flags & BGE_FLAG_ADJUST_TRIM)) {
 		if (sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
+		    sc->bge_asicrev == BGE_ASICREV_BCM5761 ||
+		    sc->bge_asicrev == BGE_ASICREV_BCM5784 ||
 		    sc->bge_asicrev == BGE_ASICREV_BCM5787) {
 			if (sc->bge_chipid != BGE_CHIPID_BCM5722_A0)
 				sc->bge_flags |= BGE_FLAG_JITTER_BUG;
@@ -2873,8 +2926,7 @@
 
 	/* Disable fastboot on controllers that support it. */
 	if (sc->bge_asicrev == BGE_ASICREV_BCM5752 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5787) {
+	    BGE_IS_5755_PLUS(sc)) {
 		if (bootverbose)
 			device_printf(sc->bge_dev, "Disabling fastboot\n");
 		CSR_WRITE_4(sc, BGE_FASTBOOT_PC, 0x0);
@@ -4689,6 +4741,8 @@
 		}
 
 		printf("Hardware Flags:\n");
+		if (BGE_IS_5755_PLUS(sc))
+			printf(" - 5755 Plus\n");
 		if (BGE_IS_575X_PLUS(sc))
 			printf(" - 575X Plus\n");
 		if (BGE_IS_5705_PLUS(sc))

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#5 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.83 2009/03/23 14:36:50 marius Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $
  */
 
 /*
@@ -218,6 +218,7 @@
 #define	BGE_PCI_UNDI_TX_BD_PRODIDX_LO	0xAC
 #define	BGE_PCI_ISR_MBX_HI		0xB0
 #define	BGE_PCI_ISR_MBX_LO		0xB4
+#define	BGE_PCI_PRODID_ASICREV		0xBC
 
 /* PCI Misc. Host control register */
 #define	BGE_PCIMISCCTL_CLEAR_INTA	0x00000001
@@ -229,6 +230,7 @@
 #define	BGE_PCIMISCCTL_REG_WORDSWAP	0x00000040
 #define	BGE_PCIMISCCTL_INDIRECT_ACCESS	0x00000080
 #define	BGE_PCIMISCCTL_ASICREV		0xFFFF0000
+#define	BGE_PCIMISCCTL_ASICREV_SHIFT	16
 
 #define	BGE_HIF_SWAP_OPTIONS	(BGE_PCIMISCCTL_ENDIAN_WORDSWAP)
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -245,66 +247,72 @@
 	(BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_CLEAR_INTA| \
 	 BGE_PCIMISCCTL_MASK_PCI_INTR|BGE_PCIMISCCTL_INDIRECT_ACCESS)
 
-#define	BGE_CHIPID_TIGON_I		0x40000000
-#define	BGE_CHIPID_TIGON_II		0x60000000
-#define	BGE_CHIPID_BCM5700_A0		0x70000000
-#define	BGE_CHIPID_BCM5700_A1		0x70010000
-#define	BGE_CHIPID_BCM5700_B0		0x71000000
-#define	BGE_CHIPID_BCM5700_B1		0x71010000
-#define	BGE_CHIPID_BCM5700_B2		0x71020000
-#define	BGE_CHIPID_BCM5700_B3		0x71030000
-#define	BGE_CHIPID_BCM5700_ALTIMA	0x71040000
-#define	BGE_CHIPID_BCM5700_C0		0x72000000
-#define	BGE_CHIPID_BCM5701_A0		0x00000000	/* grrrr */
-#define	BGE_CHIPID_BCM5701_B0		0x01000000
-#define	BGE_CHIPID_BCM5701_B2		0x01020000
-#define	BGE_CHIPID_BCM5701_B5		0x01050000
-#define	BGE_CHIPID_BCM5703_A0		0x10000000
-#define	BGE_CHIPID_BCM5703_A1		0x10010000
-#define	BGE_CHIPID_BCM5703_A2		0x10020000
-#define	BGE_CHIPID_BCM5703_A3		0x10030000
-#define	BGE_CHIPID_BCM5703_B0		0x11000000
-#define	BGE_CHIPID_BCM5704_A0		0x20000000
-#define	BGE_CHIPID_BCM5704_A1		0x20010000
-#define	BGE_CHIPID_BCM5704_A2		0x20020000
-#define	BGE_CHIPID_BCM5704_A3		0x20030000
-#define	BGE_CHIPID_BCM5704_B0		0x21000000
-#define	BGE_CHIPID_BCM5705_A0		0x30000000
-#define	BGE_CHIPID_BCM5705_A1		0x30010000
-#define	BGE_CHIPID_BCM5705_A2		0x30020000
-#define	BGE_CHIPID_BCM5705_A3		0x30030000
-#define	BGE_CHIPID_BCM5750_A0		0x40000000
-#define	BGE_CHIPID_BCM5750_A1		0x40010000
-#define	BGE_CHIPID_BCM5750_A3		0x40030000
-#define	BGE_CHIPID_BCM5750_B0		0x41000000
-#define	BGE_CHIPID_BCM5750_B1		0x41010000
-#define	BGE_CHIPID_BCM5750_C0		0x42000000
-#define	BGE_CHIPID_BCM5750_C1		0x42010000
-#define	BGE_CHIPID_BCM5750_C2		0x42020000
-#define	BGE_CHIPID_BCM5714_A0		0x50000000
-#define	BGE_CHIPID_BCM5752_A0		0x60000000
-#define	BGE_CHIPID_BCM5752_A1		0x60010000
-#define	BGE_CHIPID_BCM5752_A2		0x60020000
-#define	BGE_CHIPID_BCM5714_B0		0x80000000
-#define	BGE_CHIPID_BCM5714_B3		0x80030000
-#define	BGE_CHIPID_BCM5715_A0		0x90000000
-#define	BGE_CHIPID_BCM5715_A1		0x90010000
-#define	BGE_CHIPID_BCM5715_A3		0x90030000
-#define	BGE_CHIPID_BCM5755_A0		0xa0000000
-#define	BGE_CHIPID_BCM5755_A1		0xa0010000
-#define	BGE_CHIPID_BCM5755_A2		0xa0020000
-#define	BGE_CHIPID_BCM5722_A0		0xa2000000
-#define	BGE_CHIPID_BCM5754_A0		0xb0000000
-#define	BGE_CHIPID_BCM5754_A1		0xb0010000
-#define	BGE_CHIPID_BCM5754_A2		0xb0020000
-#define	BGE_CHIPID_BCM5787_A0		0xb0000000
-#define	BGE_CHIPID_BCM5787_A1		0xb0010000
-#define	BGE_CHIPID_BCM5787_A2		0xb0020000
-#define	BGE_CHIPID_BCM5906_A1		0xc0010000
-#define	BGE_CHIPID_BCM5906_A2		0xc0020000
+#define	BGE_CHIPID_TIGON_I		0x4000
+#define	BGE_CHIPID_TIGON_II		0x6000
+#define	BGE_CHIPID_BCM5700_A0		0x7000
+#define	BGE_CHIPID_BCM5700_A1		0x7001
+#define	BGE_CHIPID_BCM5700_B0		0x7100
+#define	BGE_CHIPID_BCM5700_B1		0x7101
+#define	BGE_CHIPID_BCM5700_B2		0x7102
+#define	BGE_CHIPID_BCM5700_B3		0x7103
+#define	BGE_CHIPID_BCM5700_ALTIMA	0x7104
+#define	BGE_CHIPID_BCM5700_C0		0x7200
+#define	BGE_CHIPID_BCM5701_A0		0x0000	/* grrrr */
+#define	BGE_CHIPID_BCM5701_B0		0x0100
+#define	BGE_CHIPID_BCM5701_B2		0x0102
+#define	BGE_CHIPID_BCM5701_B5		0x0105
+#define	BGE_CHIPID_BCM5703_A0		0x1000
+#define	BGE_CHIPID_BCM5703_A1		0x1001
+#define	BGE_CHIPID_BCM5703_A2		0x1002
+#define	BGE_CHIPID_BCM5703_A3		0x1003
+#define	BGE_CHIPID_BCM5703_B0		0x1100
+#define	BGE_CHIPID_BCM5704_A0		0x2000
+#define	BGE_CHIPID_BCM5704_A1		0x2001
+#define	BGE_CHIPID_BCM5704_A2		0x2002
+#define	BGE_CHIPID_BCM5704_A3		0x2003
+#define	BGE_CHIPID_BCM5704_B0		0x2100
+#define	BGE_CHIPID_BCM5705_A0		0x3000
+#define	BGE_CHIPID_BCM5705_A1		0x3001
+#define	BGE_CHIPID_BCM5705_A2		0x3002
+#define	BGE_CHIPID_BCM5705_A3		0x3003
+#define	BGE_CHIPID_BCM5750_A0		0x4000
+#define	BGE_CHIPID_BCM5750_A1		0x4001
+#define	BGE_CHIPID_BCM5750_A3		0x4000
+#define	BGE_CHIPID_BCM5750_B0		0x4100
+#define	BGE_CHIPID_BCM5750_B1		0x4101
+#define	BGE_CHIPID_BCM5750_C0		0x4200
+#define	BGE_CHIPID_BCM5750_C1		0x4201
+#define	BGE_CHIPID_BCM5750_C2		0x4202
+#define	BGE_CHIPID_BCM5714_A0		0x5000
+#define	BGE_CHIPID_BCM5752_A0		0x6000
+#define	BGE_CHIPID_BCM5752_A1		0x6001
+#define	BGE_CHIPID_BCM5752_A2		0x6002
+#define	BGE_CHIPID_BCM5714_B0		0x8000
+#define	BGE_CHIPID_BCM5714_B3		0x8003
+#define	BGE_CHIPID_BCM5715_A0		0x9000
+#define	BGE_CHIPID_BCM5715_A1		0x9001
+#define	BGE_CHIPID_BCM5715_A3		0x9003
+#define	BGE_CHIPID_BCM5755_A0		0xa000
+#define	BGE_CHIPID_BCM5755_A1		0xa001
+#define	BGE_CHIPID_BCM5755_A2		0xa002
+#define	BGE_CHIPID_BCM5722_A0		0xa200
+#define	BGE_CHIPID_BCM5754_A0		0xb000
+#define	BGE_CHIPID_BCM5754_A1		0xb001
+#define	BGE_CHIPID_BCM5754_A2		0xb002
+#define	BGE_CHIPID_BCM5761_A0		0x5761000
+#define	BGE_CHIPID_BCM5761_A1		0x5761100
+#define	BGE_CHIPID_BCM5784_A0		0x5784000
+#define	BGE_CHIPID_BCM5784_A1		0x5784100
+#define	BGE_CHIPID_BCM5787_A0		0xb000
+#define	BGE_CHIPID_BCM5787_A1		0xb001
+#define	BGE_CHIPID_BCM5787_A2		0xb002
+#define	BGE_CHIPID_BCM5906_A1		0xc001
+#define	BGE_CHIPID_BCM5906_A2		0xc002
+#define	BGE_CHIPID_BCM57780_A0		0x57780000
+#define	BGE_CHIPID_BCM57780_A1		0x57780001
 
 /* shorthand one */
-#define	BGE_ASICREV(x)			((x) >> 28)
+#define	BGE_ASICREV(x)			((x) >> 12)
 #define	BGE_ASICREV_BCM5701		0x00
 #define	BGE_ASICREV_BCM5703		0x01
 #define	BGE_ASICREV_BCM5704		0x02
@@ -319,9 +327,16 @@
 #define	BGE_ASICREV_BCM5754		0x0b
 #define	BGE_ASICREV_BCM5787		0x0b
 #define	BGE_ASICREV_BCM5906		0x0c
+/* Should consult BGE_PCI_PRODID_ASICREV for ChipID */
+#define	BGE_ASICREV_USE_PRODID_REG	0x0f
+/* BGE_PCI_PRODID_ASICREV ASIC rev. identifiers. */
+#define	BGE_ASICREV_BCM5761		0x5761
+#define	BGE_ASICREV_BCM5784		0x5784
+#define	BGE_ASICREV_BCM5785		0x5785
+#define	BGE_ASICREV_BCM57780		0x57780
 
 /* chip revisions */
-#define	BGE_CHIPREV(x)			((x) >> 24)
+#define	BGE_CHIPREV(x)			((x) >> 8)
 #define	BGE_CHIPREV_5700_AX		0x70
 #define	BGE_CHIPREV_5700_BX		0x71
 #define	BGE_CHIPREV_5700_CX		0x72
@@ -331,6 +346,9 @@
 #define	BGE_CHIPREV_5704_BX		0x21
 #define	BGE_CHIPREV_5750_AX		0x40
 #define	BGE_CHIPREV_5750_BX		0x41
+/* BGE_PCI_PRODID_ASICREV chip rev. identifiers. */
+#define	BGE_CHIPREV_5761_AX		0x57611
+#define	BGE_CHIPREV_5784_AX		0x57841
 
 /* PCI DMA Read/Write Control register */
 #define	BGE_PCIDMARWCTL_MINDMA		0x000000FF
@@ -861,6 +879,7 @@
 #define	BGE_SDCMODE_RESET		0x00000001
 #define	BGE_SDCMODE_ENABLE		0x00000002
 #define	BGE_SDCMODE_ATTN		0x00000004
+#define	BGE_SDCMODE_CDELAY		0x00000010
 
 /* Send Data completion status register */
 #define	BGE_SDCSTAT_ATTN		0x00000004
@@ -1378,6 +1397,9 @@
 #define	BGE_RDMAMODE_PCI_FIFOOREAD_ATTN	0x00000100
 #define	BGE_RDMAMODE_LOCWRITE_TOOBIG	0x00000200
 #define	BGE_RDMAMODE_ALL_ATTNS		0x000003FC
+#define	BGE_RDMAMODE_BD_SBD_CRPT_ATTN	0x00000800
+#define	BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN	0x00001000
+#define	BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN	0x00002000
 #define	BGE_RDMAMODE_FIFO_SIZE_128	0x00020000
 #define	BGE_RDMAMODE_FIFO_LONG_BURST	0x00030000
 
@@ -2101,6 +2123,7 @@
 #define	BCOM_DEVICEID_BCM5720		0x1658
 #define	BCOM_DEVICEID_BCM5721		0x1659
 #define	BCOM_DEVICEID_BCM5722		0x165A
+#define	BCOM_DEVICEID_BCM5723		0x165B
 #define	BCOM_DEVICEID_BCM5750		0x1676
 #define	BCOM_DEVICEID_BCM5750M		0x167C
 #define	BCOM_DEVICEID_BCM5751		0x1677
@@ -2115,13 +2138,22 @@
 #define	BCOM_DEVICEID_BCM5754M		0x1672
 #define	BCOM_DEVICEID_BCM5755		0x167B
 #define	BCOM_DEVICEID_BCM5755M		0x1673
+#define	BCOM_DEVICEID_BCM5761		0x1681
+#define	BCOM_DEVICEID_BCM5761E		0x1680
+#define	BCOM_DEVICEID_BCM5761S		0x1688
+#define	BCOM_DEVICEID_BCM5761SE		0x1689
+#define	BCOM_DEVICEID_BCM5764		0x1684
 #define	BCOM_DEVICEID_BCM5780		0x166A
 #define	BCOM_DEVICEID_BCM5780S		0x166B
 #define	BCOM_DEVICEID_BCM5781		0x16DD
 #define	BCOM_DEVICEID_BCM5782		0x1696
+#define	BCOM_DEVICEID_BCM5784		0x1698
+#define	BCOM_DEVICEID_BCM5785F		0x16a0
+#define	BCOM_DEVICEID_BCM5785G		0x1699
 #define	BCOM_DEVICEID_BCM5786		0x169A
 #define	BCOM_DEVICEID_BCM5787		0x169B
 #define	BCOM_DEVICEID_BCM5787M		0x1693
+#define	BCOM_DEVICEID_BCM5787F		0x167f
 #define	BCOM_DEVICEID_BCM5788		0x169C
 #define	BCOM_DEVICEID_BCM5789		0x169D
 #define	BCOM_DEVICEID_BCM5901		0x170D
@@ -2129,6 +2161,10 @@
 #define	BCOM_DEVICEID_BCM5903M		0x16FF
 #define	BCOM_DEVICEID_BCM5906		0x1712
 #define	BCOM_DEVICEID_BCM5906M		0x1713
+#define	BCOM_DEVICEID_BCM57760		0x1690
+#define	BCOM_DEVICEID_BCM57780		0x1692
+#define	BCOM_DEVICEID_BCM57788		0x1691
+#define	BCOM_DEVICEID_BCM57790		0x1694
 
 /*
  * Alteon AceNIC PCI vendor/device ID.
@@ -2179,6 +2215,14 @@
 #define	SUN_VENDORID			0x108e
 
 /*
+ * Fujitsu vendor/device IDs
+ */
+#define	FJTSU_VENDORID			0x10cf
+#define	FJTSU_DEVICEID_PW008GE5		0x11a1
+#define	FJTSU_DEVICEID_PW008GE4		0x11a2
+#define	FJTSU_DEVICEID_PP250450		0x11cc		/* PRIMEPOWER250/450 LAN */
+
+/*
  * Offset of MAC address inside EEPROM.
  */
 #define	BGE_EE_MAC_OFFSET		0x7C
@@ -2558,6 +2602,7 @@
 #define	BGE_FLAG_5705_PLUS	0x00002000
 #define	BGE_FLAG_5714_FAMILY	0x00004000
 #define	BGE_FLAG_575X_PLUS	0x00008000
+#define	BGE_FLAG_5755_PLUS	0x00010000
 #define	BGE_FLAG_RX_ALIGNBUG	0x00100000
 #define	BGE_FLAG_NO_3LED	0x00200000
 #define	BGE_FLAG_ADC_BUG	0x00400000
@@ -2568,8 +2613,8 @@
 #define	BGE_FLAG_CRC_BUG	0x08000000
 #define	BGE_FLAG_5788		0x20000000
 	uint32_t		bge_chipid;
-	uint8_t			bge_asicrev;
-	uint8_t			bge_chiprev;
+	uint32_t		bge_asicrev;
+	uint32_t		bge_chiprev;
 	uint8_t			bge_asf_mode;
 	uint8_t			bge_asf_count;
 	struct bge_ring_data	bge_ldata;	/* rings */

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/atomic.h,v 1.52 2009/10/06 13:45:49 attilio Exp $
+ * $FreeBSD: src/sys/i386/include/atomic.h,v 1.53 2009/10/06 23:48:28 attilio Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
@@ -130,57 +130,62 @@
 
 #ifdef CPU_DISABLE_CMPXCHG
 
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	cmpl	%3,%4 ;		"
-	"	jne	1f ;		"
-	"	movl	%2,%1 ;		"
-	"1:				"
-	"       sete	%0 ;		"
-	"	popfl ;			"
-	"# atomic_cmpset_int"
-	: "=q" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "r" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
+#define	DEFINE_CMPSET_GEN(NAME)				\
+static __inline int					\
+atomic_cmpset_##NAME(volatile u_int *dst, u_int exp, u_int src)\
+{							\
+	u_char res;					\
+							\
+	__asm __volatile(				\
+	"	pushfl ;		"		\
+	"	cli ;			"		\
+	"	cmpl	%3,%4 ;		"		\
+	"	jne	1f ;		"		\
+	"	movl	%2,%1 ;		"		\
+	"1:				"		\
+	"       sete	%0 ;		"		\
+	"	popfl ;			"		\
+	"# atomic_cmpset_##NAME"			\
+	: "=q" (res),			/* 0 */		\
+	  "=m" (*dst)			/* 1 */		\
+	: "r" (src),			/* 2 */		\
+	  "r" (exp),			/* 3 */		\
+	  "m" (*dst)			/* 4 */		\
+	: "memory");					\
+							\
+	return (res);					\
+}							\
+struct __hack
 
-	return (res);
-}
-
 #else /* !CPU_DISABLE_CMPXCHG */
 
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgl %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# atomic_cmpset_int"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
+#define	DEFINE_CMPSET_GEN(NAME)				\
+static __inline int					\
+atomic_cmpset_##NAME(volatile u_int *dst, u_int exp, u_int src)\
+{							\
+	u_char res;					\
+							\
+	__asm __volatile(				\
+	"	" MPLOCKED "		"		\
+	"	cmpxchgl %2,%1 ;	"		\
+	"       sete	%0 ;		"		\
+	"1:				"		\
+	"# atomic_cmpset_##NAME"			\
+	: "=a" (res),			/* 0 */		\
+	  "=m" (*dst)			/* 1 */		\
+	: "r" (src),			/* 2 */		\
+	  "a" (exp),			/* 3 */		\
+	  "m" (*dst)			/* 4 */		\
+	: "memory");					\
+							\
+	return (res);					\
+}							\
+struct __hack
 
-	return (res);
-}
-
 #endif /* CPU_DISABLE_CMPXCHG */
 
-#define	atomic_cmpset_barr_int		atomic_cmpset_int
+DEFINE_CMPSET_GEN(int);
+DEFINE_CMPSET_GEN(barr_int);
 
 /*
  * Atomically add the value of v to the integer pointed to by p and return

==== //depot/projects/trustedbsd/capabilities/src/usr.sbin/cdcontrol/cdcontrol.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.51 2008/07/14 13:22:09 gahr Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.52 2009/10/07 13:25:22 jh Exp $");
 
 #include <sys/cdio.h>
 #include <sys/cdrio.h>
@@ -241,7 +241,7 @@
 
 	if (argc > 0) {
 		char buf[80], *p;
-		int len;
+		int len, rc;
 
 		for (p=buf; argc-->0; ++argv) {
 			len = strlen (*argv);
@@ -257,7 +257,11 @@
 		}
 		*p = 0;
 		arg = parse (buf, &cmd);
-		return (run (cmd, arg));
+		rc = run (cmd, arg);
+		if (rc < 0 && verbose)
+			warn(NULL);
+
+		return (rc);
 	}
 
 	if (verbose == 1)

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 14:15:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89BA41065679; Wed,  7 Oct 2009 14:15:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E6D91065672
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:15:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C33C8FC08
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:15:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97EFmT1076750
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 14:15:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97EFmD6076748
	for perforce@freebsd.org; Wed, 7 Oct 2009 14:15:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 14:15:48 GMT
Message-Id: <200910071415.n97EFmD6076748@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169292 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:15:48 -0000

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

Change 169292 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:14:59

	Following merge of basename_r to head, the symbol should have the
	new FBSD_1.2 symbol version.  Also move other new symbols for
	capability stuff in libc.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#13 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#13 (text) ====

@@ -328,7 +328,6 @@
 FBSD_1.1 {
 	arc4random_buf;
 	arc4random_uniform;
-	basename_r;
 	fdevname;
 	fdevname_r;
 	fdopendir;
@@ -341,8 +340,6 @@
 	fts_read;
 	fts_set;
 	fts_set_clientptr;
-	ld_caplibindex_lookup;
-	ld_insandbox;
 	posix_spawn;
 	posix_spawn_file_actions_addclose;
 	posix_spawn_file_actions_adddup2;
@@ -372,6 +369,8 @@
 FBSD_1.2 {
 	basename_r;
 	getpagesizes;
+	ld_caplibindex_lookup;
+	ld_insandbox;
 };
 
 FBSDprivate_1.0 {

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 14:19:53 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D3DE106568B; Wed,  7 Oct 2009 14:19:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6129106566B
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:19:52 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C3D128FC0C
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:19:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97EJqx8076968
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 14:19:52 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97EJqHc076966
	for perforce@freebsd.org; Wed, 7 Oct 2009 14:19:52 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 14:19:52 GMT
Message-Id: <200910071419.n97EJqHc076966@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169293 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:19:53 -0000

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

Change 169293 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:19:47

	Document ENOTCAPABLE in errno(2).

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#3 (text+ko) ====

@@ -456,6 +456,9 @@
 .It Er 88 EDOOFUS Em "Programming error" .
 A function or API is being abused in a way which could only be detected
 at run-time.
+.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" .
+An operation on a capability file descriptor requires greater privilege than
+the capability allows.
 .El
 .Sh DEFINITIONS
 .Bl -tag -width Ds

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 14:34:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0138B1065694; Wed,  7 Oct 2009 14:34:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A18191065692
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:34:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F47E8FC1A
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:34:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97EY8kL078040
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 14:34:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97EY8gG078038
	for perforce@freebsd.org; Wed, 7 Oct 2009 14:34:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 14:34:08 GMT
Message-Id: <200910071434.n97EY8gG078038@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169295 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:34:09 -0000

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

Change 169295 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:33:39

	Integrate TrustedBSD capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1789,7 +1789,7 @@
 
 	/* Enable host coalescing bug fix. */
 	if (BGE_IS_5755_PLUS(sc))
-		val |= 1 << 29;
+		val |= BGE_WDMAMODE_STATUS_TAG_FIX;
 
 	/* Turn on write DMA state machine */
 	CSR_WRITE_4(sc, BGE_WDMA_MODE, val);

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.85 2009/10/07 14:29:48 stas Exp $
  */
 
 /*
@@ -1431,6 +1431,7 @@
 #define	BGE_WDMAMODE_PCI_FIFOOREAD_ATTN	0x00000100
 #define	BGE_WDMAMODE_LOCREAD_TOOBIG	0x00000200
 #define	BGE_WDMAMODE_ALL_ATTNS		0x000003FC
+#define	BGE_WDMAMODE_STATUS_TAG_FIX	0x20000000
 
 /* Write DMA status register */
 #define	BGE_WDMASTAT_PCI_TGT_ABRT_ATTN	0x00000004

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 15:37:19 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B52911065692; Wed,  7 Oct 2009 15:37:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57CFA1065672
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 15:37:19 +0000 (UTC)
	(envelope-from yohanes@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4455A8FC30
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 15:37:19 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97FbI1Q083807
	for <perforce@FreeBSD.org>; Wed, 7 Oct 2009 15:37:18 GMT
	(envelope-from yohanes@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97FbHjB083804
	for perforce@freebsd.org; Wed, 7 Oct 2009 15:37:17 GMT
	(envelope-from yohanes@FreeBSD.org)
Date: Wed, 7 Oct 2009 15:37:17 GMT
Message-Id: <200910071537.n97FbHjB083804@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	yohanes@FreeBSD.org using -f
From: Yohanes Nugroho <yohanes@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169297 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 15:37:20 -0000

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

Change 169297 by yohanes@econa on 2009/10/07 15:36:43

	update source

Affected files ...

.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#6 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/faq/book.sgml#3 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 integrate
.. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate
.. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate
.. //depot/projects/str91xx/doc/share/pgpkeys/csjp.key#1 branch
.. //depot/projects/str91xx/doc/share/pgpkeys/gahr.key#2 integrate
.. //depot/projects/str91xx/doc/share/pgpkeys/jh.key#1 branch
.. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate
.. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys.ent#5 integrate
.. //depot/projects/str91xx/ports/KNOBS#4 integrate
.. //depot/projects/str91xx/ports/MOVED#9 integrate
.. //depot/projects/str91xx/ports/Tools/scripts/rmport#2 integrate
.. //depot/projects/str91xx/src/bin/sh/eval.c#6 integrate
.. //depot/projects/str91xx/src/bin/sh/exec.c#5 integrate
.. //depot/projects/str91xx/src/bin/sh/parser.c#3 integrate
.. //depot/projects/str91xx/src/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/str91xx/src/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/str91xx/src/contrib/tcsh/sh.c#3 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ChangeLog#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/README#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/README.platform#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth-pam.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth-passwd.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth-sia.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth1.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2-kbdint.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2-none.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/auth2.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/canohost.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/canohost.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/channels.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/clientloop.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/config.h#3 integrate
.. //depot/projects/str91xx/src/crypto/openssh/config.h.in#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/defines.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/gss-genr.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/includes.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/kex.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/kex.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/kexgexs.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/monitor.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/monitor_wrap.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/monitor_wrap.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/packet.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/packet.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/readconf.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/roaming.h#1 branch
.. //depot/projects/str91xx/src/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/str91xx/src/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/str91xx/src/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/str91xx/src/crypto/openssh/servconf.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/serverloop.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/session.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh-keygen.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh.1#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh_config#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh_config.5#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/ssh_namespace.h#3 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshconnect.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshconnect.h#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshconnect2.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshd.8#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshd.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshd_config#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshd_config.5#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/sshlogin.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/str91xx/src/crypto/openssh/version.h#2 integrate
.. //depot/projects/str91xx/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/str91xx/src/etc/network.subr#6 integrate
.. //depot/projects/str91xx/src/etc/pam.d/ftpd#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/kde#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/other#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/sshd#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/system#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/telnetd#2 integrate
.. //depot/projects/str91xx/src/etc/pam.d/xdm#2 integrate
.. //depot/projects/str91xx/src/etc/rc.d/defaultroute#4 integrate
.. //depot/projects/str91xx/src/etc/rc.d/faith#2 integrate
.. //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#4 integrate
.. //depot/projects/str91xx/src/etc/rc.d/netoptions#3 integrate
.. //depot/projects/str91xx/src/etc/rc.d/routing#4 integrate
.. //depot/projects/str91xx/src/etc/rc.d/static_arp#2 integrate
.. //depot/projects/str91xx/src/etc/rc.d/stf#2 integrate
.. //depot/projects/str91xx/src/etc/rc.subr#5 integrate
.. //depot/projects/str91xx/src/etc/services#2 integrate
.. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/str91xx/src/include/langinfo.h#2 integrate
.. //depot/projects/str91xx/src/include/libgen.h#2 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/Symbol.map#4 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/basename.c#2 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/fts.3#2 integrate
.. //depot/projects/str91xx/src/lib/libc/gen/fts.c#2 integrate
.. //depot/projects/str91xx/src/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/str91xx/src/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/str91xx/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/str91xx/src/lib/libpmc/Makefile#2 integrate
.. //depot/projects/str91xx/src/lib/libradius/radlib.c#3 integrate
.. //depot/projects/str91xx/src/libexec/rtld-elf/map_object.c#3 integrate
.. //depot/projects/str91xx/src/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/str91xx/src/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/str91xx/src/secure/libexec/sftp-server/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/str91xx/src/secure/usr.sbin/sshd/Makefile#2 integrate
.. //depot/projects/str91xx/src/share/man/man4/de.4#2 integrate
.. //depot/projects/str91xx/src/share/man/man4/unix.4#2 integrate
.. //depot/projects/str91xx/src/share/man/man4/urtw.4#3 integrate
.. //depot/projects/str91xx/src/share/man/man4/zyd.4#2 integrate
.. //depot/projects/str91xx/src/share/man/man9/Makefile#6 integrate
.. //depot/projects/str91xx/src/share/man/man9/fetch.9#2 integrate
.. //depot/projects/str91xx/src/share/man/man9/store.9#2 integrate
.. //depot/projects/str91xx/src/share/misc/committers-src.dot#3 integrate
.. //depot/projects/str91xx/src/sys/amd64/amd64/elf_machdep.c#4 integrate
.. //depot/projects/str91xx/src/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/str91xx/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/str91xx/src/sys/amd64/include/atomic.h#2 integrate
.. //depot/projects/str91xx/src/sys/amd64/include/cpufunc.h#3 integrate
.. //depot/projects/str91xx/src/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/str91xx/src/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/str91xx/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/str91xx/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/str91xx/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/str91xx/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate
.. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/str91xx/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/str91xx/src/sys/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/str91xx/src/sys/conf/files#8 integrate
.. //depot/projects/str91xx/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/acpica/acpi_video.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/age/if_age.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/alc/if_alc.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/ale/if_ale.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/str91xx/src/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/str91xx/src/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/str91xx/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/str91xx/src/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#5 integrate
.. //depot/projects/str91xx/src/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonacl.c#3 integrate
.. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_events.c#2 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_move.c#2 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/str91xx/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/str91xx/src/sys/i386/i386/elf_machdep.c#5 integrate
.. //depot/projects/str91xx/src/sys/i386/i386/initcpu.c#3 integrate
.. //depot/projects/str91xx/src/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/str91xx/src/sys/i386/include/cpufunc.h#3 integrate
.. //depot/projects/str91xx/src/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/str91xx/src/sys/ia64/ia64/elf_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/str91xx/src/sys/kern/init_main.c#4 integrate
.. //depot/projects/str91xx/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_lock.c#5 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_rwlock.c#5 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/str91xx/src/sys/kern/kern_sx.c#6 integrate
.. //depot/projects/str91xx/src/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/str91xx/src/sys/kern/syscalls.c#3 integrate
.. //depot/projects/str91xx/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/str91xx/src/sys/kern/uipc_socket.c#6 integrate
.. //depot/projects/str91xx/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/str91xx/src/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/str91xx/src/sys/kern/vfs_acl.c#3 integrate
.. //depot/projects/str91xx/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/str91xx/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/str91xx/src/sys/mips/mips/elf64_machdep.c#2 integrate
.. //depot/projects/str91xx/src/sys/mips/mips/elf_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/str91xx/src/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/str91xx/src/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/str91xx/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/str91xx/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/str91xx/src/sys/net/route.c#3 integrate
.. //depot/projects/str91xx/src/sys/netinet/in.c#6 integrate
.. //depot/projects/str91xx/src/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/str91xx/src/sys/netinet6/in6_ifattach.c#6 integrate
.. //depot/projects/str91xx/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/str91xx/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/str91xx/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/str91xx/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/str91xx/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/str91xx/src/sys/sys/rwlock.h#2 integrate
.. //depot/projects/str91xx/src/sys/sys/sx.h#4 integrate
.. //depot/projects/str91xx/src/sys/sys/syscall.h#3 integrate
.. //depot/projects/str91xx/src/sys/sys/syscall.mk#3 integrate
.. //depot/projects/str91xx/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/str91xx/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/str91xx/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/str91xx/src/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/str91xx/src/sys/vm/vm_page.c#4 integrate
.. //depot/projects/str91xx/src/sys/vm/vm_page.h#3 integrate
.. //depot/projects/str91xx/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/str91xx/src/tools/regression/bin/sh/execution/unknown1.0#1 branch
.. //depot/projects/str91xx/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/str91xx/src/tools/regression/mmap/mmap.c#2 integrate
.. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/str91xx/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/str91xx/src/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/str91xx/src/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/str91xx/src/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/str91xx/src/usr.bin/netstat/netstat.h#3 integrate
.. //depot/projects/str91xx/src/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/str91xx/src/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/str91xx/src/usr.bin/whois/whois.c#2 integrate
.. //depot/projects/str91xx/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/str91xx/src/usr.sbin/lpr/lp/lp.sh#3 integrate
.. //depot/projects/str91xx/www/de/platforms/sparc.sgml#2 integrate
.. //depot/projects/str91xx/www/de/share/sgml/news.xml#6 integrate
.. //depot/projects/str91xx/www/en/administration.sgml#3 integrate
.. //depot/projects/str91xx/www/en/cgi/query-pr.cgi#2 integrate
.. //depot/projects/str91xx/www/en/developers.sgml#5 integrate
.. //depot/projects/str91xx/www/en/donations/donors.sgml#4 integrate
.. //depot/projects/str91xx/www/en/news/status/Makefile#2 integrate
.. //depot/projects/str91xx/www/en/news/status/report-2009-04-2009-09.xml#1 branch
.. //depot/projects/str91xx/www/hu/share/sgml/news.xml#7 integrate
.. //depot/projects/str91xx/www/it/share/sgml/l10n.ent#2 integrate
.. //depot/projects/str91xx/www/share/sgml/advisories.xml#3 integrate
.. //depot/projects/str91xx/www/share/sgml/news.xml#7 integrate
.. //depot/projects/str91xx/www/share/sgml/notices.xml#3 integrate
.. //depot/projects/str91xx/www/share/sgml/usergroups.xml#3 integrate

Differences ...

==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 (text+ko) ====

@@ -2,10 +2,10 @@
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
-$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.99 2009/06/13 20:35:13 bcr Exp $
-$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.747 2009/06/08 20:10:08 bcr Exp $
+$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.100 2009/10/07 10:19:09 bcr Exp $
+$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.748 2009/10/04 18:22:15 bcr Exp $
 
-    basiert auf: 1.1116
+    basiert auf: 1.1117
 
 -->
 
@@ -35,7 +35,7 @@
       </collab>
     </authorgroup>
 
-    <pubdate>$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.747 2009/06/08 20:10:08 bcr Exp $</pubdate>
+    <pubdate>$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.748 2009/10/04 18:22:15 bcr Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -368,12 +368,9 @@
 	</question>
 
 	<answer>
-	  <para>James Howards Artikel <ulink 
-	    url="http://ezine.daemonnews.org/200104/bsd_family.html">The
-	    BSD Family Tree</ulink>, der in <ulink 
-	    url="http://www.daemonnews.org/">DaemonNews</ulink>
-	    erschienen ist, beschreibt sehr gut die Geschichte und die
-	    Unterschiede der BSD-Varianten.</para>
+	  <para>James Howards Artikel, genannt <ulink 
+	    url="http://www-personal.si.umich.edu/~dhogan/documentation/unix/bsd-family.html">The BSD Family Tree</ulink>, beschreibt sehr gut die Geschichte
+	    und die Unterschiede der BSD-Varianten.</para>
 	</answer>
       </qandaentry>
 

==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.48 2008/03/26 19:02:44 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.134 2008/03/25 19:34:02 jkois Exp $
-     basiert auf: 1.229
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.49 2009/10/07 10:19:10 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.142 2009/09/24 18:36:59 bcr Exp $
+     basiert auf: 1.238
 -->
 
 <chapter id="config-tuning">
@@ -64,7 +64,8 @@
       <listitem>
 	<para>Die Grundlagen der Konfiguration mit
 	  <filename>rc.conf</filename> und des Systems zum Starten
-	  von Anwendungen in <filename>/usr/local/etc/rc.d</filename>.</para>
+	  von Anwendungen in <filename
+	  class="directory">/usr/local/etc/rc.d</filename>.</para>
       </listitem>
       <listitem>
 	<para>Wie Sie Netzwerkkarten konfigurieren und testen.</para>
@@ -75,7 +76,7 @@
       </listitem>
       <listitem>
 	<para>Wie Sie die verschiedenen Konfigurationsdateien
-	  in <filename>/etc</filename> benutzen.</para>
+	  in <filename class="directory">/etc</filename> benutzen.</para>
       </listitem>
       <listitem>
 	<para>Wie Sie mit <command>sysctl</command>-Variablen &os;
@@ -107,9 +108,12 @@
       <title>Layout von Partitionen</title>
 
       <indexterm><primary>Layout von Partitionen</primary></indexterm>
-      <indexterm><primary><filename>/etc</filename></primary></indexterm>
-      <indexterm><primary><filename>/var</filename></primary></indexterm>
-      <indexterm><primary><filename>/usr</filename></primary></indexterm>
+      <indexterm><primary><filename
+      class="directory">/etc</filename></primary></indexterm>
+      <indexterm><primary><filename
+      class="directory">/var</filename></primary></indexterm>
+      <indexterm><primary><filename
+      class="directory">/usr</filename></primary></indexterm>
 
       <sect3>
 	<title>Partitionen</title>
@@ -121,31 +125,45 @@
 	  inneren Spuren.  Daher sollten die kleineren oft benutzten
 	  Dateisysteme, wie das Root-Dateisystem oder die Swap-Partition,
 	  an den &auml;u&szlig;eren Rand der Platte gelegt werden.
-	  Die gr&ouml;&szlig;eren Partitionen wie <filename>/usr</filename>
-	  sollten in die inneren Bereiche gelegt werden.
-	  Es empfiehlt sich, die Partitionen in einer &auml;hnlichen
-	  Reihenfolge wie Root-Partition, Swap, <filename>/var</filename>
-	  und <filename>/usr</filename> anzulegen.</para>
+	  Die gr&ouml;&szlig;eren Partitionen wie <filename
+	  class="directory">/usr</filename> sollten in die inneren Bereiche
+	  gelegt werden.  Es empfiehlt sich, die Partitionen in einer
+	  &auml;hnlichen Reihenfolge wie Root-Partition, Swap, <filename
+	  class="directory">/var</filename> und <filename
+	  class="directory">/usr</filename> anzulegen.</para>
 
-	<para>Die Gr&ouml;&szlig;e von <filename>/var</filename>
-	  ist abh&auml;ngig vom Zweck der Maschine.
-	  <filename>/var</filename> enth&auml;lt haupts&auml;chlich
-	  Postf&auml;cher, den Spoolbereich zum Drucken und Logdateien.
-	  Abh&auml;ngig von der Anzahl der Systembenutzer und der
+	<para>Die Gr&ouml;&szlig;e der <filename
+	  class="directory">/var</filename>-Partition ist abh&auml;ngig vom
+	  Zweck der Maschine.  Das <filename
+	  class="directory">/var</filename>-Dateisystem enth&auml;lt
+	  haupts&auml;chlich Postf&auml;cher, den Spoolbereich zum Drucken und
+	  Logdateien.  Abh&auml;ngig von der Anzahl der Systembenutzer und der
 	  Aufbewahrungszeit f&uuml;r Logdateien, k&ouml;nnen gerade
 	  die Postf&auml;cher und Logdateien zu ungeahnten Gr&ouml;&szlig;en
-	  wachsen.  Oft werden Sie mit weniger als einem Gigabyte
-	  auskommen, doch beachten Sie, dass
-	  <filename>/var/tmp</filename> f&uuml;r Pakete ausreichend
-	  dimensioniert ist.</para>
+	  wachsen.  Die meisten Benutzer werden selten mehr als etwa ein
+	  Gigabyte in <filename class="directory">/var</filename>
+	  ben&ouml;tigen.</para>
 
-	<para>Die <filename>/usr</filename>-Partition enth&auml;lt den
-	  Hauptteil des Systems, die Ports-Sammlung (empfohlen) und die
-	  Quellen (optional).  Im Laufe der Installation haben Sie die
-	  M&ouml;glichkeit, die Quellen und die Ports-Sammlung gleich mit
-	  zu installieren.  F&uuml;r die
-	  <filename>/usr</filename>-Partition sollten Sie mindestens
-	  zwei&nbsp;Gigabyte vorsehen.</para>
+        <note>
+          <para>Ein paar Mal wird es vorkommen, dass viel Festplattenspeicher
+            in <filename class="directory">/var/tmp</filename> gebraucht
+            wird.  Wenn neue Software mit &man.pkg.add.1; installiert wird,
+            extrahieren die Paketwerkzeuge eine vor&uuml;bergehende Kopie der
+            Pakete unter <filename class="directory">/var/tmp</filename>.  Die
+            Installation grosser Softwarepakete wie
+            <application>Firefox</application> oder
+            <application>Openoffice</application> kann sich wegen zu wenig
+            Speicherplatz in <filename class="directory">/var/tmp</filename>
+            als trickreich herausstellen.</para>
+        </note>
+          
+        <para>Die <filename class="directory">/usr</filename>-Partition
+          enth&auml;lt viele der Hauptbestandteile des Systems, dazu
+          geh&ouml;hren die &man.ports.7;-Sammlung (empfohlen) und die Quellen
+          (optional).  Sowohl die Ports als auch die Quellen des Basissystems
+          sind zum Zeitpunkt der Installation optional, trotzdem sollten Sie
+          mindestens zwei&nbsp;Gigabyte f&uuml;r diese Partition
+          vorsehen.</para>
 
 	<para>Wenn Sie die Gr&ouml;&szlig;e der Partitionen festlegen,
 	  beachten Sie bitte das Wachstum Ihres Systems.  Wenn Sie den
@@ -155,9 +173,9 @@
 
 	<note><para>Die automatische Partitionierung von &man.sysinstall.8;
 	  mit <literal>Auto-defaults</literal> legt manchmal zu kleine
-	  <filename>/</filename> und <filename>/var</filename>-Partition an.
-	  Partitionieren Sie weise und gro&szlig;z&uuml;gig.</para></note>
-
+	  <filename class="directory">/</filename> und <filename
+	  class="directory">/var</filename>-Partition an.  Partitionieren Sie
+	  weise und gro&szlig;z&uuml;gig.</para></note>
       </sect3>
 
       <sect3 id="swap-design">
@@ -208,10 +226,11 @@
 	<para>Gegen eine einzelne Partition sprechen mehrere Gr&uuml;nde.
 	  Jede Partition hat im Betrieb unterschiedliche Eigenschaften
 	  und die Trennung der Partitionen erlaubt es, die Dateisysteme
-	  an diese Eigenschaften anzupassen.  Die Root- und
-	  <filename>/usr</filename>-Partitionen weisen meist nur
-	  lesende Zugriffe auf, w&auml;hrend <filename>/var</filename>
-	  und <filename>/var/tmp</filename> haupts&auml;chlich
+	  an diese Eigenschaften anzupassen.  Die Root- und <filename
+	  class="directory">/usr</filename>-Partitionen weisen meist nur
+	  lesende Zugriffe auf, w&auml;hrend <filename
+	  class="directory">/var</filename> und <filename
+	  class="directory">/var/tmp</filename> haupts&auml;chlich
 	  beschrieben werden.</para>
 
 	<para>Indem Sie ein System richtig partitionieren, verhindern
@@ -222,10 +241,10 @@
 	  I/O-Leistung diesen Partitionen steigen.
 	  Die I/O-Leistung ist nat&uuml;rlich auch f&uuml;r gro&szlig;e
 	  Partitionen wichtig, doch erzielen Sie eine gr&ouml;&szlig;ere
-	  Leistungssteigerung, wenn Sie <filename>/var</filename> an den
-	  Rand der Platte legen.  Schlie&szlig;lich sollten Sie
-	  noch die Stabilit&auml;t des Systems beachten.
-	  Eine kleine Root-Partition, auf die meist nur lesend
+	  Leistungssteigerung, wenn Sie <filename
+	  class="directory">/var</filename> an den Rand der Platte legen. 
+	  Schlie&szlig;lich sollten Sie noch die Stabilit&auml;t des Systems
+	  beachten.  Eine kleine Root-Partition, auf die meist nur lesend
 	  zugegriffen wird, &uuml;berlebt einen schlimmen Absturz
 	  wahrscheinlich eher als eine gro&szlig;e Partition.</para>
       </sect3>
@@ -249,10 +268,10 @@
 
     <para>In <filename>rc.conf</filename> werden die Vorgabewerte aus
       <filename>/etc/defaults/rc.conf</filename> &uuml;berschrieben.
-      Die Vorgabedatei sollte nicht nach <filename>/etc</filename>
-      kopiert werden, da sie die Vorgabewerte und keine Beispiele
-      enth&auml;lt.  Jede systemspezifische &Auml;nderung wird
-      in <filename>rc.conf</filename> vorgenommen.</para>
+      Die Vorgabedatei sollte nicht nach <filename
+      class="directory">/etc</filename> kopiert werden, da sie die
+      Vorgabewerte und keine Beispiele enth&auml;lt.  Jede systemspezifische
+      &Auml;nderung wird in <filename>rc.conf</filename> vorgenommen.</para>
 
     <para>Um den administrativen Aufwand gering zu halten, existieren
       in geclusterten Anwendungen mehrere Strategien,
@@ -299,8 +318,8 @@
 
     <indexterm><primary>/usr/local/etc</primary></indexterm>
 
-    <para>F&uuml;r gew&ouml;hnlich werden diese Dateien in
-      <filename>/usr/local/etc</filename> installiert.  Besitzt
+    <para>F&uuml;r gew&ouml;hnlich werden diese Dateien in <filename
+      class="directory">/usr/local/etc</filename> installiert.  Besitzt
       eine Anwendung viele Konfigurationsdateien, werden
       diese in einem separaten Unterverzeichnis abgelegt.</para>
 
@@ -311,8 +330,8 @@
       f&uuml;r eine Anwendung existieren, werden sie durch
       Kopieren der <filename>.default</filename> Dateien erstellt.</para>
 
-    <para>Als Beispiel sei <filename>/usr/local/etc/apache</filename>
-      gezeigt:</para>
+    <para>Als Beispiel sei <filename
+      class="directory">/usr/local/etc/apache</filename> gezeigt:</para>
 
     <literallayout class="monospaced">-rw-r--r--  1 root  wheel   2184 May 20  1998 access.conf
 -rw-r--r--  1 root  wheel   2184 May 20  1998 access.conf.default
@@ -363,67 +382,6 @@
       Hersteller-Version.  Allerdings kann ein Dienst mit
       einfachen Skripten gestartet werden.</para>
 
-    <para>Vor der Einf&uuml;hrung von <filename>rc.d</filename>
-      legten Anwendungen einfach ein Startskript im Verzeichnis
-      <filename class="directory">/usr/local/etc/rc.d</filename>
-      ab.  Das Startskript wurde von den Systemskripten in
-      den letzten Phasen des Systemstarts ausgef&uuml;hrt.</para>
-
-    <para>Obwohl bereits viele Startskripten auf das neue
-      <filename>rc.d</filename>-System umgestellt wurden, gibt es
-      noch Anwendungen,
-      die ein Startskript im eben erw&auml;hnten Verzeichnis
-      ben&ouml;tigen.  In diesem Fall weisen die Skripte kleinere
-      Unterschiede auf.  Vor &os;&nbsp;5.1 wurde der alte Stil
-      verwendet, obwohl in den meisten F&auml;llen auch der neue
-      Stil problemlos funktionieren w&uuml;rde.</para>
-
-    <para>Die Startskripten m&uuml;ssen das Suffix
-      <filename>.sh</filename> tragen und ausf&uuml;hrbar sein.
-      Sie machen ein Skript ausf&uuml;hrbar, indem Sie mit
-      <command>chmod</command> die Rechte <literal>755</literal>
-      vergeben.  Das Skript sollte die Optionen <option>start</option>
-      und <option>stop</option> akzeptieren, um die Anwendung
-      zu starten und zu stoppen.</para>
-
-    <para>Ein einfaches Startskript sieht wie folgt aus:</para>
-
-    <programlisting>#!/bin/sh
-echo -n ' utility'
-
-case "$1" in
-start)
-        /usr/local/bin/utility
-        ;;
-stop)
-        kill -9 `cat /var/run/utility.pid`
-        ;;
-*)
-        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
-        exit 64
-        ;;
-esac
-
-exit 0</programlisting>
-
-    <para>Das Skript akzeptiert die Optionen <literal>start</literal>
-      und <literal>stop</literal> zum Starten und Stoppen
-      einer Anwendung mit Namen <literal>utility</literal>.</para>
-
-    <para>Manuell wird die Anwendung mit dem nachstehenden
-      Kommando gestartet:</para>
-
-    <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/utility.sh start</userinput></screen>
-
-    <para>Obwohl nicht jede Anwendung die Zeile in
-      <filename>rc.conf</filename> ben&ouml;tigt, akzeptieren
-      immer mehr Ports diese Konfiguration.  Pr&uuml;fen Sie
-      die Ausgaben w&auml;hrend der Installation einer
-      Anwendung, um herauszufinden, wie die Anwendung
-      gestartet wird.  Einige Anwendungen stellen Startskripten
-      bereit, die das <filename>rc.d</filename>-System
-      (wird im n&auml;chsten Abschnitt besprochen) verwenden.</para>
-
     <sect2>
       <title>Dienste &uuml;ber das
         <filename>rc.d</filename>-System starten</title>
@@ -445,15 +403,8 @@
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-# SET THEM IN THE /etc/rc.conf FILE
-#
-utility_enable=${utility_enable-"NO"}
-utility_flags=${utility_flags-""}
-utility_pidfile=${utility_pidfile-"/var/run/utility.pid"}
 
-. /etc/rc.subr
+./etc/rc.subr
 
 name="utility"
 rcvar=`set_rcvar`
@@ -461,15 +412,20 @@
 
 load_rc_config $name
 
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# SET THEM IN THE /etc/rc.conf FILE
+#
+utility_enable=${utility_enable-"NO"}
+utility_pidfile=${utility_pidfile-"/var/run/utility.pid"}
+
 pidfile="${utility_pidfile}"
 
-start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}"
-
 run_rc_command "$1"</programlisting>
 
       <para>Dieses Skript stellt sicher, dass
 	<application>utility</application> nach den
-	<literal>daemon</literal>-Diensten gestartet wird.
+	<literal>DAEMON</literal>-Pseudodiensten gestartet wird.
 	Es stellt auch eine Methode bereit, die
 	Prozess-<acronym>ID</acronym> (<acronym>PID</acronym>)
 	der Anwendung in einer Datei zu speichern.</para>
@@ -491,13 +447,14 @@
       <title>Andere Arten, um Dienste zu starten</title>
 
       <para>Dienste wie <acronym>POP</acronym>3 oder
-	<acronym>IMAP</acronym> k&ouml;nnen &uuml;ber den
+	<acronym>IMAP</acronym> k&ouml;nnen &uuml;ber
 	&man.inetd.8; gestartet werden.  Nach der Installation
 	der Anwendung aus der Ports-Sammlung muss eine
 	Konfigurationszeile in der Datei
 	<filename>/etc/inetd.conf</filename> hinzugef&uuml;gt oder
-	aktiviert werden.  Der Abschnitt
-	<xref linkend="network-inetd"> beschreibt den
+	in der aktuellen Konfiguration durch Entfernen der Kommentare
+	aktiviert werden.  Der Abschnitt <xref
+	linkend="network-inetd"> beschreibt den
 	<application>inetd</application> und dessen Konfiguration.</para>
 
       <para>Systemdienste k&ouml;nnen auch mit &man.cron.8; gestartet
@@ -536,9 +493,9 @@
       &uuml;berpr&uuml;ft fortlaufend die Datei
       <filename>/etc/crontab</filename>.  Beim Start sucht
       <command>cron</command> neue <filename>crontab</filename>-Dateien
-      im Verzeichnis <filename>/var/cron/tabs</filename>.  In den
-      <filename>crontab</filename>-Dateien wird festgelegt, welche
-      Programme zu welchem Zeitpunkt laufen sollen.</para>
+      im Verzeichnis <filename class="directory">/var/cron/tabs</filename>. 
+      In den <filename class="directory">crontab</filename>-Dateien wird
+      festgelegt, welche Programme zu welchem Zeitpunkt laufen sollen.</para>
 
     <para>Das Werkzeug <command>cron</command> verwendet
       zwei verschiedene Konfigurationsdateien: Die
@@ -726,7 +683,7 @@
     <para>2002 wurde das <application>rc.d</application>-System von
       NetBSD zum Start von Systemdiensten in &os; integriert.
       Die zu diesem System geh&ouml;renden Dateien sind im
-      Verzeichnis <filename>/etc/rc.d</filename> abgelegt.
+      Verzeichnis <filename class="directory">/etc/rc.d</filename> abgelegt.
       Die Skripten in diesem Verzeichnis akzeptieren die
       Optionen <option>start</option>, <option>stop</option>
       und <option>restart</option>.  Beispielsweise kann
@@ -1478,7 +1435,7 @@
     <title>Konfigurationsdateien</title>
 
     <sect2>
-      <title><filename>/etc</filename> Layout</title>
+      <title><filename class="directory">/etc</filename> Layout</title>
       <para>Konfigurationsdateien finden sich in einigen Verzeichnissen
 	unter anderem in:</para>
 
@@ -1489,45 +1446,48 @@
 
 	  <tbody>
 	    <row>
-	      <entry><filename>/etc</filename></entry>
+	      <entry><filename class="directory">/etc</filename></entry>
 	      <entry>Enth&auml;lt generelle Konfigurationsinformationen,
 		die Daten hier sind systemspezifisch.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/etc/defaults</filename></entry>
+	      <entry><filename
+	        class="directory">/etc/defaults</filename></entry>
 	      <entry>Default Versionen der Konfigurationsdateien.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/etc/mail</filename></entry>
+	      <entry><filename class="directory">/etc/mail</filename></entry>
 	      <entry>Enth&auml;lt die &man.sendmail.8; Konfiguration
 		und weitere MTA Konfigurationsdateien.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/etc/ppp</filename></entry>
+	      <entry><filename class="directory">/etc/ppp</filename></entry>
 	      <entry>Hier findet sich die Konfiguration f&uuml;r
 		die User- und Kernel-ppp Programme.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/etc/namedb</filename></entry>
+	      <entry><filename class="directory">/etc/namedb</filename></entry>
 	      <entry>Das Vorgabeverzeichnis, in dem Daten von
 		&man.named.8; gehalten werden.  Normalerweise
 		werden hier <filename>named.conf</filename> und Zonendaten
 		abgelegt.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/usr/local/etc</filename></entry>
+	      <entry><filename
+	        class="directory">/usr/local/etc</filename></entry>
 	      <entry>Installierte Anwendungen legen hier ihre
 		Konfigurationsdateien ab.  Dieses Verzeichnis kann
 		Unterverzeichnisse f&uuml;r bestimmte Anwendungen
 		enthalten.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/usr/local/etc/rc.d</filename></entry>
+	      <entry><filename
+	        class="directory">/usr/local/etc/rc.d</filename></entry>
 	      <entry>Ort f&uuml;r Start- und Stopskripten installierter
 		Anwendungen.</entry>
 	    </row>
 	    <row>
-	      <entry><filename>/var/db</filename></entry>
+	      <entry><filename class="directory">/var/db</filename></entry>
 	      <entry>Automatisch generierte systemspezifische Datenbanken,
 	        wie die Paket-Datenbank oder die
 		<command>locate</command>-Datenbank.</entry>
@@ -1614,33 +1574,35 @@
 
 	<programlisting># &dollar;FreeBSD&dollar;
 #
+#
 # Host Database
-# This file should contain the addresses and aliases
-# for local hosts that share this file.
+#
+# This file should contain the addresses and aliases for local hosts that
+# share this file.  Replace 'my.domain' below with the domainname of your
+# machine.
+#
 # In the presence of the domain name service or NIS, this file may
 # not be consulted at all; see /etc/nsswitch.conf for the resolution order.
 #
 #
-::1                     localhost localhost.my.domain myname.my.domain
-127.0.0.1               localhost localhost.my.domain myname.my.domain
-
+::1         localhost localhost.my.domain
+127.0.0.1       localhost localhost.my.domain
 #
 # Imaginary network.
-#10.0.0.2               myname.my.domain myname
-#10.0.0.3               myfriend.my.domain myfriend
+#10.0.0.2       myname.my.domain myname
+#10.0.0.3       myfriend.my.domain myfriend
 #
 # According to RFC 1918, you can use the following IP networks for
 # private nets which will never be connected to the Internet:
 #
-#       10.0.0.0        -   10.255.255.255
-#       172.16.0.0      -   172.31.255.255
-#       192.168.0.0     -   192.168.255.255
+#   10.0.0.0    -   10.255.255.255
+#   172.16.0.0  -   172.31.255.255
+#   192.168.0.0 -   192.168.255.255
 #
 # In case you want to be able to connect to the Internet, you need
-# real official assigned numbers.  PLEASE PLEASE PLEASE do not try
-# to invent your own network numbers but instead get one from your
-# network provider (if any) or from the Internet Registry (ftp to
-# rs.internic.net, directory `/templates').
+# real official assigned numbers.  Do not try to invent your own network
+# numbers but instead get one from your network provider (if any) or 
+# from your regional registry (ARIN, APNIC, LACNIC, RIPE NCC, or AfriNIC.)
 #</programlisting>
 
 	<para><filename>/etc/hosts</filename> hat ein einfaches Format:</para>
@@ -2304,7 +2266,7 @@
 	  k&ouml;nnen die ben&ouml;tigten Ressourcen &auml;hnlich denen
 	  eines gro&szlig;en Webservers sein.</para>
 
-	<para>Seit &os;&nbsp;4.5 wird <varname>kern.maxusers</varname> beim
+	<para>Die Variable <varname>kern.maxusers</varname> wird beim
 	  Systemstart automatisch aus dem zur Verf&uuml;gung stehenden
 	  Hauptspeicher bestimmt.  Im laufenden Betrieb kann dieser Wert
 	  aus der (nur lesbaren) sysctl-Variable
@@ -2321,10 +2283,8 @@
 	  <filename>/boot/loader.conf</filename> (sehen Sie sich dazu
 	  auch &man.loader.conf.5; sowie die Datei
 	  <filename>/boot/defaults/loader.conf</filename> an) an Ihre
-	  Bed&uuml;rfnisse angepasst werden.  Auf &os;-Systemen vor
-	  &os;&nbsp;4.4 muss dieser Wert allerdings &uuml;ber die
-	  Kernelkonfigurationsoption (siehe auch &man.config.8;)
-	  <option>maxusers</option> gesetzt werden.</para>
+	  Bed&uuml;rfnisse angepasst werden, so wie es bereits an anderer
+	  Stelle dieses Dokuments beschrieben ist.</para>
 
 	<para>&Auml;ltere &os;-Versionen setzen diesen Wert selbst,
 	  wenn Sie in der Konfigurationsdatei den Wert <literal>0</literal>
@@ -2363,15 +2323,7 @@
 	  <emphasis>nicht</emphasis> begrenzt.  Der Wert dieser
 	  Variablen legt neben der m&ouml;glichen Anzahl der Prozesse
 	  eines Benutzers weitere sinnvolle Gr&ouml;&szlig;en f&uuml;r
-	  bestimmte Systemtabellen fest.  Die Option <link
-	  linkend="kernelconfig-ptys"><literal>pseudo-device pty 16</literal></link>
-	  legt die Anzahl der erlaubten Anmeldungen von entfernten
-	  Systemen und X-Terminals fest.  Unter &os;&nbsp;5.X brauchen
-	  Sie sich um die Anzahl dieser Ger&auml;te nicht mehr zu
-	  k&uuml;mmern, da der &man.pty.4;-Treiber automatisch neue
-	  Ger&auml;te erstellt, wenn Sie die Option
-	  <literal>device pty</literal> in Ihre Kernelkonfigurationsdatei
-	  aufnehmen und danach den Kernel neu bauen.</para>
+	  bestimmte Systemtabellen fest.</para>
 	</note>
       </sect3>
 

==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.37 2008/12/27 14:19:15 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.83 2008/12/27 13:40:25 jkois Exp $
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.38 2009/10/07 10:19:10 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.84 2009/09/29 17:26:09 bcr Exp $
      basiert auf: 1.227
 -->
 
@@ -107,15 +107,680 @@
   </sect1>
 
   <sect1 id="updating-upgrading-portsnap">
-    <title>Portsnap: A Ports Collection Update Tool (noch
-      nicht &uuml;bersetzt)</title>
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	  <contrib>Geschrieben von </contrib>
+	</author>
+      </authorgroup>
+      <authorgroup>
+	<author>
+	  <firstname>Colin</firstname>
+	  <surname>Percival</surname>
+	  <contrib>Basierend auf bereitgestellten Mitschriften von </contrib>
+	</author>
+      </authorgroup>
+      <authorgroup>
+	<author>
+	  <firstname>Benedict</firstname>
+	  <surname>Reuschling</surname>
+	  <contrib>&Uuml;bersetzt von </contrib>
+	</author>
+      </authorgroup>
+    </sect1info>
+    <title>Portsnap: Ein Werkzeug zur Aktualisierung der Ports-Sammlung</title>
+
+    <indexterm><primary>Updating and Upgrading</primary></indexterm>
+    <indexterm>
+      <primary>Portsnap</primary>
+      <see>Updating and Upgrading</see>
+    </indexterm>
+
+    <para>Das Basissystem von &os; enth&auml;lt auch ein Programm zum
+      Aktualisieren der Ports-Sammlung: das &man.portsnap.8; Werkzeug.  Wenn
+      es ausgef&uuml;hrt wird, verbindet es sich mit einem entfernten Rechner, 
+      &uuml;berpr&uuml;ft den Sicherungsschl&uuml;ssel und l&auml;dt eine neue
+      Kopie der Ports-Sammlung herunter.  Der Schl&uuml;ssel wird dazu
+      verwendet, um die Integrit&auml;t aller heruntergeladenen Dateien zu
+      pr&uuml;fen und um sicherzustellen, dass diese unterwegs nicht
+      ver&auml;ndert wurden.  Um die aktuellsten Dateien der Ports-Sammlung
+      herunter zu laden, geben Sie das folgende Kommando ein:</para>
+
+    <screen>&prompt.root; <userinput>portsnap fetch</userinput>
+Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found.
+Fetching snapshot tag from portsnap1.FreeBSD.org... done.
+Fetching snapshot metadata... done.
+Updating from Wed Aug  6 18:00:22 EDT 2008 to Sat Aug 30 20:24:11 EDT 2008.
+Fetching 3 metadata patches.. done.
+Applying metadata patches... done.
+Fetching 3 metadata files... done.
+Fetching 90 patches.....10....20....30....40....50....60....70....80....90. done.
+Applying patches... done.
+Fetching 133 new ports or files... done.</screen>
+
+    <para>Dieses Beispiel zeigt, dass &man.portsnap.8; mehrere Korrekturen
+      f&uuml;r die aktuellen Ports-Daten gefunden und verifiziert hat.  Es
+      zeigt auch, dass das Programm zuvor schon einmal gestartet wurde.
+      W&auml;re es das erste Mal, w&uuml;rde nur die Ports-Sammlung
+      heruntergeladen werden.</para>
+
+    <para>Wenn &man.portsnap.8; erfolgreich die
+      <command>fetch</command>-Operation abgeschlossen hat, befinden sich die
+      Ports-Sammlung und die dazugeh&ouml;rigen Korrekturen auf dem lokalen
+      System, welches die &Uuml;berpr&uuml;fung bestanden hat.  Die 
+      aktualisierten Dateien k&ouml;nnen nun installiert werden durch die
+      Eingabe von:</para>
+
+    <screen>&prompt.root; <userinput>portsnap extract</userinput>
+/usr/ports/.cvsignore
+/usr/ports/CHANGES
+/usr/ports/COPYRIGHT
+/usr/ports/GIDs
+/usr/ports/KNOBS
+/usr/ports/LEGAL
+/usr/ports/MOVED
+/usr/ports/Makefile
+/usr/ports/Mk/bsd.apache.mk
+/usr/ports/Mk/bsd.autotools.mk
+/usr/ports/Mk/bsd.cmake.mk
+<replaceable>...</replaceable></screen>
+
+    <para>Der Prozess ist jetzt abgeschlossen und Anwendungen k&ouml;nnen
+      mittels der aktuellen Ports-Sammlung installiert oder aktualisiert
+      werden.</para>
+
+    <para>Um beide Prozesse nacheinander auszuf&uuml;hren, geben Sie das
+      folgende Kommando ein:</para>
+
+    <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
+  </sect1>
+
+  <sect1 id="updating-upgrading-documentation">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Benedict</firstname>
+	  <surname>Reuschling</surname>
+	  <contrib>&Uuml;bersetzt von </contrib>
+	</author>
+      </authorgroup>
+    </sect1info>
+    <title>Aktualisieren der Dokumentationssammlung</title>
+
+    <indexterm><primary>Updating and Upgrading</primary></indexterm>
+
+    <indexterm>
+      <primary>Documentation</primary>

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

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 17:43:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5884E10656A6; Wed,  7 Oct 2009 17:43:37 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03D1B1065693
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 17:43:37 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5F3D8FC1A
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 17:43:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97HhaPU007298
	for <perforce@FreeBSD.org>; Wed, 7 Oct 2009 17:43:36 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97HhaOB007296
	for perforce@freebsd.org; Wed, 7 Oct 2009 17:43:36 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Oct 2009 17:43:36 GMT
Message-Id: <200910071743.n97HhaOB007296@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169299 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 17:43:37 -0000

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

Change 169299 by hselasky@hselasky_laptop001 on 2009/10/07 17:43:32

	
	USB PCI+BIOS:
	 - patch from Andriy Gapon to workaround buggy BIOS
	code in USB regard. By doing the BIOS to OS handover
	for all host controllers at the same time, we avoid
	problems where the BIOS will actually write to the
	USB registers of all the USB host controllers every
	time we handover one of them, and consequently reset
	the OS programmed values.

Affected files ...

.. //depot/projects/usb/src/sys/dev/pci/pci.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#1 add
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#10 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohcireg.h#1 add
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#10 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhcireg.h#1 add

Differences ...

==== //depot/projects/usb/src/sys/dev/pci/pci.c#27 (text+ko) ====

@@ -62,6 +62,10 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pci_private.h>
 
+#include <dev/usb/controller/ehcireg.h>
+#include <dev/usb/controller/ohcireg.h>
+#include <dev/usb/controller/uhcireg.h>
+
 #include "pcib_if.h"
 #include "pci_if.h"
 
@@ -270,6 +274,13 @@
 SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD,
     &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI");
 
+static int pci_usb_takeover = 1;
+TUNABLE_INT("hw.pci.usb_early_takeover", &pci_usb_takeover);
+SYSCTL_INT(_hw_pci, OID_AUTO, usb_early_takeover, CTLFLAG_RD | CTLFLAG_TUN,
+    &pci_usb_takeover, 1, "Enable early takeover of USB controllers.\n\
+Disable this if you depend on BIOS emulation of USB devices, that is\n\
+you use USB devices (like keyboard or mouse) but do not load USB drivers");
+
 /* Find a device_t by bus/slot/function in domain 0 */
 
 device_t
@@ -2569,6 +2580,106 @@
 	resource_list_add(&dinfo->resources, SYS_RES_IRQ, 0, irq, irq, 1);
 }
 
+/* Perform early OHCI takeover from SMM. */
+static void
+ohci_early_takeover(device_t self)
+{
+	struct resource *res;
+	uint32_t ctl;
+	int rid;
+	int i;
+
+	rid = PCIR_BAR(0);
+	res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (res == NULL)
+		return;
+
+	ctl = bus_read_4(res, OHCI_CONTROL);
+	if (ctl & OHCI_IR) {
+		if (bootverbose)
+			printf("ohci early: "
+			    "SMM active, request owner change\n");
+		bus_write_4(res, OHCI_COMMAND_STATUS, OHCI_OCR);
+		for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) {
+			DELAY(1000);
+			ctl = bus_read_4(res, OHCI_CONTROL);
+		}
+		if (ctl & OHCI_IR) {
+			if (bootverbose)
+				printf("ohci early: "
+				    "SMM does not respond, resetting\n");
+			bus_write_4(res, OHCI_CONTROL, OHCI_HCFS_RESET);
+		}
+	}
+
+	bus_release_resource(self, SYS_RES_MEMORY, rid, res);
+}
+
+/* Perform early UHCI takeover from SMM. */
+static void
+uhci_early_takeover(device_t self)
+{
+	/*
+	 * Set the PIRQD enable bit and switch off all the others. We don't
+	 * want legacy support to interfere with us XXX Does this also mean
+	 * that the BIOS won't touch the keyboard anymore if it is connected
+	 * to the ports of the root hub?
+	 */
+	pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2);
+}
+
+/* Perform early EHCI takeover from SMM. */
+static void
+ehci_early_takeover(device_t self)
+{
+	struct resource *res;
+	uint32_t cparams;
+	uint32_t eec;
+	uint8_t eecp;
+	uint8_t bios_sem;
+	int rid;
+	int i;
+
+	rid = PCIR_BAR(0);
+	res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (res == NULL)
+		return;
+
+	cparams = bus_read_4(res, EHCI_HCCPARAMS);
+
+	/* Synchronise with the BIOS if it owns the controller. */
+	for (eecp = EHCI_HCC_EECP(cparams); eecp != 0;
+	    eecp = EHCI_EECP_NEXT(eec)) {
+		eec = pci_read_config(self, eecp, 4);
+		if (EHCI_EECP_ID(eec) != EHCI_EC_LEGSUP) {
+			continue;
+		}
+		bios_sem = pci_read_config(self, eecp +
+		    EHCI_LEGSUP_BIOS_SEM, 1);
+		if (bios_sem == 0) {
+			continue;
+		}
+		if (bootverbose)
+			printf("ehci early: "
+			    "SMM active, request owner change\n");
+
+		pci_write_config(self, eecp + EHCI_LEGSUP_OS_SEM, 1, 1);
+
+		for (i = 0; (i < 100) && (bios_sem != 0); i++) {
+			DELAY(1000);
+			bios_sem = pci_read_config(self, eecp +
+			    EHCI_LEGSUP_BIOS_SEM, 1);
+		}
+
+		if (bios_sem != 0) {
+			if (bootverbose)
+				printf("ehci early: "
+				    "SMM does not respond\n");
+		}
+	}
+	bus_release_resource(self, SYS_RES_MEMORY, rid, res);
+}
+
 void
 pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask)
 {
@@ -2612,6 +2723,16 @@
 		pci_assign_interrupt(bus, dev, 0);
 #endif
 	}
+
+	if (pci_usb_takeover && pci_get_class(dev) == PCIC_SERIALBUS &&
+	    pci_get_subclass(dev) == PCIS_SERIALBUS_USB) {
+		if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_EHCI)
+			ehci_early_takeover(dev);
+		else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_OHCI)
+			ohci_early_takeover(dev);
+		else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_UHCI)
+			uhci_early_takeover(dev);
+	}
 }
 
 void

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#11 (text+ko) ====

@@ -40,138 +40,7 @@
 
 #define	EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-/* PCI config registers  */
-#define	PCI_CBMEM		0x10	/* configuration base MEM */
-#define	PCI_INTERFACE_EHCI	0x20
-#define	PCI_USBREV		0x60	/* RO USB protocol revision */
-#define	PCI_USB_REV_MASK	0xff
-#define	PCI_USB_REV_PRE_1_0	0x00
-#define	PCI_USB_REV_1_0		0x10
-#define	PCI_USB_REV_1_1		0x11
-#define	PCI_USB_REV_2_0		0x20
-#define	PCI_EHCI_FLADJ		0x61	/* RW Frame len adj, SOF=59488+6*fladj */
-#define	PCI_EHCI_PORTWAKECAP	0x62	/* RW Port wake caps (opt)  */
-
-/* EHCI Extended Capabilities */
-#define	EHCI_EC_LEGSUP		0x01
-#define	EHCI_EECP_NEXT(x)	(((x) >> 8) & 0xff)
-#define	EHCI_EECP_ID(x)		((x) & 0xff)
-
-/* Legacy support extended capability */
-#define	EHCI_LEGSUP_BIOS_SEM		0x02
-#define	EHCI_LEGSUP_OS_SEM		0x03
-#define	EHCI_LEGSUP_USBLEGCTLSTS	0x04
-
-/* EHCI capability registers */
-#define	EHCI_CAPLENGTH		0x00	/* RO Capability register length field */
-/* reserved			0x01 */
-#define	EHCI_HCIVERSION		0x02	/* RO Interface version number */
-#define	EHCI_HCSPARAMS		0x04	/* RO Structural parameters */
-#define	EHCI_HCS_DEBUGPORT(x)	(((x) >> 20) & 0xf)
-#define	EHCI_HCS_P_INDICATOR(x) ((x) & 0x10000)
-#define	EHCI_HCS_N_CC(x)	(((x) >> 12) & 0xf)	/* # of companion ctlrs */
-#define	EHCI_HCS_N_PCC(x)	(((x) >> 8) & 0xf)	/* # of ports per comp. */
-#define	EHCI_HCS_PPC(x)		((x) & 0x10)	/* port power control */
-#define	EHCI_HCS_N_PORTS(x)	((x) & 0xf)	/* # of ports */
-#define	EHCI_HCCPARAMS		0x08	/* RO Capability parameters */
-#define	EHCI_HCC_EECP(x)	(((x) >> 8) & 0xff)	/* extended ports caps */
-#define	EHCI_HCC_IST(x)		(((x) >> 4) & 0xf)	/* isoc sched threshold */
-#define	EHCI_HCC_ASPC(x)	((x) & 0x4)	/* async sched park cap */
-#define	EHCI_HCC_PFLF(x)	((x) & 0x2)	/* prog frame list flag */
-#define	EHCI_HCC_64BIT(x)	((x) & 0x1)	/* 64 bit address cap */
-#define	EHCI_HCSP_PORTROUTE	0x0c	/* RO Companion port route description */
-
-/* EHCI operational registers.  Offset given by EHCI_CAPLENGTH register */
-#define	EHCI_USBCMD		0x00	/* RO, RW, WO Command register */
-#define	EHCI_CMD_ITC_M		0x00ff0000	/* RW interrupt threshold ctrl */
-#define	EHCI_CMD_ITC_1		0x00010000
-#define	EHCI_CMD_ITC_2		0x00020000
-#define	EHCI_CMD_ITC_4		0x00040000
-#define	EHCI_CMD_ITC_8		0x00080000
-#define	EHCI_CMD_ITC_16		0x00100000
-#define	EHCI_CMD_ITC_32		0x00200000
-#define	EHCI_CMD_ITC_64		0x00400000
-#define	EHCI_CMD_ASPME		0x00000800	/* RW/RO async park enable */
-#define	EHCI_CMD_ASPMC		0x00000300	/* RW/RO async park count */
-#define	EHCI_CMD_LHCR		0x00000080	/* RW light host ctrl reset */
-#define	EHCI_CMD_IAAD		0x00000040	/* RW intr on async adv door
-						 * bell */
-#define	EHCI_CMD_ASE		0x00000020	/* RW async sched enable */
-#define	EHCI_CMD_PSE		0x00000010	/* RW periodic sched enable */
-#define	EHCI_CMD_FLS_M		0x0000000c	/* RW/RO frame list size */
-#define	EHCI_CMD_FLS(x)		(((x) >> 2) & 3)	/* RW/RO frame list size */
-#define	EHCI_CMD_HCRESET	0x00000002	/* RW reset */
-#define	EHCI_CMD_RS		0x00000001	/* RW run/stop */
-#define	EHCI_USBSTS		0x04	/* RO, RW, RWC Status register */
-#define	EHCI_STS_ASS		0x00008000	/* RO async sched status */
-#define	EHCI_STS_PSS		0x00004000	/* RO periodic sched status */
-#define	EHCI_STS_REC		0x00002000	/* RO reclamation */
-#define	EHCI_STS_HCH		0x00001000	/* RO host controller halted */
-#define	EHCI_STS_IAA		0x00000020	/* RWC interrupt on async adv */
-#define	EHCI_STS_HSE		0x00000010	/* RWC host system error */
-#define	EHCI_STS_FLR		0x00000008	/* RWC frame list rollover */
-#define	EHCI_STS_PCD		0x00000004	/* RWC port change detect */
-#define	EHCI_STS_ERRINT		0x00000002	/* RWC error interrupt */
-#define	EHCI_STS_INT		0x00000001	/* RWC interrupt */
-#define	EHCI_STS_INTRS(x)	((x) & 0x3f)
-
-/*
- * NOTE: the doorbell interrupt is enabled, but the doorbell is never
- * used! SiS chipsets require this.
- */
-#define	EHCI_NORMAL_INTRS	(EHCI_STS_IAA | EHCI_STS_HSE |	\
-				EHCI_STS_PCD | EHCI_STS_ERRINT | EHCI_STS_INT)
-
-#define	EHCI_USBINTR		0x08	/* RW Interrupt register */
-#define	EHCI_INTR_IAAE		0x00000020	/* interrupt on async advance
-						 * ena */
-#define	EHCI_INTR_HSEE		0x00000010	/* host system error ena */
-#define	EHCI_INTR_FLRE		0x00000008	/* frame list rollover ena */
-#define	EHCI_INTR_PCIE		0x00000004	/* port change ena */
-#define	EHCI_INTR_UEIE		0x00000002	/* USB error intr ena */
-#define	EHCI_INTR_UIE		0x00000001	/* USB intr ena */
-
-#define	EHCI_FRINDEX		0x0c	/* RW Frame Index register */
-
-#define	EHCI_CTRLDSSEGMENT	0x10	/* RW Control Data Structure Segment */
-
-#define	EHCI_PERIODICLISTBASE	0x14	/* RW Periodic List Base */
-#define	EHCI_ASYNCLISTADDR	0x18	/* RW Async List Base */
-
-#define	EHCI_CONFIGFLAG		0x40	/* RW Configure Flag register */
-#define	EHCI_CONF_CF		0x00000001	/* RW configure flag */
-
-#define	EHCI_PORTSC(n)		(0x40+(4*(n)))	/* RO, RW, RWC Port Status reg */
-#define	EHCI_PS_WKOC_E		0x00400000	/* RW wake on over current ena */
-#define	EHCI_PS_WKDSCNNT_E	0x00200000	/* RW wake on disconnect ena */
-#define	EHCI_PS_WKCNNT_E	0x00100000	/* RW wake on connect ena */
-#define	EHCI_PS_PTC		0x000f0000	/* RW port test control */
-#define	EHCI_PS_PIC		0x0000c000	/* RW port indicator control */
-#define	EHCI_PS_PO		0x00002000	/* RW port owner */
-#define	EHCI_PS_PP		0x00001000	/* RW,RO port power */
-#define	EHCI_PS_LS		0x00000c00	/* RO line status */
-#define	EHCI_PS_IS_LOWSPEED(x)	(((x) & EHCI_PS_LS) == 0x00000400)
-#define	EHCI_PS_PR		0x00000100	/* RW port reset */
-#define	EHCI_PS_SUSP		0x00000080	/* RW suspend */
-#define	EHCI_PS_FPR		0x00000040	/* RW force port resume */
-#define	EHCI_PS_OCC		0x00000020	/* RWC over current change */
-#define	EHCI_PS_OCA		0x00000010	/* RO over current active */
-#define	EHCI_PS_PEC		0x00000008	/* RWC port enable change */
-#define	EHCI_PS_PE		0x00000004	/* RW port enable */
-#define	EHCI_PS_CSC		0x00000002	/* RWC connect status change */
-#define	EHCI_PS_CS		0x00000001	/* RO connect status */
-#define	EHCI_PS_CLEAR		(EHCI_PS_OCC | EHCI_PS_PEC | EHCI_PS_CSC)
-
-#define	EHCI_USBMODE		0x68	/* RW USB Device mode register */
-#define	EHCI_UM_CM		0x00000003	/* R/WO Controller Mode */
-#define	EHCI_UM_CM_IDLE		0x0	/* Idle */
-#define	EHCI_UM_CM_HOST		0x3	/* Host Controller */
-#define	EHCI_UM_ES		0x00000004	/* R/WO Endian Select */
-#define	EHCI_UM_ES_LE		0x0	/* Little-endian byte alignment */
-#define	EHCI_UM_ES_BE		0x4	/* Big-endian byte alignment */
-#define	EHCI_UM_SDIS		0x00000010	/* R/WO Stream Disable Mode */
-
-#define	EHCI_PORT_RESET_COMPLETE	2	/* ms */
+#include <dev/usb/controller/ehcireg.h>
 
 /*
  * Alignment NOTE: structures must be aligned so that the hardware can index

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#10 (text+ko) ====

@@ -41,94 +41,7 @@
 
 #define	OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-/* PCI config registers  */
-#define	PCI_CBMEM		0x10	/* configuration base memory */
-#define	PCI_INTERFACE_OHCI	0x10
-
-/* OHCI registers */
-#define	OHCI_REVISION		0x00	/* OHCI revision */
-#define	OHCI_REV_LO(rev)	((rev) & 0xf)
-#define	OHCI_REV_HI(rev)	(((rev)>>4) & 0xf)
-#define	OHCI_REV_LEGACY(rev)	((rev) & 0x100)
-#define	OHCI_CONTROL		0x04
-#define	OHCI_CBSR_MASK		0x00000003	/* Control/Bulk Service Ratio */
-#define	OHCI_RATIO_1_1		0x00000000
-#define	OHCI_RATIO_1_2		0x00000001
-#define	OHCI_RATIO_1_3		0x00000002
-#define	OHCI_RATIO_1_4		0x00000003
-#define	OHCI_PLE		0x00000004	/* Periodic List Enable */
-#define	OHCI_IE			0x00000008	/* Isochronous Enable */
-#define	OHCI_CLE		0x00000010	/* Control List Enable */
-#define	OHCI_BLE		0x00000020	/* Bulk List Enable */
-#define	OHCI_HCFS_MASK		0x000000c0	/* HostControllerFunctionalStat
-						 * e */
-#define	OHCI_HCFS_RESET		0x00000000
-#define	OHCI_HCFS_RESUME	0x00000040
-#define	OHCI_HCFS_OPERATIONAL	0x00000080
-#define	OHCI_HCFS_SUSPEND	0x000000c0
-#define	OHCI_IR			0x00000100	/* Interrupt Routing */
-#define	OHCI_RWC		0x00000200	/* Remote Wakeup Connected */
-#define	OHCI_RWE		0x00000400	/* Remote Wakeup Enabled */
-#define	OHCI_COMMAND_STATUS	0x08
-#define	OHCI_HCR		0x00000001	/* Host Controller Reset */
-#define	OHCI_CLF		0x00000002	/* Control List Filled */
-#define	OHCI_BLF		0x00000004	/* Bulk List Filled */
-#define	OHCI_OCR		0x00000008	/* Ownership Change Request */
-#define	OHCI_SOC_MASK		0x00030000	/* Scheduling Overrun Count */
-#define	OHCI_INTERRUPT_STATUS	0x0c
-#define	OHCI_SO			0x00000001	/* Scheduling Overrun */
-#define	OHCI_WDH		0x00000002	/* Writeback Done Head */
-#define	OHCI_SF			0x00000004	/* Start of Frame */
-#define	OHCI_RD			0x00000008	/* Resume Detected */
-#define	OHCI_UE			0x00000010	/* Unrecoverable Error */
-#define	OHCI_FNO		0x00000020	/* Frame Number Overflow */
-#define	OHCI_RHSC		0x00000040	/* Root Hub Status Change */
-#define	OHCI_OC			0x40000000	/* Ownership Change */
-#define	OHCI_MIE		0x80000000	/* Master Interrupt Enable */
-#define	OHCI_INTERRUPT_ENABLE	0x10
-#define	OHCI_INTERRUPT_DISABLE	0x14
-#define	OHCI_HCCA		0x18
-#define	OHCI_PERIOD_CURRENT_ED	0x1c
-#define	OHCI_CONTROL_HEAD_ED	0x20
-#define	OHCI_CONTROL_CURRENT_ED	0x24
-#define	OHCI_BULK_HEAD_ED	0x28
-#define	OHCI_BULK_CURRENT_ED	0x2c
-#define	OHCI_DONE_HEAD		0x30
-#define	OHCI_FM_INTERVAL	0x34
-#define	OHCI_GET_IVAL(s)	((s) & 0x3fff)
-#define	OHCI_GET_FSMPS(s)	(((s) >> 16) & 0x7fff)
-#define	OHCI_FIT		0x80000000
-#define	OHCI_FM_REMAINING	0x38
-#define	OHCI_FM_NUMBER		0x3c
-#define	OHCI_PERIODIC_START	0x40
-#define	OHCI_LS_THRESHOLD	0x44
-#define	OHCI_RH_DESCRIPTOR_A	0x48
-#define	OHCI_GET_NDP(s)		((s) & 0xff)
-#define	OHCI_PSM		0x0100	/* Power Switching Mode */
-#define	OHCI_NPS		0x0200	/* No Power Switching */
-#define	OHCI_DT			0x0400	/* Device Type */
-#define	OHCI_OCPM		0x0800	/* Overcurrent Protection Mode */
-#define	OHCI_NOCP		0x1000	/* No Overcurrent Protection */
-#define	OHCI_GET_POTPGT(s)	((s) >> 24)
-#define	OHCI_RH_DESCRIPTOR_B	0x4c
-#define	OHCI_RH_STATUS		0x50
-#define	OHCI_LPS		0x00000001	/* Local Power Status */
-#define	OHCI_OCI		0x00000002	/* OverCurrent Indicator */
-#define	OHCI_DRWE		0x00008000	/* Device Remote Wakeup Enable */
-#define	OHCI_LPSC		0x00010000	/* Local Power Status Change */
-#define	OHCI_CCIC		0x00020000	/* OverCurrent Indicator
-						 * Change */
-#define	OHCI_CRWE		0x80000000	/* Clear Remote Wakeup Enable */
-#define	OHCI_RH_PORT_STATUS(n)	(0x50 + ((n)*4))	/* 1 based indexing */
-
-#define	OHCI_LES		(OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE)
-#define	OHCI_ALL_INTRS		(OHCI_SO | OHCI_WDH | OHCI_SF |		\
-				OHCI_RD | OHCI_UE | OHCI_FNO |		\
-				OHCI_RHSC | OHCI_OC)
-#define	OHCI_NORMAL_INTRS	(OHCI_WDH | OHCI_RD | OHCI_UE | OHCI_RHSC)
-
-#define	OHCI_FSMPS(i)		(((i-210)*6/7) << 16)
-#define	OHCI_PERIODIC(i)	((i)*9/10)
+#include <dev/usb/controller/ohcireg.h>
 
 #define	OHCI_NO_INTRS		32
 #define	OHCI_HCCA_SIZE		256

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#10 (text+ko) ====

@@ -41,64 +41,8 @@
 
 #define	UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-/* PCI config registers  */
-#define	PCI_USBREV		0x60	/* USB protocol revision */
-#define	PCI_USB_REV_MASK		0xff
-#define	PCI_USB_REV_PRE_1_0	0x00
-#define	PCI_USB_REV_1_0		0x10
-#define	PCI_USB_REV_1_1		0x11
-#define	PCI_LEGSUP		0xc0	/* Legacy Support register */
-#define	PCI_LEGSUP_USBPIRQDEN	0x2000	/* USB PIRQ D Enable */
-#define	PCI_CBIO		0x20	/* configuration base IO */
-#define	PCI_INTERFACE_UHCI	0x00
-
-/* UHCI registers */
-#define	UHCI_CMD		0x00
-#define	UHCI_CMD_RS		0x0001
-#define	UHCI_CMD_HCRESET	0x0002
-#define	UHCI_CMD_GRESET		0x0004
-#define	UHCI_CMD_EGSM		0x0008
-#define	UHCI_CMD_FGR		0x0010
-#define	UHCI_CMD_SWDBG		0x0020
-#define	UHCI_CMD_CF		0x0040
-#define	UHCI_CMD_MAXP		0x0080
-#define	UHCI_STS		0x02
-#define	UHCI_STS_USBINT		0x0001
-#define	UHCI_STS_USBEI		0x0002
-#define	UHCI_STS_RD		0x0004
-#define	UHCI_STS_HSE		0x0008
-#define	UHCI_STS_HCPE		0x0010
-#define	UHCI_STS_HCH		0x0020
-#define	UHCI_STS_ALLINTRS	0x003f
-#define	UHCI_INTR		0x04
-#define	UHCI_INTR_TOCRCIE	0x0001
-#define	UHCI_INTR_RIE		0x0002
-#define	UHCI_INTR_IOCE		0x0004
-#define	UHCI_INTR_SPIE		0x0008
-#define	UHCI_FRNUM		0x06
-#define	UHCI_FRNUM_MASK		0x03ff
-#define	UHCI_FLBASEADDR		0x08
-#define	UHCI_SOF		0x0c
-#define	UHCI_SOF_MASK		0x7f
-#define	UHCI_PORTSC1      	0x010
-#define	UHCI_PORTSC2      	0x012
-#define	UHCI_PORTSC_CCS		0x0001
-#define	UHCI_PORTSC_CSC		0x0002
-#define	UHCI_PORTSC_PE		0x0004
-#define	UHCI_PORTSC_POEDC	0x0008
-#define	UHCI_PORTSC_LS		0x0030
-#define	UHCI_PORTSC_LS_SHIFT	4
-#define	UHCI_PORTSC_RD		0x0040
-#define	UHCI_PORTSC_LSDA	0x0100
-#define	UHCI_PORTSC_PR		0x0200
-#define	UHCI_PORTSC_OCI		0x0400
-#define	UHCI_PORTSC_OCIC	0x0800
-#define	UHCI_PORTSC_SUSP	0x1000
+#include <dev/usb/controller/uhcireg.h>
 
-#define	URWMASK(x)		((x) & (UHCI_PORTSC_SUSP |		\
-				UHCI_PORTSC_PR | UHCI_PORTSC_RD |	\
-				UHCI_PORTSC_PE))
-
 #define	UHCI_FRAMELIST_COUNT	1024	/* units */
 #define	UHCI_FRAMELIST_ALIGN	4096	/* bytes */
 
@@ -118,8 +62,6 @@
 #define	UHCI_PTR_QH		0x00000002
 #define	UHCI_PTR_VF		0x00000004
 
-#define	UHCI_QH_REMOVE_DELAY	5	/* us - QH remove delay */
-
 /*
  * The Queue Heads (QH) and Transfer Descriptors (TD) are accessed by
  * both the CPU and the USB-controller which run concurrently. Great

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 20:26:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC0DD1065697; Wed,  7 Oct 2009 20:26:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70D4E1065695
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 20:26:35 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 472778FC17
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 20:26:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97KQZJj022438
	for <perforce@FreeBSD.org>; Wed, 7 Oct 2009 20:26:35 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97KQZkk022436
	for perforce@freebsd.org; Wed, 7 Oct 2009 20:26:35 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 7 Oct 2009 20:26:35 GMT
Message-Id: <200910072026.n97KQZkk022436@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169304 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 20:26:35 -0000

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

Change 169304 by pgj@beehive on 2009/10/07 20:26:22

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/administration.sgml#8 integrate
.. //depot/projects/docproj_hu/www/en/news/status/Makefile#6 integrate
.. //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#1 branch
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#55 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/administration.sgml#8 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.25 2009/06/04 09:21:29 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.26 2009/10/06 08:03:43 danger Exp $">
 <!ENTITY title "FreeBSD Project Administration and Management">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -169,6 +169,7 @@
     <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
     <li>&a.dwhite; &lt;<a href="mailto:dwhite@FreeBSD.org">dwhite@FreeBSD.org</a>&gt;</li>
+    <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-re-alpha">FreeBSD/alpha Release Engineering Team</a>

==== //depot/projects/docproj_hu/www/en/news/status/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.46 2009/05/07 18:12:15 brd Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.47 2009/10/05 12:49:16 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -44,6 +44,7 @@
 XMLDOCS+=	report-2008-07-2008-09
 XMLDOCS+=	report-2008-10-2008-12
 XMLDOCS+=	report-2009-01-2009-03
+#XMLDOCS+=	report-2009-04-2009-09
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#55 (text+ko) ====

@@ -11,7 +11,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/hu/share/sgml/news.xml,v 1.22 2009/09/23 10:50:07 pgj Exp $
+      $FreeBSD: www/hu/share/sgml/news.xml,v 1.23 2009/10/05 18:52:17 pgj Exp $
     </cvs:keyword>
   </cvs:keywords>
 

From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 21:05:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 696561065695; Wed,  7 Oct 2009 21:05:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DE141065693
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 21:05:18 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DC288FC13
	for <perforce@FreeBSD.org>; Wed,  7 Oct 2009 21:05:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97L5Isp036478
	for <perforce@FreeBSD.org>; Wed, 7 Oct 2009 21:05:18 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97L5H7I036476
	for perforce@freebsd.org; Wed, 7 Oct 2009 21:05:17 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 7 Oct 2009 21:05:17 GMT
Message-Id: <200910072105.n97L5H7I036476@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169309 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 21:05:18 -0000

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

Change 169309 by pgj@beehive on 2009/10/07 21:04:25

	MFen (www):
		1.25       -> 1.26       hu/administration.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/administration.sgml#20 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/administration.sgml#20 (text+ko) ====

@@ -9,7 +9,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
      %SOURCE%	en/administration.sgml
-     %SRCID%	1.25
+     %SRCID%	1.26
 -->
 
 <html>
@@ -249,6 +249,7 @@
     <li>&a.murray; &lt;<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>&gt;</li>
     <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
     <li>&a.dwhite; &lt;<a href="mailto:dwhite@FreeBSD.org">dwhite@FreeBSD.org</a>&gt;</li>
+    <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-re-alpha">&os;/alpha Release Engineering Team</a>

From owner-p4-projects@FreeBSD.ORG  Thu Oct  8 06:13:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6908A106568D; Thu,  8 Oct 2009 06:13:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20CF9106566B
	for <perforce@freebsd.org>; Thu,  8 Oct 2009 06:13:17 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E7C38FC17
	for <perforce@freebsd.org>; Thu,  8 Oct 2009 06:13:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n986DGfn006826
	for <perforce@freebsd.org>; Thu, 8 Oct 2009 06:13:16 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n986DGD9006824
	for perforce@freebsd.org; Thu, 8 Oct 2009 06:13:16 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 8 Oct 2009 06:13:16 GMT
Message-Id: <200910080613.n986DGD9006824@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169316 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 06:13:17 -0000

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

Change 169316 by mav@mav_mavbook on 2009/10/08 06:13:04

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/sh.1#6 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcpdump/print-tcp.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcpdump/tcp.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/errlst.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/intro.2#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/bce.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/bge.4#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#63 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_server.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/errno.h#5 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/unknown1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/tmpfs/h_tools.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/cdcontrol.c#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -713,12 +713,7 @@
 				do_clearcmdentry = 1;
 			}
 
-		find_command(argv[0], &cmdentry, 1, path);
-		if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
-			exitstatus = 127;
-			flushout(&errout);
-			return;
-		}
+		find_command(argv[0], &cmdentry, 0, path);
 		/* implement the bltin builtin here */
 		if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
 			for (;;) {
@@ -740,7 +735,7 @@
 
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd
-	 || (cmdentry.cmdtype == CMDNORMAL
+	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
 	    && ((flags & EV_EXIT) == 0 || have_traps()))
 	 || ((flags & EV_BACKCMD) != 0
 	    && (cmdentry.cmdtype != CMDBUILTIN

==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -429,6 +429,7 @@
 			outfmt(out2, "%s: %s\n", name, strerror(e));
 	}
 	entry->cmdtype = CMDUNKNOWN;
+	entry->u.index = 0;
 	return;
 
 success:

==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#6 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
 .\"
 .Dd May 31, 2009
 .Dt SH 1
@@ -1227,6 +1227,9 @@
 final value of
 .Ar parameter
 is substituted.
+Quoting inside
+.Ar word
+does not prevent field splitting or pathname expansion.
 Only variables, not positional
 parameters or special parameters, can be
 assigned in this way.

==== //depot/projects/scottl-camlock/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ====

@@ -124,6 +124,7 @@
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
+        { TCPOPT_UTO, "uto" },
         { 0, NULL }
 };
 
@@ -613,6 +614,17 @@
                                  */
                                 break;
 
+                        case TCPOPT_UTO:
+                                datalen = 2;
+                                LENCHECK(datalen);
+                                uint utoval = EXTRACT_16BITS(cp);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
+                                else
+                                        utoval >>= 1;
+                                (void)printf(" %u", utoval);
+                                break;
+
                         default:
                                 datalen = len - 2;
                                 for (i = 0; i < datalen; ++i) {

==== //depot/projects/scottl-camlock/src/contrib/tcpdump/tcp.h#3 (text+ko) ====

@@ -83,6 +83,8 @@
 #define    TCPOLEN_SIGNATURE		18
 #define TCP_SIGLEN 16			/* length of an option 19 digest */
 #define TCPOPT_AUTH             20      /* Enhanced AUTH option */
+#define	TCPOPT_UTO		28	/* tcp user timeout (rfc5482) */
+#define	   TCPOLEN_UTO			4
 
 #define TCPOPT_TSTAMP_HDR	\
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)

==== //depot/projects/scottl-camlock/src/contrib/tcsh/sh.c#4 (text+ko) ====

@@ -1291,6 +1291,8 @@
     /*
      * Mop-up.
      */
+    /* Take care of these (especially HUP) here instead of inside flush. */
+    handle_pending_signals();
     if (intty) {
 	if (loginsh) {
 	    xprintf("logout\n");

==== //depot/projects/scottl-camlock/src/lib/libc/gen/errlst.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.10 2009/10/07 20:20:51 rwatson Exp $");
 
 #include <stdio.h>
 
@@ -150,5 +150,6 @@
 	"Multihop attempted",			/* 90 - EMULTIHOP */
 	"Link has been severed",		/* 91 - ENOLINK */
 	"Protocol error",			/* 92 - EPROTO */
+	"Capabilities insufficient",		/* 93 - ENOTCAPABLE */
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);

==== //depot/projects/scottl-camlock/src/lib/libc/sys/intro.2#3 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.49 2009/09/06 07:22:09 pjd Exp $
+.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.50 2009/10/07 20:20:51 rwatson Exp $
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
@@ -456,6 +456,9 @@
 .It Er 88 EDOOFUS Em "Programming error" .
 A function or API is being abused in a way which could only be detected
 at run-time.
+.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" .
+An operation on a capability file descriptor requires greater privilege than
+the capability allows.
 .El
 .Sh DEFINITIONS
 .Bl -tag -width Ds

==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#5 (text+ko) ====

@@ -22,7 +22,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/map_object.c,v 1.22 2009/07/17 19:32:04 kib Exp $
+ * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.23 2009/10/06 17:14:39 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -273,7 +273,7 @@
     } u;
     ssize_t nbytes;
 
-    if ((nbytes = read(fd, u.buf, PAGE_SIZE)) == -1) {
+    if ((nbytes = pread(fd, u.buf, PAGE_SIZE, 0)) == -1) {
 	_rtld_error("%s: read error: %s", path, strerror(errno));
 	return NULL;
     }

==== //depot/projects/scottl-camlock/src/share/man/man4/bce.4#3 (text) ====

@@ -26,9 +26,9 @@
 .\" 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/bce.4,v 1.12 2009/04/07 22:23:48 delphij Exp $
+.\" $FreeBSD: src/share/man/man4/bce.4,v 1.13 2009/10/07 13:45:12 simon Exp $
 .\"
-.Dd April 7, 2009
+.Dd October 7, 2009
 .Dt BCE 4
 .Os
 .Sh NAME
@@ -165,6 +165,8 @@
 .It
 Dell PowerEdge 2950 integrated BCM5708 NIC
 .It
+Dell PowerEdge R710 integrated BCM5709 NIC
+.It
 HP NC370F Multifunction Gigabit Server Adapter
 .It
 HP NC370T Multifunction Gigabit Server Adapter

==== //depot/projects/scottl-camlock/src/share/man/man4/bge.4#3 (text+ko) ====

@@ -29,14 +29,14 @@
 .\" 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/bge.4,v 1.35 2009/05/19 17:17:53 joel Exp $
+.\" $FreeBSD: src/share/man/man4/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $
 .\"
-.Dd May 19, 2009
+.Dd Oct 7, 2009
 .Dt BGE 4
 .Os
 .Sh NAME
 .Nm bge
-.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver"
+.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -56,8 +56,8 @@
 The
 .Nm
 driver provides support for various NICs based on the Broadcom BCM570x,
-5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet
-controller chips.
+5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families
+of Gigabit Ethernet controller chips.
 .Pp
 All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5
 copper cable, except for the SysKonnect SK-9D41 which supports only

==== //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.48 2009/10/06 23:48:28 attilio Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
@@ -32,9 +32,9 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#define mb()	__asm__ __volatile__ ("mfence;": : :"memory")
-#define wmb()	__asm__ __volatile__ ("sfence;": : :"memory")
-#define rmb()	__asm__ __volatile__ ("lfence;": : :"memory")
+#define	mb()	__asm __volatile("mfence;" : : : "memory")
+#define	wmb()	__asm __volatile("sfence;" : : : "memory")
+#define	rmb()	__asm __volatile("lfence;" : : : "memory")
 
 /*
  * Various simple operations on memory, each of which is atomic in the
@@ -131,50 +131,33 @@
  * Returns 0 on failure, non-zero on success
  */
 
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src)
-{
-	u_char res;
+#define	DEFINE_CMPSET_GEN(NAME, TYPE, OP)		\
+static __inline int					\
+atomic_cmpset_##NAME(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\
+{							\
+	u_char res;					\
+							\
+	__asm __volatile(				\
+	"	" MPLOCKED "		"		\
+	"	" OP "	%2,%1 ;		"		\
+	"       sete	%0 ;		"		\
+	"1:				"		\
+	"# atomic_cmpset_##NAME"			\
+	: "=a" (res),			/* 0 */		\
+	  "=m" (*dst)			/* 1 */		\
+	: "r" (src),			/* 2 */		\
+	  "a" (exp),			/* 3 */		\
+	  "m" (*dst)			/* 4 */		\
+	: "memory");					\
+							\
+	return (res);					\
+}							\
+struct __hack
 
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgl %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# atomic_cmpset_int"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
-
-	return (res);
-}
-
-static __inline int
-atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgq %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# atomic_cmpset_long"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
-
-	return (res);
-}
-
-#define	atomic_cmpset_barr_int	atomic_cmpset_int
-#define	atomic_cmpset_barr_long	atomic_cmpset_long
+DEFINE_CMPSET_GEN(int, int, "cmpxchgl");
+DEFINE_CMPSET_GEN(long, long, "cmpxchgq");
+DEFINE_CMPSET_GEN(barr_int, int, "cmpxchgl");
+DEFINE_CMPSET_GEN(barr_long, long, "cmpxchgq");
 
 /*
  * Atomically add the value of v to the integer pointed to by p and return

==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 (text+ko) ====

@@ -1821,6 +1821,12 @@
 #endif
 
 #ifdef _KERNEL
+	if (needfree)
+		return (1);
+	if (arc_size > arc_c_max)
+		return (1);
+	if (arc_size <= arc_c_min)
+		return (0);
 
 	/*
 	 * If pages are needed or we're within 2048 pages 
@@ -1829,9 +1835,6 @@
 	if (vm_pages_needed || (vm_paging_target() > -2048))
 		return (1);
 
-	if (needfree)
-		return (1);
-
 #if 0
 	/*
 	 * take 'desfree' extra pages, so we reclaim sooner, rather than later

==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 (text+ko) ====

@@ -433,7 +433,7 @@
 	if (cp != NULL) {
 		len = strlen(cp->provider->name) + strlen("/dev/") + 1;
 		buf = kmem_alloc(len, KM_SLEEP);
-	
+
 		snprintf(buf, len, "/dev/%s", cp->provider->name);
 		spa_strfree(vd->vdev_path);
 		vd->vdev_path = buf;
@@ -662,26 +662,6 @@
 static void
 vdev_geom_io_done(zio_t *zio)
 {
-
-	/*																						    
-	 * If the device returned ENXIO, then attempt we should verify if GEOM														
-	 * provider has been removed. If this is the case, then we trigger an														 
-	 * asynchronous removal of the device.																		
-	 */																						   
-	if (zio->io_error == ENXIO) {
-		vdev_t *vd = zio->io_vd;
-		vdev_geom_ctx_t *ctx;
-		struct g_provider *pp = NULL;
-
-		ctx = vd->vdev_tsd;
-		if (ctx != NULL && ctx->gc_consumer != NULL)
-			pp = ctx->gc_consumer->provider;
-
-		if (pp == NULL || (pp->flags & G_PF_ORPHAN)) {
-			vd->vdev_remove_wanted = B_TRUE;
-			spa_async_request(zio->io_spa, SPA_ASYNC_REMOVE);
-		}
-	}
 }
 
 vdev_ops_t vdev_geom_ops = {

==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 (text+ko) ====

@@ -2538,6 +2538,7 @@
 	vattr_t		oldva;
 	uint_t		mask = vap->va_mask;
 	uint_t		saved_mask;
+	uint64_t	saved_mode;
 	int		trim_mask = 0;
 	uint64_t	new_mode;
 	znode_t		*attrzp;
@@ -2766,6 +2767,13 @@
 		if (trim_mask) {
 			saved_mask = vap->va_mask;
 			vap->va_mask &= ~trim_mask;
+			if (trim_mask & AT_MODE) {
+				/*
+				 * Save the mode, as secpolicy_vnode_setattr()
+				 * will overwrite it with ova.va_mode.
+				 */
+				saved_mode = vap->va_mode;
+			}
 		}
 		err = secpolicy_vnode_setattr(cr, vp, vap, &oldva, flags,
 		    (int (*)(void *, int, cred_t *))zfs_zaccess_unix, zp);
@@ -2774,8 +2782,16 @@
 			return (err);
 		}
 
-		if (trim_mask)
+		if (trim_mask) {
 			vap->va_mask |= saved_mask;
+			if (trim_mask & AT_MODE) {
+				/*
+				 * Recover the mode after
+				 * secpolicy_vnode_setattr().
+				 */
+				vap->va_mode = saved_mode;
+			}
+		}
 	}
 
 	/*

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#63 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.6 2009/09/06 21:22:24 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.7 2009/10/07 15:40:04 mav Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
@@ -1259,15 +1259,16 @@
 
 	if (!ch->readlog)
 		xpt_freeze_simq(ch->sim, ch->numrslots);
-	/* Handle command with timeout. */
-	ahci_end_transaction(&ch->slot[slot->slot], AHCI_ERR_TIMEOUT);
-	/* Handle the rest of commands. */
+	/* Handle frozen command. */
 	if (ch->frozen) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
 		fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ;
 		xpt_done(fccb);
 	}
+	/* Handle command with timeout. */
+	ahci_end_transaction(&ch->slot[slot->slot], AHCI_ERR_TIMEOUT);
+	/* Handle the rest of commands. */
 	for (i = 0; i < ch->numslots; i++) {
 		/* Do we have a running request on slot? */
 		if (ch->slot[i].state < AHCI_SLOT_RUNNING)

==== //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#24 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.227 2009/08/18 21:07:39 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -170,6 +170,7 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5720 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5721 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5722 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5723 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5750 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5750M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5751 },
@@ -184,12 +185,21 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5754M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761E },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761S },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761SE },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5764 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5780 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5780S },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5781 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5782 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5784 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5785F },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5785G },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5786 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787F },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5787M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5788 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5789 },
@@ -198,11 +208,19 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5903M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57760 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57780 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57788 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57790 },
 
 	{ SK_VENDORID,		SK_DEVICEID_ALTIMA },
 
 	{ TC_VENDORID,		TC_DEVICEID_3C996 },
 
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PW008GE4 },
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PW008GE5 },
+	{ FJTSU_VENDORID,	FJTSU_DEVICEID_PP250450 },
+
 	{ 0, 0 }
 };
 
@@ -216,6 +234,7 @@
 	{ BCOM_VENDORID,	"Broadcom" },
 	{ SK_VENDORID,		"SysKonnect" },
 	{ TC_VENDORID,		"3Com" },
+	{ FJTSU_VENDORID,	"Fujitsu" },
 
 	{ 0, NULL }
 };
@@ -271,12 +290,18 @@
 	{ BGE_CHIPID_BCM5755_A1,	"BCM5755 A1" },
 	{ BGE_CHIPID_BCM5755_A2,	"BCM5755 A2" },
 	{ BGE_CHIPID_BCM5722_A0,	"BCM5722 A0" },
+	{ BGE_CHIPID_BCM5761_A0,	"BCM5761 A0" },
+	{ BGE_CHIPID_BCM5761_A1,	"BCM5761 A1" },
+	{ BGE_CHIPID_BCM5784_A0,	"BCM5784 A0" },
+	{ BGE_CHIPID_BCM5784_A1,	"BCM5784 A1" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_CHIPID_BCM5787_A0,	"BCM5754/5787 A0" }, 
 	{ BGE_CHIPID_BCM5787_A1,	"BCM5754/5787 A1" },
 	{ BGE_CHIPID_BCM5787_A2,	"BCM5754/5787 A2" },
 	{ BGE_CHIPID_BCM5906_A1,	"BCM5906 A1" },
 	{ BGE_CHIPID_BCM5906_A2,	"BCM5906 A2" },
+	{ BGE_CHIPID_BCM57780_A0,	"BCM57780 A0" },
+	{ BGE_CHIPID_BCM57780_A1,	"BCM57780 A1" },
 
 	{ 0, NULL }
 };
@@ -297,9 +322,13 @@
 	{ BGE_ASICREV_BCM5780,		"unknown BCM5780" },
 	{ BGE_ASICREV_BCM5714,		"unknown BCM5714" },
 	{ BGE_ASICREV_BCM5755,		"unknown BCM5755" },
+	{ BGE_ASICREV_BCM5761,		"unknown BCM5761" },
+	{ BGE_ASICREV_BCM5784,		"unknown BCM5784" },
+	{ BGE_ASICREV_BCM5785,		"unknown BCM5785" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_ASICREV_BCM5787,		"unknown BCM5754/5787" },
 	{ BGE_ASICREV_BCM5906,		"unknown BCM5906" },
+	{ BGE_ASICREV_BCM57780,		"unknown BCM57780" },
 
 	{ 0, NULL }
 };
@@ -309,6 +338,7 @@
 #define	BGE_IS_5705_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_5705_PLUS)
 #define	BGE_IS_5714_FAMILY(sc)		((sc)->bge_flags & BGE_FLAG_5714_FAMILY)
 #define	BGE_IS_575X_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_575X_PLUS)
+#define	BGE_IS_5755_PLUS(sc)		((sc)->bge_flags & BGE_FLAG_5755_PLUS)
 
 const struct bge_revision * bge_lookup_rev(uint32_t);
 const struct bge_vendor * bge_lookup_vendor(uint16_t);
@@ -1758,9 +1788,8 @@
 	val = BGE_WDMAMODE_ENABLE | BGE_WDMAMODE_ALL_ATTNS;
 
 	/* Enable host coalescing bug fix. */
-	if (sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5787)
-		val |= 1 << 29;
+	if (BGE_IS_5755_PLUS(sc))
+		val |= BGE_WDMAMODE_STATUS_TAG_FIX;
 
 	/* Turn on write DMA state machine */
 	CSR_WRITE_4(sc, BGE_WDMA_MODE, val);
@@ -1768,6 +1797,12 @@
 
 	/* Turn on read DMA state machine */
 	val = BGE_RDMAMODE_ENABLE | BGE_RDMAMODE_ALL_ATTNS;
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5784 ||
+	    sc->bge_asicrev == BGE_ASICREV_BCM5785 ||
+	    sc->bge_asicrev == BGE_ASICREV_BCM57780)
+		val |= BGE_RDMAMODE_BD_SBD_CRPT_ATTN |
+		    BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN |
+		    BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN;
 	if (sc->bge_flags & BGE_FLAG_PCIE)
 		val |= BGE_RDMAMODE_FIFO_LONG_BURST;
 	CSR_WRITE_4(sc, BGE_RDMA_MODE, val);
@@ -1790,7 +1825,10 @@
 	CSR_WRITE_4(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE);
 
 	/* Turn on send data completion state machine */
-	CSR_WRITE_4(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE);
+	val = BGE_SDCMODE_ENABLE;
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5761)
+		val |= BGE_SDCMODE_CDELAY;
+	CSR_WRITE_4(sc, BGE_SDC_MODE, val);
 
 	/* Turn on send data initiator state machine */
 	CSR_WRITE_4(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE);
@@ -1897,8 +1935,11 @@
 			const struct bge_vendor *v;
 			uint32_t id;
 
-			id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) &
-			    BGE_PCIMISCCTL_ASICREV;
+			id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >>
+			    BGE_PCIMISCCTL_ASICREV_SHIFT;
+			if (BGE_ASICREV(id) == BGE_ASICREV_USE_PRODID_REG)
+				id = pci_read_config(dev,
+				    BGE_PCI_PRODID_ASICREV, 4);
 			br = bge_lookup_rev(id);
 			v = bge_lookup_vendor(vid);
 			{
@@ -1915,8 +1956,8 @@
 					    br != NULL ? br->br_name :
 					    "NetXtreme Ethernet Controller");
 			}
-			snprintf(buf, 96, "%s, %sASIC rev. %#04x", model,
-			    br != NULL ? "" : "unknown ", id >> 16);
+			snprintf(buf, 96, "%s, %sASIC rev. %#08x", model,
+			    br != NULL ? "" : "unknown ", id);
 			device_set_desc_copy(dev, buf);
 			if (pci_get_subvendor(dev) == DELL_VENDORID)
 				sc->bge_flags |= BGE_FLAG_NO_3LED;
@@ -2411,8 +2452,11 @@
 
 	/* Save various chip information. */
 	sc->bge_chipid =
-	    pci_read_config(dev, BGE_PCI_MISC_CTL, 4) &
-	    BGE_PCIMISCCTL_ASICREV;
+	    pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >>
+	    BGE_PCIMISCCTL_ASICREV_SHIFT;
+	if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_USE_PRODID_REG)
+		sc->bge_chipid = pci_read_config(dev, BGE_PCI_PRODID_ASICREV,
+		    4);
 	sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid);
 	sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid);
 
@@ -2431,6 +2475,15 @@
 
 	/* Save chipset family. */
 	switch (sc->bge_asicrev) {
+	case BGE_ASICREV_BCM5755:
+	case BGE_ASICREV_BCM5761:
+	case BGE_ASICREV_BCM5784:
+	case BGE_ASICREV_BCM5785:
+	case BGE_ASICREV_BCM5787:
+	case BGE_ASICREV_BCM57780:
+		sc->bge_flags |= BGE_FLAG_5755_PLUS | BGE_FLAG_575X_PLUS |
+		    BGE_FLAG_5705_PLUS;
+		break;
 	case BGE_ASICREV_BCM5700:
 	case BGE_ASICREV_BCM5701:
 	case BGE_ASICREV_BCM5703:
@@ -2444,8 +2497,6 @@
 		/* FALLTHROUGH */
 	case BGE_ASICREV_BCM5750:
 	case BGE_ASICREV_BCM5752:
-	case BGE_ASICREV_BCM5755:
-	case BGE_ASICREV_BCM5787:
 	case BGE_ASICREV_BCM5906:
 		sc->bge_flags |= BGE_FLAG_575X_PLUS;
 		/* FALLTHROUGH */
@@ -2466,6 +2517,8 @@
 	if (BGE_IS_5705_PLUS(sc) &&
 	    !(sc->bge_flags & BGE_FLAG_ADJUST_TRIM)) {
 		if (sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
+		    sc->bge_asicrev == BGE_ASICREV_BCM5761 ||
+		    sc->bge_asicrev == BGE_ASICREV_BCM5784 ||
 		    sc->bge_asicrev == BGE_ASICREV_BCM5787) {
 			if (sc->bge_chipid != BGE_CHIPID_BCM5722_A0)
 				sc->bge_flags |= BGE_FLAG_JITTER_BUG;
@@ -2873,8 +2926,7 @@
 
 	/* Disable fastboot on controllers that support it. */
 	if (sc->bge_asicrev == BGE_ASICREV_BCM5752 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5755 ||
-	    sc->bge_asicrev == BGE_ASICREV_BCM5787) {
+	    BGE_IS_5755_PLUS(sc)) {
 		if (bootverbose)
 			device_printf(sc->bge_dev, "Disabling fastboot\n");
 		CSR_WRITE_4(sc, BGE_FASTBOOT_PC, 0x0);
@@ -4689,6 +4741,8 @@
 		}
 
 		printf("Hardware Flags:\n");
+		if (BGE_IS_5755_PLUS(sc))
+			printf(" - 5755 Plus\n");
 		if (BGE_IS_575X_PLUS(sc))
 			printf(" - 575X Plus\n");
 		if (BGE_IS_5705_PLUS(sc))

==== //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#18 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.83 2009/03/23 14:36:50 marius Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.85 2009/10/07 14:29:48 stas Exp $
  */
 
 /*
@@ -218,6 +218,7 @@
 #define	BGE_PCI_UNDI_TX_BD_PRODIDX_LO	0xAC
 #define	BGE_PCI_ISR_MBX_HI		0xB0
 #define	BGE_PCI_ISR_MBX_LO		0xB4
+#define	BGE_PCI_PRODID_ASICREV		0xBC
 
 /* PCI Misc. Host control register */
 #define	BGE_PCIMISCCTL_CLEAR_INTA	0x00000001
@@ -229,6 +230,7 @@
 #define	BGE_PCIMISCCTL_REG_WORDSWAP	0x00000040
 #define	BGE_PCIMISCCTL_INDIRECT_ACCESS	0x00000080
 #define	BGE_PCIMISCCTL_ASICREV		0xFFFF0000
+#define	BGE_PCIMISCCTL_ASICREV_SHIFT	16
 
 #define	BGE_HIF_SWAP_OPTIONS	(BGE_PCIMISCCTL_ENDIAN_WORDSWAP)
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -245,66 +247,72 @@
 	(BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_CLEAR_INTA| \
 	 BGE_PCIMISCCTL_MASK_PCI_INTR|BGE_PCIMISCCTL_INDIRECT_ACCESS)
 
-#define	BGE_CHIPID_TIGON_I		0x40000000
-#define	BGE_CHIPID_TIGON_II		0x60000000
-#define	BGE_CHIPID_BCM5700_A0		0x70000000
-#define	BGE_CHIPID_BCM5700_A1		0x70010000
-#define	BGE_CHIPID_BCM5700_B0		0x71000000
-#define	BGE_CHIPID_BCM5700_B1		0x71010000
-#define	BGE_CHIPID_BCM5700_B2		0x71020000
-#define	BGE_CHIPID_BCM5700_B3		0x71030000
-#define	BGE_CHIPID_BCM5700_ALTIMA	0x71040000
-#define	BGE_CHIPID_BCM5700_C0		0x72000000
-#define	BGE_CHIPID_BCM5701_A0		0x00000000	/* grrrr */
-#define	BGE_CHIPID_BCM5701_B0		0x01000000
-#define	BGE_CHIPID_BCM5701_B2		0x01020000
-#define	BGE_CHIPID_BCM5701_B5		0x01050000
-#define	BGE_CHIPID_BCM5703_A0		0x10000000
-#define	BGE_CHIPID_BCM5703_A1		0x10010000
-#define	BGE_CHIPID_BCM5703_A2		0x10020000
-#define	BGE_CHIPID_BCM5703_A3		0x10030000
-#define	BGE_CHIPID_BCM5703_B0		0x11000000
-#define	BGE_CHIPID_BCM5704_A0		0x20000000
-#define	BGE_CHIPID_BCM5704_A1		0x20010000
-#define	BGE_CHIPID_BCM5704_A2		0x20020000
-#define	BGE_CHIPID_BCM5704_A3		0x20030000
-#define	BGE_CHIPID_BCM5704_B0		0x21000000
-#define	BGE_CHIPID_BCM5705_A0		0x30000000
-#define	BGE_CHIPID_BCM5705_A1		0x30010000
-#define	BGE_CHIPID_BCM5705_A2		0x30020000
-#define	BGE_CHIPID_BCM5705_A3		0x30030000
-#define	BGE_CHIPID_BCM5750_A0		0x40000000
-#define	BGE_CHIPID_BCM5750_A1		0x40010000
-#define	BGE_CHIPID_BCM5750_A3		0x40030000
-#define	BGE_CHIPID_BCM5750_B0		0x41000000
-#define	BGE_CHIPID_BCM5750_B1		0x41010000
-#define	BGE_CHIPID_BCM5750_C0		0x42000000
-#define	BGE_CHIPID_BCM5750_C1		0x42010000
-#define	BGE_CHIPID_BCM5750_C2		0x42020000
-#define	BGE_CHIPID_BCM5714_A0		0x50000000
-#define	BGE_CHIPID_BCM5752_A0		0x60000000
-#define	BGE_CHIPID_BCM5752_A1		0x60010000
-#define	BGE_CHIPID_BCM5752_A2		0x60020000
-#define	BGE_CHIPID_BCM5714_B0		0x80000000
-#define	BGE_CHIPID_BCM5714_B3		0x80030000
-#define	BGE_CHIPID_BCM5715_A0		0x90000000
-#define	BGE_CHIPID_BCM5715_A1		0x90010000
-#define	BGE_CHIPID_BCM5715_A3		0x90030000
-#define	BGE_CHIPID_BCM5755_A0		0xa0000000
-#define	BGE_CHIPID_BCM5755_A1		0xa0010000
-#define	BGE_CHIPID_BCM5755_A2		0xa0020000
-#define	BGE_CHIPID_BCM5722_A0		0xa2000000
-#define	BGE_CHIPID_BCM5754_A0		0xb0000000
-#define	BGE_CHIPID_BCM5754_A1		0xb0010000
-#define	BGE_CHIPID_BCM5754_A2		0xb0020000
-#define	BGE_CHIPID_BCM5787_A0		0xb0000000
-#define	BGE_CHIPID_BCM5787_A1		0xb0010000
-#define	BGE_CHIPID_BCM5787_A2		0xb0020000
-#define	BGE_CHIPID_BCM5906_A1		0xc0010000
-#define	BGE_CHIPID_BCM5906_A2		0xc0020000
+#define	BGE_CHIPID_TIGON_I		0x4000
+#define	BGE_CHIPID_TIGON_II		0x6000
+#define	BGE_CHIPID_BCM5700_A0		0x7000
+#define	BGE_CHIPID_BCM5700_A1		0x7001
+#define	BGE_CHIPID_BCM5700_B0		0x7100
+#define	BGE_CHIPID_BCM5700_B1		0x7101
+#define	BGE_CHIPID_BCM5700_B2		0x7102
+#define	BGE_CHIPID_BCM5700_B3		0x7103
+#define	BGE_CHIPID_BCM5700_ALTIMA	0x7104
+#define	BGE_CHIPID_BCM5700_C0		0x7200
+#define	BGE_CHIPID_BCM5701_A0		0x0000	/* grrrr */
+#define	BGE_CHIPID_BCM5701_B0		0x0100
+#define	BGE_CHIPID_BCM5701_B2		0x0102
+#define	BGE_CHIPID_BCM5701_B5		0x0105
+#define	BGE_CHIPID_BCM5703_A0		0x1000
+#define	BGE_CHIPID_BCM5703_A1		0x1001
+#define	BGE_CHIPID_BCM5703_A2		0x1002
+#define	BGE_CHIPID_BCM5703_A3		0x1003
+#define	BGE_CHIPID_BCM5703_B0		0x1100
+#define	BGE_CHIPID_BCM5704_A0		0x2000
+#define	BGE_CHIPID_BCM5704_A1		0x2001
+#define	BGE_CHIPID_BCM5704_A2		0x2002
+#define	BGE_CHIPID_BCM5704_A3		0x2003
+#define	BGE_CHIPID_BCM5704_B0		0x2100
+#define	BGE_CHIPID_BCM5705_A0		0x3000
+#define	BGE_CHIPID_BCM5705_A1		0x3001
+#define	BGE_CHIPID_BCM5705_A2		0x3002
+#define	BGE_CHIPID_BCM5705_A3		0x3003
+#define	BGE_CHIPID_BCM5750_A0		0x4000
+#define	BGE_CHIPID_BCM5750_A1		0x4001
+#define	BGE_CHIPID_BCM5750_A3		0x4000
+#define	BGE_CHIPID_BCM5750_B0		0x4100
+#define	BGE_CHIPID_BCM5750_B1		0x4101
+#define	BGE_CHIPID_BCM5750_C0		0x4200
+#define	BGE_CHIPID_BCM5750_C1		0x4201
+#define	BGE_CHIPID_BCM5750_C2		0x4202
+#define	BGE_CHIPID_BCM5714_A0		0x5000
+#define	BGE_CHIPID_BCM5752_A0		0x6000
+#define	BGE_CHIPID_BCM5752_A1		0x6001
+#define	BGE_CHIPID_BCM5752_A2		0x6002
+#define	BGE_CHIPID_BCM5714_B0		0x8000
+#define	BGE_CHIPID_BCM5714_B3		0x8003
+#define	BGE_CHIPID_BCM5715_A0		0x9000
+#define	BGE_CHIPID_BCM5715_A1		0x9001
+#define	BGE_CHIPID_BCM5715_A3		0x9003
+#define	BGE_CHIPID_BCM5755_A0		0xa000
+#define	BGE_CHIPID_BCM5755_A1		0xa001
+#define	BGE_CHIPID_BCM5755_A2		0xa002
+#define	BGE_CHIPID_BCM5722_A0		0xa200
+#define	BGE_CHIPID_BCM5754_A0		0xb000
+#define	BGE_CHIPID_BCM5754_A1		0xb001
+#define	BGE_CHIPID_BCM5754_A2		0xb002
+#define	BGE_CHIPID_BCM5761_A0		0x5761000
+#define	BGE_CHIPID_BCM5761_A1		0x5761100
+#define	BGE_CHIPID_BCM5784_A0		0x5784000
+#define	BGE_CHIPID_BCM5784_A1		0x5784100
+#define	BGE_CHIPID_BCM5787_A0		0xb000
+#define	BGE_CHIPID_BCM5787_A1		0xb001
+#define	BGE_CHIPID_BCM5787_A2		0xb002
+#define	BGE_CHIPID_BCM5906_A1		0xc001
+#define	BGE_CHIPID_BCM5906_A2		0xc002
+#define	BGE_CHIPID_BCM57780_A0		0x57780000
+#define	BGE_CHIPID_BCM57780_A1		0x57780001
 
 /* shorthand one */
-#define	BGE_ASICREV(x)			((x) >> 28)
+#define	BGE_ASICREV(x)			((x) >> 12)
 #define	BGE_ASICREV_BCM5701		0x00
 #define	BGE_ASICREV_BCM5703		0x01
 #define	BGE_ASICREV_BCM5704		0x02
@@ -319,9 +327,16 @@
 #define	BGE_ASICREV_BCM5754		0x0b
 #define	BGE_ASICREV_BCM5787		0x0b
 #define	BGE_ASICREV_BCM5906		0x0c
+/* Should consult BGE_PCI_PRODID_ASICREV for ChipID */
+#define	BGE_ASICREV_USE_PRODID_REG	0x0f
+/* BGE_PCI_PRODID_ASICREV ASIC rev. identifiers. */
+#define	BGE_ASICREV_BCM5761		0x5761
+#define	BGE_ASICREV_BCM5784		0x5784
+#define	BGE_ASICREV_BCM5785		0x5785
+#define	BGE_ASICREV_BCM57780		0x57780
 
 /* chip revisions */
-#define	BGE_CHIPREV(x)			((x) >> 24)
+#define	BGE_CHIPREV(x)			((x) >> 8)
 #define	BGE_CHIPREV_5700_AX		0x70
 #define	BGE_CHIPREV_5700_BX		0x71
 #define	BGE_CHIPREV_5700_CX		0x72
@@ -331,6 +346,9 @@
 #define	BGE_CHIPREV_5704_BX		0x21
 #define	BGE_CHIPREV_5750_AX		0x40
 #define	BGE_CHIPREV_5750_BX		0x41
+/* BGE_PCI_PRODID_ASICREV chip rev. identifiers. */
+#define	BGE_CHIPREV_5761_AX		0x57611
+#define	BGE_CHIPREV_5784_AX		0x57841
 
 /* PCI DMA Read/Write Control register */
 #define	BGE_PCIDMARWCTL_MINDMA		0x000000FF
@@ -861,6 +879,7 @@
 #define	BGE_SDCMODE_RESET		0x00000001
 #define	BGE_SDCMODE_ENABLE		0x00000002
 #define	BGE_SDCMODE_ATTN		0x00000004
+#define	BGE_SDCMODE_CDELAY		0x00000010
 
 /* Send Data completion status register */
 #define	BGE_SDCSTAT_ATTN		0x00000004
@@ -1378,6 +1397,9 @@
 #define	BGE_RDMAMODE_PCI_FIFOOREAD_ATTN	0x00000100
 #define	BGE_RDMAMODE_LOCWRITE_TOOBIG	0x00000200
 #define	BGE_RDMAMODE_ALL_ATTNS		0x000003FC
+#define	BGE_RDMAMODE_BD_SBD_CRPT_ATTN	0x00000800
+#define	BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN	0x00001000
+#define	BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN	0x00002000
 #define	BGE_RDMAMODE_FIFO_SIZE_128	0x00020000
 #define	BGE_RDMAMODE_FIFO_LONG_BURST	0x00030000
 
@@ -1409,6 +1431,7 @@
 #define	BGE_WDMAMODE_PCI_FIFOOREAD_ATTN	0x00000100
 #define	BGE_WDMAMODE_LOCREAD_TOOBIG	0x00000200
 #define	BGE_WDMAMODE_ALL_ATTNS		0x000003FC
+#define	BGE_WDMAMODE_STATUS_TAG_FIX	0x20000000
 
 /* Write DMA status register */
 #define	BGE_WDMASTAT_PCI_TGT_ABRT_ATTN	0x00000004
@@ -2101,6 +2124,7 @@
 #define	BCOM_DEVICEID_BCM5720		0x1658
 #define	BCOM_DEVICEID_BCM5721		0x1659
 #define	BCOM_DEVICEID_BCM5722		0x165A
+#define	BCOM_DEVICEID_BCM5723		0x165B
 #define	BCOM_DEVICEID_BCM5750		0x1676
 #define	BCOM_DEVICEID_BCM5750M		0x167C
 #define	BCOM_DEVICEID_BCM5751		0x1677
@@ -2115,13 +2139,22 @@
 #define	BCOM_DEVICEID_BCM5754M		0x1672
 #define	BCOM_DEVICEID_BCM5755		0x167B
 #define	BCOM_DEVICEID_BCM5755M		0x1673
+#define	BCOM_DEVICEID_BCM5761		0x1681
+#define	BCOM_DEVICEID_BCM5761E		0x1680
+#define	BCOM_DEVICEID_BCM5761S		0x1688
+#define	BCOM_DEVICEID_BCM5761SE		0x1689
+#define	BCOM_DEVICEID_BCM5764		0x1684
 #define	BCOM_DEVICEID_BCM5780		0x166A
 #define	BCOM_DEVICEID_BCM5780S		0x166B

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

From owner-p4-projects@FreeBSD.ORG  Thu Oct  8 14:01:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 11710106568B; Thu,  8 Oct 2009 14:01:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C95CC1065676
	for <perforce@FreeBSD.org>; Thu,  8 Oct 2009 14:01:44 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E8488FC16
	for <perforce@FreeBSD.org>; Thu,  8 Oct 2009 14:01:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n98E1ifx067520
	for <perforce@FreeBSD.org>; Thu, 8 Oct 2009 14:01:44 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n98E1iBq067518
	for perforce@freebsd.org; Thu, 8 Oct 2009 14:01:44 GMT
	(envelope-from gk@FreeBSD.org)
Date: Thu, 8 Oct 2009 14:01:44 GMT
Message-Id: <200910081401.n98E1iBq067518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 14:01:45 -0000

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

Change 169323 by gk@gk_h1 on 2009/10/08 14:00:57

	recursively lock root vnode if fs was mounted on the same dir (e.g. pefs mount ~/Private ~/Private)
	lock Giant if needed during async node free

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#14 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#14 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#13 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#21 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#14 (text+ko) ====

@@ -97,11 +97,14 @@
 	struct pefs_tkey pn_tkey;
 };
 
+#define PM_ROOT_CANRECURSE		0x01
+
 struct pefs_mount {
 	struct mount *pm_lowervfs;
 	struct vnode *pm_rootvp;	/* Reference to root pefs_node */
 	struct mtx pm_keys_lock;
 	struct pefs_key_head pm_keys;
+	int pm_flags;
 };
 
 struct pefs_chunk {

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#14 (text+ko) ====

@@ -469,6 +469,7 @@
 {
 	struct pefs_node *pn;
 	struct vnode *lowervp;
+	int vfslocked = 0;
 
 	while (1) {
 		mtx_lock(&pefs_node_listmtx);
@@ -481,9 +482,13 @@
 		mtx_unlock(&pefs_node_listmtx);
 		lowervp = pn->pn_lowervp_dead;
 		uma_zfree(pefs_node_zone, pn);
-		if (lowervp != NULL)
+		if (lowervp != NULL) {
+			if (!vfslocked)
+				vfslocked = VFS_LOCK_GIANT(lowervp->v_mount);
 			vrele(lowervp);
+		}
 	}
+	VFS_UNLOCK_GIANT(vfslocked);
 }
 
 /*

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#13 (text+ko) ====

@@ -134,6 +134,8 @@
 	 * Save reference to underlying FS
 	 */
 	pm->pm_lowervfs = lowerrootvp->v_mount;
+	if (lowerrootvp == mp->mnt_vnodecovered)
+		pm->pm_flags |= PM_ROOT_CANRECURSE;
 
 	/*
 	 * Save reference.  Each mount also holds

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#21 (text+ko) ====

@@ -891,6 +891,7 @@
 {
 	struct vnode *vp = ap->a_vp;
 	int flags = ap->a_flags;
+	struct pefs_mount *pm;
 	struct pefs_node *pn;
 	struct vnode *lvp;
 	int error;
@@ -907,6 +908,13 @@
 	 * vop lock.
 	 */
 	if (pn != NULL && (lvp = pn->pn_lowervp) != NULL) {
+		if (vp->v_mount != NULL) {
+			pm = VFS_TO_PEFS(vp->v_mount);
+			if (pm != NULL &&
+			    (pm->pm_flags & PM_ROOT_CANRECURSE) &&
+			    pm->pm_rootvp == vp)
+				ap->a_flags = flags |= LK_CANRECURSE;
+		}
 		VI_LOCK_FLAGS(lvp, MTX_DUPOK);
 		VI_UNLOCK(vp);
 		/*

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 07:15:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6DAC31065676; Fri,  9 Oct 2009 07:15:34 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 250381065670
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 07:15:34 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF2598FC08
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 07:15:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n997FXiS000553
	for <perforce@FreeBSD.org>; Fri, 9 Oct 2009 07:15:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n997FXbs000551
	for perforce@freebsd.org; Fri, 9 Oct 2009 07:15:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 9 Oct 2009 07:15:33 GMT
Message-Id: <200910090715.n997FXbs000551@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169337 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 07:15:34 -0000

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

Change 169337 by hselasky@hselasky_laptop001 on 2009/10/09 07:15:13

	
	USB storage:
	 - correct Olympus quirk
	 - reported by: Pavel Gubin

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#33 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#33 (text+ko) ====

@@ -679,7 +679,7 @@
 		WRONG_CSWSIG
 	},
 	{USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700, RID_WILDCARD,
-		UMASS_PROTO_SCSI,
+		UMASS_PROTO_DEFAULT,
 		NO_GETMAXLUN
 	},
 	{USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SDS_HOTFIND_D, RID_WILDCARD,

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 09:09:52 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 841911065676; Fri,  9 Oct 2009 09:09:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A71E106566B
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 09:09:52 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2877D8FC08
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 09:09:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9999p6Z020624
	for <perforce@freebsd.org>; Fri, 9 Oct 2009 09:09:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9999pfV020622
	for perforce@freebsd.org; Fri, 9 Oct 2009 09:09:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 9 Oct 2009 09:09:51 GMT
Message-Id: <200910090909.n9999pfV020622@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169338 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 09:09:53 -0000

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

Change 169338 by rwatson@rwatson_cinnamon on 2009/10/09 09:09:12

	Correct two spelling nits.
	Submitted by:	ceri

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#6 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#10 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#6 (text+ko) ====

@@ -85,7 +85,7 @@
 canonical representation of a right.
 Consumers of
 .Fn cap_enter
-should also be aware of other inheritted rights, such as access to VM
+should also be aware of other inherited rights, such as access to VM
 resources, memory contents, and other process properties that should be
 considered.
 It is advisable to use

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#10 (text+ko) ====

@@ -218,7 +218,7 @@
 .It Dv CAP_IOCTL
 Permit
 .Xr ioctl 2 .
-Be aware that this system call has enourmous scope, including potentially
+Be aware that this system call has enormous scope, including potentially
 global scope for some objects.
 .It Dv CAP_KEVENT
 Permit

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 10:21:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A03601065679; Fri,  9 Oct 2009 10:21:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 648D2106566B
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 10:21:10 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 540F18FC14
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 10:21:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n99ALAJK026800
	for <perforce@freebsd.org>; Fri, 9 Oct 2009 10:21:10 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n99AL960026798
	for perforce@freebsd.org; Fri, 9 Oct 2009 10:21:09 GMT
	(envelope-from mav@freebsd.org)
Date: Fri, 9 Oct 2009 10:21:09 GMT
Message-Id: <200910091021.n99AL960026798@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169341 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 10:21:11 -0000

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

Change 169341 by mav@mav_mavtest on 2009/10/09 10:20:45

	Fix two timeout-related bugs in ata(4) wrapper.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#29 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#20 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#29 (text+ko) ====

@@ -1278,7 +1278,7 @@
 	request->transfersize = min(request->bytecount, 16*512);
 //	request->callback = ad_done;
 	request->retries = 0;
-	request->timeout = ccb->ccb_h.timeout / 1000;
+	request->timeout = (ccb->ccb_h.timeout + 999) / 1000;
 	callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED);
 	request->ccb = ccb;
 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#20 (text+ko) ====

@@ -514,6 +514,8 @@
 	if (ch->dma.unload)
 	    ch->dma.unload(request);
 #ifdef ATA_CAM
+	ch->running = NULL;
+	ch->state = ATA_IDLE;
 	ata_cam_end_transaction(ch->dev, request);
 #endif
 	mtx_unlock(&ch->state_mtx);

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 17:38:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EBE61065679; Fri,  9 Oct 2009 17:38:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6366E1065672
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 17:38:07 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 52A4B8FC0A
	for <perforce@freebsd.org>; Fri,  9 Oct 2009 17:38:07 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n99Hc7XO084929
	for <perforce@freebsd.org>; Fri, 9 Oct 2009 17:38:07 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n99Hc7QN084927
	for perforce@freebsd.org; Fri, 9 Oct 2009 17:38:07 GMT
	(envelope-from mav@freebsd.org)
Date: Fri, 9 Oct 2009 17:38:07 GMT
Message-Id: <200910091738.n99Hc7QN084927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169347 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 17:38:07 -0000

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

Change 169347 by mav@mav_mavtest on 2009/10/09 17:37:25

	Use ata_wait() command for waiting for !BSY and !ERR after PACKET
	command submission. It allows to less confuse ATA drive and recover
	faster.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#14 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#14 (text+ko) ====

@@ -666,6 +666,7 @@
 
     if (request->flags & ATA_R_ATAPI) {
 	int timeout = 5000;
+	int res;
 
 	/* issue packet command to controller */
 	if (request->flags & ATA_R_DMA) {
@@ -684,6 +685,13 @@
 	if (request->flags & ATA_R_ATAPI_INTR)
 	    return 0;
 
+	/* command processed ? */
+	res = ata_wait(ch, request->unit, 0);
+	if (res != 0) {
+	    if (res < 0)
+		    device_printf(request->parent, "timeout waiting for PACKET command\n");
+	    return (-1);
+	}
 	/* wait for ready to write ATAPI command block */
 	while (timeout--) {
 	    int reason = ATA_IDX_INB(ch, ATA_IREASON);

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 21:01:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7430610656C3; Fri,  9 Oct 2009 21:01:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 370B610656C1
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 21:01:50 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 25D268FC20
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 21:01:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n99L1oDN012357
	for <perforce@FreeBSD.org>; Fri, 9 Oct 2009 21:01:50 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n99L1oEV012355
	for perforce@freebsd.org; Fri, 9 Oct 2009 21:01:50 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 9 Oct 2009 21:01:50 GMT
Message-Id: <200910092101.n99L1oEV012355@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169351 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 21:01:50 -0000

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

Change 169351 by truncs@aditya on 2009/10/09 21:01:41

	Use roundup2 instead of roundup.
	Reference: http://svn.freebsd.org/viewvc/base?view=revision&revision=11264 

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#5 (text+ko) ====

@@ -370,7 +370,7 @@
 		nchstats.ncs_2passes++;
 	}
 	prevoff = dp->i_offset;
-	endsearch = roundup(dp->i_size, DIRBLKSIZ);
+	endsearch = roundup2(dp->i_size, DIRBLKSIZ);
 	enduseful = 0;
 
 searchloop:
@@ -504,7 +504,7 @@
 		 * dp->i_offset + dp->i_count.
 		 */
 		if (slotstatus == NONE) {
-			dp->i_offset = roundup(dp->i_size, DIRBLKSIZ);
+			dp->i_offset = roundup2(dp->i_size, DIRBLKSIZ);
 			dp->i_count = 0;
 			enduseful = dp->i_offset;
 		} else {
@@ -513,7 +513,7 @@
 			if (enduseful < slotoffset + slotsize)
 				enduseful = slotoffset + slotsize;
 		}
-		dp->i_endoff = roundup(enduseful, DIRBLKSIZ);
+		dp->i_endoff = roundup2(enduseful, DIRBLKSIZ);
 		dp->i_flag |= IN_CHANGE | IN_UPDATE;
 		/*
 		 * We return with the directory locked, so that
@@ -798,7 +798,7 @@
 			/* XXX should grow with balloc() */
 			panic("ext2_direnter: frag size");
 		else if (!error) {
-			dp->i_size = roundup(dp->i_size, DIRBLKSIZ);
+			dp->i_size = roundup2(dp->i_size, DIRBLKSIZ);
 			dp->i_flag |= IN_CHANGE;
 		}
 		return (error);

From owner-p4-projects@FreeBSD.ORG  Fri Oct  9 22:58:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49D51106568B; Fri,  9 Oct 2009 22:58:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E64E1065672
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 22:58:58 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F15E68FC17
	for <perforce@FreeBSD.org>; Fri,  9 Oct 2009 22:58:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n99Mwv3Z022376
	for <perforce@FreeBSD.org>; Fri, 9 Oct 2009 22:58:57 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n99MwvIe022374
	for perforce@freebsd.org; Fri, 9 Oct 2009 22:58:57 GMT
	(envelope-from gk@FreeBSD.org)
Date: Fri, 9 Oct 2009 22:58:57 GMT
Message-Id: <200910092258.n99MwvIe022374@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169353 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 22:58:58 -0000

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

Change 169353 by gk@gk_h1 on 2009/10/09 22:58:02

	increase hash buckets umber to desiredvnodes/8
	use roundup2 instead of reimplementing it

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#14 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#15 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#14 (text+ko) ====

@@ -50,7 +50,6 @@
 
 #define PEFS_CTR_BLOCK_SIZE		16
 #define PEFS_NAME_BLOCK_SIZE		16
-#define PEFS_BLOCK_ROUND(block, a)	(((a) + (block) - 1) & ~((block) - 1))
 
 CTASSERT(PEFS_KEY_SIZE <= SHA512_DIGEST_LENGTH);
 CTASSERT(PEFS_TWEAK_SIZE == 64/8);
@@ -448,7 +447,7 @@
 	MPASS(size > PEFS_NAME_CSUM_SIZE && size <= MAXNAMLEN);
 	psize = size - PEFS_NAME_CSUM_SIZE;
 	psize = PEFS_NAME_CSUM_SIZE +
-	    PEFS_BLOCK_ROUND(PEFS_NAME_BLOCK_SIZE, psize);
+	    roundup2(psize, PEFS_NAME_BLOCK_SIZE);
 
 	return (psize);
 }

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#15 (text+ko) ====

@@ -70,26 +70,15 @@
 #include <sys/dirent.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
+#include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/taskqueue.h>
 #include <sys/vnode.h>
 
 #include <fs/pefs/pefs.h>
 
-#define LOG2_SIZEVNODE 8		/* log2(sizeof struct vnode) */
-#define	NPENODECACHE 16
-
-/*
- * Null layer cache:
- * Each cache entry holds a reference to the lower vnode
- * along with a pointer to the alias vnode.  When an
- * entry is added the lower vnode is VREF'd.  When the
- * alias is removed the lower vnode is vrele'd.
- */
+static SYSCTL_NODE(_vfs, OID_AUTO, pefs, CTLFLAG_RW, 0, "PEFS filesystem");
 
-#define	PEFS_NHASH(vp) \
-	(&pefs_node_hashtbl[(((uintptr_t)vp)>>LOG2_SIZEVNODE) & pefs_node_hash])
-
 typedef int (pefs_node_init_fn)(struct mount *mp, struct pefs_node *pn,
     void *context);
 LIST_HEAD(pefs_node_listhead, pefs_node);
@@ -103,13 +92,17 @@
 
 static struct pefs_node_listhead pefs_node_freelist;
 static struct pefs_node_listhead *pefs_node_hashtbl;
-static u_long pefs_node_hash;
+static u_long pefs_node_hashmask;
 
 static MALLOC_DEFINE(M_PEFSHASH, "pefs_hash", "PEFS hash table");
 MALLOC_DEFINE(M_PEFSBUF, "pefs_buf", "PEFS buffers");
 
 static uma_zone_t pefs_node_zone;
 
+static u_int pefs_nodes;
+SYSCTL_UINT(_vfs_pefs, OID_AUTO, nodes, CTLFLAG_RD, &pefs_nodes, 0,
+    "Allocated nodes");
+
 /*
  * Initialise cache headers
  */
@@ -128,9 +121,13 @@
 	pefs_node_zone = uma_zcreate("pefs_node", sizeof(struct pefs_node),
 	    NULL, NULL, NULL, (uma_fini) bzero, UMA_ALIGN_PTR, 0);
 
-	pefs_node_hashtbl = hashinit(NPENODECACHE, M_PEFSHASH, &pefs_node_hash);
+	pefs_node_hashtbl = hashinit(desiredvnodes / 8, M_PEFSHASH,
+	    &pefs_node_hashmask);
+	pefs_nodes = 0;
 	mtx_init(&pefs_node_listmtx, "pefs_node_list", NULL, MTX_DEF);
+
 	pefs_crypto_init();
+
 	return (0);
 }
 
@@ -147,6 +144,21 @@
 	return (0);
 }
 
+static inline struct pefs_node_listhead *
+pefs_node_hashlookup(struct vnode *vp)
+{
+	uintptr_t v = (uintptr_t)vp;
+
+	v = (~v) + (v << 18);
+	v = v ^ (v >> 31);
+	v = v * 21;
+	v = v ^ (v >> 11);
+	v = v + (v << 6);
+	v = v ^ (v >> 22);
+
+	return (&pefs_node_hashtbl[v & pefs_node_hashmask]);
+}
+
 /*
  * Return a VREF'ed alias for lower vnode if already exists, else 0.
  * Lower vnode should be locked on entry and will be left locked on exit.
@@ -166,7 +178,7 @@
 	 * the lower vnode.  If found, the increment the pefs_node
 	 * reference count (but NOT the lower vnode's VREF counter).
 	 */
-	hd = PEFS_NHASH(lowervp);
+	hd = pefs_node_hashlookup(lowervp);
 	mtx_lock(&pefs_node_listmtx);
 	LIST_FOREACH(a, hd, pn_listentry) {
 		if (a->pn_lowervp == lowervp && PN_TO_VP(a)->v_mount == mp) {
@@ -197,7 +209,7 @@
 	struct pefs_node *oxp;
 	struct vnode *ovp;
 
-	hd = PEFS_NHASH(pn->pn_lowervp);
+	hd = pefs_node_hashlookup(pn->pn_lowervp);
 	mtx_lock(&pefs_node_listmtx);
 	LIST_FOREACH(oxp, hd, pn_listentry) {
 		if (oxp->pn_lowervp == pn->pn_lowervp &&
@@ -212,6 +224,7 @@
 			return (ovp);
 		}
 	}
+	pefs_nodes++;
 	LIST_INSERT_HEAD(hd, pn, pn_listentry);
 	mtx_unlock(&pefs_node_listmtx);
 	return (NULLVP);
@@ -500,6 +513,7 @@
 	PEFSDEBUG("pefs_node_asyncfree: free node %p\n", pn);
 	pefs_key_release(pn->pn_tkey.ptk_key);
 	mtx_lock(&pefs_node_listmtx);
+	pefs_nodes--;
 	LIST_REMOVE(pn, pn_listentry);
 	LIST_INSERT_HEAD(&pefs_node_freelist, pn, pn_listentry);
 	mtx_unlock(&pefs_node_listmtx);

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 08:49:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABC89106568B; Sat, 10 Oct 2009 08:49:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 642F61065676
	for <perforce@FreeBSD.org>; Sat, 10 Oct 2009 08:49:43 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 525318FC08
	for <perforce@FreeBSD.org>; Sat, 10 Oct 2009 08:49:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9A8nhYZ004827
	for <perforce@FreeBSD.org>; Sat, 10 Oct 2009 08:49:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9A8ngNJ004825
	for perforce@freebsd.org; Sat, 10 Oct 2009 08:49:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 10 Oct 2009 08:49:42 GMT
Message-Id: <200910100849.n9A8ngNJ004825@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 169355 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 08:49:43 -0000

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

Change 169355 by hselasky@hselasky_laptop001 on 2009/10/10 08:49:12

	
	USB controller:
	 - fix order of header file inclusion.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#11 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#35 (text+ko) ====

@@ -83,6 +83,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #define	EHCI_BUS2SC(bus) \
    ((ehci_softc_t *)(((uint8_t *)(bus)) - \

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#12 (text+ko) ====

@@ -40,8 +40,6 @@
 
 #define	EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/ehcireg.h>
-
 /*
  * Alignment NOTE: structures must be aligned so that the hardware can index
  * without performing addition.

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#9 (text+ko) ====

@@ -62,6 +62,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#8 (text+ko) ====

@@ -69,6 +69,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#13 (text+ko) ====

@@ -84,6 +84,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #define	PCI_EHCI_VENDORID_ACERLABS	0x10b9
 #define	PCI_EHCI_VENDORID_AMD		0x1022

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#28 (text+ko) ====

@@ -72,6 +72,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #define	OHCI_BUS2SC(bus) \
    ((ohci_softc_t *)(((uint8_t *)(bus)) - \

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#11 (text+ko) ====

@@ -41,8 +41,6 @@
 
 #define	OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/ohcireg.h>
-
 #define	OHCI_NO_INTRS		32
 #define	OHCI_HCCA_SIZE		256
 

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#8 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #include <sys/rman.h>
 

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#11 (text+ko) ====

@@ -81,6 +81,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #define	PCI_OHCI_VENDORID_ACERLABS	0x10b9
 #define	PCI_OHCI_VENDORID_AMD		0x1022

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#26 (text+ko) ====

@@ -75,6 +75,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/uhci.h>
+#include <dev/usb/controller/uhcireg.h>
 
 #define	alt_next next
 #define	UHCI_BUS2SC(bus) \

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#11 (text+ko) ====

@@ -41,8 +41,6 @@
 
 #define	UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/uhcireg.h>
-
 #define	UHCI_FRAMELIST_COUNT	1024	/* units */
 #define	UHCI_FRAMELIST_ALIGN	4096	/* bytes */
 

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#11 (text+ko) ====

@@ -81,6 +81,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/uhci.h>
+#include <dev/usb/controller/uhcireg.h>
 
 #define	PCI_UHCI_VENDORID_INTEL		0x8086
 #define	PCI_UHCI_VENDORID_VIA		0x1106

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 11:01:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C1481065679; Sat, 10 Oct 2009 11:01:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4872D1065676
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 11:01:06 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 37A298FC17
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 11:01:06 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AB16cn016546
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 11:01:06 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9AB16N1016544
	for perforce@freebsd.org; Sat, 10 Oct 2009 11:01:06 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 10 Oct 2009 11:01:06 GMT
Message-Id: <200910101101.n9AB16N1016544@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169356 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 11:01:06 -0000

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

Change 169356 by mav@mav_mavtest on 2009/10/10 11:00:11

	Detect more fatal SATA errors. AMD AHCI controllers may not report
	SATA protocol errors as fatal, requiring recovery,
	causing timeout on next command.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#64 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#64 (text+ko) ====

@@ -866,15 +866,11 @@
 }
 
 static void
-ahci_phy_check_events(device_t dev)
+ahci_phy_check_events(device_t dev, u_int32_t serr)
 {
 	struct ahci_channel *ch = device_get_softc(dev);
-	u_int32_t error = ATA_INL(ch->r_mem, AHCI_P_SERR);
 
-	/* Clear error bits/interrupt */
-	ATA_OUTL(ch->r_mem, AHCI_P_SERR, error);
-	/* If we have a connection event, deal with it */
-	if ((error & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) {
+	if ((serr & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) {
 		u_int32_t status = ATA_INL(ch->r_mem, AHCI_P_SSTS);
 		if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) &&
 		    ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) &&
@@ -944,7 +940,7 @@
 {
 	device_t dev = (device_t)data;
 	struct ahci_channel *ch = device_get_softc(dev);
-	uint32_t istatus, sstatus, cstatus, sntf = 0, ok, err;
+	uint32_t istatus, sstatus, cstatus, serr = 0, sntf = 0, ok, err;
 	enum ahci_err_type et;
 	int i, ccs, ncq_err = 0;
 
@@ -959,14 +955,20 @@
 	if ((istatus & AHCI_P_IX_SDB) && (ch->caps & AHCI_CAP_SSNTF))
 		sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF);
 	/* Process PHY events */
-	if (istatus & (AHCI_P_IX_PRC | AHCI_P_IX_PC))
-		ahci_phy_check_events(dev);
+	if (istatus & (AHCI_P_IX_PC | AHCI_P_IX_PRC | AHCI_P_IX_OF |
+	    AHCI_P_IX_IF | AHCI_P_IX_HBD | AHCI_P_IX_HBF | AHCI_P_IX_TFE)) {
+		serr = ATA_INL(ch->r_mem, AHCI_P_SERR);
+		if (serr) {
+			ATA_OUTL(ch->r_mem, AHCI_P_SERR, serr);
+			ahci_phy_check_events(dev, serr);
+		}
+	}
 	/* Process command errors */
-	if (istatus & (AHCI_P_IX_IF | AHCI_P_IX_HBD | AHCI_P_IX_HBF |
-		       AHCI_P_IX_TFE | AHCI_P_IX_OF)) {
-//device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n",
-//    __func__, istatus, cstatus, sstatus, ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD),
-//    ATA_INL(ch->r_mem, AHCI_P_SERR));
+	if (istatus & (AHCI_P_IX_OF | AHCI_P_IX_IF |
+	    AHCI_P_IX_HBD | AHCI_P_IX_HBF | AHCI_P_IX_TFE)) {
+device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n",
+    __func__, istatus, cstatus, sstatus, ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD),
+    serr);
 		ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK)
 		    >> AHCI_P_CMD_CCS_SHIFT;
 		err = ch->rslots & (cstatus | sstatus);
@@ -997,7 +999,14 @@
 			/* XXX: reqests in loading state. */
 			if (((err >> i) & 1) == 0)
 				continue;
-			if (istatus & AHCI_P_IX_TFE) {
+			if ((istatus & AHCI_P_IX_IF) ||
+			    (serr & (ATA_SE_HOST_ERR | ATA_SE_PROT_ERR |
+			    ATA_SE_COMM_ERR | ATA_SE_DATA_ERR))) {
+				if (ch->numtslots == 0 && i != ccs)
+					et = AHCI_ERR_INNOCENT;
+				else
+					et = AHCI_ERR_SATA;
+			} else if (istatus & AHCI_P_IX_TFE) {
 				/* Task File Error */
 				if (ch->numtslots == 0) {
 					/* Untagged operation. */
@@ -1010,9 +1019,6 @@
 					et = AHCI_ERR_NCQ;
 					ncq_err = 1;
 				}
-			} else if (istatus & AHCI_P_IX_IF) {
-				/* SATA error */
-				et = AHCI_ERR_SATA;
 			} else
 				et = AHCI_ERR_INVALID;
 			ahci_end_transaction(&ch->slot[i], et);
@@ -1253,6 +1259,11 @@
 		return;
 
 	device_printf(dev, "Timeout on slot %d\n", slot->slot);
+device_printf(dev, "%s is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n",
+    __func__, ATA_INL(ch->r_mem, AHCI_P_IS),
+    ATA_INL(ch->r_mem, AHCI_P_CI), 
+    ATA_INL(ch->r_mem, AHCI_P_SACT), ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD),
+    ATA_INL(ch->r_mem, AHCI_P_SERR));
 	/* Kick controller into sane state. */
 	ahci_stop(ch->dev);
 	ahci_start(ch->dev);

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 18:56:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2907A10656AD; Sat, 10 Oct 2009 18:56:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E15991065698
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 18:56:45 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D0B1C8FC16
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 18:56:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AIujcb078719
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 18:56:45 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9AIujV1078717
	for perforce@freebsd.org; Sat, 10 Oct 2009 18:56:45 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 10 Oct 2009 18:56:45 GMT
Message-Id: <200910101856.n9AIujV1078717@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169363 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 18:56:46 -0000

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

Change 169363 by mav@mav_mavbook on 2009/10/10 18:56:04

	Report max_target = 15 when PMP supported. PMP is also a target.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#65 edit
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#7 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#65 (text+ko) ====

@@ -1936,7 +1936,7 @@
 		cpi->hba_misc = PIM_SEQSCAN;
 		cpi->hba_eng_cnt = 0;
 		if (ch->caps & AHCI_CAP_SPM)
-			cpi->max_target = 14;
+			cpi->max_target = 15;
 		else
 			cpi->max_target = 0;
 		cpi->max_lun = 0;

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#7 (text+ko) ====

@@ -1565,7 +1565,7 @@
 		cpi->target_sprt = 0;
 		cpi->hba_misc = PIM_SEQSCAN;
 		cpi->hba_eng_cnt = 0;
-		cpi->max_target = 14;
+		cpi->max_target = 15;
 		cpi->max_lun = 0;
 		cpi->initiator_id = 0;
 		cpi->bus_id = cam_sim_bus(sim);

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 20:35:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3914B1065672; Sat, 10 Oct 2009 20:35:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D70F0106566B
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 20:35:33 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BB7488FC13
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 20:35:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AKZXWq087650
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 20:35:33 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9AKZXah087648
	for perforce@freebsd.org; Sat, 10 Oct 2009 20:35:33 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 10 Oct 2009 20:35:33 GMT
Message-Id: <200910102035.n9AKZXah087648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169364 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 20:35:34 -0000

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

Change 169364 by mav@mav_mavbook on 2009/10/10 20:34:54

	Add done method for port-specific XPT. It will allow XPT to recover
	bus from heavy error conditions.
	Fix SATA scanning, broken by recent ahci/siis change.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#38 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#104 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#18 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#8 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#17 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#38 (text+ko) ====

@@ -183,6 +183,7 @@
 static struct xpt_xport ata_xport = {
 	.alloc_device = ata_alloc_device,
 	.action = ata_action,
+	.done = xpt_done_default,
 	.async = ata_dev_async,
 };
 
@@ -986,7 +987,8 @@
 take_next:
 		/* Take next device. Wrap from 15 (PM) to 0. */
 		scan_info->counter = (scan_info->counter + 1 ) & 0x0f;
-		if (scan_info->counter >= scan_info->cpi->max_target+1) {
+		if (scan_info->counter > scan_info->cpi->max_target -
+		    ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? 1 : 0)) {
 			xpt_free_ccb(work_ccb);
 			xpt_free_ccb((union ccb *)scan_info->cpi);
 			request_ccb = scan_info->request_ccb;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#104 (text+ko) ====

@@ -2989,6 +2989,13 @@
 }
 
 void
+xpt_done_default(union ccb *done_ccb)
+{
+	/* Call the peripheral driver's callback */
+	(*done_ccb->ccb_h.cbfcnp)(done_ccb->ccb_h.path->periph, done_ccb);
+}
+
+void
 xpt_polled_action(union ccb *start_ccb)
 {
 	u_int32_t timeout;
@@ -3729,6 +3736,7 @@
 static struct xpt_xport xport_default = {
 	.alloc_device = xpt_alloc_device_default,
 	.action = xpt_action_default,
+	.done = xpt_done_default,
 	.async = xpt_dev_async_default,
 };
 
@@ -4999,8 +5007,8 @@
 			xpt_run_dev_sendq(ccb_h->path->bus);
 		}
 
-		/* Call the peripheral driver's callback */
-		(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
+		/* Call the XPT's callback */
+		(*(ccb_h->path->bus->xport->done))((union ccb *)ccb_h);
 	}
 }
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#18 (text+ko) ====

@@ -87,6 +87,7 @@
 
 void			xpt_action(union ccb *new_ccb);
 void			xpt_action_default(union ccb *new_ccb);
+void			xpt_done_default(union ccb *new_ccb);
 void			xpt_setup_ccb(struct ccb_hdr *ccb_h,
 				      struct cam_path *path,
 				      u_int32_t priority);

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#8 (text+ko) ====

@@ -41,6 +41,7 @@
 				        struct cam_et *target,
 				        struct cam_ed *device);
 typedef void (*xpt_action_func)(union ccb *start_ccb);
+typedef void (*xpt_done_func)(union ccb *done_ccb);
 typedef void (*xpt_dev_async_func)(u_int32_t async_code,
 				   struct cam_eb *bus,
 				   struct cam_et *target,
@@ -53,6 +54,7 @@
 	xpt_alloc_device_func	alloc_device;
 	xpt_release_device_func	reldev;
 	xpt_action_func		action;
+	xpt_done_func		done;
 	xpt_dev_async_func	async;
 	xpt_announce_periph_func announce;
 };

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#17 (text+ko) ====

@@ -555,6 +555,7 @@
 static struct xpt_xport scsi_xport = {
 	.alloc_device = scsi_alloc_device,
 	.action = scsi_action,
+	.done = xpt_done_default,
 	.async = scsi_dev_async,
 };
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 21:12:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 27FC81065695; Sat, 10 Oct 2009 21:12:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E0B301065693
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:12:13 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CFDA38FC18
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:12:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ALCDjP001498
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:12:13 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ALCD2X001496
	for perforce@freebsd.org; Sat, 10 Oct 2009 21:12:13 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 10 Oct 2009 21:12:13 GMT
Message-Id: <200910102112.n9ALCD2X001496@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169365 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 21:12:14 -0000

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

Change 169365 by trasz@trasz_victim on 2009/10/10 21:11:44

	These should be static.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#63 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#63 (text+ko) ====

@@ -70,7 +70,7 @@
 	int		d_value;
 };
 
-struct dict subjectnames[] = {
+static struct dict subjectnames[] = {
 	{ "process", HRL_SUBJECT_TYPE_PROCESS },
 	{ "user", HRL_SUBJECT_TYPE_USER },
 	{ "group", HRL_SUBJECT_TYPE_GROUP },
@@ -78,7 +78,7 @@
 	{ "jail", HRL_SUBJECT_TYPE_JAIL },
 	{ NULL, -1 }};
 
-struct dict resourcenames[] = {
+static struct dict resourcenames[] = {
 	{ "cputime", HRL_RESOURCE_CPUTIME },
 	{ "filesize", HRL_RESOURCE_FILESIZE },
 	{ "datasize", HRL_RESOURCE_DATASIZE },
@@ -94,7 +94,7 @@
 	{ "swap", HRL_RESOURCE_SWAP },
 	{ NULL, -1 }};
 
-struct dict actionnames[] = {
+static struct dict actionnames[] = {
 	{ "deny", HRL_ACTION_DENY },
 	{ "delay", HRL_ACTION_DELAY },
 	{ "log", HRL_ACTION_LOG },

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 21:37:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5022F1065694; Sat, 10 Oct 2009 21:37:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13D06106568B
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:37:42 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 029048FC16
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:37:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ALbfXD003314
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:37:41 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ALbfmh003312
	for perforce@freebsd.org; Sat, 10 Oct 2009 21:37:41 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 10 Oct 2009 21:37:41 GMT
Message-Id: <200910102137.n9ALbfmh003312@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169367 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 21:37:42 -0000

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

Change 169367 by trasz@trasz_victim on 2009/10/10 21:36:46

	Index arrays properly.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#64 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#36 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#64 (text+ko) ====

@@ -133,7 +133,7 @@
 	
 	cred = p->p_ucred;
 	mtx_assert(&hrl_lock, MA_OWNED);
-	for (resource = 0; resource < HRL_RESOURCE_MAX; resource++)
+	for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++)
 		KASSERT(p->p_usage.hu_resources[resource] >= 0,
 		    ("resource usage propagation meltdown"));
 	KASSERT(cred->cr_ruidinfo->ui_usage.hu_resources[resource] >= 0,
@@ -150,7 +150,7 @@
 	}
 	if (hrl_group_accounting) {
 		for (i = 0; i < cred->cr_ngroups; i++) {
-			for (resource = 0; resource < HRL_RESOURCE_MAX; resource++) {
+			for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++) {
 				KASSERT(cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] >= 0,
 				    ("resource usage propagation meltdown"));
 				KASSERT(cred->cr_gidinfos[i]->gi_usage.hu_resources[resource] >=
@@ -175,7 +175,7 @@
 	hrl_allocated(p, HRL_RESOURCE_PTY, 0);
 
 	mtx_lock(&hrl_lock);
-	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
 		KASSERT(p->p_usage.hu_resources[i] == 0,
 			    ("dead process still holding resources"));
 	}
@@ -449,7 +449,7 @@
 
 	mtx_assert(&hrl_lock, MA_OWNED);
 
-	for (i = 0; i < HRL_RESOURCE_MAX; i++)
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++)
 		(*availablep)[i] = INT64_MAX;
 
 	LIST_FOREACH(limit, &p->p_limits, hl_next) {
@@ -648,7 +648,7 @@
 	int i;
 
 	mtx_lock(&hrl_lock);
-	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 		KASSERT(src->hu_resources[i] >= 0,
@@ -666,7 +666,7 @@
 	int i;
 
 	mtx_lock(&hrl_lock);
-	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 		KASSERT(src->hu_resources[i] >= 0,
@@ -1410,7 +1410,7 @@
 	struct sbuf *sb;
 
 	sb = sbuf_new_auto();
-	for (i = 1; i < HRL_RESOURCE_MAX; i++) {
+	for (i = 1; i <= HRL_RESOURCE_MAX; i++) {
 		sbuf_printf(sb, "%s=%jd,", hrl_resource_name(i),
 		    usage->hu_resources[i]);
 	}
@@ -1836,7 +1836,7 @@
 	PROC_LOCK(child);
 	mtx_lock(&hrl_lock);
 
-	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
+	for (i = 0; i <= HRL_RESOURCE_MAX; i++) {
 		if (parent->p_usage.hu_resources[i] != 0 &&
 		    hrl_resource_inheritable(i))
 			hrl_allocated(child, i,

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#36 (text+ko) ====

@@ -80,44 +80,44 @@
 	u_int	hr_refcount;
 };
 
-#define	HRL_SUBJECT_TYPE_UNDEFINED	0x0000
-#define	HRL_SUBJECT_TYPE_PROCESS	0x0001
-#define	HRL_SUBJECT_TYPE_USER		0x0002
-#define	HRL_SUBJECT_TYPE_GROUP		0x0003
-#define	HRL_SUBJECT_TYPE_LOGINCLASS	0x0004
-#define	HRL_SUBJECT_TYPE_JAIL		0x0005
+#define	HRL_SUBJECT_TYPE_UNDEFINED	-1
+#define	HRL_SUBJECT_TYPE_PROCESS	0x0000
+#define	HRL_SUBJECT_TYPE_USER		0x0001
+#define	HRL_SUBJECT_TYPE_GROUP		0x0002
+#define	HRL_SUBJECT_TYPE_LOGINCLASS	0x0003
+#define	HRL_SUBJECT_TYPE_JAIL		0x0004
 #define	HRL_SUBJECT_TYPE_MAX		HRL_SUBJECT_TYPE_JAIL
 
 /*
  * 'hr_per' takes the same flags as 'hr_subject_type'.
  */
 
-#define	HRL_RESOURCE_UNDEFINED		0x0000
-#define	HRL_RESOURCE_CPUTIME		0x0001
-#define	HRL_RESOURCE_FILESIZE		0x0002
-#define	HRL_RESOURCE_DATASIZE		0x0003
-#define	HRL_RESOURCE_STACKSIZE		0x0004
-#define	HRL_RESOURCE_COREDUMPSIZE	0x0005
-#define	HRL_RESOURCE_MEMORYUSE		0x0006
-#define	HRL_RESOURCE_MEMORYLOCKED	0x0007
-#define	HRL_RESOURCE_MAXPROCESSES	0x0008
-#define	HRL_RESOURCE_FILEDESCRIPTORS	0x0009
-#define	HRL_RESOURCE_SBSIZE		0x000a
-#define	HRL_RESOURCE_VMEMORYUSE		0x000b
-#define	HRL_RESOURCE_PTY		0x000c
-#define	HRL_RESOURCE_SWAP		0x000d
+#define	HRL_RESOURCE_UNDEFINED		-1
+#define	HRL_RESOURCE_CPUTIME		0x0000
+#define	HRL_RESOURCE_FILESIZE		0x0001
+#define	HRL_RESOURCE_DATASIZE		0x0002
+#define	HRL_RESOURCE_STACKSIZE		0x0003
+#define	HRL_RESOURCE_COREDUMPSIZE	0x0004
+#define	HRL_RESOURCE_MEMORYUSE		0x0005
+#define	HRL_RESOURCE_MEMORYLOCKED	0x0006
+#define	HRL_RESOURCE_MAXPROCESSES	0x0007
+#define	HRL_RESOURCE_FILEDESCRIPTORS	0x0008
+#define	HRL_RESOURCE_SBSIZE		0x0009
+#define	HRL_RESOURCE_VMEMORYUSE		0x000a
+#define	HRL_RESOURCE_PTY		0x000b
+#define	HRL_RESOURCE_SWAP		0x000c
 #define	HRL_RESOURCE_MAX		HRL_RESOURCE_SWAP
 
-#define	HRL_ACTION_UNDEFINED		0x0000
-#define	HRL_ACTION_DENY			0x0001
-#define	HRL_ACTION_DELAY		0x0002
-#define	HRL_ACTION_LOG			0x0003
-#define	HRL_ACTION_SIGHUP		0x0004
-#define	HRL_ACTION_SIGINT		0x0005
-#define	HRL_ACTION_SIGKILL		0x0006
-#define	HRL_ACTION_SIGSEGV		0x0007
-#define	HRL_ACTION_SIGXCPU		0x0008
-#define	HRL_ACTION_SIGXFSZ		0x0009
+#define	HRL_ACTION_UNDEFINED		-1
+#define	HRL_ACTION_DENY			0x0000
+#define	HRL_ACTION_DELAY		0x0001
+#define	HRL_ACTION_LOG			0x0002
+#define	HRL_ACTION_SIGHUP		0x0003
+#define	HRL_ACTION_SIGINT		0x0004
+#define	HRL_ACTION_SIGKILL		0x0005
+#define	HRL_ACTION_SIGSEGV		0x0006
+#define	HRL_ACTION_SIGXCPU		0x0007
+#define	HRL_ACTION_SIGXFSZ		0x0008
 #define	HRL_ACTION_MAX			HRL_ACTION_SIGXFSZ
 
 #define	HRL_AMOUNT_UNDEFINED		-1

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 21:52:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 096291065676; Sat, 10 Oct 2009 21:52:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C249D1065670
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:52:58 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D4138FC14
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:52:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ALqw0c004440
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:52:58 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ALqwuv004438
	for perforce@freebsd.org; Sat, 10 Oct 2009 21:52:58 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 10 Oct 2009 21:52:58 GMT
Message-Id: <200910102152.n9ALqwuv004438@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169369 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 21:52:59 -0000

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

Change 169369 by mav@mav_mavtest on 2009/10/10 21:52:15

	Remove serr check. Looks like error reported there by AMD SB700
	is it's own hardware bug.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#66 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#66 (text+ko) ====

@@ -999,9 +999,7 @@
 			/* XXX: reqests in loading state. */
 			if (((err >> i) & 1) == 0)
 				continue;
-			if ((istatus & AHCI_P_IX_IF) ||
-			    (serr & (ATA_SE_HOST_ERR | ATA_SE_PROT_ERR |
-			    ATA_SE_COMM_ERR | ATA_SE_DATA_ERR))) {
+			if (istatus & AHCI_P_IX_IF) {
 				if (ch->numtslots == 0 && i != ccs)
 					et = AHCI_ERR_INNOCENT;
 				else

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 21:55:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 72F351065676; Sat, 10 Oct 2009 21:55:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35FF21065672
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:55:10 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 222678FC13
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:55:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ALt1lV004601
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:55:01 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ALt0tv004553
	for perforce@freebsd.org; Sat, 10 Oct 2009 21:55:00 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 10 Oct 2009 21:55:00 GMT
Message-Id: <200910102155.n9ALt0tv004553@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169370 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 21:55:10 -0000

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

Change 169370 by trasz@trasz_victim on 2009/10/10 21:54:19

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/openpam/doc/man/pam.conf.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/tcpdump/print-tcp.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/tcpdump/tcp.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/sh.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_namespace.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/ftpd#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/kde#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/other#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/sshd#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/system#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/telnetd#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/xdm#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/services#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/langinfo.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/libgen.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/basename.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/errlst.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/fts.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/fts.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/getdelim.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/intro.2#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/map_object.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/misc/man2hwnotes.pl#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bce.4#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bge.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/de.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/lindev.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/unix.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/urtw.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/zyd.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/fetch.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/store.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_wakeup.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/atomic.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#37 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#56 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_common.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_t3_hw.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_core.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#33 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/label/g_label.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/stripe/g_stripe.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_subr.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/atomic.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf64_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfslockd/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/pf/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_prot_server.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/elf_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/elf_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/elf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/errno.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/sequences#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/execution/unknown1.0#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/libc/stdio/test-getdelim.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/tmpfs/h_tools.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/calendars/calendar.freebsd#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/unix.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/whois/whois.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cdcontrol/cdcontrol.c#3 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#8 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -713,12 +713,7 @@
 				do_clearcmdentry = 1;
 			}
 
-		find_command(argv[0], &cmdentry, 1, path);
-		if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
-			exitstatus = 127;
-			flushout(&errout);
-			return;
-		}
+		find_command(argv[0], &cmdentry, 0, path);
 		/* implement the bltin builtin here */
 		if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
 			for (;;) {
@@ -740,7 +735,7 @@
 
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd
-	 || (cmdentry.cmdtype == CMDNORMAL
+	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
 	    && ((flags & EV_EXIT) == 0 || have_traps()))
 	 || ((flags & EV_BACKCMD) != 0
 	    && (cmdentry.cmdtype != CMDBUILTIN

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -429,6 +429,7 @@
 			outfmt(out2, "%s: %s\n", name, strerror(e));
 	}
 	entry->cmdtype = CMDUNKNOWN;
+	entry->u.index = 0;
 	return;
 
 success:

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#6 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
 .\"
 .Dd May 31, 2009
 .Dt SH 1
@@ -1227,6 +1227,9 @@
 final value of
 .Ar parameter
 is substituted.
+Quoting inside
+.Ar word
+does not prevent field splitting or pathname expansion.
 Only variables, not positional
 parameters or special parameters, can be
 assigned in this way.

==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 (text+ko) ====

@@ -1790,11 +1790,14 @@
 
 	/* We don't support those properties on FreeBSD. */
 	switch (prop) {
+	case ZFS_PROP_DEVICES:
+	case ZFS_PROP_ZONED:
 	case ZFS_PROP_SHAREISCSI:
-	case ZFS_PROP_DEVICES:
-	case ZFS_PROP_ACLMODE:
-	case ZFS_PROP_ACLINHERIT:
 	case ZFS_PROP_ISCSIOPTIONS:
+	case ZFS_PROP_XATTR:
+	case ZFS_PROP_VSCAN:
+	case ZFS_PROP_NBMAND:
+	case ZFS_PROP_SHARESMB:
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    "property '%s' not supported on FreeBSD", propname);
 		ret = zfs_error(hdl, EZFS_PERM, errbuf);

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/openpam/doc/man/pam.conf.5#2 (text) ====

@@ -109,7 +109,7 @@
 .It Cm requisite
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
 .It Cm sufficient
 If this module succeeds, the chain is broken and the result is
 success.

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/tcpdump/print-tcp.c#3 (text+ko) ====

@@ -124,6 +124,7 @@
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
+        { TCPOPT_UTO, "uto" },
         { 0, NULL }
 };
 
@@ -613,6 +614,17 @@
                                  */
                                 break;
 
+                        case TCPOPT_UTO:
+                                datalen = 2;
+                                LENCHECK(datalen);
+                                uint utoval = EXTRACT_16BITS(cp);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
+                                else
+                                        utoval >>= 1;
+                                (void)printf(" %u", utoval);
+                                break;
+
                         default:
                                 datalen = len - 2;
                                 for (i = 0; i < datalen; ++i) {

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/tcpdump/tcp.h#3 (text+ko) ====

@@ -83,6 +83,8 @@
 #define    TCPOLEN_SIGNATURE		18
 #define TCP_SIGLEN 16			/* length of an option 19 digest */
 #define TCPOPT_AUTH             20      /* Enhanced AUTH option */
+#define	TCPOPT_UTO		28	/* tcp user timeout (rfc5482) */
+#define	   TCPOLEN_UTO			4
 
 #define TCPOPT_TSTAMP_HDR	\
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/sh.c#4 (text+ko) ====

@@ -1291,6 +1291,8 @@
     /*
      * Mop-up.
      */
+    /* Take care of these (especially HUP) here instead of inside flush. */
+    handle_pending_signals();
     if (intty) {
 	if (loginsh) {
 	    xprintf("logout\n");

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_namespace.h#6 (text) ====

@@ -7,9 +7,9 @@
  *
  * A list of symbols which need munging is obtained as follows:
  *
- * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
+ * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.7 2009/10/01 17:12:52 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $
  */
 
 #define a2port					ssh_a2port
@@ -18,6 +18,7 @@
 #define acss_setkey				ssh_acss_setkey
 #define acss_setsubkey				ssh_acss_setsubkey
 #define add_host_to_hostfile			ssh_add_host_to_hostfile
+#define add_recv_bytes				ssh_add_recv_bytes
 #define addargs					ssh_addargs
 #define addr_match_list				ssh_addr_match_list
 #define ask_permission				ssh_ask_permission
@@ -111,6 +112,8 @@
 #define channel_open_message			ssh_channel_open_message
 #define channel_output_poll			ssh_channel_output_poll
 #define channel_permit_all_opens		ssh_channel_permit_all_opens
+#define channel_post				ssh_channel_post
+#define channel_pre				ssh_channel_pre
 #define channel_prepare_select			ssh_channel_prepare_select
 #define channel_print_adm_permitted_opens	ssh_channel_print_adm_permitted_opens
 #define channel_register_cleanup		ssh_channel_register_cleanup
@@ -150,14 +153,19 @@
 #define cipher_set_key_string			ssh_cipher_set_key_string
 #define cipher_set_keycontext			ssh_cipher_set_keycontext
 #define cipher_set_keyiv			ssh_cipher_set_keyiv
+#define ciphers					ssh_ciphers
 #define ciphers_valid				ssh_ciphers_valid
 #define cleanhostname				ssh_cleanhostname
 #define cleanup_exit				ssh_cleanup_exit
 #define clear_cached_addr			ssh_clear_cached_addr
 #define colon					ssh_colon
+#define compat13				ssh_compat13
+#define compat20				ssh_compat20
 #define compat_cipher_proposal			ssh_compat_cipher_proposal
 #define compat_datafellows			ssh_compat_datafellows
 #define convtime				ssh_convtime
+#define current_keys				ssh_current_keys
+#define datafellows				ssh_datafellows
 #define debug					ssh_debug
 #define debug					ssh_debug
 #define debug2					ssh_debug2
@@ -175,6 +183,7 @@
 #define dh_new_group14				ssh_dh_new_group14
 #define dh_new_group_asc			ssh_dh_new_group_asc
 #define dh_pub_is_valid				ssh_dh_pub_is_valid
+#define dispatch				ssh_dispatch
 #define dispatch_init				ssh_dispatch_init
 #define dispatch_protocol_error			ssh_dispatch_protocol_error
 #define dispatch_protocol_ignore		ssh_dispatch_protocol_ignore
@@ -205,6 +214,7 @@
 #define get_local_port				ssh_get_local_port
 #define get_peer_ipaddr				ssh_get_peer_ipaddr
 #define get_peer_port				ssh_get_peer_port
+#define get_recv_bytes				ssh_get_recv_bytes
 #define get_remote_ipaddr			ssh_get_remote_ipaddr
 #define get_remote_name_or_ip			ssh_get_remote_name_or_ip
 #define get_remote_port				ssh_get_remote_port
@@ -216,6 +226,7 @@
 #define host_hash				ssh_host_hash
 #define hostfile_read_key			ssh_hostfile_read_key
 #define hpdelim					ssh_hpdelim
+#define incoming_stream				ssh_incoming_stream
 #define init_rng				ssh_init_rng
 #define ipv64_normalise_mapped			ssh_ipv64_normalise_mapped
 #define kex_derive_keys				ssh_kex_derive_keys
@@ -268,6 +279,7 @@
 #define mac_init				ssh_mac_init
 #define mac_setup				ssh_mac_setup
 #define mac_valid				ssh_mac_valid
+#define macs					ssh_macs
 #define match_host_and_ip			ssh_match_host_and_ip
 #define match_hostname				ssh_match_hostname
 #define match_list				ssh_match_list
@@ -279,6 +291,7 @@
 #define ms_subtract_diff			ssh_ms_subtract_diff
 #define ms_to_timeval				ssh_ms_to_timeval
 #define mysignal				ssh_mysignal
+#define outgoing_stream				ssh_outgoing_stream
 #define packet_add_padding			ssh_packet_add_padding
 #define packet_backup_state			ssh_packet_backup_state
 #define packet_close				ssh_packet_close
@@ -363,9 +376,13 @@
 #define refresh_progress_meter			ssh_refresh_progress_meter
 #define replacearg				ssh_replacearg
 #define restore_uid				ssh_restore_uid
+#define resume_in_progress			ssh_resume_in_progress
+#define resume_kex				ssh_resume_kex
 #define rijndael_decrypt			ssh_rijndael_decrypt
 #define rijndael_encrypt			ssh_rijndael_encrypt
 #define rijndael_set_key			ssh_rijndael_set_key
+#define roaming_read				ssh_roaming_read
+#define roaming_write				ssh_roaming_write
 #define rsa_generate_additional_parameters	ssh_rsa_generate_additional_parameters
 #define rsa_private_decrypt			ssh_rsa_private_decrypt
 #define rsa_public_encrypt			ssh_rsa_public_encrypt
@@ -393,6 +410,7 @@
 #define tty_make_modes				ssh_tty_make_modes
 #define tty_parse_modes				ssh_tty_parse_modes
 #define tun_open				ssh_tun_open
+#define umac_ctx				ssh_umac_ctx
 #define umac_delete				ssh_umac_delete
 #define umac_final				ssh_umac_final
 #define umac_new				ssh_umac_new

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/ftpd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.20 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "ftpd" service
 #
@@ -8,12 +8,12 @@
 auth		sufficient	pam_opie.so		no_warn no_fake_prompts
 auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn
-#auth           sufficient      pam_ssh.so		no_warn try_first_pass
+#auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/kde#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/kde,v 1.9 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "kde" service
 #
@@ -11,9 +11,9 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/other#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/other,v 1.13 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "other" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so
 
 # password

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/sshd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/sshd,v 1.18 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "sshd" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so
 
 # password

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/system#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
+# $FreeBSD: src/etc/pam.d/system,v 1.3 2009/10/05 09:28:54 des Exp $
 #
 # System-wide defaults
 #
@@ -12,12 +12,12 @@
 auth		required	pam_unix.so		no_warn try_first_pass nullok
 
 # account
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/telnetd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.10 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "telnetd" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2008/trasz_nfs4acl/etc/pam.d/xdm#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.12 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "xdm" service
 #
@@ -11,11 +11,11 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session
-#session 	required	pam_ssh.so		want_agent
+#session	required	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#7 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.91 2009/10/05 20:11:33 hrs Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -602,7 +602,7 @@
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:-${_override_command}}
+	command=${command:+${_override_command:-$command}}
 
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=

==== //depot/projects/soc2008/trasz_nfs4acl/etc/services#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
+# $FreeBSD: src/etc/services,v 1.114 2009/10/03 11:02:36 rpaulo Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -1521,6 +1521,8 @@
 nfa		1155/udp   #Network File Access
 phone		1167/udp   #conference calling
 skkserv		1178/tcp   #SKK (kanji input)
+openvpn		1194/tcp   #OpenVPN
+openvpn		1194/udp   #OpenVPN
 lupa		1212/tcp
 lupa		1212/udp
 nerv		1222/tcp   #SNI R&D network

==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#12 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.276 2009/07/16 20:29:36 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -18126,7 +18126,7 @@
 		   commenting on rumors of womanizing.
 %
 Food for thought is no substitute for the real thing.
-		-- Walt Kelly, "Putluck Pogo"
+		-- Walt Kelly, "Potluck Pogo"
 %
 Foolproof Operation:
 	No provision for adjustment.

==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.9 2007/12/09 01:00:11 dougb Exp $
+# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.10 2009/10/06 02:13:32 dougb Exp $
 AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk
 AAAARRRRGGGGHHHH
 aafte
@@ -3300,6 +3300,7 @@
 Postnews
 Postpetroleum
 potholes
+Potluck
 potty
 Poul
 Pournelle
@@ -3376,7 +3377,6 @@
 PUSHes
 pushy
 pussycats
-Putluck
 Putt's
 PVLC
 PxP

==== //depot/projects/soc2008/trasz_nfs4acl/include/langinfo.h#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/include/langinfo.h,v 1.6 2002/09/18 05:54:25 mike Exp $
+ * $FreeBSD: src/include/langinfo.h,v 1.7 2009/10/05 07:11:19 edwin Exp $
  */
 
 #ifndef _LANGINFO_H_
@@ -114,6 +114,20 @@
 #define	D_MD_ORDER	57	/* month/day order (local extension) */
 #endif
 
+/* standalone months forms for %OB */
+#define	ALTMON_1	58
+#define	ALTMON_2	59
+#define	ALTMON_3	60
+#define	ALTMON_4	61
+#define	ALTMON_5	62
+#define	ALTMON_6	63
+#define	ALTMON_7	64
+#define	ALTMON_8	65
+#define	ALTMON_9	66
+#define	ALTMON_10	67
+#define	ALTMON_11	68
+#define	ALTMON_12	69
+
 __BEGIN_DECLS
 char	*nl_langinfo(nl_item);
 __END_DECLS

==== //depot/projects/soc2008/trasz_nfs4acl/include/libgen.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
+/*	$FreeBSD: src/include/libgen.h,v 1.3 2009/10/06 14:05:57 rwatson Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -36,6 +36,7 @@
 __BEGIN_DECLS
 
 char	*basename(const char *);
+char	*basename_r(const char *, char *);
 char	*dirname(const char *);
 #if 0
 char	*regcmp(const char *, ...);

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -76,6 +76,7 @@
 
 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \
 	arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
+MLINKS+=basename.3 basename_r.3
 MLINKS+=ctermid.3 ctermid_r.3
 MLINKS+=devname.3 devname_r.3
 MLINKS+=devname.3 fdevname.3

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#11 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $
  */
 
 FBSD_1.0 {
@@ -367,6 +367,7 @@
 };
 
 FBSD_1.2 {
+	basename_r;
 	getpagesizes;
 };
 

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/basename.3#2 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.9 2009/10/06 14:05:57 rwatson Exp $
 .\"
-.Dd October 12, 2006
+.Dd October 6, 2009
 .Dt BASENAME 3
 .Os
 .Sh NAME
@@ -37,6 +37,8 @@
 .In libgen.h
 .Ft char *
 .Fn basename "const char *path"
+.Ft char *
+.Fn basename_r "const char *path" "char *bname"
 .Sh DESCRIPTION
 The
 .Fn basename
@@ -58,6 +60,12 @@
 is a null pointer or the empty string, a pointer to the string
 .Qq \&.
 is returned.
+.Pp
+The
+.Fn basename_r
+variation accepts a buffer of at least
+.Dv MAXPATHLEN
+bytes in which to store the resulting component.
 .Sh IMPLEMENTATION NOTES
 The
 .Fn basename
@@ -65,15 +73,17 @@
 returns a pointer to internal storage space allocated on the first call
 that will be overwritten
 by subsequent calls.
+.Fn basename_r
+is therefore preferred for threaded applications.
 .Sh RETURN VALUES
 On successful completion,
 .Fn basename
-returns a pointer to the last component of
+and
+.Fn basename_r
+return pointers to the last component of
 .Fa path .
 .Pp
-If
-.Fn basename
-fails, a null pointer is returned and the global variable
+If they fail, a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/basename.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.8 2009/10/06 14:05:57 rwatson Exp $");
 
 #include <errno.h>
 #include <libgen.h>
@@ -40,18 +40,12 @@
 #include <sys/param.h>
 
 char *
-basename(path)
+basename_r(path, bname)
 	const char *path;
+	char *bname;
 {
-	static char *bname = NULL;
 	const char *endp, *startp;
 
- 	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
-			return(NULL);
-	}
-
 	/* Empty or NULL string gets treated as "." */
 	if (path == NULL || *path == '\0') {
 		(void)strcpy(bname, ".");
@@ -82,3 +76,17 @@
 	bname[endp - startp + 1] = '\0';
 	return(bname);
 }
+
+char *
+basename(path)
+	const char *path;
+{
+	static char *bname = NULL;
+
+	if (bname == NULL) {
+		bname = (char *)malloc(MAXPATHLEN);
+		if (bname == NULL)
+			return (NULL);
+	}
+	return (basename_r(path, bname));
+}

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/errlst.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.10 2009/10/07 20:20:51 rwatson Exp $");
 
 #include <stdio.h>
 
@@ -150,5 +150,6 @@
 	"Multihop attempted",			/* 90 - EMULTIHOP */
 	"Link has been severed",		/* 91 - ENOLINK */
 	"Protocol error",			/* 92 - EPROTO */
+	"Capabilities insufficient",		/* 93 - ENOTCAPABLE */
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/fts.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.25 2009/10/05 21:11:04 delphij Exp $
 .\"
-.Dd January 26, 2008
+.Dd October 5, 2009
 .Dt FTS 3
 .Os
 .Sh NAME
@@ -776,7 +776,7 @@
 as follows:
 .Bl -tag -width Er
 .It Bq Er EINVAL
-The options were invalid.
+The options were invalid, or the list were empty.
 .El
 .Sh SEE ALSO
 .Xr find 1 ,

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/fts.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.30 2009/03/04 03:30:21 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.31 2009/10/05 21:11:04 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -124,6 +124,12 @@
 		return (NULL);
 	}
 
+	/* fts_open() requires at least one path */
+	if (*argv == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
 	/* Allocate/initialize the stream. */
 	if ((priv = malloc(sizeof(*priv))) == NULL)
 		return (NULL);

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/locale/nl_langinfo.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.18 2009/10/05 07:13:15 edwin Exp $");
 
 #include <langinfo.h>
 #include <limits.h>
@@ -93,6 +93,12 @@
 	case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
 		ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
 		break;
+	case ALTMON_1: case ALTMON_2: case ALTMON_3: case ALTMON_4:
+	case ALTMON_5: case ALTMON_6: case ALTMON_7: case ALTMON_8:
+	case ALTMON_9: case ALTMON_10: case ALTMON_11: case ALTMON_12:
+		ret = (char*)
+		    __get_current_time_locale()->alt_month[_REL(ALTMON_1)];
+		break;
 	case ERA:
 		/* XXX: need to be implemented  */
 		ret = "";

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/getdelim.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.2 2009/04/06 13:50:04 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.3 2009/10/04 19:43:36 das Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -120,8 +120,8 @@
 		goto error;

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

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 21:56:04 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEED3106568B; Sat, 10 Oct 2009 21:56:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A697106566B
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:56:03 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 776488FC14
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:56:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ALu3Vd004687
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 21:56:03 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ALu2M9004685
	for perforce@freebsd.org; Sat, 10 Oct 2009 21:56:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 10 Oct 2009 21:56:02 GMT
Message-Id: <200910102156.n9ALu2M9004685@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169371 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 21:56:04 -0000

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

Change 169371 by trasz@trasz_victim on 2009/10/10 21:55:11

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/openpam/doc/man/pam.conf.5#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcsh/sh.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/ftpd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/kde#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/other#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/sshd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/system#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/telnetd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/xdm#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.subr#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/services#2 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/soc2009/trasz_limits/include/langinfo.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/include/libgen.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/sys/intro.2#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libpmc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/map_object.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/bce.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/bge.4#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/de.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/lindev.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/unix.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/urtw.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/zyd.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#10 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/fetch.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/store.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/atomic.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ati.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtw.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/label/g_label.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_events.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_move.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/elf_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/elf_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/elf64_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/route.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_os_bsd.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/errno.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/sequences#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/unknown1.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/tmpfs/h_tools.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/netstat.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/whois/whois.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/cdcontrol/cdcontrol.c#2 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -713,12 +713,7 @@
 				do_clearcmdentry = 1;
 			}
 
-		find_command(argv[0], &cmdentry, 1, path);
-		if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
-			exitstatus = 127;
-			flushout(&errout);
-			return;
-		}
+		find_command(argv[0], &cmdentry, 0, path);
 		/* implement the bltin builtin here */
 		if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
 			for (;;) {
@@ -740,7 +735,7 @@
 
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd
-	 || (cmdentry.cmdtype == CMDNORMAL
+	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
 	    && ((flags & EV_EXIT) == 0 || have_traps()))
 	 || ((flags & EV_BACKCMD) != 0
 	    && (cmdentry.cmdtype != CMDBUILTIN

==== //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -429,6 +429,7 @@
 			outfmt(out2, "%s: %s\n", name, strerror(e));
 	}
 	entry->cmdtype = CMDUNKNOWN;
+	entry->u.index = 0;
 	return;
 
 success:

==== //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#6 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
 .\"
 .Dd May 31, 2009
 .Dt SH 1
@@ -1227,6 +1227,9 @@
 final value of
 .Ar parameter
 is substituted.
+Quoting inside
+.Ar word
+does not prevent field splitting or pathname expansion.
 Only variables, not positional
 parameters or special parameters, can be
 assigned in this way.

==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 (text+ko) ====

@@ -1790,11 +1790,14 @@
 
 	/* We don't support those properties on FreeBSD. */
 	switch (prop) {
+	case ZFS_PROP_DEVICES:
+	case ZFS_PROP_ZONED:
 	case ZFS_PROP_SHAREISCSI:
-	case ZFS_PROP_DEVICES:
-	case ZFS_PROP_ACLMODE:
-	case ZFS_PROP_ACLINHERIT:
 	case ZFS_PROP_ISCSIOPTIONS:
+	case ZFS_PROP_XATTR:
+	case ZFS_PROP_VSCAN:
+	case ZFS_PROP_NBMAND:
+	case ZFS_PROP_SHARESMB:
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    "property '%s' not supported on FreeBSD", propname);
 		ret = zfs_error(hdl, EZFS_PERM, errbuf);

==== //depot/projects/soc2009/trasz_limits/contrib/openpam/doc/man/pam.conf.5#2 (text) ====

@@ -109,7 +109,7 @@
 .It Cm requisite
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
 .It Cm sufficient
 If this module succeeds, the chain is broken and the result is
 success.

==== //depot/projects/soc2009/trasz_limits/contrib/tcpdump/print-tcp.c#2 (text+ko) ====

@@ -124,6 +124,7 @@
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_AUTH, "enhanced auth" },
+        { TCPOPT_UTO, "uto" },
         { 0, NULL }
 };
 
@@ -613,6 +614,17 @@
                                  */
                                 break;
 
+                        case TCPOPT_UTO:
+                                datalen = 2;
+                                LENCHECK(datalen);
+                                uint utoval = EXTRACT_16BITS(cp);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
+                                else
+                                        utoval >>= 1;
+                                (void)printf(" %u", utoval);
+                                break;
+
                         default:
                                 datalen = len - 2;
                                 for (i = 0; i < datalen; ++i) {

==== //depot/projects/soc2009/trasz_limits/contrib/tcpdump/tcp.h#2 (text+ko) ====

@@ -83,6 +83,8 @@
 #define    TCPOLEN_SIGNATURE		18
 #define TCP_SIGLEN 16			/* length of an option 19 digest */
 #define TCPOPT_AUTH             20      /* Enhanced AUTH option */
+#define	TCPOPT_UTO		28	/* tcp user timeout (rfc5482) */
+#define	   TCPOLEN_UTO			4
 
 #define TCPOPT_TSTAMP_HDR	\
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)

==== //depot/projects/soc2009/trasz_limits/contrib/tcsh/sh.c#3 (text+ko) ====

@@ -1291,6 +1291,8 @@
     /*
      * Mop-up.
      */
+    /* Take care of these (especially HUP) here instead of inside flush. */
+    handle_pending_signals();
     if (intty) {
 	if (loginsh) {
 	    xprintf("logout\n");

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#5 (text) ====

@@ -7,9 +7,9 @@
  *
  * A list of symbols which need munging is obtained as follows:
  *
- * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
+ * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.7 2009/10/01 17:12:52 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $
  */
 
 #define a2port					ssh_a2port
@@ -18,6 +18,7 @@
 #define acss_setkey				ssh_acss_setkey
 #define acss_setsubkey				ssh_acss_setsubkey
 #define add_host_to_hostfile			ssh_add_host_to_hostfile
+#define add_recv_bytes				ssh_add_recv_bytes
 #define addargs					ssh_addargs
 #define addr_match_list				ssh_addr_match_list
 #define ask_permission				ssh_ask_permission
@@ -111,6 +112,8 @@
 #define channel_open_message			ssh_channel_open_message
 #define channel_output_poll			ssh_channel_output_poll
 #define channel_permit_all_opens		ssh_channel_permit_all_opens
+#define channel_post				ssh_channel_post
+#define channel_pre				ssh_channel_pre
 #define channel_prepare_select			ssh_channel_prepare_select
 #define channel_print_adm_permitted_opens	ssh_channel_print_adm_permitted_opens
 #define channel_register_cleanup		ssh_channel_register_cleanup
@@ -150,14 +153,19 @@
 #define cipher_set_key_string			ssh_cipher_set_key_string
 #define cipher_set_keycontext			ssh_cipher_set_keycontext
 #define cipher_set_keyiv			ssh_cipher_set_keyiv
+#define ciphers					ssh_ciphers
 #define ciphers_valid				ssh_ciphers_valid
 #define cleanhostname				ssh_cleanhostname
 #define cleanup_exit				ssh_cleanup_exit
 #define clear_cached_addr			ssh_clear_cached_addr
 #define colon					ssh_colon
+#define compat13				ssh_compat13
+#define compat20				ssh_compat20
 #define compat_cipher_proposal			ssh_compat_cipher_proposal
 #define compat_datafellows			ssh_compat_datafellows
 #define convtime				ssh_convtime
+#define current_keys				ssh_current_keys
+#define datafellows				ssh_datafellows
 #define debug					ssh_debug
 #define debug					ssh_debug
 #define debug2					ssh_debug2
@@ -175,6 +183,7 @@
 #define dh_new_group14				ssh_dh_new_group14
 #define dh_new_group_asc			ssh_dh_new_group_asc
 #define dh_pub_is_valid				ssh_dh_pub_is_valid
+#define dispatch				ssh_dispatch
 #define dispatch_init				ssh_dispatch_init
 #define dispatch_protocol_error			ssh_dispatch_protocol_error
 #define dispatch_protocol_ignore		ssh_dispatch_protocol_ignore
@@ -205,6 +214,7 @@
 #define get_local_port				ssh_get_local_port
 #define get_peer_ipaddr				ssh_get_peer_ipaddr
 #define get_peer_port				ssh_get_peer_port
+#define get_recv_bytes				ssh_get_recv_bytes
 #define get_remote_ipaddr			ssh_get_remote_ipaddr
 #define get_remote_name_or_ip			ssh_get_remote_name_or_ip
 #define get_remote_port				ssh_get_remote_port
@@ -216,6 +226,7 @@
 #define host_hash				ssh_host_hash
 #define hostfile_read_key			ssh_hostfile_read_key
 #define hpdelim					ssh_hpdelim
+#define incoming_stream				ssh_incoming_stream
 #define init_rng				ssh_init_rng
 #define ipv64_normalise_mapped			ssh_ipv64_normalise_mapped
 #define kex_derive_keys				ssh_kex_derive_keys
@@ -268,6 +279,7 @@
 #define mac_init				ssh_mac_init
 #define mac_setup				ssh_mac_setup
 #define mac_valid				ssh_mac_valid
+#define macs					ssh_macs
 #define match_host_and_ip			ssh_match_host_and_ip
 #define match_hostname				ssh_match_hostname
 #define match_list				ssh_match_list
@@ -279,6 +291,7 @@
 #define ms_subtract_diff			ssh_ms_subtract_diff
 #define ms_to_timeval				ssh_ms_to_timeval
 #define mysignal				ssh_mysignal
+#define outgoing_stream				ssh_outgoing_stream
 #define packet_add_padding			ssh_packet_add_padding
 #define packet_backup_state			ssh_packet_backup_state
 #define packet_close				ssh_packet_close
@@ -363,9 +376,13 @@
 #define refresh_progress_meter			ssh_refresh_progress_meter
 #define replacearg				ssh_replacearg
 #define restore_uid				ssh_restore_uid
+#define resume_in_progress			ssh_resume_in_progress
+#define resume_kex				ssh_resume_kex
 #define rijndael_decrypt			ssh_rijndael_decrypt
 #define rijndael_encrypt			ssh_rijndael_encrypt
 #define rijndael_set_key			ssh_rijndael_set_key
+#define roaming_read				ssh_roaming_read
+#define roaming_write				ssh_roaming_write
 #define rsa_generate_additional_parameters	ssh_rsa_generate_additional_parameters
 #define rsa_private_decrypt			ssh_rsa_private_decrypt
 #define rsa_public_encrypt			ssh_rsa_public_encrypt
@@ -393,6 +410,7 @@
 #define tty_make_modes				ssh_tty_make_modes
 #define tty_parse_modes				ssh_tty_parse_modes
 #define tun_open				ssh_tun_open
+#define umac_ctx				ssh_umac_ctx
 #define umac_delete				ssh_umac_delete
 #define umac_final				ssh_umac_final
 #define umac_new				ssh_umac_new

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/ftpd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.20 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "ftpd" service
 #
@@ -8,12 +8,12 @@
 auth		sufficient	pam_opie.so		no_warn no_fake_prompts
 auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn
-#auth           sufficient      pam_ssh.so		no_warn try_first_pass
+#auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/kde#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/kde,v 1.9 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "kde" service
 #
@@ -11,9 +11,9 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/other#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/other,v 1.13 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "other" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so
 
 # password

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/sshd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/sshd,v 1.18 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "sshd" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_permit.so
 
 # password

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/system#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
+# $FreeBSD: src/etc/pam.d/system,v 1.3 2009/10/05 09:28:54 des Exp $
 #
 # System-wide defaults
 #
@@ -12,12 +12,12 @@
 auth		required	pam_unix.so		no_warn try_first_pass nullok
 
 # account
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/telnetd#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.10 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "telnetd" service
 #
@@ -13,12 +13,12 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_login_access.so
 account		required	pam_unix.so
 
 # session
-#session 	optional	pam_ssh.so
+#session	optional	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2009/trasz_limits/etc/pam.d/xdm#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.12 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "xdm" service
 #
@@ -11,11 +11,11 @@
 
 # account
 account		required	pam_nologin.so
-#account 	required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session
-#session 	required	pam_ssh.so		want_agent
+#session	required	pam_ssh.so		want_agent
 session		required	pam_lastlog.so		no_fail
 
 # password

==== //depot/projects/soc2009/trasz_limits/etc/rc.subr#5 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.91 2009/10/05 20:11:33 hrs Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -602,7 +602,7 @@
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:-${_override_command}}
+	command=${command:+${_override_command:-$command}}
 
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=

==== //depot/projects/soc2009/trasz_limits/etc/services#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
+# $FreeBSD: src/etc/services,v 1.114 2009/10/03 11:02:36 rpaulo Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -1521,6 +1521,8 @@
 nfa		1155/udp   #Network File Access
 phone		1167/udp   #conference calling
 skkserv		1178/tcp   #SKK (kanji input)
+openvpn		1194/tcp   #OpenVPN
+openvpn		1194/udp   #OpenVPN
 lupa		1212/tcp
 lupa		1212/udp
 nerv		1222/tcp   #SNI R&D network

==== //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#4 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.276 2009/07/16 20:29:36 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -18126,7 +18126,7 @@
 		   commenting on rumors of womanizing.
 %
 Food for thought is no substitute for the real thing.
-		-- Walt Kelly, "Putluck Pogo"
+		-- Walt Kelly, "Potluck Pogo"
 %
 Foolproof Operation:
 	No provision for adjustment.

==== //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.9 2007/12/09 01:00:11 dougb Exp $
+# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.10 2009/10/06 02:13:32 dougb Exp $
 AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk
 AAAARRRRGGGGHHHH
 aafte
@@ -3300,6 +3300,7 @@
 Postnews
 Postpetroleum
 potholes
+Potluck
 potty
 Poul
 Pournelle
@@ -3376,7 +3377,6 @@
 PUSHes
 pushy
 pussycats
-Putluck
 Putt's
 PVLC
 PxP

==== //depot/projects/soc2009/trasz_limits/include/langinfo.h#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/include/langinfo.h,v 1.6 2002/09/18 05:54:25 mike Exp $
+ * $FreeBSD: src/include/langinfo.h,v 1.7 2009/10/05 07:11:19 edwin Exp $
  */
 
 #ifndef _LANGINFO_H_
@@ -114,6 +114,20 @@
 #define	D_MD_ORDER	57	/* month/day order (local extension) */
 #endif
 
+/* standalone months forms for %OB */
+#define	ALTMON_1	58
+#define	ALTMON_2	59
+#define	ALTMON_3	60
+#define	ALTMON_4	61
+#define	ALTMON_5	62
+#define	ALTMON_6	63
+#define	ALTMON_7	64
+#define	ALTMON_8	65
+#define	ALTMON_9	66
+#define	ALTMON_10	67
+#define	ALTMON_11	68
+#define	ALTMON_12	69
+
 __BEGIN_DECLS
 char	*nl_langinfo(nl_item);
 __END_DECLS

==== //depot/projects/soc2009/trasz_limits/include/libgen.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
+/*	$FreeBSD: src/include/libgen.h,v 1.3 2009/10/06 14:05:57 rwatson Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -36,6 +36,7 @@
 __BEGIN_DECLS
 
 char	*basename(const char *);
+char	*basename_r(const char *, char *);
 char	*dirname(const char *);
 #if 0
 char	*regcmp(const char *, ...);

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -76,6 +76,7 @@
 
 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \
 	arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
+MLINKS+=basename.3 basename_r.3
 MLINKS+=ctermid.3 ctermid_r.3
 MLINKS+=devname.3 devname_r.3
 MLINKS+=devname.3 fdevname.3

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#4 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $
  */
 
 FBSD_1.0 {
@@ -367,6 +367,7 @@
 };
 
 FBSD_1.2 {
+	basename_r;
 	getpagesizes;
 };
 

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.3#2 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.9 2009/10/06 14:05:57 rwatson Exp $
 .\"
-.Dd October 12, 2006
+.Dd October 6, 2009
 .Dt BASENAME 3
 .Os
 .Sh NAME
@@ -37,6 +37,8 @@
 .In libgen.h
 .Ft char *
 .Fn basename "const char *path"
+.Ft char *
+.Fn basename_r "const char *path" "char *bname"
 .Sh DESCRIPTION
 The
 .Fn basename
@@ -58,6 +60,12 @@
 is a null pointer or the empty string, a pointer to the string
 .Qq \&.
 is returned.
+.Pp
+The
+.Fn basename_r
+variation accepts a buffer of at least
+.Dv MAXPATHLEN
+bytes in which to store the resulting component.
 .Sh IMPLEMENTATION NOTES
 The
 .Fn basename
@@ -65,15 +73,17 @@
 returns a pointer to internal storage space allocated on the first call
 that will be overwritten
 by subsequent calls.
+.Fn basename_r
+is therefore preferred for threaded applications.
 .Sh RETURN VALUES
 On successful completion,
 .Fn basename
-returns a pointer to the last component of
+and
+.Fn basename_r
+return pointers to the last component of
 .Fa path .
 .Pp
-If
-.Fn basename
-fails, a null pointer is returned and the global variable
+If they fail, a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.8 2009/10/06 14:05:57 rwatson Exp $");
 
 #include <errno.h>
 #include <libgen.h>
@@ -40,18 +40,12 @@
 #include <sys/param.h>
 
 char *
-basename(path)
+basename_r(path, bname)
 	const char *path;
+	char *bname;
 {
-	static char *bname = NULL;
 	const char *endp, *startp;
 
- 	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
-			return(NULL);
-	}
-
 	/* Empty or NULL string gets treated as "." */
 	if (path == NULL || *path == '\0') {
 		(void)strcpy(bname, ".");
@@ -82,3 +76,17 @@
 	bname[endp - startp + 1] = '\0';
 	return(bname);
 }
+
+char *
+basename(path)
+	const char *path;
+{
+	static char *bname = NULL;
+
+	if (bname == NULL) {
+		bname = (char *)malloc(MAXPATHLEN);
+		if (bname == NULL)
+			return (NULL);
+	}
+	return (basename_r(path, bname));
+}

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.10 2009/10/07 20:20:51 rwatson Exp $");
 
 #include <stdio.h>
 
@@ -150,5 +150,6 @@
 	"Multihop attempted",			/* 90 - EMULTIHOP */
 	"Link has been severed",		/* 91 - ENOLINK */
 	"Protocol error",			/* 92 - EPROTO */
+	"Capabilities insufficient",		/* 93 - ENOTCAPABLE */
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.25 2009/10/05 21:11:04 delphij Exp $
 .\"
-.Dd January 26, 2008
+.Dd October 5, 2009
 .Dt FTS 3
 .Os
 .Sh NAME
@@ -776,7 +776,7 @@
 as follows:
 .Bl -tag -width Er
 .It Bq Er EINVAL
-The options were invalid.
+The options were invalid, or the list were empty.
 .El
 .Sh SEE ALSO
 .Xr find 1 ,

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.30 2009/03/04 03:30:21 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.31 2009/10/05 21:11:04 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -124,6 +124,12 @@
 		return (NULL);
 	}
 
+	/* fts_open() requires at least one path */
+	if (*argv == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
 	/* Allocate/initialize the stream. */
 	if ((priv = malloc(sizeof(*priv))) == NULL)
 		return (NULL);

==== //depot/projects/soc2009/trasz_limits/lib/libc/locale/nl_langinfo.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.18 2009/10/05 07:13:15 edwin Exp $");
 
 #include <langinfo.h>
 #include <limits.h>
@@ -93,6 +93,12 @@
 	case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
 		ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
 		break;
+	case ALTMON_1: case ALTMON_2: case ALTMON_3: case ALTMON_4:
+	case ALTMON_5: case ALTMON_6: case ALTMON_7: case ALTMON_8:
+	case ALTMON_9: case ALTMON_10: case ALTMON_11: case ALTMON_12:
+		ret = (char*)
+		    __get_current_time_locale()->alt_month[_REL(ALTMON_1)];
+		break;
 	case ERA:
 		/* XXX: need to be implemented  */
 		ret = "";

==== //depot/projects/soc2009/trasz_limits/lib/libc/stdio/getdelim.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.2 2009/04/06 13:50:04 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.3 2009/10/04 19:43:36 das Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -120,8 +120,8 @@
 		goto error;

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

From owner-p4-projects@FreeBSD.ORG  Sat Oct 10 22:20:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD6DE1065676; Sat, 10 Oct 2009 22:20:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8228D1065670
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 22:20:30 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7135F8FC1A
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 22:20:30 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AMKUbe007383
	for <perforce@freebsd.org>; Sat, 10 Oct 2009 22:20:30 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9AMKUp0007381
	for perforce@freebsd.org; Sat, 10 Oct 2009 22:20:30 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 10 Oct 2009 22:20:30 GMT
Message-Id: <200910102220.n9AMKUp0007381@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169372 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 22:20:31 -0000

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

Change 169372 by trasz@trasz_victim on 2009/10/10 22:19:50

	Remove '#ifdef notyet'; without HRL support in the kernel, it will
	get killed with a signal anyway.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#4 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#4 (text+ko) ====

@@ -517,10 +517,8 @@
         if ((flags & LOGIN_SETLOGINCLASS) &&
 	    setloginclass(lc->lc_class) != 0) {
 	    syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class);
-#ifdef notyet
 	    login_close(llc);
 	    return (-1);
-#endif
         }
     }