From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 10:14:40 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F42E1065670; Sun, 24 Jul 2011 10:14:40 +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 DFD27106564A
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:14:39 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id CC9228FC14
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:14:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OAEdNY008558
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:14:39 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OAEd7G008555
	for perforce@freebsd.org; Sun, 24 Jul 2011 10:14:39 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 24 Jul 2011 10:14:39 GMT
Message-Id: <201107241014.p6OAEd7G008555@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196623 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 10:14:40 -0000

http://p4web.freebsd.org/@@196623?ac=10

Change 196623 by rene@rene_acer on 2011/07/24 10:14:30

	IFC (and MFen network-servers)

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#41 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#97 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#63 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/port-mentor-guidelines/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#23 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#28 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#109 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#57 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#21 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#38 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#46 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#28 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#56 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#53 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/zi.key#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/MIMEIterator.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Email.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/FieldStart.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/MIME.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Patch.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/StateChange.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Text.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/SectionIterator.pm#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#8 integrate
.. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#5 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#58 integrate
.. //depot/projects/docproj_nl/www/en/layout/css/query-pr.css#2 integrate
.. //depot/projects/docproj_nl/www/en/search/search.sgml#10 integrate
.. //depot/projects/docproj_nl/www/share/mk/web.site.mk#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#111 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#25 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.62 2011/02/13 17:53:26 manolis Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.63 2011/07/20 17:50:26 tabthorpe Exp $
 
 SUBDIR =
 SUBDIR+= 5-roadmap
@@ -43,6 +43,7 @@
 SUBDIR+= new-users
 SUBDIR+= p4-primer
 SUBDIR+= pam
+SUBDIR+= port-mentor-guidelines
 SUBDIR+= portbuild
 SUBDIR+= pr-guidelines
 SUBDIR+= problem-reports

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#41 (text+ko) ====

@@ -9,7 +9,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.300 2011/06/16 19:40:12 simon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.301 2011/07/18 12:57:33 gjb Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -1081,7 +1081,8 @@
 	<para>Add yourself to the <quote>Developers</quote> section of
 	  the <ulink url="&url.articles.contributors;/index.html">Contributors List</ulink>
 	  (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml</filename>) and remove yourself from the <quote>Additional
-	  Contributors</quote> section (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml</filename>).</para>
+	  Contributors</quote> section (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml</filename>).
+	  Please note that entries are sorted by last name.</para>
       </listitem>
 
       <listitem>
@@ -1096,7 +1097,8 @@
 	  <filename>doc/share/pgpkeys</filename> (and if you do not
 	  have a key, you should create one).  Do not forget to commit
 	  the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>
-	  and <filename>doc/share/pgpkeys/pgpkeys-developers.sgml</filename>.</para>
+	  and <filename>doc/share/pgpkeys/pgpkeys-developers.sgml</filename>.
+	  Please note that entries are sorted by last name.</para>
 
 	<para>&a.des; has
 	  written a shell script (<filename>doc/share/pgpkeys/addkey.sh</filename>) to make this extremely simple.  See the

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#97 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1006 2011/07/07 13:37:40 martymac Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1007 2011/07/15 21:07:31 zi Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8652,11 +8652,6 @@
     </listitem>
 
     <listitem>
-      <para>Ryan Steinmetz
-	<email>rpsfa@rit.edu</email></para>
-    </listitem>
-
-    <listitem>
       <para>Ryan T. Dean
 	<email>rtdean@cytherianage.net</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#63 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.328 2011/06/14 12:04:34 gber Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.330 2011/07/17 02:07:03 zi Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1555,6 +1555,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.zi;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.lstewart;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#5 (text+ko) ====

@@ -27,24 +27,24 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.35 2011/07/05 11:09:50 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.36 2011/07/12 01:20:10 gjb Exp $
 -->
 
 <chapter id="tools">
   <title>Tools</title>
-  
+
   <para>The FDP uses a number of different software tools to help
     manage the FreeBSD documentation, convert it to different output
     formats, and so on.  You will need to use these tools yourself if
-    you are to work with the FreeBSD documentation.</para>                    
+    you are to work with the FreeBSD documentation.</para>
 
   <para>All these tools are available as FreeBSD Ports and Packages,
     greatly simplifying the work you have to do to install
-    them.</para>                                                              
-  
+    them.</para>
+
   <para>You will need to install these tools before you work through
     any of the examples in later chapters.  The actual usage of these
-    tools is covered in later chapters.</para>     
+    tools is covered in later chapters.</para>
 
   <tip>
     <title>Use <filename role="package">textproc/docproj</filename> If Possible</title>
@@ -87,38 +87,38 @@
 
     <sect2>
       <title>Software</title>
-      
+
       <para>These programs are required before you can usefully work with the
 	FreeBSD documentation, and they will allow you to convert the
 	documentation to HTML, plain text, and RTF formats.  They are all
 	included in <filename role="package">textproc/docproj</filename>.</para>
-      
+
       <variablelist>
 	<varlistentry>
 	  <term><application>Jade</application>
 	    (<filename role="package">textproc/jade</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>A DSSSL implementation.  Used for converting marked up
 	      documents to other formats, including HTML and &tex;.</para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term><application>Tidy</application>
 	    (<filename role="package">www/tidy</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>An HTML <quote>pretty printer</quote>, used to reformat some of the
 	      automatically generated HTML so that it is easier to
 	      follow.</para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term><application>Links</application>
 	    (<filename role="package">www/links</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>A text-mode WWW browser that can also convert
 	      HTML files to plain text.</para>
@@ -128,7 +128,7 @@
 	<varlistentry>
 	  <term><application>peps</application>
 	    (<filename role="package">graphics/peps</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>Some of the documentation includes images, some of which are
 	      stored as EPS files.  These must be converted to PNG before most
@@ -143,30 +143,30 @@
 
       <para>These are the DTDs and entity sets used by the FDP.  They need to
 	be installed before you can work with any of the documentation.</para>
-      
+
       <variablelist>
 	<varlistentry>
 	  <term>HTML DTD (<filename role="package">textproc/html</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>HTML is the markup language of choice for the World Wide
 	      Web, and is used throughout the FreeBSD web site.</para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term>DocBook DTD (<filename role="package">textproc/docbook</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>DocBook is designed for marking up technical documentation.
 	      All the FreeBSD documentation is written in DocBook.</para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term>ISO 8879 entities
 	    (<filename role="package">textproc/iso8879</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>19 of the ISO 8879:1986 character entity sets used by many
 	      DTDs.  Includes named mathematical symbols, additional
@@ -182,12 +182,12 @@
 
       <para>The stylesheets are used when converting and formatting the
 	documentation for display on screen, printing, and so on.</para>
-      
+
       <variablelist>
 	<varlistentry>
 	  <term>Modular DocBook Stylesheets
 	    (<filename role="package">textproc/dsssl-docbook-modular</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>The Modular DocBook Stylesheets are used when converting
 	      documentation marked up in DocBook to other formats, such as
@@ -208,14 +208,14 @@
 
     <sect2>
       <title>Software</title>
-      
+
       <variablelist>
 	<varlistentry>
 	  <term><application>JadeTeX</application> and
 	    <application>teTeX</application>
 	    (<filename role="package">print/jadetex</filename> and
 	    <filename role="package">print/teTeX</filename>)</term>
-	  
+
 	  <listitem>
 	    <para><application>Jade</application> and
 	      <application>teTeX</application> are used to convert DocBook
@@ -242,13 +242,13 @@
 	    </important>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term><application>Emacs</application> or
-	    <application>XEmacs</application> 
+	    <application>XEmacs</application>
 	    (<filename role="package">editors/emacs</filename> or
 	    <filename role="package">editors/xemacs</filename>)</term>
-	  
+
 	  <listitem>
 	    <para>Both these editors include a special mode for editing
 	      documents marked up according to an SGML DTD.  This mode
@@ -261,7 +261,7 @@
 	  </listitem>
 	</varlistentry>
       </variablelist>
-      
+
       <para>If anyone has recommendations for other software that is useful
 	when manipulating SGML documents, please let &a.doceng; know, so they
 	can be added to this list.</para>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#23 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.208 2011/07/08 17:41:07 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.209 2011/07/23 21:39:12 gjb Exp $
 -->
 
 <appendix id="eresources">
@@ -406,6 +406,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.office.name;</entry>
+	      <entry>Office applications on &os;</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.openoffice.name;</entry>
 	      <entry>Porting <application>OpenOffice.org</application> and
 		<application>&staroffice;</application> to FreeBSD</entry>
@@ -1409,6 +1414,18 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.office.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Office applications on &os;</emphasis></para>
+
+	    <para>Discussion centers around office applications,
+	      their installation, their development and their support
+	      within &os;.</para>
+	   </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.openoffice.name;</term>
 
 	  <listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#28 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.134 2011/05/26 08:50:03 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.135 2011/07/23 21:30:36 gjb Exp $
 -->
 
 <chapter id="network-servers">
@@ -3873,7 +3873,7 @@
 
     <sect2>
       <title><acronym
-        role="Doman Name Security Extensions">DNSSEC</acronym></title>
+        role="Domain Name Security Extensions">DNSSEC</acronym></title>
       <indexterm>
         <primary>BIND</primary>
         <secondary>DNS security extensions</secondary>
@@ -4107,8 +4107,8 @@
 	  also possible to rename the keys.  For each <acronym>KSK</acronym>
 	  file do:</para>
 
-	<screen>&prompt.user; <userinput>mv Kexample.com+005+nnnnn.key Kexample.com+005+nnnnn.KSK.key</userinput>
-&prompt.user; <userinput>mv Kexample.com+005+nnnnn.private Kexample.com+005+nnnnn.KSK.private</userinput></screen>
+	<screen>&prompt.user; <userinput>mv Kexample.com.+005+nnnnn.key Kexample.com.+005+nnnnn.KSK.key</userinput>
+&prompt.user; <userinput>mv Kexample.com.+005+nnnnn.private Kexample.com.+005+nnnnn.KSK.private</userinput></screen>
 
 	<para>For the <acronym>ZSK</acronym> files, substitute
 	  <literal>KSK</literal> for <literal>ZSK</literal> as necessary.  The

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#109 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1111 2011/06/28 12:10:40 bz Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1113 2011/07/20 04:26:06 linimon Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -8857,9 +8857,7 @@
 	kernel source files so that the port can compile.  Here is the
 	correct way to determine if the user has them installed:</para>
 
-      <programlisting>SRC_BASE?=      /usr/src
-
-.if !exists(${SRC_BASE}/sys/Makefile)
+      <programlisting>.if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=         requires kernel sources to be installed
 .endif</programlisting>
     </sect1>
@@ -14027,6 +14025,54 @@
 		      into libm.</entry>
 		  </row>
 		  <row>
+		    <entry>802503</entry>
+		    <entry>May 1, 2011</entry>
+		    <entry>8.2-STABLE after upgrade of the gcc to the last
+		      GPLv2 version from the FSF gcc-4_2-branch.</entry>
+		  </row>
+		  <row>
+		    <entry>802504</entry>
+		    <entry>May 28, 2011</entry>
+		    <entry>8.2-STABLE after introduction of the KPI and
+		      supporting infrastructure for modular congestion
+		      control.</entry>
+		  </row>
+		  <row>
+		    <entry>802505</entry>
+		    <entry>May 28, 2011</entry>
+		    <entry>8.2-STABLE after introduction of Hhook and Khelp
+		      KPIs.</entry>
+		  </row>
+		  <row>
+		    <entry>802506</entry>
+		    <entry>May 28, 2011</entry>
+		    <entry>8.2-STABLE after addition of OSD to struct
+		      tcpcb.</entry>
+		  </row>
+		  <row>
+		    <entry>802507</entry>
+		    <entry>June 6, 2011</entry>
+		    <entry>8.2-STABLE after ZFS v28 import.</entry>
+		  </row>
+		  <row>
+		    <entry>802508</entry>
+		    <entry>June 8, 2011</entry>
+		    <entry>8.2-STABLE after removal of sv_schedtail
+		      struct sysvec method.</entry>
+		  </row>
+		  <row>
+		    <entry>802509</entry>
+		    <entry>July 14, 2011</entry>
+		    <entry>8.2-STABLE after merging the SSSE3 support
+		      into binutils.</entry>
+		  </row>
+		  <row>
+		    <entry>802510</entry>
+		    <entry>July 19, 2011</entry>
+		    <entry>8.2-STABLE after addition of
+		      RFTSIGZMB flag for <function>rfork(2)</function>.</entry>
+		  </row>
+		  <row>
 		    <entry>900000</entry>
 		    <entry>August 22, 2009</entry>
 		    <entry>9.0-CURRENT.</entry>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#57 (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.543 2011/06/14 08:16:25 gber Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.544 2011/07/15 21:07:31 zi Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -1296,6 +1296,8 @@
 
 <!ENTITY a.zec "Marko Zec <email>zec@FreeBSD.org</email>">
 
+<!ENTITY a.zi "Ryan Steinmetz <email>zi@FreeBSD.org</email>">
+
 <!ENTITY a.zml "Zachary Loafman <email>zml@FreeBSD.org</email>">
 
 <!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#21 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.79 2011/07/08 17:41:07 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.80 2011/07/23 21:39:12 gjb Exp $
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
@@ -307,6 +307,10 @@
 <!ENTITY a.newbus "<ulink url='&a.newbus.url;'>FreeBSD new-bus mailing list</ulink>">
 <!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
 
+<!ENTITY a.office.url "&a.mailman.listinfo;/freebsd-office">
+<!ENTITY a.office "<ulink url='&a.office.url;'>Office applications on FreeBSD</ulink>">
+<!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
+
 <!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
 <!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>FreeBSD OpenOffice mailing list</ulink>">
 <!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.28 2011/05/15 04:11:45 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.29 2011/07/11 19:17:34 rene Exp $
      Vertaald door: Siebrand Mazeland
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.23 2011/05/15 04:11:46 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.24 2011/07/11 19:17:34 rene Exp $
 
     %SOURCE%	en_US.ISO8859-1/books/handbook/install/chapter.sgml
     %SRCID%	1.426

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#46 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.32 2011/05/28 09:38:36 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
-     %SRCID%	1.135
+     %SRCID%	1.136
 -->
 
 <chapter id="network-servers">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#28 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.24 2011/05/11 18:58:09 rene Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.25 2011/07/11 19:17:35 rene Exp $
     Vertaald door: Siebrand Mazeland
 
     %SOURCE%	en_US.ISO8859-1/share/sgml/mailing-lists.ent

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#56 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.155 2011/06/14 02:02:00 stephen Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.157 2011/07/18 01:02:24 zi Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1446,6 +1446,11 @@
       &pgpkey.vsevolod;
     </sect2>
 
+    <sect2 id="pgpkey-zi">
+      <title>&a.zi;</title>
+      &pgpkey.zi;
+    </sect2>
+
     <sect2 id="pgpkey-rrs">
       <title>&a.rrs;</title>
       &pgpkey.rrs;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#53 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.245 2011/06/14 02:01:40 stephen Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.246 2011/07/15 21:07:31 zi Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -361,6 +361,7 @@
 <!ENTITY pgpkey.yoichi SYSTEM "yoichi.key">
 <!ENTITY pgpkey.yzlin SYSTEM "yzlin.key">
 <!ENTITY pgpkey.zack SYSTEM "zack.key">
+<!ENTITY pgpkey.zi SYSTEM "zi.key">
 <!ENTITY pgpkey.zml SYSTEM "zml.key">
 <!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.sgml">
 <!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.sgml">

==== //depot/projects/docproj_nl/www/en/cgi/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.34 2007/03/19 05:44:58 dougb Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.35 2011/07/20 23:52:12 shaun Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -9,12 +9,25 @@
 
 DATA=
 DATA+=	Gnats.pm
+DATA+=	GnatsPR.pm
 DATA+=	cgi-lib.pl
 DATA+=	cgi-style.pl
 DATA+=	cvsweb.conf
 DATA+=	cvsweb.conf-freebsd
 DATA+=	query-pr-lib.pl
 
+CGI_SUBDIRS=	GnatsPR GnatsPR/Section
+
+CGI_SUBFILES+=	GnatsPR/MIMEIterator.pm
+CGI_SUBFILES+=	GnatsPR/Section.pm
+CGI_SUBFILES+=	GnatsPR/Section/Email.pm
+CGI_SUBFILES+=	GnatsPR/Section/FieldStart.pm
+CGI_SUBFILES+=	GnatsPR/Section/MIME.pm
+CGI_SUBFILES+=	GnatsPR/Section/Patch.pm
+CGI_SUBFILES+=	GnatsPR/Section/StateChange.pm
+CGI_SUBFILES+=	GnatsPR/Section/Text.pm
+CGI_SUBFILES+=	GnatsPR/SectionIterator.pm
+
 CGI=
 CGI+=	confirm-code.cgi
 CGI+=	cvsweb.cgi

==== //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.42 2011/01/08 14:58:27 wosch Exp $
+# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.43 2011/07/23 00:06:42 shaun Exp $
 #
 # Perl routines to encapsulate various elements of HTML page style.
 
@@ -32,6 +32,10 @@
     $hsty_date = '';
 }
 
+if (!defined($hsty_charset)) {
+    $hsty_charset = 'iso-8859-1';
+}
+
 # This can be set to either a string containing an inline CSS stylesheet
 # or to a <link> element that references an external CSS stylesheet, to
 # make local modifications to the style of a CGI script's output.
@@ -212,7 +216,7 @@
 $html
 
 <head><title>$title</title>
-<meta http-equiv='content-type' content='text/html; charset=iso-8859-1' $endslash>
+<meta http-equiv='content-type' content='text/html; charset=$hsty_charset' $endslash>
 <meta name='robots' content='nofollow' $endslash>
     <link rel="stylesheet" media="screen"
     href="$hsty_base/layout/css/fixed.css" type="text/css"

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

@@ -1,8 +1,8 @@
 #!/usr/bin/perl -Tw
+#------------------------------------------------------------------------------
+# GNATS query-pr Interface, Generation III
 #
-# A "More Useful" GNATS query-pr Interface
-#
-# Copyright (C) 2006, Shaun Amott <shaun@FreeBSD.org>
+# Copyright (C) 2006-2011, Shaun Amott <shaun@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,1177 +26,876 @@
 # 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.69 2009/11/15 18:40:26 remko Exp $
+# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.80 2011/07/23 02:42:59 shaun Exp $
+#
+# Useful PRs for testing:
 #
-
+# - ports/147261 - RFC 2047 words, attachments, interjected e-mail (inc.
+#                  malformed header)
+# - ports/138672 - Lots of attachments, multi-level MIME.
+# - ports/132344 - Base64-encoded attachment.
 #
-# Note: this is a script to run on a webserver. If you want to do tests
-# on the command-line, use the QUERY_STRING environment variable to
-# pass parameters to the script:
-#	$ QUERY_STRING=pr=bin/106049 ./query-pr.cgi
+# TODO:
 #
+# - Charset and transfer encoding transformation.
+# - Refine linkifier.
+# - Better end-of-diff detection.
+# - Inline patches inside MIME parts (probably just the first part).
+# - Modernise HTML (may require altering site-wide CSS)
+#------------------------------------------------------------------------------
 
-use strict;
+BEGIN { push @INC, '.'; }
+
+use CGI;
+
+use GnatsPR;
+use GnatsPR::SectionIterator;
+use GnatsPR::MIMEIterator;
 
-use MIME::Base64;                      # ports/converters/p5-MIME-Base64
-use MIME::QuotedPrint;                 #
-use Convert::UU qw(uudecode uuencode); # ports/converters/p5-Convert-UU
+#use MIME::EncWords (decode_mimewords);   # mail/p5-MIME-EncWords
+sub decode_mimewords { wantarray ? @_ : join ' ', @_; } # Temp. substitute for the above
 
 require './cgi-style.pl';
 require './query-pr-lib.pl';
 
-use constant HTTP_HEADER        => "Content-type: text/html; charset=UTF-8\r\n\r\n";
-use constant HTTP_HEADER_PATCH  => "Content-type: text/plain; charset=UTF-8\r\nContent-Disposition: inline; filename=\"%s\"\r\n\r\n";
+use strict;
+
 
-use constant SECT_HEADER        => 1;
-use constant SECT_SFIELDS       => 2;
-use constant SECT_MFIELDS       => 3;
+#------------------------------------------------------------------------------
+# Constants
+#------------------------------------------------------------------------------
 
-use constant ENCODING_BASE64    => 1;
-use constant ENCODING_QP        => 2;
+use constant EXIT_NOPRS   => 1;
+use constant EXIT_DBBUSY  => 2;
+use constant EXIT_NOPATCH => 3;
 
-use constant PATCH_ANY          => 0x0001;
-use constant PATCH_DIFF         => 0x0002;
-use constant PATCH_UUENC        => 0x0004;
-use constant PATCH_UUENC_BIN    => 0x0008;
-use constant PATCH_SHAR         => 0x0010;
-use constant PATCH_BASE64       => 0x0020;
 
-my @fields_single = (
-	"Number",       "Category",      "Synopsis",      "Confidential",
-	"Severity",     "Priority",      "Responsible",   "State",
-	"Quarter",      "Keywords",      "Date-Required", "Class",
-	"Submitter-Id", "Arrival-Date",  "Closed-Date",   "Last-Modified",
-	"Originator",   "Release",
-);
+#------------------------------------------------------------------------------
+# Globals
+#------------------------------------------------------------------------------
 
-my @fields_multiple = (
-	"Organization", "Environment",   "Description",   "How-To-Repeat",
-	"Fix",          "Release-Note",  "Audit-Trail",   "Unformatted",
-);
+our $valid_category = '[a-z0-9][A-Za-z0-9-_]{1,25}';
+our $valid_pr       = '\d{1,8}';
 
-my $fields_skip    = "Confidential|Quarter|Keywords|Date-Required|Submitter-Id";
+our $cvsweb_url    = 'http://www.FreeBSD.org/cgi/cvsweb.cgi/';
+our $stylesheet    = "$main::hsty_base/layout/css/query-pr.css";
 
-my $valid_category = '[a-z0-9][A-Za-z0-9-_]{1,25}';
-my $valid_pr       = '\d{1,8}';
+our $iscgi = defined $ENV{'SCRIPT_NAME'};
 
-my $binary_filetypes = '(?:\.gz|\.bz2|\.zip|\.tar)$';
+# Keep this ahead of CGI
 
-my %fmt;
+if (!$iscgi && !exists $ENV{'REQUEST_METHOD'}) {
+	# Makes debugging easier
+	$ENV{'REQUEST_METHOD'} = 'GET';
+}
 
-my $f = "";
-my $PR = -1;
-my $getpatch = -1;
-my $mimepatch = "";
-my $inpatch = 0;
-my $patchendhint = 0;
-my $category;
-my @query;
-my (%header, %sfields, %mfields);
+# Stuff from cgi-style.pl
 
-my $iscgi = defined $ENV{'SCRIPT_NAME'};
+$main::hsty_base ||= '';
+$main::t_style   ||= '';
+$main::hsty_charset ||= '';
 
-my $fromwebform = 0;
+$main::hsty_charset = 'utf-8';
 
-$ENV{'PATH'} = "/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin";
+$main::t_style =
+qq{<link href="$stylesheet" rel="stylesheet" type="text/css" />
+<link rel="search" type="application/opensearchdescription+xml"
+	href="http://www.freebsd.org/search/opensearch/query-pr.xml"
+	title="FreeBSD Bugs" />
+};
 
-$ENV{'QUERY_STRING'} ||= "";
-$ENV{'SCRIPT_NAME'}  ||= $0;
+# Global CGI accessor
 
-# Junk from cgi-style.pl
-$main::hsty_base     ||= "";
-$main::t_style       ||= "";
+our $q = new CGI;
 
-my $scriptname  = htmlclean($ENV{'SCRIPT_NAME'});
-my $querystring = htmlclean($ENV{'QUERY_STRING'});
 
-# Do not change $self_url_base, unless you understand what it is for!
-# In particular: it is used as a delimiter between comments in the
-# Audit-Trail.
-my $self_url_base = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=";
-my $cvsweb_url    = "http://www.FreeBSD.org/cgi/cvsweb.cgi/";
-my $stylesheet    = "$main::hsty_base/layout/css/query-pr.css";
+#------------------------------------------------------------------------------
+# Environment vars
+#------------------------------------------------------------------------------
 
+$ENV{'PATH'} = '/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin';
 
-#-----------------------------------------------------------------------
-# Format strings
-#-----------------------------------------------------------------------
+$ENV{'SCRIPT_NAME'} ||= $0;
 
-$fmt{'header_thead'} = <<EOF;
-<table class="headtable">
-EOF
 
-$fmt{'header_tfoot'} = <<EOF;
-</table><br />
-EOF
+#------------------------------------------------------------------------------
+# Begin Code
+#------------------------------------------------------------------------------
 
-$fmt{'header_trow'} = <<EOF;
-<tr><td class="key">%%(1):</td><td class="val">%%(2)</td></tr>
-EOF
+main();
 
-$fmt{'sfields_thead'} = <<EOF;
-<table class="headtable">
-EOF
 
-$fmt{'sfields_trow'} = <<EOF;
-<tr><td class="key">%%(1):</td><td class="val">%%(2)</td></tr>
-EOF
+#------------------------------------------------------------------------------
+# Main routine
+#------------------------------------------------------------------------------
 
-$fmt{'sfields_tfoot'} = <<EOF;
-</table><br />
-EOF
+sub main
+{
+	my ($PR, $category, $rawdata, $gnatspr);
 
-$fmt{'mfields_header'} = <<EOF;
-<table class="headtable"><tr><td class="blkhead">%%(1):</td></tr></table>
-<div class="mfield">
-EOF
-$fmt{'mfields_header'} =~ s/\n+$//;
+	binmode STDOUT, ':utf8';
 
-$fmt{'mfields_footer'} = <<EOF;
-</div>
-EOF
+	if ($q->param('pr')) {
+		$PR = $q->param('pr');
+	} elsif ($q->param('q')) {
+		$PR = $q->param('q');
+	} elsif ($q->param('prp')) {
+		# Legacy param format
+		my $prp = $q->param('prp');
 
-$fmt{'patchblock_thead'} = <<EOF;
-<table class="patchblock" cellspacing="0" cellpadding="3">
-  <tr class="info"><td>
-    <b>Download <a href="${scriptname}?prp=%%(pr)-%%(1)-%%(3)&n=/%%(2)">%%(2)</a></b>
-  </td></tr>
-<tr><td class="content"><pre>
-EOF
-$fmt{'patchblock_thead'} =~ s/\n+$//;
+		if ($prp =~ /^(\d+)-(\d+)/) {
+			my $get = $2;
+			$PR = $1;
 
-$fmt{'patchblock_tfoot'} = <<EOF;
-</pre></td></tr>
-</table><br />
-EOF
-$fmt{'patchblock_tfoot'} =~ s/\n+$//;
-$fmt{'patchblock_tfoot'} =~ s/^\n+//;
+			$q->param(-name => 'pr', -value => $PR);
+			$q->param(-name => 'getpatch', -value => $get);
+		} else {
+			ErrorExit();
+		}
+	} else {
+		ErrorExit(EXIT_NOPRS);
+	}
 
-$fmt{'auditblock_thead'} = <<EOF;
-<table class="auditblock" cellspacing="0" cellpadding="3">
-  <tr class="info"><td colspan="2"><b>%%(1) Changed</b></td></tr>
-EOF
+	if ($PR =~ /^($valid_category)\/($valid_pr)$/) {
+		$category = $1;
+		$PR = $2;
+	}
 
-$fmt{'auditblock_tfoot'} = <<EOF;
-  </table>
-<br />
-EOF
+	length $PR > 0
+		or ErrorExit();
 
-$fmt{'auditblock_trow'} = <<EOF;
-<tr><td class="key" valign="top">%%(1):</td><td valign="top">%%(2)</td></tr>
-EOF
+	# category may be undef
+	$rawdata = DoQueryPR($PR, $category);
 
-$fmt{'responseblock_thead'} = <<EOF;
-<table class="replyblock" cellspacing="0" cellpadding="3">
-  <tr><td class="info" colspan="2"><b>Reply via E-mail</b></td></tr>
-EOF
+	# Dump the raw PR data if requested
+	if ($q->param('f') && $q->param('f') eq 'raw') {
+		print "Content-type: text/plain; charset=UTF-8\r\n\r\n";
+		print $$rawdata;
+		Exit();
+	}
 
-$fmt{'responseblock_tfoot'} = <<EOF;
-  </table><br />
-EOF
+	# Run PR text through the parser
+	$gnatspr = GnatsPR->new($rawdata);
 
-$fmt{'responseblock_textfoot'} = <<EOF;
-</td></tr>
-EOF
+	# User is requesting a patch extraction?
+	if ($q->param('getpatch')) {
+		my ($patch, $patchnum);
 
-$fmt{'responseblock_texthead'} = <<EOF;
-<tr><td colspan="2">
-EOF
+		$patchnum  = $q->param('getpatch');
+		$patchnum =~ s/[^0-9]+//g;
 
-$fmt{'responseblock_trow'} = <<EOF;
-<tr><td class="key"><b>%%(1):</b></td><td class="val">%%(2)</td></tr>
-EOF
+		$patch = $gnatspr->GetAttachment($patchnum);
 
-$fmt{'unexpectedtext_thead'} = <<EOF;
+		defined $patch
+			or ErrorExit(EXIT_NOPATCH);
 
-EOF
+		printf 'Content-type: %s; charset=UTF-8'."\r\n",
+			($patch->isbinary ? 'application/octet-stream' : 'text/plain');
 
-$fmt{'unexpectedtext_tfoot'} = <<EOF;
-<br />
-EOF
+		printf 'Content-Length: %s'."\r\n"
+			. 'Content-Disposition: inline; filename="%s"'."\r\n\r\n",
+			$patch->size,
+			$patch->filename;
 

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

From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 10:36:17 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A96E106568A; Sun, 24 Jul 2011 10:36: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 3D4661065687
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:36:17 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 11CE98FC0A
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:36:17 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OAaG4m012275
	for <perforce@FreeBSD.org>; Sun, 24 Jul 2011 10:36:16 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OAaGhS012272
	for perforce@freebsd.org; Sun, 24 Jul 2011 10:36:16 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 24 Jul 2011 10:36:16 GMT
Message-Id: <201107241036.p6OAaGhS012272@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196625 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 10:36:17 -0000

http://p4web.freebsd.org/@@196625?ac=10

Change 196625 by rene@rene_acer on 2011/07/24 10:35:38

	MFen:
	- articles/Makefile 1.62 -> 1.63
	  (SRCID bump only, new article not translated)
	- handbook/eresources 1.208 -> 1.209
	- mailing-lists.ent 1.79 -> 1.80

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#16 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#39 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#29 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#16 (text+ko) ====

@@ -1,7 +1,7 @@
 # $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.7 2011/03/20 10:57:10 rene Exp $
 
 # %SOURCE%	en_US.ISO8859-1/articles/Makefile
-# %SRCID%	1.62
+# %SRCID%	1.63
 
 SUBDIR =
 SUBDIR+= contributing

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

@@ -5,7 +5,7 @@
      Vertaald door: Siebrand Mazeland
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
-     %SRCID%	1.208
+     %SRCID%	1.209
 -->
 
 <appendix id="eresources">
@@ -488,6 +488,12 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.office.name;</entry>
+
+	      <entry>Kantoortoepassingen op &os;</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.openoffice.name;</entry>
 
 	      <entry>Porten van
@@ -1621,6 +1627,18 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.office.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Kantoortoepassingen op &os;</emphasis></para>
+
+	    <para>De discussie richt zich op kantoortoepassingen, hun
+	      installatie, hun ontwikkeling en hun ondersteuning binnen
+	      &os;.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.openoffice.name;</term>
 
 	  <listitem>

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#29 (text+ko) ====

@@ -5,7 +5,7 @@
     Vertaald door: Siebrand Mazeland
 
     %SOURCE%	en_US.ISO8859-1/share/sgml/mailing-lists.ent
-    %SRCID%	1.79
+    %SRCID%	1.80
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
@@ -311,6 +311,10 @@
 <!ENTITY a.newbus "<ulink url='&a.newbus.url;'>&os; new-bus mailinglijst</ulink>">
 <!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
 
+<!ENTITY a.office.url "&a.mailman.listinfo;/freebsd-office">
+<!ENTITY a.office "<ulink url='&a.office.url;'>Kantoortoepassingen op &os;</ulink>">
+<!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
+
 <!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
 <!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>&os; OpenOffice mailinglijst</ulink>">
 <!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">

From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 14:17:53 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12A0F1065670; Sun, 24 Jul 2011 14:17: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 C93E1106566B
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 14:17:52 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B53FE8FC12
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 14:17:52 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OEHqiJ056700
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 14:17:52 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OEHqPO056697
	for perforce@freebsd.org; Sun, 24 Jul 2011 14:17:52 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Sun, 24 Jul 2011 14:17:52 GMT
Message-Id: <201107241417.p6OEHqPO056697@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 14:17:53 -0000

http://p4web.freebsd.org/@@196633?ac=10

Change 196633 by cnicutar@cnicutar_cronos on 2011/07/24 14:17:31

	Add IPv6 support to UTO tests and cleanup.

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/long_uto.c#2 edit
.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/runtest.sh#2 edit
.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/send_uto.c#2 edit
.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/short_uto.c#2 edit
.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.c#2 edit
.. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.h#2 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/long_uto.c#2 (text+ko) ====

@@ -1,7 +1,6 @@
 #include <sys/wait.h>
 
 #include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysexits.h>
@@ -9,10 +8,6 @@
 
 #include "test_utils.h"
 
-#define CLIENT_ADDR	"192.0.2.2"
-#define SERVER_ADDR	"192.0.2.3"
-#define PORT		1296
-
 #define UTO		20*60		/* 20 minutes UTO. */
 #define DOWNTIME	5*60		/* 5 minutes of network downtime. */
 #define WAITTIME	7*60		/* Waiting 7 minutes. */
@@ -26,12 +21,21 @@
  * The test passes if the server exits normally (the second write succeeds).
  */
 int
-main(void)
+main(int argc, char *argv[])
 {
 	int status;
+	char *caddr, *saddr, *port;
 	pid_t server;
 	pid_t client;
 
+	if (argc != 4)
+		errx(EX_USAGE, "Usage: %s client_addr server_addr port",
+		    argv[0]);
+
+	caddr = argv[1];
+	saddr = argv[2];
+	port = argv[3];
+
 	if(getuid())
 		errx(EX_USAGE, "Only root may run this test");
 
@@ -41,8 +45,7 @@
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		server_disconnect(SERVER_ADDR, PORT, CLIENT_ADDR, DOWNTIME,
-		    UTO, 1);
+		server_disconnect(saddr, port, caddr, DOWNTIME, UTO, 1);
 		exit(EX_OK);
 		break;
 	}
@@ -56,14 +59,14 @@
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		client_generic(CLIENT_ADDR, SERVER_ADDR, PORT, 0, 1);
+		client_generic(caddr, saddr, port, 0, 1);
 		exit(EX_OK);
 		break;
 	}
 
 	sleep(WAITTIME);
 
-	/* Wait server. The test passes if the server exits normlly (which
+	/* Wait server. The test passes if the server exits normally (which
 	 * means the second write completed successfully).
 	 */
 	if (waitpid(server, &status, WNOHANG) <= 0)

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/runtest.sh#2 (text+ko) ====

@@ -10,41 +10,46 @@
 # Create two loopback interfaces and assign example addresses
 lo_up()
 {
+	# Just in case they are still around
 	lo_down
 
         ifconfig lo2 create
         ifconfig lo3 create
-
-        ifconfig lo2 192.0.2.2 netmask 255.255.255.255 mtu 1500 up
-        ifconfig lo3 192.0.2.3 netmask 255.255.255.255 mtu 1500 up
+	
+	if [ -n "$ipv6" ]
+	then
+		ifconfig lo2 inet6 "$1/128" mtu 1500 up
+		ifconfig lo3 inet6 "$2/128" mtu 1500 up
+	else
+        	ifconfig lo2 "$1/32" mtu 1500 up
+        	ifconfig lo3 "$2/32" mtu 1500 up
+	fi
 }
 
-# Run a test and display results
-runtest()
+needroot()
 {
-	no=$1			# Test number
-	name=$2			# Test name
-	needroot=$3		# Does the test need root ?
-
-	killall "$name" > /dev/null 2>&1
-
-	if [ -n "$needroot" ] && [ $(id -u) -ne 0 ]
+	if [ $(id -u) -ne 0 ]
 	then
 		echo "not ok $no - $name # Only root may run this test"
 		exit 1
 	fi
+}
+
+# Run a test and display results
+runtest()
+{
+	args=$1			# Test arguments
 
-	# Create loopback interfaces
-	lo_up > /dev/null 2>&1
+	killall "$bin" > /dev/null 2>&1
 
-	if ! make -f "Makefile.${name}" > /dev/null 2>&1
+	if ! make -f "Makefile.${bin}" > /dev/null 2>&1
 	then
 		echo "not ok $no - $name # make failed"
 		exit 1
 	fi
 	
 	# Finally run the test
-	if ./$name > /dev/null 2>&1
+	if ./$bin  > /dev/null 2>&1 $args
 	then
 		echo "ok $no - $name"
 	else
@@ -53,12 +58,58 @@
 	lo_down > /dev/null 2>&1
 }
 
+test_with_loopback()
+{
+	lo1=$1
+	lo2=$2
 
+	# Make sure we run as root
+	needroot 
 
-case "$1" in
-	"1") runtest "$1" send_uto 	;;
-	"2") runtest "$1" short_uto 1 	;;
-	"3") runtest "$1" long_uto 1 	;;	
+	# Create loopback interfaces
+	lo_up $lo1 $lo2 > /dev/null 2>&1
+	
+	# Run the atual test
+	runtest "$lo1 $lo2 $PORT"
+
+	# Destroy loopback interfaces
+	lo_down > /dev/null 2>&1
+}
+
+PORT="1296"
+
+no=$1
+case "$no" in
+	"1")
+		name="Send UTO"
+		bin="send_uto"
+		addr="127.0.0.1"
+
+		runtest "$addr $PORT"
+	;;
+	"2")
+		name="short_uto"
+		bin="short_uto"
+		client="192.0.2.2"
+		server="192.0.2.3"
+
+		test_with_loopback $client $server
+	;;
+	"3")
+		name="long_uto"
+		bin="long_uto"
+		client="192.0.2.2"
+		server="192.0.2.3"
+
+		test_with_loopback $client $server
+	;;
+	"4")
+		name="send_uto_ipv6"
+		bin="send_uto"
+		addr="127.0.0.1"
+
+		runtest "$addr $PORT"
+	;;
 esac
 
 

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/send_uto.c#2 (text+ko) ====

@@ -3,7 +3,6 @@
 #include <sys/wait.h>
 
 #include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysexits.h>
@@ -12,9 +11,6 @@
 #include "test_utils.h"
 
 
-#define ADDR		"127.0.0.1"
-#define PORT		1296
-
 #define SERVER_UTO	1600
 #define CLIENT_UTO	1200
 #define WAITTIME	5
@@ -25,7 +21,7 @@
  * Send new UTO and tests again the received UTO.
  */
 static void
-server()
+server(char *addr, char *port)
 {
 	int listen_sock;
 	int sock;
@@ -35,7 +31,7 @@
 	int send_uto, recv_uto;
 
 	/* Bind and start listening. */
-	listen_sock = listen_socket(ADDR, PORT, SERVER_UTO, 1);
+	listen_sock = listen_uto(addr, port, SERVER_UTO, 1);
 
 	sock = accept(listen_sock, NULL, NULL);
 	if (sock < 0)
@@ -70,7 +66,7 @@
  * Exchanges data and tests the received value again.
  */
 static void
-client()
+client(char *addr, char *port)
 {
 	int sock;
 	static char buf[6000];
@@ -78,7 +74,7 @@
 	int send_uto, recv_uto;
 
 	/* Connect to the server, with the specified UTO values. */
-	sock = connect_socket(ADDR, ADDR, PORT, CLIENT_UTO, 1);
+	sock = connect_uto(addr, addr, port, CLIENT_UTO, 1);
 
 	/* See what the server sent. */
 	uto_get(sock, &send_uto, &recv_uto);
@@ -112,16 +108,23 @@
  */
 
 int
-main(void)
+main(int argc, char *argv[])
 {
 	int status;
+	char *addr, *port;
+
+	if (argc != 3)
+		errx(EX_USAGE, "Usage: %s address port", argv[0]);
+
+	addr = argv[1];
+	port = argv[2];
 
 	switch(fork()) {
 	case -1:
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		server();
+		server(addr, port);
 		exit(EX_OK);
 		break;
 	}
@@ -134,7 +137,7 @@
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		client();
+		client(addr, port);
 		exit(EX_OK);
 		break;
 	}

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/short_uto.c#2 (text+ko) ====

@@ -1,7 +1,6 @@
 #include <sys/wait.h>
 
 #include <err.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysexits.h>
@@ -9,10 +8,6 @@
 
 #include "test_utils.h"
 
-#define CLIENT_ADDR	"192.0.2.2"
-#define SERVER_ADDR	"192.0.2.3"
-#define PORT		1296
-
 #define UTO		10		/* 10 seconds UTO. */
 #define DOWNTIME	20		/* 20 seconds of network downtime. */
 #define WAITTIME	40		/* Waiting 40 seconds. */
@@ -29,12 +24,21 @@
  * The test passes if the server exits abnormally with EX_IOERR.
  */
 int
-main(void)
+main(int argc, char *argv[])
 {
 	int status;
+	char *caddr, *saddr, *port;
 	pid_t server;
 	pid_t client;
 
+	if (argc != 4)
+		errx(EX_USAGE, "Usage: %s client_addr server_addr port",
+		    argv[0]);
+
+	caddr = argv[1];
+	saddr = argv[2];
+	port = argv[3];
+
 	/* Changing a network flag requires root. */
 	if(getuid())
 		errx(EX_USAGE, "Only root may run this test");
@@ -45,8 +49,7 @@
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		server_disconnect(SERVER_ADDR, PORT, CLIENT_ADDR, DOWNTIME,
-		    UTO, 1);
+		server_disconnect(saddr, port, caddr, DOWNTIME, UTO, 1);
 		exit(EX_OK);
 		break;
 	}
@@ -60,12 +63,11 @@
 		err(EX_OSERR, "fork");
 		break;
 	case 0:
-		client_generic(CLIENT_ADDR, SERVER_ADDR, PORT, 0, 1);
+		client_generic(caddr, saddr, port, 0, 1);
 		exit(EX_OK);
 		break;
 	}
 
-	/* Allow connection to run. */
 	sleep(WAITTIME);
 
 	/*
@@ -77,6 +79,7 @@
 		exit(-1);
 	if (WIFEXITED(status) && WEXITSTATUS(status) == EX_IOERR)
 		exit(EX_OK);
-
+	
+	printf("Here\n");
 	return -1;
 }

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.c#2 (text+ko) ====

@@ -3,12 +3,10 @@
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <err.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,33 +19,86 @@
 /*
  * Bind a socket to an address, using the SO_REUSEADDR socket option.
  */
-void
-tcp_bind(int s, char *addr, int port)
+int tcp_bind(char *addr, char *port)
 {
-	struct sockaddr_in sin;
-	int optval;
+	int s, rc, yes = 1;
+	struct addrinfo hints;
+	struct addrinfo *result, *rp;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_canonname = NULL;
+	hints.ai_addr = NULL;
+	hints.ai_next = NULL;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_family = AF_UNSPEC;		/* Both v4 and v6.*/
+	hints.ai_flags = AI_PASSIVE;
+
+	/* Address lookup. */
+	rc = getaddrinfo(addr, port, &hints, &result);
+	if (rc)
+		return -1;
+
+	/* Loop until we can bind to something. */
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		s = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+		if (s == -1)
+			/* Try another result. */
+			continue;
 
-	sin.sin_port = htons(port);
-	sin.sin_family = AF_INET;
+		if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &yes,
+		    sizeof(yes))) {
+			close(s);
+			freeaddrinfo(result);
+			return -1;
+		}
 
-	if (NULL != addr && strlen(addr)) {
-		int rc;
-		rc = inet_pton(AF_INET, addr, &sin.sin_addr);
-		if (rc < 0)
-			err(EX_DATAERR, "inet_pton");
-		if (rc == 0)
-			errx(EX_DATAERR, "inet_pton can't parse `%s'", addr);
+		if (bind(s, rp->ai_addr, rp->ai_addrlen) == 0)
+			/* Return bound socket. */
+			break;
+		
+		/* Couldn't bind; try another result. */
+		close(s);
 	}
+	freeaddrinfo(result);
 
-	optval = 1;
-	if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)))
-		err(EX_UNAVAILABLE, "setsockopt");
+	return (rp == NULL) ? -1 : s;
+}
+
+
+int tcp_connect(int s, char *addr, char *port)
+{
+	int rc;
+	struct addrinfo hints;
+	struct addrinfo *result, *rp;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_canonname = NULL;
+	hints.ai_addr = NULL;
+	hints.ai_next = NULL;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_family = AF_UNSPEC;		/* Both v4 and v6.*/
+
+	/* Look up address. */
+	rc = getaddrinfo(addr, port, &hints, &result);
+	if (rc)
+		return -1;
+
+	/* Search for a suitable combination. */
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		if (connect(s, rp->ai_addr, rp->ai_addrlen) == 0)
+			/* Done connect, break. */
+			break;
+
+		/* Connect failed; trying next entry. */
+	}
+	freeaddrinfo(result);
 
-	if (bind(s, (struct sockaddr *)&sin, sizeof(sin)))
-		err(EX_UNAVAILABLE, "bind");
+	return (rp == NULL) ? -1 : s;
 }
 
 
+
+
 /*
  * Set UTO values on a socket.
  */
@@ -84,16 +135,14 @@
  * Create a socket, set UTO values, bind it locally, start listening.
  */
 int
-listen_socket(char *listen_addr, int port, int send_uto, int recv_uto)
+listen_uto(char *laddr, char *port, int send_uto, int recv_uto)
 {
 	int s;
-
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s <= 0)
-		err(EX_OSERR, "socket");
-
+	
+	s = tcp_bind(laddr, port);
+	if (s < 0)
+		err(EX_UNAVAILABLE, "tcp_bind");
 	uto_set(s, send_uto, recv_uto);
-	tcp_bind(s, listen_addr, port);
 
 	if(listen(s, -1))
 		err(EX_UNAVAILABLE, "listen");
@@ -104,31 +153,26 @@
  * Create a socket, set UTO values, bind it locally and attempt to connect.
  */
 int
-connect_socket(char *local_addr, char *remote_addr, int remote_port,
-    int send_uto, int recv_uto)
+connect_uto(char *laddr, char *raddr, char *rport, int send_uto, int recv_uto)
 {
 	int s;
-	struct sockaddr_in sin;
-
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s <= 0)
-		err(EX_OSERR, "socket");
+	
+	s = tcp_bind(laddr, NULL);
+	if (s < 0)
+		err(EX_UNAVAILABLE, "tcp_bind");
 
 	uto_set(s, send_uto, recv_uto);
-	tcp_bind(s, local_addr, 0);
-
-	sin.sin_family = AF_INET;
-	sin.sin_port = htons(remote_port);
+	if (s != tcp_connect(s, raddr, rport))
+		err(EX_UNAVAILABLE, "tcp_connect");
 
-	if (inet_pton(AF_INET, remote_addr, &sin.sin_addr) <= 0)
-		err(EX_DATAERR, "inet_pton");
-
-	if (connect(s, (struct sockaddr *)&sin, sizeof(sin)))
-		err(EX_UNAVAILABLE, "connect");
-
 	return s;
 }
 
+int
+is_v6(char *addr)
+{
+	return strchr(addr, ':') != NULL;
+}
 
 /*
  * Simulate broken connectivity by setting the "blackhole" flag on a route;
@@ -139,7 +183,13 @@
 route_down(char *addr)
 {
 	static char cmd[256];
-	snprintf(cmd, sizeof(cmd), "route change %s -blackhole", addr);
+	
+	if (is_v6(addr))
+		snprintf(cmd, sizeof(cmd), "route change -inet6 %s -blackhole",
+		    addr);
+	else
+		snprintf(cmd, sizeof(cmd), "route change -inet %s -blackhole",
+		    addr);
 	system(cmd);
 }
 
@@ -150,7 +200,10 @@
 route_up(char *addr)
 {
 	static char cmd[256];
-	snprintf(cmd, sizeof(cmd), "route change %s", addr);
+	if (is_v6(addr))
+		snprintf(cmd, sizeof(cmd), "route change -inet6 %s", addr);
+	else
+		snprintf(cmd, sizeof(cmd), "route change %s", addr);
 	system(cmd);
 }
 
@@ -163,7 +216,7 @@
  * If the connection is dead, write(2) should trigger an EPIPE.
  */
 void
-server_disconnect(char *laddr, int lport, char *downaddr, int downtime,
+server_disconnect(char *laddr, char *lport, char *downaddr, int downtime,
     int send_uto, int recv_uto)
 {
 	int listen_sock;
@@ -172,7 +225,7 @@
 	ssize_t bytes;
 
 	/* Bind and start listening. */
-	listen_sock = listen_socket(laddr, lport, send_uto, recv_uto);
+	listen_sock = listen_uto(laddr, lport, send_uto, recv_uto);
 
 	sock = accept(listen_sock, NULL, NULL);
 	if (sock < 0)
@@ -202,14 +255,14 @@
  * Generic client that simply connects and tries to receive data.
  */
 void
-client_generic(char *laddr, char *raddr, int rport, int send_uto, int recv_uto)
+client_generic(char *laddr, char *raddr, char *rport, int send_uto, int recv_uto)
 {
 	int sock;
 	static char buf[6000];
 	ssize_t bytes;
 
 	/* Connect to the server, with the specified UTO values. */
-	sock = connect_socket(laddr, raddr, rport, send_uto, recv_uto);
+	sock = connect_uto(laddr, raddr, rport, send_uto, recv_uto);
 
 	bytes = recv(sock, &buf, sizeof(buf), MSG_WAITALL);
 	if (bytes < 0 || (unsigned) bytes < sizeof(buf))

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.h#2 (text+ko) ====

@@ -5,17 +5,16 @@
 #define TCP_RCVUTO_TIMEOUT	0x100
 
 
-void tcp_bind(int s, char *addr, int port);
+int tcp_bind(char *addr, char *port);
 void uto_set(int s, int send_uto, int recv_uto);
 void uto_get(int s, int *send_uto, int *recv_uto);
-int listen_socket(char *listen_addr, int port, int send_uto, int recv_uto);
-int connect_socket(char *local_addr, char *remote_addr, int remote_port,
-    int send_uto, int recv_uto);
+int listen_uto(char *laddr, char *port, int send_uto, int recv_uto);
+int connect_uto(char *laddr, char *raddr, char *rport, int send_uto, int recv_uto);
 void route_down(char *addr);
 void route_up(char *addr);
-void server_disconnect(char *laddr, int lport, char *downaddr, int downtime,
+void server_disconnect(char *laddr, char *lport, char *downaddr, int downtime,
     int send_uto, int recv_uto);
-void client_generic(char *laddr, char *raddr, int rport,
+void client_generic(char *laddr, char *raddr, char *rport,
     int send_uto, int recv_uto);
 
 #endif

From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 17:30:55 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8ADF41065673; Sun, 24 Jul 2011 17:30: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 4DF8E106566B
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:30:55 +0000 (UTC)
	(envelope-from peter@wemm.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 399F48FC0A
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:30:55 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OHUses097483
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:30:54 GMT
	(envelope-from peter@wemm.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OHUcEu097260
	for perforce@freebsd.org; Sun, 24 Jul 2011 17:30:38 GMT
	(envelope-from peter@wemm.org)
Date: Sun, 24 Jul 2011 17:30:38 GMT
Message-Id: <201107241730.p6OHUcEu097260@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	peter@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196638 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 17:30:55 -0000

http://p4web.freebsd.org/@@196638?ac=10

Change 196638 by peter@peter_overcee on 2011/07/24 17:29:53

	IFC @196636

Affected files ...

.. //depot/projects/hammer/ObsoleteFiles.inc#83 integrate
.. //depot/projects/hammer/UPDATING#149 integrate
.. //depot/projects/hammer/bin/expr/expr.1#11 integrate
.. //depot/projects/hammer/bin/expr/expr.y#5 integrate
.. //depot/projects/hammer/bin/ps/keyword.c#25 integrate
.. //depot/projects/hammer/bin/ps/print.c#28 integrate
.. //depot/projects/hammer/bin/ps/ps.1#33 integrate
.. //depot/projects/hammer/bin/rcp/rcp.c#12 integrate
.. //depot/projects/hammer/bin/realpath/realpath.1#6 integrate
.. //depot/projects/hammer/bin/realpath/realpath.c#5 integrate
.. //depot/projects/hammer/bin/sh/arith_yacc.c#4 integrate
.. //depot/projects/hammer/bin/sh/eval.c#33 integrate
.. //depot/projects/hammer/bin/sh/mkinit.c#8 integrate
.. //depot/projects/hammer/bin/sh/nodetypes#5 integrate
.. //depot/projects/hammer/bin/sh/options.h#5 integrate
.. //depot/projects/hammer/bin/sh/parser.c#29 integrate
.. //depot/projects/hammer/bin/sh/sh.1#42 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#7 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#8 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool.8#5 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#7 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/ztest/ztest.c#6 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#8 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#8 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#4 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/CHANGES#24 integrate
.. //depot/projects/hammer/contrib/bind9/COPYRIGHT#11 integrate
.. //depot/projects/hammer/contrib/bind9/FAQ.xml#11 integrate
.. //depot/projects/hammer/contrib/bind9/HISTORY#1 branch
.. //depot/projects/hammer/contrib/bind9/KNOWN-DEFECTS#2 delete
.. //depot/projects/hammer/contrib/bind9/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/NSEC3-NOTES#3 delete
.. //depot/projects/hammer/contrib/bind9/README#13 integrate
.. //depot/projects/hammer/contrib/bind9/README.idnkit#4 delete
.. //depot/projects/hammer/contrib/bind9/README.pkcs11#2 delete
.. //depot/projects/hammer/contrib/bind9/acconfig.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.docbook#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/confgen/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/ddns-confgen.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/include/confgen/os.h#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/keygen.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/keygen.h#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/rndc-confgen.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/unix/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/unix/os.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/util.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/confgen/util.h#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dig/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-revoke.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-settime.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/bind.keys.h#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl#3 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/builtin.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/client.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/config.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/control.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/client.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/config.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/log.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwdclient.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/main.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/notify.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/query.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/server.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tsigconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/types.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/zoneconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/log.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdgabn.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwdgrbn.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/main.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/named.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/query.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/server.c#14 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/statschannel.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/tkeyconf.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/tsigconf.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/update.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/xfrout.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/zoneconf.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.1#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#8 integrate
.. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/include/rndc/os.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.8#8 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.c#7 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.docbook#7 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.html#8 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/Makefile.in#5 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/os.c#5 delete
.. //depot/projects/hammer/contrib/bind9/bin/rndc/util.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/bin/tools/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.1#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/arpaname.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/genrandom.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/isc-hmac-fixup.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/named-journalprint.html#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.8#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.c#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.docbook#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/tools/nsec3hash.html#1 branch
.. //depot/projects/hammer/contrib/bind9/config.guess#4 integrate
.. //depot/projects/hammer/contrib/bind9/config.h.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/configure.in#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#15 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#11 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#14 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#8 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#13 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#12 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/dnssec.xml#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/libdns.xml#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.arpaname.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.ddns-confgen.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#5 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#5 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-revoke.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-settime.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.genrandom.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.isc-hmac-fixup.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-journalprint.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsec3hash.html#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsupdate.html#6 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#10 integrate
.. //depot/projects/hammer/contrib/bind9/doc/arm/managed-keys.xml#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/arm/pkcs11.xml#1 branch
.. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#8 integrate
.. //depot/projects/hammer/contrib/bind9/doc/misc/options#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/api#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/acl.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/api#19 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/byaddr.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/client.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/db.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/diff.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dlz.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dns64.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ds.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_api.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_internal.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_openssl.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ecdb.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/forward.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gen-unix.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gen.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gssapi_link.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/gssapictx.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/hmac_link.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acl.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cache.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/client.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/compress.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/diff.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dlz.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dns64.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dnssec.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ds.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ecdb.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/events.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/forward.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/journal.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keydata.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keytable.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyvalues.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/log.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lookup.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/master.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/masterdump.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/message.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/name.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec3.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/peer.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/private.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rbt.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdata.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataset.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/request.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/resolver.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/result.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rpz.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rriterator.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdb.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdlz.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secalg.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/soa.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ssu.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/stats.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tkey.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsec.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsig.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/view.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/xfrin.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zone.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/dst.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/gssapi.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/iptable.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/keydata.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/keytable.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/lib.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/log.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/name.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ncache.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/nsec.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/nsec3.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/opensslgost_link.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/peer.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/private.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rcode.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hip_55.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hip_55.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdataset.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rdataslab.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#18 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/result.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/rpz.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/rriterator.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/sdlz.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/soa.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ssu.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/ssu_external.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/stats.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/time.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/tsec.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#17 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/export/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/dns/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/dns/include/dst/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/irs/include/irs/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/isc/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/include/isc/bind9.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nls/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/Makefile-postinstall.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/nsprobe.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-async.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-gai.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-request.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample-update.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/export/samples/sample.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/api#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/context.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/dnsconf.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/gai_strerror.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/getaddrinfo.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/getnameinfo.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/Makefile.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/context.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/dnsconf.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/netdb.h.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/platform.h.in#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/resconf.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/types.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/include/irs/version.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/resconf.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/irs/version.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/api#12 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/app_api.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/backtrace-emptytbl.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/backtrace.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/base32.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/base64.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/entropy.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hash.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/heap.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hmacmd5.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/hmacsha.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/httpd.c#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/app.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/backtrace.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bind9.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/buffer.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/entropy.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/error.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/file.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/fsaccess.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hash.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/heap.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacmd5.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacsha.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lib.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/log.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/md5.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/namespace.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netaddr.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netscope.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/portset.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/radix.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/random.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ratelimiter.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/refcount.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/result.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resultclass.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/serial.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha1.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha2.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sockaddr.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stats.h#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/symtab.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/task.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/util.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/inet_aton.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/inet_ntop.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/iterated_hash.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/lib.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/log.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/md5.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/mem_api.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/netaddr.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nls/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/mutex.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/radix.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/random.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/rwlock.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sha1.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sha2.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/sockaddr.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/socket_api.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/stats.c#3 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/task.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/task_api.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/task_p.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer_api.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isc/timer_p.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/dir.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/entropy.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/file.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/net.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/offset.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/strerror.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/time.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/interfaceiter.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#13 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isc/unix/strerror.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccc/api#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/aclconf.c#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#11 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/dnsconf.c#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#4 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h#1 branch
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/log.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/isccfg/parser.c#6 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/api#10 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/context.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/context_p.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getaddrinfo.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/getipnode.c#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/context.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#5 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/lwconfig.c#7 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.3#8 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.html#9 integrate
.. //depot/projects/hammer/contrib/bind9/lib/lwres/print_p.h#5 integrate
.. //depot/projects/hammer/contrib/bind9/make/rules.in#9 integrate
.. //depot/projects/hammer/contrib/bind9/version#24 integrate
.. //depot/projects/hammer/contrib/binutils/bfd/coffcode.h#6 integrate
.. //depot/projects/hammer/contrib/binutils/bfd/opncls.c#5 integrate
.. //depot/projects/hammer/contrib/binutils/bfd/peicode.h#5 integrate
.. //depot/projects/hammer/contrib/binutils/gas/config/obj-elf.c#6 integrate
.. //depot/projects/hammer/contrib/binutils/gas/config/tc-arm.c#5 integrate
.. //depot/projects/hammer/contrib/binutils/gas/frags.c#4 integrate
.. //depot/projects/hammer/contrib/binutils/gas/subsegs.c#5 integrate
.. //depot/projects/hammer/contrib/binutils/ld/ldexp.c#6 integrate
.. //depot/projects/hammer/contrib/binutils/ld/sysdep.h#4 integrate
.. //depot/projects/hammer/contrib/binutils/opcodes/i386-dis.c#4 integrate
.. //depot/projects/hammer/contrib/dialog/CHANGES#3 integrate
.. //depot/projects/hammer/contrib/dialog/VERSION#3 integrate
.. //depot/projects/hammer/contrib/dialog/aclocal.m4#3 integrate
.. //depot/projects/hammer/contrib/dialog/arrows.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/buttons.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/calendar.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/checklist.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/columns.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/config.guess#3 integrate
.. //depot/projects/hammer/contrib/dialog/config.sub#3 integrate
.. //depot/projects/hammer/contrib/dialog/configure#3 integrate
.. //depot/projects/hammer/contrib/dialog/configure.in#3 integrate
.. //depot/projects/hammer/contrib/dialog/dialog.1#3 integrate
.. //depot/projects/hammer/contrib/dialog/dialog.3#3 integrate
.. //depot/projects/hammer/contrib/dialog/dialog.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/dialog.h#3 integrate
.. //depot/projects/hammer/contrib/dialog/dlg_keys.h#2 integrate
.. //depot/projects/hammer/contrib/dialog/editbox.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/formbox.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/fselect.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/guage.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/help.c#1 branch
.. //depot/projects/hammer/contrib/dialog/inputbox.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/makefile.in#3 integrate
.. //depot/projects/hammer/contrib/dialog/menubox.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/mixedgauge.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/msgbox.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/package/debian/changelog#2 integrate
.. //depot/projects/hammer/contrib/dialog/package/debian/control#2 integrate
.. //depot/projects/hammer/contrib/dialog/package/dialog.spec#2 integrate
.. //depot/projects/hammer/contrib/dialog/pause.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/po/sk.po#1 branch
.. //depot/projects/hammer/contrib/dialog/prgbox.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/progressbox.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/rc.c#2 integrate
.. //depot/projects/hammer/contrib/dialog/samples/valgrind.log#1 branch
.. //depot/projects/hammer/contrib/dialog/tailbox.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/textbox.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/timebox.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/trace.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/ui_getc.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/util.c#3 integrate
.. //depot/projects/hammer/contrib/dialog/yesno.c#2 integrate
.. //depot/projects/hammer/contrib/gcc/c-decl.c#15 integrate
.. //depot/projects/hammer/contrib/gcc/c.opt#4 integrate
.. //depot/projects/hammer/contrib/gcc/cfg.c#5 integrate
.. //depot/projects/hammer/contrib/gcc/common.opt#5 integrate
.. //depot/projects/hammer/contrib/gcc/output.h#6 integrate
.. //depot/projects/hammer/contrib/gcc/rtl.h#10 integrate
.. //depot/projects/hammer/contrib/gcc/tree-nested.c#2 integrate
.. //depot/projects/hammer/contrib/gcc/tree.h#10 integrate
.. //depot/projects/hammer/contrib/gperf/src/gen-perf.cc#3 integrate
.. //depot/projects/hammer/contrib/gperf/src/key-list.cc#3 integrate
.. //depot/projects/hammer/contrib/libpcap/bpf/net/bpf_filter.c#6 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm-c/Core.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm-c/Target.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/IPO.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APFloat.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APInt.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ArrayRef.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableList.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PackedVector.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallVector.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringMap.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Triple.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/AbstractTypeUser.h#3 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BlockFrequency.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DIBuilder.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/IVUsers.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Passes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ValueTracking.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Assembly/Writer.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Attributes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/BasicBlock.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Analysis.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequency.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Passes.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#3 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Constant.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Constants.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/DefaultPasses.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/DerivedTypes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Function.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalAlias.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalValue.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalVariable.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/InitializePasses.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/InlineAsm.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Instructions.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.td#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/LLVMContext.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/LinkAllPasses.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfo.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCContext.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInstrDesc.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInstrInfo.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInstrItineraries.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCRegisterInfo.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCStreamer.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSubtargetInfo.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/MC/SubtargetFeature.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Module.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Object/Binary.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Object/COFF.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Object/Error.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Object/ObjectFile.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/BranchProbability.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/CFG.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ConstantFolder.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DebugLoc.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ELF.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Endian.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/IRBuilder.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/NoFolder.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PassManagerBuilder.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/TargetFolder.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/TypeBuilder.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Support/system_error.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/SubtargetFeature.h#4 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/Target.td#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetAsmInfo.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetAsmParser.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetData.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetFrameLowering.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#4 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#5 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetLowering.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetMachine.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetOpcodes.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetOptions.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetRegistry.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSelect.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#5 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSubtarget.h#2 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h#1 branch
.. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/IPO.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Scalar.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Type.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/TypeSymbolTable.h#4 delete
.. //depot/projects/hammer/contrib/llvm/include/llvm/Use.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/include/llvm/Value.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/Analysis.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/BlockFrequency.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/ConstantFolding.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/DIBuilder.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/DebugInfo.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/IVUsers.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/Lint.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/MemDepPrinter.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Analysis/ValueTracking.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLLexer.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLLexer.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLParser.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLParser.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLToken.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AllocationOrder.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/BranchFolding.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/BranchFolding.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CodeGen.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFWriter.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFWriter.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/EdgeBundles.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/IfConversion.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/InterferenceCache.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/InterferenceCache.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineBlockFrequency.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineCSE.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineFunction.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineInstr.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineLICM.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#3 delete
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterClassInfo.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterCoalescer.h#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#5 delete
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#5 delete
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SplitKit.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SplitKit.h#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Splitter.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/StackProtector.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TailDuplication.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegMap.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Linker/LinkModules.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmInfo.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmStreamer.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler/EDInfo.h#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCDwarf.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCELFStreamer.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCELFStreamer.h#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCMachOStreamer.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCNullStreamer.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCObjectStreamer.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCStreamer.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCSubtargetInfo.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/MC/MCWin64EH.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/MachObjectWriter.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/MC/SubtargetFeature.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/Object/Binary.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/Object/COFFObjectFile.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Object/ELFObjectFile.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Object/Error.cpp#1 branch
.. //depot/projects/hammer/contrib/llvm/lib/Object/MachOObjectFile.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Object/Object.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Object/ObjectFile.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/APFloat.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/APInt.cpp#5 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/Atomic.cpp#2 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/CommandLine.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/ConstantRange.cpp#3 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/Host.cpp#4 integrate
.. //depot/projects/hammer/contrib/llvm/lib/Support/Threading.cpp#2 integrate

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

From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 17:32:01 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A110D1065673; Sun, 24 Jul 2011 17:32: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 638B9106566B
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:32:01 +0000 (UTC)
	(envelope-from peter@wemm.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3852A8FC08
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:32:01 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OHW1R8098644
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 17:32:01 GMT
	(envelope-from peter@wemm.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OHW1Yw098641
	for perforce@freebsd.org; Sun, 24 Jul 2011 17:32:01 GMT
	(envelope-from peter@wemm.org)
Date: Sun, 24 Jul 2011 17:32:01 GMT
Message-Id: <201107241732.p6OHW1Yw098641@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	peter@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196639 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 17:32:01 -0000

http://p4web.freebsd.org/@@196639?ac=10

Change 196639 by peter@peter_overcee on 2011/07/24 17:30:49

	IFC @196636 (stragglers)

Affected files ...

.. //depot/projects/hammer/sys/modules/pfsync/Makefile#4 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sun Jul 24 22:47:10 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8ADE31065675; Sun, 24 Jul 2011 22:47: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 4D2BE106566B
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 22:47:09 +0000 (UTC)
	(envelope-from jceel@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 397358FC08
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 22:47:09 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6OMl9m2061221
	for <perforce@freebsd.org>; Sun, 24 Jul 2011 22:47:09 GMT
	(envelope-from jceel@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6OMl8aX061218
	for perforce@freebsd.org; Sun, 24 Jul 2011 22:47:08 GMT
	(envelope-from jceel@freebsd.org)
Date: Sun, 24 Jul 2011 22:47:08 GMT
Message-Id: <201107242247.p6OMl8aX061218@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jceel@freebsd.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196654 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Jul 2011 22:47:10 -0000

http://p4web.freebsd.org/@@196654?ac=10

Change 196654 by jceel@jceel_cyclone on 2011/07/24 22:46:36

	Update GPIO driver, now complete and working stable.

Affected files ...

.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#3 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#5 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#3 edit

Differences ...

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#3 (text+ko) ====

@@ -24,6 +24,31 @@
  * SUCH DAMAGE.
  *
  */
+
+/*
+ * GPIO on LPC32x0 consist of 4 ports:
+ * - Port0 with 8 input/output pins
+ * - Port1 with 24 input/output pins
+ * - Port2 with 13 input/output pins
+ * - Port3 with:
+ *   - 26 input pins (GPI_00..GPI_09 + GPI_15..GPI_23 + GPI_25 + GPI_27..GPI_28)
+ *   - 24 output pins (GPO_00..GPO_23)
+ *   - 6 input/ouput pins (GPIO_00..GPIO_05)
+ *
+ * Pins are mapped to logical pin number as follows:
+ * [0..9] -> GPI_00..GPI_09 		(port 3)
+ * [10..18] -> GPI_15..GPI_23 		(port 3)
+ * [19] -> GPI_25			(port 3)
+ * [20..21] -> GPI_27..GPI_28		(port 3)
+ * [22..45] -> GPO_00..GPO_23		(port 3)
+ * [46..51] -> GPIO_00..GPIO_05		(port 3)
+ * [52..64] -> P2.0..P2.12		(port 2)
+ * [65..88] -> P1.0..P1.23		(port 1)
+ * [89..96] -> P0.0..P0.7		(port 0)
+ *
+ */
+
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -70,7 +95,41 @@
 	bus_space_handle_t	lg_bsh;
 };
 
-#define	LPC_GPIO_NPINS		(32 * 2)
+struct lpc_gpio_pinmap
+{
+	int			lp_start_idx;
+	int			lp_pin_count;
+	int			lp_port;
+	int			lp_start_bit;
+	int			lp_flags;
+};
+
+static const struct lpc_gpio_pinmap lpc_gpio_pins[] = {
+	{ 0,	10,	3,	0,	GPIO_PIN_INPUT },
+	{ 10,	9,	3,	15,	GPIO_PIN_INPUT },
+	{ 19,	1,	3,	25,	GPIO_PIN_INPUT },
+	{ 20,	2,	3,	27,	GPIO_PIN_INPUT },
+	{ 22,	24,	3,	0,	GPIO_PIN_OUTPUT },
+	/*
+	 * -1 below is to mark special case for Port3 GPIO pins, as they
+	 * have other bits in Port 3 registers as inputs and as outputs
+	 */
+	{ 46,	6,	3,	-1,	GPIO_PIN_INPUT | GPIO_PIN_OUTPUT },
+	{ 52,	13,	2,	0,	GPIO_PIN_INPUT | GPIO_PIN_OUTPUT },
+	{ 65,	24,	1,	0,	GPIO_PIN_INPUT | GPIO_PIN_OUTPUT },
+	{ 89,	8,	0,	0,	GPIO_PIN_INPUT | GPIO_PIN_OUTPUT },
+	{ -1,	-1,	-1,	-1,	-1 },
+};
+
+#define	LPC_GPIO_NPINS				\
+    (LPC_GPIO_P0_COUNT + LPC_GPIO_P1_COUNT +	\
+    LPC_GPIO_P2_COUNT + LPC_GPIO_P3_COUNT)
+
+#define	LPC_GPIO_PIN_IDX(_map, _idx)	\
+    (_idx - _map->lp_start_idx)
+
+#define	LPC_GPIO_PIN_BIT(_map, _idx)	\
+    (_map->lp_start_bit + LPC_GPIO_PIN_IDX(_map, _idx))
 
 static int lpc_gpio_probe(device_t);
 static int lpc_gpio_attach(device_t);
@@ -85,10 +144,18 @@
 static int lpc_gpio_pin_set(device_t, uint32_t, uint32_t);
 static int lpc_gpio_pin_toggle(device_t, uint32_t);
 
-#define	lpc_gpio_read_4(_sc, _reg)		\
+static const struct lpc_gpio_pinmap *lpc_gpio_get_pinmap(int);
+
+static struct lpc_gpio_softc *lpc_gpio_sc = NULL;
+
+#define	lpc_gpio_read_4(_sc, _reg) \
     bus_space_read_4(_sc->lg_bst, _sc->lg_bsh, _reg)
-#define	lpc_gpio_write_4(_sc, _reg, _val)	\
+#define	lpc_gpio_write_4(_sc, _reg, _val) \
     bus_space_write_4(_sc->lg_bst, _sc->lg_bsh, _reg, _val)
+#define	lpc_gpio_get_4(_sc, _test, _reg1, _reg2) \
+    lpc_gpio_read_4(_sc, ((_test) ? _reg1 : _reg2))
+#define	lpc_gpio_set_4(_sc, _test, _reg1, _reg2, _val) \
+    lpc_gpio_write_4(_sc, ((_test) ? _reg1 : _reg2), _val)
 
 static int
 lpc_gpio_probe(device_t dev)
@@ -96,6 +163,7 @@
 	if (!ofw_bus_is_compatible(dev, "lpc,gpio"))
 		return (ENXIO);
 
+	device_set_desc(dev, "LPC32x0 GPIO");
 	return (BUS_PROBE_DEFAULT);
 }
 
@@ -118,6 +186,8 @@
 	sc->lg_bst = rman_get_bustag(sc->lg_res);
 	sc->lg_bsh = rman_get_bushandle(sc->lg_res);
 
+	lpc_gpio_sc = sc;
+
 	device_add_child(dev, "gpioc", device_get_unit(dev));
 	device_add_child(dev, "gpiobus", device_get_unit(dev));
 
@@ -134,18 +204,21 @@
 static int
 lpc_gpio_pin_max(device_t dev, int *npins)
 {
-	/* Currently supports only P0 and P1 */
-	*npins = LPC_GPIO_NPINS;
+	*npins = LPC_GPIO_NPINS - 1;
 	return (0);
 }
 
 static int
 lpc_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
 {
+	const struct lpc_gpio_pinmap *map;
+
 	if (pin > LPC_GPIO_NPINS)
 		return (ENODEV);
 
-	*caps = GPIO_PIN_INPUT | GPIO_PIN_OUTPUT;
+	map = lpc_gpio_get_pinmap(pin);
+
+	*caps = map->lp_flags;
 	return (0);
 }
 
@@ -153,19 +226,44 @@
 lpc_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
 {
 	struct lpc_gpio_softc *sc = device_get_softc(dev);
-	uint32_t direction;
+	const struct lpc_gpio_pinmap *map;
+	uint32_t state;
+	int dir;
+
+	if (pin > LPC_GPIO_NPINS)
+		return (ENODEV);
+
+	map = lpc_gpio_get_pinmap(pin);
+
+	/* Check whether it's bidirectional pin */
+	if ((map->lp_flags & (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) != 
+	    (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) {
+		*flags = map->lp_flags;
+		return (0);
+	}
 
-	if (pin >= 32) {
-		pin -= 32;
-		direction = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE);
-	} else {
-		direction = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE);
+	switch (map->lp_port) {
+	case 0:
+		state = lpc_gpio_read_4(sc, LPC_GPIO_P0_DIR_STATE);
+		dir = (state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+		break;
+	case 1:
+		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE);
+		dir = (state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+		break;
+	case 2:
+		state = lpc_gpio_read_4(sc, LPC_GPIO_P2_DIR_STATE);
+		dir = (state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+		break;
+	case 3:
+		state = lpc_gpio_read_4(sc, LPC_GPIO_P2_DIR_STATE);
+		dir = (state & (1 << (25 + LPC_GPIO_PIN_IDX(map, pin))));
+		break;
+	default:
+		panic("unknown GPIO port");
 	}
 
-	if (direction & (1 << pin))
-		*flags = GPIO_PIN_OUTPUT;
-	else
-		*flags = GPIO_PIN_INPUT;
+	*flags = dir ? GPIO_PIN_OUTPUT : GPIO_PIN_INPUT;
 
 	return (0);
 }
@@ -174,31 +272,79 @@
 lpc_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
 {
 	struct lpc_gpio_softc *sc = device_get_softc(dev);
-	uint32_t direction, state;
+	const struct lpc_gpio_pinmap *map;
+	uint32_t dir, state;
+
+	if (pin > LPC_GPIO_NPINS)
+		return (ENODEV);
+
+	map = lpc_gpio_get_pinmap(pin);
 
+	/* Check whether it's bidirectional pin */
+	if ((map->lp_flags & (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) != 
+	    (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT))
+		return (ENOTSUP);
+	
 	if (flags & GPIO_PIN_INPUT)
-		direction = 0;
+		dir = 0;
 
 	if (flags & GPIO_PIN_OUTPUT)
-		direction = 1;
+		dir = 1;
 
-	if (pin >= 32) {
-		pin -= 32;
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE);
-		lpc_gpio_write_4(sc, LPC_GPIO_P1_DIR_SET, state | (direction << pin));
-	} else {
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE);
-		lpc_gpio_write_4(sc, LPC_GPIO_P1_DIR_SET, state | (direction << pin));
+	switch (map->lp_port) {
+	case 0:
+		state = (1 << LPC_GPIO_PIN_IDX(map, pin));
+		lpc_gpio_set_4(sc, dir, LPC_GPIO_P0_DIR_SET, 
+		    LPC_GPIO_P0_DIR_CLR, state);
+		break;
+	case 1:
+		state = (1 << LPC_GPIO_PIN_IDX(map, pin));
+		lpc_gpio_set_4(sc, dir, LPC_GPIO_P1_DIR_SET, 
+		    LPC_GPIO_P0_DIR_CLR, state);
+		break;
+	case 2:
+		state = (1 << LPC_GPIO_PIN_IDX(map, pin));
+		lpc_gpio_set_4(sc, dir, LPC_GPIO_P2_DIR_SET, 
+		    LPC_GPIO_P0_DIR_CLR, state);
+		break;
+	case 3:
+		state = (1 << (25 + (pin - map->lp_start_idx)));
+		lpc_gpio_set_4(sc, dir, LPC_GPIO_P2_DIR_SET, 
+		    LPC_GPIO_P0_DIR_CLR, state);
+		break;
+	}
 
-	}
-	
 	return (0);
 }
 
 static int
 lpc_gpio_pin_getname(device_t dev, uint32_t pin, char *name)
 {
-	snprintf(name, GPIOMAXNAME - 1, "pin%d", pin);
+	const struct lpc_gpio_pinmap *map;
+	int idx;
+
+	map = lpc_gpio_get_pinmap(pin);
+	idx = LPC_GPIO_PIN_IDX(map, pin);
+
+	switch (map->lp_port) {
+	case 0:
+	case 1:
+	case 2:
+		snprintf(name, GPIOMAXNAME - 1, "P%d.%d", map->lp_port, 
+		    map->lp_start_bit + LPC_GPIO_PIN_IDX(map, pin));
+		break;
+	case 3:
+		if (map->lp_start_bit == -1) {
+			snprintf(name, GPIOMAXNAME - 1, "GPIO_%02d", idx);
+			break;
+		}
+
+		snprintf(name, GPIOMAXNAME - 1, "GP%c_%02d",
+		    (map->lp_flags & GPIO_PIN_INPUT) ? 'I' : 'O',
+		    map->lp_start_bit + idx);
+		break;
+	}
+
 	return (0);
 }
 
@@ -206,15 +352,46 @@
 lpc_gpio_pin_get(device_t dev, uint32_t pin, uint32_t *value)
 {
 	struct lpc_gpio_softc *sc = device_get_softc(dev);
-	uint32_t state;
+	const struct lpc_gpio_pinmap *map;
+	uint32_t state, flags;
+	int dir;
+
+	map = lpc_gpio_get_pinmap(pin);
+
+	if (lpc_gpio_pin_getflags(dev, pin, &flags))
+		return (ENXIO);
+
+	if (flags & GPIO_PIN_OUTPUT)
+		dir = 1;
+
+	if (flags & GPIO_PIN_INPUT)
+		dir = 0;
+
+	switch (map->lp_port) {
+	case 0:
+		state = lpc_gpio_get_4(sc, dir, LPC_GPIO_P0_OUTP_STATE,
+		    LPC_GPIO_P0_INP_STATE);
+		*value = !!(state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+	case 1:
+		state = lpc_gpio_get_4(sc, dir, LPC_GPIO_P1_OUTP_STATE,
+		    LPC_GPIO_P1_INP_STATE);
+		*value = !!(state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+	case 2:
+		state = lpc_gpio_read_4(sc, LPC_GPIO_P2_INP_STATE);
+		*value = !!(state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
+	case 3:
+		state = lpc_gpio_get_4(sc, dir, LPC_GPIO_P3_OUTP_STATE,
+		    LPC_GPIO_P3_INP_STATE);
+		if (map->lp_start_bit == -1) {
+			if (dir)
+				*value = !!(state & (1 << (25 + 
+				    LPC_GPIO_PIN_IDX(map, pin))));
+			else
+				*value = !!(state & (1 << (10 + 
+				    LPC_GPIO_PIN_IDX(map, pin))));
+		}
 
-	if (pin >= 32) {
-		pin -= 32;
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_INP_STATE);
-		*value = (state & (1 << pin));
-	} else {
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P0_INP_STATE);
-		*value = (state & (1 << pin));
+		*value = !!(state & (1 << LPC_GPIO_PIN_BIT(map, pin)));
 	}
 
 	return (0);
@@ -224,17 +401,39 @@
 lpc_gpio_pin_set(device_t dev, uint32_t pin, uint32_t value)
 {
 	struct lpc_gpio_softc *sc = device_get_softc(dev);
-	uint32_t state;
+	const struct lpc_gpio_pinmap *map;
+	uint32_t state, flags;
+
+	map = lpc_gpio_get_pinmap(pin);
+
+	if (lpc_gpio_pin_getflags(dev, pin, &flags))
+		return (ENXIO);
+
+	if ((flags & GPIO_PIN_OUTPUT) == 0)
+		return (EINVAL);
+
+	state = (1 << LPC_GPIO_PIN_BIT(map, pin));
 
-	if (pin >= 32) {
-		pin -= 32;
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_OUTP_STATE);
-		state = value ? state | (1 << pin) : state & ~(1 << pin);
-		lpc_gpio_write_4(sc, LPC_GPIO_P1_OUTP_SET, state);
-	} else {
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P0_OUTP_STATE);
-		state = value ? state | (1 << pin) : state & ~(1 << pin);
-		lpc_gpio_write_4(sc, LPC_GPIO_P0_OUTP_SET, state | (1 << pin));
+	switch (map->lp_port) {
+	case 0:
+		lpc_gpio_set_4(sc, value, LPC_GPIO_P0_OUTP_SET,
+		    LPC_GPIO_P0_OUTP_CLR, state);
+		break;
+	case 1:
+		lpc_gpio_set_4(sc, value, LPC_GPIO_P1_OUTP_SET,
+		    LPC_GPIO_P1_OUTP_CLR, state);
+		break;
+	case 2:
+		lpc_gpio_set_4(sc, value, LPC_GPIO_P2_OUTP_SET,
+		    LPC_GPIO_P2_OUTP_CLR, state);
+		break;
+	case 3:
+		if (map->lp_start_bit == -1)
+			state = (1 << (25 + LPC_GPIO_PIN_IDX(map, pin)));
+		
+		lpc_gpio_set_4(sc, value, LPC_GPIO_P3_OUTP_SET,
+		    LPC_GPIO_P3_OUTP_CLR, state);
+		break;
 	}
 
 	return (0);
@@ -243,22 +442,63 @@
 static int
 lpc_gpio_pin_toggle(device_t dev, uint32_t pin)
 {
-	struct lpc_gpio_softc *sc = device_get_softc(dev);
-	uint32_t state;
+	//struct lpc_gpio_softc *sc = device_get_softc(dev);
+	const struct lpc_gpio_pinmap *map;
+	uint32_t /*state,*/ flags;
+
+	map = lpc_gpio_get_pinmap(pin);
+
+	if (lpc_gpio_pin_getflags(dev, pin, &flags))
+		return (ENXIO);
+
+	if ((flags & GPIO_PIN_OUTPUT) == 0)
+		return (EINVAL);
+	
+	panic("not implemented yet");
+
+	return (0);
+
+}
+
+static const struct lpc_gpio_pinmap *
+lpc_gpio_get_pinmap(int pin)
+{
+	const struct lpc_gpio_pinmap *map;
 
-	if (pin >= 32) {
-		pin -= 32;
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P1_OUTP_STATE);
-		state = (state & (1 << pin)) ? state & ~(1 << pin) : state | (1 << pin);
-		lpc_gpio_write_4(sc, LPC_GPIO_P1_OUTP_SET, state);
-	} else {
-		state = lpc_gpio_read_4(sc, LPC_GPIO_P0_OUTP_STATE);
-		state = (state & (1 << pin)) ? state & ~(1 << pin) : state | (1 << pin);
-		lpc_gpio_write_4(sc, LPC_GPIO_P0_OUTP_SET, state | (1 << pin));
+	for (map = &lpc_gpio_pins[0]; map->lp_start_idx != -1; map++) {
+		if (pin >= map->lp_start_idx &&
+		    pin < map->lp_start_idx + map->lp_pin_count)
+			return map;
 	}
 
-	return (0);
+	panic("pin number %d out of range", pin);
+}
+
+int
+lpc_gpio_set_flags(device_t dev, int pin, int flags)
+{
+	if (lpc_gpio_sc == NULL)
+		return (ENXIO);
+
+	return lpc_gpio_pin_setflags(lpc_gpio_sc->lg_dev, pin, flags);
+}
+
+int
+lpc_gpio_set_state(device_t dev, int pin, int state)
+{
+	if (lpc_gpio_sc == NULL)
+		return (ENXIO);
+
+	return lpc_gpio_pin_set(lpc_gpio_sc->lg_dev, pin, state); 
+}
+
+int
+lpc_gpio_get_state(device_t dev, int pin, int *state)
+{
+	if (lpc_gpio_sc == NULL)
+		return (ENXIO);
 
+	return lpc_gpio_pin_get(lpc_gpio_sc->lg_dev, pin, state);
 }
 
 static device_method_t lpc_gpio_methods[] = {

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#5 (text+ko) ====

@@ -27,72 +27,72 @@
 #ifndef	_ARM_LPC_LPCREG_H
 #define	_ARM_LPC_LPCREG_H
 
-#define	LPC_DEV_PHYS_BASE	0x40000000
-#define	LPC_DEV_BASE		0xd0000000
-#define	LPC_DEV_SIZE		0x10000000
+#define	LPC_DEV_PHYS_BASE		0x40000000
+#define	LPC_DEV_BASE			0xd0000000
+#define	LPC_DEV_SIZE			0x10000000
 
 /*
  * Interrupt controller (from UM10326: LPC32x0 User manual, page 87)
 
  */
-#define	LPC_INTC_MIC_ER		0x0000
-#define	LPC_INTC_MIC_RSR	0x0004
-#define	LPC_INTC_MIC_SR		0x0008
-#define	LPC_INTC_MIC_APR	0x000c
-#define	LPC_INTC_MIC_ATR	0x0010
-#define	LPC_INTC_MIC_ITR	0x0014
-#define	LPC_INTC_SIC1_ER	0x4000
-#define	LPC_INTC_SIC1_RSR	0x4004
-#define	LPC_INTC_SIC1_SR	0x4008
-#define	LPC_INTC_SIC1_APR	0x400c
-#define	LPC_INTC_SIC1_ATR	0x4010
-#define	LPC_INTC_SIC1_ITR	0x4014
-#define	LPC_INTC_SIC2_ER	0x8000
-#define	LPC_INTC_SIC2_RSR	0x8004
-#define	LPC_INTC_SIC2_SR	0x8008
-#define	LPC_INTC_SIC2_APR	0x800c
-#define	LPC_INTC_SIC2_ATR	0x8010
-#define	LPC_INTC_SIC2_ITR	0x8014
+#define	LPC_INTC_MIC_ER			0x0000
+#define	LPC_INTC_MIC_RSR		0x0004
+#define	LPC_INTC_MIC_SR			0x0008
+#define	LPC_INTC_MIC_APR		0x000c
+#define	LPC_INTC_MIC_ATR		0x0010
+#define	LPC_INTC_MIC_ITR		0x0014
+#define	LPC_INTC_SIC1_ER		0x4000
+#define	LPC_INTC_SIC1_RSR		0x4004
+#define	LPC_INTC_SIC1_SR		0x4008
+#define	LPC_INTC_SIC1_APR		0x400c
+#define	LPC_INTC_SIC1_ATR		0x4010
+#define	LPC_INTC_SIC1_ITR		0x4014
+#define	LPC_INTC_SIC2_ER		0x8000
+#define	LPC_INTC_SIC2_RSR		0x8004
+#define	LPC_INTC_SIC2_SR		0x8008
+#define	LPC_INTC_SIC2_APR		0x800c
+#define	LPC_INTC_SIC2_ATR		0x8010
+#define	LPC_INTC_SIC2_ITR		0x8014
 
 
 /*
  * Timer 0|1|2|3|4|5. (from UM10326: LPC32x0 User manual, page 540)
  */
-#define	LPC_TIMER_IR		0x00
-#define	LPC_TIMER_TCR		0x04
-#define	LPC_TIMER_TCR_ENABLE	(1 << 0)
-#define	LPC_TIMER_TCR_RESET	(1 << 1)
-#define	LPC_TIMER_TC		0x08
-#define	LPC_TIMER_PR		0x0c
-#define	LPC_TIMER_PC		0x10
-#define	LPC_TIMER_MCR		0x14
-#define	LPC_TIMER_MCR_MR0I	(1 << 0)
-#define	LPC_TIMER_MCR_MR0R	(1 << 1)
-#define	LPC_TIMER_MCR_MR0S	(1 << 2)
-#define	LPC_TIMER_MCR_MR1I	(1 << 3)
-#define	LPC_TIMER_MCR_MR1R	(1 << 4)
-#define	LPC_TIMER_MCR_MR1S	(1 << 5)
-#define	LPC_TIMER_MCR_MR2I	(1 << 6)
-#define	LPC_TIMER_MCR_MR2R	(1 << 7)
-#define	LPC_TIMER_MCR_MR2S	(1 << 8)
-#define	LPC_TIMER_MCR_MR3I	(1 << 9)
-#define	LPC_TIMER_MCR_MR3R	(1 << 10)
-#define	LPC_TIMER_MCR_MR3S	(1 << 11)
-#define	LPC_TIMER_MR0		0x18
-#define	LPC_TIMER_CTCR		0x70
+#define	LPC_TIMER_IR			0x00
+#define	LPC_TIMER_TCR			0x04
+#define	LPC_TIMER_TCR_ENABLE		(1 << 0)
+#define	LPC_TIMER_TCR_RESET		(1 << 1)
+#define	LPC_TIMER_TC			0x08
+#define	LPC_TIMER_PR			0x0c
+#define	LPC_TIMER_PC			0x10
+#define	LPC_TIMER_MCR			0x14
+#define	LPC_TIMER_MCR_MR0I		(1 << 0)
+#define	LPC_TIMER_MCR_MR0R		(1 << 1)
+#define	LPC_TIMER_MCR_MR0S		(1 << 2)
+#define	LPC_TIMER_MCR_MR1I		(1 << 3)
+#define	LPC_TIMER_MCR_MR1R		(1 << 4)
+#define	LPC_TIMER_MCR_MR1S		(1 << 5)
+#define	LPC_TIMER_MCR_MR2I		(1 << 6)
+#define	LPC_TIMER_MCR_MR2R		(1 << 7)
+#define	LPC_TIMER_MCR_MR2S		(1 << 8)
+#define	LPC_TIMER_MCR_MR3I		(1 << 9)
+#define	LPC_TIMER_MCR_MR3R		(1 << 10)
+#define	LPC_TIMER_MCR_MR3S		(1 << 11)
+#define	LPC_TIMER_MR0			0x18
+#define	LPC_TIMER_CTCR			0x70
 
 /*
  * Watchdog timer. (from UM10326: LPC32x0 User manual, page 572)
  */
-#define	LPC_WDTIM_BASE		(LPC_DEV_BASE + 0x3c000)
-#define	LPC_WDTIM_INT		0x00
-#define	LPC_WDTIM_CTRL		0x04
-#define	LPC_WDTIM_COUNTER	0x08
-#define	LPC_WDTIM_MCTRL		0x0c
-#define	LPC_WDTIM_MATCH0	0x10
-#define	LPC_WDTIM_EMR		0x14
-#define	LPC_WDTIM_PULSE		0x18
-#define	LPC_WDTIM_RES		0x1c
+#define	LPC_WDTIM_BASE			(LPC_DEV_BASE + 0x3c000)
+#define	LPC_WDTIM_INT			0x00
+#define	LPC_WDTIM_CTRL			0x04
+#define	LPC_WDTIM_COUNTER		0x08
+#define	LPC_WDTIM_MCTRL			0x0c
+#define	LPC_WDTIM_MATCH0		0x10
+#define	LPC_WDTIM_EMR			0x14
+#define	LPC_WDTIM_PULSE			0x18
+#define	LPC_WDTIM_RES			0x1c
 
 /*
  * Clocking and power control. (from UM10326: LPC32x0 User manual, page 58)
@@ -146,6 +146,12 @@
 #define	LPC_CLKPWR_LCDCLK_CTRL		0x54
 #define	LPC_CLKPWR_I2S_CTRL		0x7c
 #define	LPC_CLKPWR_SSP_CTRL		0x78
+#define	LPC_CLKPWR_SSP_CTRL_SSP1RXDMA	(1 << 5)
+#define	LPC_CLKPWR_SSP_CTRL_SSP1TXDMA	(1 << 4)
+#define	LPC_CLKPWR_SSP_CTRL_SSP0RXDMA	(1 << 3)
+#define	LPC_CLKPWR_SSP_CTRL_SSP0TXDMA	(1 << 2)
+#define	LPC_CLKPWR_SSP_CTRL_SSP1EN	(1 << 1)
+#define	LPC_CLKPWR_SSP_CTRL_SSP0EN	(1 << 0)
 #define	LPC_CLKPWR_SPI_CTRL		0xc4
 #define	LPC_CLKPWR_I2CCLK_CTRL		0xac
 #define	LPC_CLKPWR_TIMCLK_CTRL1		0xc0
@@ -371,8 +377,86 @@
 #define	LPC_LCD_CRSR_INTSTAT		0xc2c
 
 /*
+ * SPI interface (from UM10326: LPC32x0 User manual, page 483)
+ */
+#define	LPC_SPI_GLOBAL			0x00
+#define	LPC_SPI_GLOBAL_RST		(1 << 1)
+#define	LPC_SPI_GLOBAL_ENABLE		(1 << 0)
+#define	LPC_SPI_CON			0x04
+#define	LPC_SPI_CON_UNIDIR		(1 << 23)
+#define	LPC_SPI_CON_BHALT		(1 << 22)
+#define	LPC_SPI_CON_BPOL		(1 << 21)
+#define	LPC_SPI_CON_MSB			(1 << 19)
+#define	LPC_SPI_CON_MODE(_n)		((_n & 0x3) << 16)
+#define	LPC_SPI_CON_RXTX		(1 << 15)
+#define	LPC_SPI_CON_THR			(1 << 14)
+#define	LPC_SPI_CON_SHIFT_OFF		(1 << 13)
+#define	LPC_SPI_CON_BITNUM(_n)		((_n & 0xf) << 9)
+#define	LPC_SPI_CON_MS			(1 << 7)
+#define	LPC_SPI_CON_RATE(_n)		(_n & 0x7f)
+#define	LPC_SPI_FRM			0x08
+#define	LPC_SPI_IER			0x0c
+#define	LPC_SPI_IER_INTEOT		(1 << 1)
+#define	LPC_SPI_IER_INTTHR		(1 << 0)
+#define	LPC_SPI_STAT			0x10
+#define	LPC_SPI_STAT_INTCLR		(1 << 8)
+#define	LPC_SPI_STAT_EOT		(1 << 7)
+#define	LPC_SPI_STAT_BUSYLEV		(1 << 6)
+#define	LPC_SPI_STAT_SHIFTACT		(1 << 3)
+#define	LPC_SPI_STAT_BF			(1 << 2)
+#define	LPC_SPI_STAT_THR		(1 << 1)
+#define	LPC_SPI_STAT_BE			(1 << 0)
+#define	LPC_SPI_DAT			0x14
+#define	LPC_SPI_TIM_CTRL		0x400
+#define	LPC_SPI_TIM_COUNT		0x404
+#define	LPC_SPI_TIM_STAT		0x408
+
+/*
+ * SSP interface (from UM10326: LPC32x0 User manual, page 500)
+ */
+#define	LPC_SSP0_BASE			0x4c00
+#define	LPC_SSP1_BASE			0xc000
+#define	LPC_SSP_CR0			0x00
+#define	LPC_SSP_CR0_DSS(_n)		((_n-1) & 0xf)
+#define	LPC_SSP_CR0_TI			(1 << 4)
+#define	LPC_SSP_CR0_MICROWIRE		(1 << 5)
+#define	LPC_SSP_CR0_CPOL		(1 << 6)
+#define	LPC_SSP_CR0_CPHA		(1 << 7)
+#define	LPC_SSP_CR0_SCR(_n)		((_x & & 0xff) << 8)
+#define	LPC_SSP_CR1			0x04
+#define	LPC_SSP_CR1_LBM			(1 << 0)
+#define	LPC_SSP_CR1_SSE			(1 << 1)
+#define	LPC_SSP_CR1_MS			(1 << 2)
+#define	LPC_SSP_CR1_SOD			(1 << 3)
+#define	LPC_SSP_DR			0x08
+#define	LPC_SSP_SR			0x0c
+#define	LPC_SSP_SR_TFE			(1 << 0)
+#define	LPC_SSP_SR_TNF			(1 << 1)
+#define	LPC_SSP_SR_RNE			(1 << 2)
+#define	LPC_SSP_SR_RFF			(1 << 3)
+#define	LPC_SSP_SR_BSY			(1 << 4)
+#define	LPC_SSP_CPSR			0x10
+#define	LPC_SSP_IMSC			0x14
+#define	LPC_SSP_IMSC_RORIM		(1 << 0)
+#define	LPC_SSP_IMSC_RTIM		(1 << 1)
+#define	LPC_SSP_IMSC_RXIM		(1 << 2)
+#define	LPC_SSP_IMSC_TXIM		(1 << 3)
+#define	LPC_SSP_RIS			0x18
+#define	LPC_SSP_RIS_RORRIS		(1 << 0)
+#define	LPC_SSP_RIS_RTRIS		(1 << 1)
+#define	LPC_SSP_RIS_RXRIS		(1 << 2)
+#define	LPC_SSP_RIS_TXRIS		(1 << 3)
+#define	LPC_SSP_MIS			0x1c
+#define	LPC_SSP_ICR			0x20
+#define	LPC_SSP_DMACR			0x24
+
+/*
  * GPIO (from UM10326: LPC32x0 User manual, page 606)
  */
+#define	LPC_GPIO_P0_COUNT		8
+#define	LPC_GPIO_P1_COUNT		24
+#define	LPC_GPIO_P2_COUNT		13
+#define	LPC_GPIO_P3_COUNT		52
 #define	LPC_GPIO_P0_INP_STATE		0x40
 #define	LPC_GPIO_P0_OUTP_SET		0x44
 #define	LPC_GPIO_P0_OUTP_CLR		0x48
@@ -397,5 +481,55 @@
 #define	LPC_GPIO_P3_OUTP_SET		0x04
 #define	LPC_GPIO_P3_OUTP_CLR		0x08
 #define	LPC_GPIO_P3_OUTP_STATE		0x0c
+/* Aliases for logical pin numbers: */
+#define	LPC_GPIO_GPI_00(_n)		(0 + _n)
+#define	LPC_GPIO_GPI_15(_n)		(10 + _n)
+#define	LPC_GPIO_GPI_25			(19)
+#define	LPC_GPIO_GPI_27(_n)		(20 + _n)
+#define	LPC_GPIO_GPO_00(_n)		(22 + _n)
+#define	LPC_GPIO_GPIO_00(_n)		(46 + _n)
+
+/*
+ * GPDMA controller (from UM10326: LPC32x0 User manual, page 106)
+ */
+#define	LPC_DMAC_INTSTAT		0x00
+#define	LPC_DMAC_INTTCSTAT		0x04
+#define	LPC_DMAC_INTTCCLEAR		0x08
+#define	LPC_DMAC_INTERRSTAT		0x0c
+#define	LPC_DMAC_INTERRCLR		0x10
+#define	LPC_DMAC_RAWINTTCSTAT		0x14
+#define	LPC_DMAC_RAWINTERRSTAT		0x18
+#define	LPC_DMAC_ENABLED_CHANNELS	0x1c
+#define	LPC_DMAC_SOFTBREQ		0x20
+#define	LPC_DMAC_SOFTSREQ		0x24
+#define	LPC_DMAC_SOFTLBREQ		0x28
+#define	LPC_DMAC_SOFTLSREQ		0x2c
+#define	LPC_DMAC_CONFIG			0x30
+#define	LPC_DMAC_CHADDR(_n)		(0x100 + (_n * 0x20))
+#define	LPC_DMAC_CH_SRCADDR		0x00
+#define	LPC_DMAC_CH_DSTADDR		0x04
+#define	LPC_DMAC_CH_LLI			0x08
+#define	LPC_DMAC_CH_LLI_AHB1		(1 << 0)
+#define	LPC_DMAC_CH_CONTROL		0x0c
+#define	LPC_DMAC_CH_CONTROL_I		(1 << 31)
+#define	LPC_DMAC_CH_CONTROL_DI		(1 << 27)
+#define	LPC_DMAC_CH_CONTROL_SI		(1 << 26)
+#define	LPC_DMAC_CH_CONTROL_D		(1 << 25)
+#define	LPC_DMAC_CH_CONTROL_S		(1 << 24)
+#define	LPC_DMAC_CH_CONTROL_DWIDTH(_n)	((_n & 0x7) << 21)
+#define	LPC_DMAC_CH_CONTROL_SWIDTH(_n)	((_n & 0x7) << 18)
+#define	LPC_DMAC_CH_CONTROL_DBSIZE(_n)	((_n & 0x7) << 15)
+#define	LPC_DMAC_CH_CONTROL_SBSIZE(_n)	((_n & 0x7) << 12)
+#define	LPC_DMAC_CH_CONTROL_XFERLEN(_n)	(_n & 0xfff) 
+#define	LPC_DMAC_CH_CONFIG		0x10
+#define	LPC_DMAC_CH_CONFIG_H		(1 << 18)
+#define	LPC_DMAC_CH_CONFIG_A		(1 << 17)
+#define	LPC_DMAC_CH_CONFIG_L		(1 << 16)
+#define	LPC_DMAC_CH_CONFIG_ITC		(1 << 15)
+#define	LPC_DMAC_CH_CONFIG_IE		(1 << 14)
+#define	LPC_DMAC_CH_CONFIG_FLOWCNTL(_n)	((_n & 0x7) << 11)
+#define	LPC_DMAC_CH_CONFIG_DESTP(_n)	((_n & 0x1f) << 6)
+#define	LPC_DMAC_CH_CONFIG_SRCP(_n)	((_n & 0x1f) << 1)
+#define	LPC_DMAC_CH_CONFIG_E		(1 << 0)
 
 #endif	/* _ARM_LPC_LPCREG_H */

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#3 (text+ko) ====

@@ -31,7 +31,13 @@
 #include <sys/bus.h>
 #include <machine/bus.h>
 
+/* Clocking and power control */
 uint32_t lpc_pwr_read(device_t, int);
 void lpc_pwr_write(device_t, int, uint32_t);
 
+/* GPIO */
+int lpc_gpio_set_flags(device_t, int, int);
+int lpc_gpio_set_state(device_t, int, int);
+int lpc_gpio_get_state(device_t, int, int *);
+
 #endif	/* _ARM_LPC_LPCVAR_H */

From owner-p4-projects@FreeBSD.ORG  Tue Jul 26 06:07:17 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3CDE61065675; Tue, 26 Jul 2011 06:07: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 E54701065672
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:07:16 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D21B28FC0C
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:07:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6Q67Gl7042186
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:07:16 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6Q67Gm3042183
	for perforce@freebsd.org; Tue, 26 Jul 2011 06:07:16 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Tue, 26 Jul 2011 06:07:16 GMT
Message-Id: <201107260607.p6Q67Gm3042183@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196725 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 26 Jul 2011 06:07:17 -0000

http://p4web.freebsd.org/@@196725?ac=10

Change 196725 by ilya@ilya_triton2011 on 2011/07/26 06:06:22

	Remove ticket_mtx.  Replace last use case during file system
	initializtion with global fuse mutex.
	
	Remove debug sysctl reclaim_inactive
	
	Remove unused size argument from fuse_vnode_get

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#19 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#14 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#15 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#20 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#19 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#23 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#43 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#19 (text+ko) ====

@@ -486,7 +486,7 @@
         return err;
     }
 
-    err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, vtyp, 0);
+    err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, vtyp);
     if (err) {
         fuse_internal_forget_send(mp, cnp->cn_thread, cnp->cn_cred,
             feo->nodeid, 1);
@@ -617,10 +617,10 @@
         fdata_set_dead(data);
     }
 
-    fuse_lck_mtx_lock(data->ticket_mtx);
+    FUSE_LOCK();
     data->dataflags |= FSESS_INITED;
     wakeup(&data->ticketer);
-    fuse_lck_mtx_unlock(data->ticket_mtx);
+    FUSE_UNLOCK();
 
     return 0;
 }

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#14 (text+ko) ====

@@ -346,8 +346,6 @@
     data->dataflags = 0;
     mtx_init(&data->ms_mtx, "fuse message list mutex", NULL, MTX_DEF);
     STAILQ_INIT(&data->ms_head);
-    mtx_init(&data->ticket_mtx, "fuse ticketer mutex", NULL, MTX_DEF);
-    debug_printf("ALLOC_INIT data=%p ticket_mtx=%p\n", data, &data->ticket_mtx);
     mtx_init(&data->aw_mtx, "fuse answer list mutex", NULL, MTX_DEF);
     TAILQ_INIT(&data->aw_head);
     data->ticketer = 0;
@@ -369,7 +367,6 @@
     /* Driving off stage all that stuff thrown at device... */
     mtx_destroy(&data->ms_mtx);
     mtx_destroy(&data->aw_mtx);
-    mtx_destroy(&data->ticket_mtx);
 #ifdef FUSE_EXPLICIT_RENAME_LOCK
     sx_destroy(&data->rename_lock);
 #endif
@@ -395,9 +392,9 @@
     selwakeuppri(&data->ks_rsel, PZERO + 1);
     fuse_lck_mtx_unlock(data->ms_mtx);
 
-    fuse_lck_mtx_lock(data->ticket_mtx);
+    FUSE_LOCK();
     wakeup(&data->ticketer);
-    fuse_lck_mtx_unlock(data->ticket_mtx);
+    FUSE_UNLOCK();
 }
 
 struct fuse_ticket *
@@ -412,9 +409,9 @@
 
     if (!(data->dataflags & FSESS_INITED) && data->ticketer > 2) {
         /* Sleep until get answer for INIT messsage */
-        fuse_lck_mtx_lock(data->ticket_mtx);
+        FUSE_LOCK();
         if (!(data->dataflags & FSESS_INITED) && data->ticketer > 2) {
-            err = msleep(&data->ticketer, &data->ticket_mtx, PCATCH | PDROP,
+            err = msleep(&data->ticketer, &fuse_mtx, PCATCH | PDROP,
                          "fu_ini", 0);
         }
     }

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#15 (text+ko) ====

@@ -138,7 +138,6 @@
     struct mtx                 aw_mtx;
     TAILQ_HEAD(, fuse_ticket)  aw_head;
 
-    struct mtx                 ticket_mtx;
     u_long                     ticketer;
 
 #ifdef FUSE_EXPLICIT_RENAME_LOCK

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#20 (text+ko) ====

@@ -170,8 +170,7 @@
                struct vnode         *dvp,
                struct vnode         **vpp,
                struct componentname *cnp,
-               enum vtype            vtyp,
-               uint64_t              size)
+               enum vtype            vtyp)
 {
     struct thread *td = (cnp != NULL ? cnp->cn_thread : curthread);
     int err = 0;

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#19 (text+ko) ====

@@ -88,8 +88,7 @@
                    struct vnode         *dvp,
                    struct vnode        **vpp,
                    struct componentname *cnp,
-                   enum vtype            vtyp,
-                   uint64_t              size);
+                   enum vtype            vtyp);
 
 void fuse_vnode_open(struct vnode *vp,
                      int32_t fuse_open_flags,

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#23 (text+ko) ====

@@ -360,7 +360,7 @@
         if (err == 0)
             *vpp = data->vroot;
     } else {
-        err = fuse_vnode_get(mp, FUSE_ROOT_ID, NULL, vpp, NULL, VDIR, 0);
+        err = fuse_vnode_get(mp, FUSE_ROOT_ID, NULL, vpp, NULL, VDIR);
         if (err == 0) {
             FUSE_LOCK();
             MPASS(data->vroot == NULL || data->vroot == *vpp);

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#43 (text+ko) ====

@@ -124,10 +124,6 @@
 SYSCTL_INT(_vfs_fuse, OID_AUTO, lookup_cache_enable, CTLFLAG_RW,
            &fuse_lookup_cache_enable, 0, "");
 
-static int fuse_reclaim_inactive = 0;
-SYSCTL_INT(_vfs_fuse, OID_AUTO, reclaim_inactive, CTLFLAG_RW,
-           &fuse_reclaim_inactive, 0, "");
-
 int fuse_pbuf_freecnt = -1;
 
 #if __FreeBSD_version >= 900011
@@ -338,7 +334,7 @@
         goto out;
     }
 
-    err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, VREG, /*size*/0);
+    err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, VREG);
     if (err) {
        if (gone_good_old) {
            fuse_internal_forget_send(mp, td, cred, feo->nodeid, 1);
@@ -555,8 +551,7 @@
         }
     }
 
-    if ((fvdat->flag & FN_REVOKED) != 0 ||
-        (fuse_reclaim_inactive && vnode_vtype(vp) != VDIR)) {
+    if ((fvdat->flag & FN_REVOKED) != 0) {
         vrecycle(vp, td);
     }
 
@@ -649,7 +644,6 @@
     int err                   = 0;
     int lookup_err            = 0;
     struct vnode *vp          = NULL;
-    uint64_t size             = 0;
 
     struct fuse_dispatcher fdi;
     enum   fuse_opcode     op;
@@ -735,7 +729,6 @@
 
     if ((op == FUSE_LOOKUP) && !lookup_err) { /* lookup call succeeded */
         nid = ((struct fuse_entry_out *)fdi.answ)->nodeid;
-        size = ((struct fuse_entry_out *)fdi.answ)->attr.size;
         if (!nid) {
             /*
              * zero nodeid is the same as "not found",
@@ -849,8 +842,7 @@
                                  dvp,
                                  &vp,
                                  cnp,
-                                 IFTOVT(fattr->mode),
-                                 size);
+                                 IFTOVT(fattr->mode));
             if (err) {
                 goto out;
             }
@@ -888,8 +880,7 @@
                                  dvp,
                                  &vp,
                                  cnp,
-                                 IFTOVT(fattr->mode),
-                                 size);
+                                 IFTOVT(fattr->mode));
             if (err) {
                 goto out;
             }
@@ -913,8 +904,7 @@
                                  NULL,
                                  &vp,
                                  cnp,
-                                 IFTOVT(fattr->mode),
-                                 0);
+                                 IFTOVT(fattr->mode));
             vn_lock(dvp, ltype | LK_RETRY);
             vref(vp);
             *vpp = vp;
@@ -927,8 +917,7 @@
                                  dvp,
                                  &vp,
                                  cnp,
-                                 IFTOVT(fattr->mode),
-                                 size);
+                                 IFTOVT(fattr->mode));
             if (err) {
                 goto out;
             }

From owner-p4-projects@FreeBSD.ORG  Tue Jul 26 06:10:34 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B8B001065674; Tue, 26 Jul 2011 06:10: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 6D31B1065670
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:10:34 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 596938FC0A
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:10:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6Q6AYFO042712
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:10:34 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6Q6AYYw042706
	for perforce@freebsd.org; Tue, 26 Jul 2011 06:10:34 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Tue, 26 Jul 2011 06:10:34 GMT
Message-Id: <201107260610.p6Q6AYYw042706@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196726 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 26 Jul 2011 06:10:35 -0000

http://p4web.freebsd.org/@@196726?ac=10

Change 196726 by ilya@ilya_triton2011 on 2011/07/26 06:10:12

	Cache file size in kernel, add sysctls to delay resize and force
	size refresh.
	
	Don't invalidate cached attributes in read*
	
	Only flush cache, don't invalidate buffers if vnode inactive.
	Add data_cache_invalidate sysctl to change action

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#20 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#11 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#21 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#20 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#44 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#20 (text+ko) ====

@@ -99,6 +99,7 @@
             DEBUG("direct write of vnode %ju via file handle %ju\n",
                 (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id);
             err = fuse_write_directbackend(vp, uio, cred, fufh);
+	    fuse_invalidate_attr(vp);
         } else {
             DEBUG("buffered write of vnode %ju\n", (uintmax_t)VTOILLU(vp));
             err = fuse_write_biobackend(vp, uio, cred, fufh);
@@ -108,8 +109,6 @@
         panic("uninterpreted mode passed to fuse_io_dispatch");
     }
 
-    fuse_invalidate_attr(vp);
-
     return (err);
 }
 
@@ -301,7 +300,7 @@
         }
 
         uio->uio_resid += diff;
-        uio->uio_offset -= diff; 
+        uio->uio_offset -= diff;
         if (uio->uio_offset > fvdat->filesize)
             fuse_vnode_setsize(vp, cred, uio->uio_offset);
     }
@@ -373,7 +372,7 @@
             if (bp != NULL) {
                 long save;
 
-                err = fuse_vnode_extend(vp, cred, uio->uio_offset + n);
+                err = fuse_vnode_setsize(vp, cred, uio->uio_offset + n);
                 if (err) {
                     brelse(bp);
                     break;
@@ -399,7 +398,7 @@
             DEBUG("getting block from OS, bcount %d\n", bcount);
             bp = getblk(vp, lbn, bcount, PCATCH, 0, 0);
             if (bp && uio->uio_offset + n > fvdat->filesize) {
-                err = fuse_vnode_extend(vp, cred, uio->uio_offset + n);
+                err = fuse_vnode_setsize(vp, cred, uio->uio_offset + n);
                 if (err) {
                     brelse(bp);
                     break;
@@ -538,6 +537,9 @@
             break;
     } while (uio->uio_resid > 0 && n > 0);
 
+    if (fuse_sync_resize && (fvdat->flag & FN_SIZECHANGE) != 0)
+	    fuse_vnode_savesize(vp, cred);
+
     return (err);
 }
 
@@ -668,6 +670,18 @@
     return (error);
 }
 
+int
+fuse_io_flushbuf(struct vnode *vp, int waitfor, struct thread *td)
+{
+	struct vop_fsync_args a = {
+		.a_vp = vp,
+		.a_waitfor = waitfor,
+		.a_td = td,
+	};
+
+	return (vop_stdfsync(&a));
+}
+
 /*
  * Flush and invalidate all dirty buffers. If another process is already
  * doing the flush, just wait for completion.

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#11 (text+ko) ====

@@ -4,6 +4,7 @@
 int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag,
     struct ucred *cred);
 int fuse_io_strategy(struct vnode *vp, struct buf *bp);
+int fuse_io_flushbuf(struct vnode *vp, int waitfor, struct thread *td);
 int fuse_io_invalbuf(struct vnode *vp, struct thread *td);
 
 #endif /* _FUSE_IO_H_ */

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#21 (text+ko) ====

@@ -49,10 +49,22 @@
 SYSCTL_INT(_vfs_fuse, OID_AUTO, data_cache_enable, CTLFLAG_RW,
            &fuse_data_cache_enable, 0, "");
 
+int fuse_data_cache_invalidate = 0;
+SYSCTL_INT(_vfs_fuse, OID_AUTO, data_cache_invalidate, CTLFLAG_RW,
+           &fuse_data_cache_invalidate, 0, "");
+
 int fuse_mmap_enable = 1;
 SYSCTL_INT(_vfs_fuse, OID_AUTO, mmap_enable, CTLFLAG_RW,
            &fuse_mmap_enable, 0, "");
 
+int fuse_refresh_size = 0;
+SYSCTL_INT(_vfs_fuse, OID_AUTO, refresh_size, CTLFLAG_RW,
+           &fuse_refresh_size, 0, "");
+
+int fuse_sync_resize = 1;
+SYSCTL_INT(_vfs_fuse, OID_AUTO, sync_resize, CTLFLAG_RW,
+           &fuse_sync_resize, 0, "");
+
 static void
 fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat,
     uint64_t nodeid, enum vtype vtyp)
@@ -224,18 +236,17 @@
 }
 
 int
-fuse_vnode_extend(struct vnode *vp, struct ucred *cred, off_t newsize)
+fuse_vnode_savesize(struct vnode *vp, struct ucred *cred)
 {
+    struct fuse_vnode_data *fvdat = VTOFUD(vp);
     struct thread *td = curthread;
     struct fuse_filehandle *fufh = NULL;
     struct fuse_dispatcher  fdi;
     struct fuse_setattr_in *fsai;
     int err = 0;
 
-    DEBUG("inode=%jd oldsize=%jd newsize=%jd\n",
-        VTOI(vp), VTOFUD(vp)->filesize, newsize);
+    DEBUG("inode=%jd size=%jd\n", VTOI(vp), fvdat->filesize);
     ASSERT_VOP_ELOCKED(vp, "fuse_io_extend");
-    MPASS(newsize > VTOFUD(vp)->filesize);
 
     if (fuse_isdeadfs(vp)) {
         return EBADF;
@@ -259,7 +270,7 @@
     fsai->valid = 0;
 
     // Truncate to a new value.
-    fsai->size = newsize;
+    fsai->size = fvdat->filesize;
     fsai->valid |= FATTR_SIZE;
 
     fuse_filehandle_getrw(vp, FUFH_WRONLY, &fufh);
@@ -270,11 +281,10 @@
 
     err = fdisp_wait_answ(&fdi);
     fdisp_destroy(&fdi);
+    if (err == 0)
+	    fvdat->flag &= ~FN_SIZECHANGE;
 
     fuse_invalidate_attr(vp);
-    if (!err) {
-        fuse_vnode_setsize(vp, cred, newsize);
-    }
 
     return err;
 }
@@ -282,20 +292,25 @@
 void
 fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred)
 {
+
+    struct fuse_vnode_data *fvdat = VTOFUD(vp);
     struct vattr va;
 
-    if (fuse_isvalid_attr(vp))
+    if ((fvdat->flag & FN_SIZECHANGE) != 0 ||
+        (fuse_refresh_size == 0 && fvdat->filesize != 0) ||
+	fuse_isvalid_attr(vp))
         return;
 
     VOP_GETATTR(vp, &va, cred);
     DEBUG("refreshed file size: %jd\n", VTOFUD(vp)->filesize);
 }
 
-void
+int
 fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize)
 {
     struct fuse_vnode_data *fvdat = VTOFUD(vp);
     off_t oldsize;
+    int err = 0;
 
     DEBUG("inode=%jd oldsize=%jd newsize=%jd\n",
         VTOI(vp), fvdat->filesize, newsize);
@@ -303,11 +318,14 @@
 
     oldsize = fvdat->filesize;
     fvdat->filesize = newsize;
+    fvdat->flag |= FN_SIZECHANGE;
 
     if (newsize < oldsize) {
-        vtruncbuf(vp, cred, curthread, newsize, fuse_iosize(vp));
+        err = vtruncbuf(vp, cred, curthread, newsize, fuse_iosize(vp));
     }
 
     vnode_pager_setsize(vp, newsize);
     fuse_invalidate_attr(vp);
+
+    return err;
 }

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#20 (text+ko) ====

@@ -14,6 +14,7 @@
 #define FN_REVOKED           0x00000020
 #define FN_FLUSHINPROG       0x00000040
 #define FN_FLUSHWANT         0x00000080
+#define FN_SIZECHANGE        0x00000100
 
 struct fuse_vnode_data {
     /** self **/
@@ -47,7 +48,9 @@
 
 extern struct vop_vector fuse_vnops;
 extern int fuse_data_cache_enable;
+extern int fuse_data_cache_invalidate;
 extern int fuse_mmap_enable;
+extern int fuse_sync_resize;
 
 static __inline__
 void
@@ -94,10 +97,10 @@
                      int32_t fuse_open_flags,
                      struct thread *td);
 
-int fuse_vnode_extend(struct vnode *vp, struct ucred *cred, off_t newsize);
+void fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred);
 
-void fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred);
+int fuse_vnode_savesize(struct vnode *vp, struct ucred *cred);
 
-void fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize);
+int fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize);
 
 #endif /* _FUSE_NODE_H_ */

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#44 (text+ko) ====

@@ -204,6 +204,7 @@
 fuse_vnop_close(struct vop_close_args *ap)
 {
     struct vnode *vp      = ap->a_vp;
+    struct ucred *cred    = ap->a_cred;
     int           fflag   = ap->a_fflag;
     int isdir = (vnode_isdir(vp)) ? 1 : 0;
     fufh_type_t fufh_type;
@@ -234,6 +235,10 @@
                 fufh_type, fflag);
     }
 
+    if ((VTOFUD(vp)->flag & FN_SIZECHANGE) != 0) {
+        fuse_vnode_savesize(vp, cred);
+    }
+
     return 0;
 }
 
@@ -445,6 +450,7 @@
     struct vattr      *vap     = ap->a_vap;
     struct ucred      *cred    = ap->a_cred;
     struct thread     *td      = curthread;
+    struct fuse_vnode_data *fvdat = VTOFUD(vp);
 
     int err = 0;
     int dataflags;
@@ -461,7 +467,10 @@
         if (vap != VTOVA(vp)) {
             memcpy(vap, VTOVA(vp), sizeof(*vap));
         }
-        debug_printf("fuse_getattr a: returning 0\n");
+        if ((fvdat->flag & FN_SIZECHANGE) != 0) {
+            vap->va_size = fvdat->filesize;
+        }
+        debug_printf("return cached: inode=%jd\n", VTOI(vp));
         return 0;
     }
 
@@ -493,13 +502,14 @@
     if (vap != VTOVA(vp)) {
         memcpy(vap, VTOVA(vp), sizeof(*vap));
     }
+    if ((fvdat->flag & FN_SIZECHANGE) != 0)
+        vap->va_size = fvdat->filesize;
 
-    if (vnode_isreg(vp)) {
+    if (vnode_isreg(vp) && (fvdat->flag & FN_SIZECHANGE) == 0) {
         /*
          * This is for those cases when the file size changed without us
          * knowing, and we want to catch up.
          */
-        struct fuse_vnode_data *fvdat = VTOFUD(vp);
         off_t new_filesize = ((struct fuse_attr_out *)fdi.answ)->attr.size;
 
         if (fvdat->filesize != new_filesize) {
@@ -536,16 +546,22 @@
     struct fuse_vnode_data *fvdat = VTOFUD(vp);
     struct fuse_filehandle *fufh = NULL;
 
-    int type, need_invalbuf = 1;
+    int type, need_flush = 1;
 
     DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp));
 
     for (type = 0; type < FUFH_MAXTYPE; type++) {
         fufh = &(fvdat->fufh[type]);
         if (FUFH_IS_VALID(fufh)) {
-            if (need_invalbuf) {
-                fuse_io_invalbuf(vp, td);
-                need_invalbuf = 0;
+            if (need_flush) {
+                if ((VTOFUD(vp)->flag & FN_SIZECHANGE) != 0) {
+                    fuse_vnode_savesize(vp, NULL);
+                }
+                if (fuse_data_cache_invalidate)
+                    fuse_io_invalbuf(vp, td);
+                else
+                    fuse_io_flushbuf(vp, MNT_WAIT, td);
+                need_flush = 0;
             }
             fuse_filehandle_close(vp, type, td, NULL, FUSE_OP_BACKGROUNDED);
         }
@@ -1104,7 +1120,7 @@
     err = fuse_internal_newentry(dvp, vpp, cnp, FUSE_MKNOD, &fmni,
                                  sizeof(fmni), vap->va_type);
 
-    if (err== 0) {
+    if (err == 0) {
         fuse_invalidate_attr(dvp);
     }
 
@@ -1247,8 +1263,6 @@
             FUSE_OP_FOREGROUNDED);
     }
 
-    fuse_invalidate_attr(vp);
-
     return err;
 }
 
@@ -1295,8 +1309,6 @@
         err = uiomove(fdi.answ, fdi.iosize, uio);
     }
 
-    fuse_invalidate_attr(vp);
-
 out:
     fdisp_destroy(&fdi);
     return err;
@@ -1655,6 +1667,7 @@
     if (!err && sizechanged) {
         fuse_invalidate_attr(vp);
         fuse_vnode_setsize(vp, cred, newsize);
+        VTOFUD(vp)->flag &= ~FN_SIZECHANGE;
     }
 
     return err;

From owner-p4-projects@FreeBSD.ORG  Tue Jul 26 06:11:40 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28D841065673; Tue, 26 Jul 2011 06:11:40 +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 C69B4106566B
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:11:39 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B31B58FC14
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:11:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6Q6BdDb043958
	for <perforce@FreeBSD.org>; Tue, 26 Jul 2011 06:11:39 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6Q6BdxD043955
	for perforce@freebsd.org; Tue, 26 Jul 2011 06:11:39 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Tue, 26 Jul 2011 06:11:39 GMT
Message-Id: <201107260611.p6Q6BdxD043955@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196727 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 26 Jul 2011 06:11:40 -0000

http://p4web.freebsd.org/@@196727?ac=10

Change 196727 by ilya@ilya_triton2011 on 2011/07/26 06:11:21

	Fix fuse device and file system data free race.
	
	Fix typo that could result in panic

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#14 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#15 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#16 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#24 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#14 (text+ko) ====

@@ -87,8 +87,8 @@
 
 	FUSE_LOCK();
 	if (fuse_get_devdata(dev)) {
+		fdata_trydestroy(fdata);
 		FUSE_UNLOCK();
-		fdata_destroy(fdata);
 		goto busy;
 	} else {
 		fdata->dataflags |= FSESS_OPENED;
@@ -108,48 +108,37 @@
 fuse_device_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
 	struct fuse_data *data;
+	struct fuse_ticket *tick;
 
-	FUSE_LOCK();
 	data = fuse_get_devdata(dev);
-	if (! data)
+	if (!data)
 		panic("no fuse data upon fuse device close");
 	KASSERT(data->dataflags | FSESS_OPENED,
 	        ("fuse device is already closed upon close"));
 	fdata_set_dead(data);
+
+	FUSE_LOCK();
         data->dataflags &= ~FSESS_OPENED;
+
 	fuse_lck_mtx_lock(data->aw_mtx);
-
 	/* wakup poll()ers */
 	selwakeuppri(&data->ks_rsel, PZERO + 1);
+	/* Don't let syscall handlers wait in vain */
+	while ((tick = fuse_aw_pop(data))) {
+		fuse_lck_mtx_lock(tick->tk_aw_mtx);
+		fticket_set_answered(tick);
+		tick->tk_aw_errno = ENOTCONN;
+		wakeup(tick);
+		fuse_lck_mtx_unlock(tick->tk_aw_mtx);
+		FUSE_ASSERT_AW_DONE(tick);
+		fuse_ticket_drop(tick);
+	}
+	fuse_lck_mtx_unlock(data->aw_mtx);
 
-	DEBUG("mntco %d\n", data->mntco);
-	if (data->mntco > 0) {
-		struct fuse_ticket *tick;
-
-		/* Don't let syscall handlers wait in vain */
-		while ((tick = fuse_aw_pop(data))) {
-			fuse_lck_mtx_lock(tick->tk_aw_mtx);
-			fticket_set_answered(tick);
-			tick->tk_aw_errno = ENOTCONN;
-			wakeup(tick);
-			fuse_lck_mtx_unlock(tick->tk_aw_mtx);
-			fuse_lck_mtx_unlock(data->aw_mtx);
-			FUSE_ASSERT_AW_DONE(tick);
-			fuse_ticket_drop(tick);
-			fuse_lck_mtx_lock(data->aw_mtx);
-		}
-		fuse_lck_mtx_unlock(data->aw_mtx);
-
-		FUSE_UNLOCK();
-		goto out;
-	}
 	dev->si_drv1 = NULL;
-	fuse_lck_mtx_unlock(data->aw_mtx);
+	fdata_trydestroy(data);
 	FUSE_UNLOCK();
 
-	fdata_destroy(data);
-
-out:
 	DEBUG("%s: device closed by thread %d.\n", dev->si_name, td->td_tid);
 	return(0);
 }

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#15 (text+ko) ====

@@ -341,14 +341,11 @@
 
     data = malloc(sizeof(struct fuse_data), M_FUSEMSG, M_WAITOK | M_ZERO);
 
-    data->mpri = FM_NOMOUNTED;
     data->fdev = fdev;
-    data->dataflags = 0;
     mtx_init(&data->ms_mtx, "fuse message list mutex", NULL, MTX_DEF);
     STAILQ_INIT(&data->ms_head);
     mtx_init(&data->aw_mtx, "fuse answer list mutex", NULL, MTX_DEF);
     TAILQ_INIT(&data->aw_head);
-    data->ticketer = 0;
     data->daemoncred = crhold(cred);
     data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT;
 
@@ -360,9 +357,23 @@
 }
 
 void
-fdata_destroy(struct fuse_data *data)
+fdata_trydestroy(struct fuse_data *data)
 {
-    debug_printf("data=%p, destroy.mntco = %d\n", data, data->mntco);
+    DEBUG("data=%p data.mp=%p data.fdev=%p data.flags=%04x\n",
+	data, data->mp, data->fdev, data->dataflags);
+
+    if (data->mp != NULL) {
+        MPASS(data->mp->mnt_data == data);
+        return;
+    }
+
+    if (data->fdev->si_drv1 != NULL) {
+        MPASS(data->fdev->si_drv1 == data);
+        return;
+    }
+
+    DEBUG("destroy: data=%p\n", data);
+    MPASS((data->dataflags & FSESS_OPENED) == 0);
 
     /* Driving off stage all that stuff thrown at device... */
     mtx_destroy(&data->ms_mtx);
@@ -381,19 +392,18 @@
 {
     debug_printf("data=%p\n", data);
 
-    fuse_lck_mtx_lock(data->ms_mtx);
+    FUSE_LOCK();
     if (fdata_get_dead(data)) {
-        fuse_lck_mtx_unlock(data->ms_mtx);
+        FUSE_UNLOCK();
         return;
     }
 
+    fuse_lck_mtx_lock(data->ms_mtx);
     data->dataflags |= FSESS_DEAD;
     wakeup_one(data);
     selwakeuppri(&data->ks_rsel, PZERO + 1);
+    wakeup(&data->ticketer);
     fuse_lck_mtx_unlock(data->ms_mtx);
-
-    FUSE_LOCK();
-    wakeup(&data->ticketer);
     FUSE_UNLOCK();
 }
 

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#16 (text+ko) ====

@@ -127,8 +127,6 @@
     struct cdev               *fdev;
     struct mount              *mp;
     struct vnode              *vroot;
-    enum mountpri              mpri;
-    int                        mntco;
     struct ucred              *daemoncred;
     int                        dataflags;
 
@@ -179,15 +177,14 @@
 struct fuse_data *
 fuse_get_devdata(struct cdev *fdev)
 {
-	return (fdev->si_drv1);
+    return fdev->si_drv1;
 }
 
 static __inline__
 struct fuse_data *
 fuse_get_mpdata(struct mount *mp)
 {
-    struct fuse_data *data = mp->mnt_data;
-    return (data->mpri == FM_PRIMARY ? data : NULL);
+    return mp->mnt_data;
 }
 
 static __inline__
@@ -251,7 +248,7 @@
 {
     struct fuse_ticket *ftick = NULL;
 
-    mtx_assert(&ftick->tk_data->aw_mtx, MA_OWNED);
+    mtx_assert(&data->aw_mtx, MA_OWNED);
 
     if ((ftick = TAILQ_FIRST(&data->aw_head))) {
         fuse_aw_remove(ftick);
@@ -276,7 +273,7 @@
 }
 
 struct fuse_data *fdata_alloc(struct cdev *dev, struct ucred *cred);
-void fdata_destroy(struct fuse_data *data);
+void fdata_trydestroy(struct fuse_data *data);
 void fdata_set_dead(struct fuse_data *data);
 
 static __inline__

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#24 (text+ko) ====

@@ -72,58 +72,18 @@
 
 MALLOC_DEFINE(M_FUSEVFS, "fuse_filesystem", "buffer for fuse vfs layer");
 
-#define FUSE_FLAGOPT(fnam, fval) do {				\
-    vfs_flagopt(opts, #fnam, &mntopts, fval);		\
-    vfs_flagopt(opts, "__" #fnam, &__mntopts, fval);	\
-} while (0)
-
 static int
-fuse_vfsop_mount(struct mount *mp)
+fuse_getdevice(const char *fspec, struct thread *td, struct cdev **fdevp)
 {
-    int err     = 0;
-    int mntopts = 0;
-    int __mntopts = 0;
-    int max_read_set = 0;
-    uint32_t max_read = ~0;
-    int daemon_timeout;
-
-    size_t len;
-
+    struct nameidata nd, *ndp = &nd;
+    struct vnode *devvp;
     struct cdev *fdev;
-    struct fuse_data *data;
-    struct thread *td = curthread;
-    char *fspec, *subtype = NULL;
-    struct vnode *devvp;
-    struct vfsoptlist *opts;
-    struct nameidata nd, *ndp = &nd;
-
-    fuse_trace_printf_vfsop();
-
-    if (mp->mnt_flag & MNT_UPDATE)
-        return EOPNOTSUPP;
-
-    mp->mnt_flag |= MNT_SYNCHRONOUS; 
-    /* Get the new options passed to mount */
-    opts = mp->mnt_optnew;
-
-    if (!opts)
-        return EINVAL;
-
-    /* `fspath' contains the mount point (eg. /mnt/fuse/sshfs); REQUIRED */
-    if (!vfs_getopts(opts, "fspath", &err))
-        return err;
-
-    /* `from' contains the device name (eg. /dev/fuse0); REQUIRED */
-    fspec = vfs_getopts(opts, "from", &err);
-    if (!fspec)
-        return err;
-
-    mp->mnt_data = NULL;
+    int err;
 
     /*
      * Not an update, or updating the name: look up the name
      * and verify that it refers to a sensible disk device.
-     */ 
+     */
 
     NDINIT(ndp, LOOKUP, FOLLOW, UIO_SYSSPACE, fspec, td);
     if ((err = namei(ndp)) != 0)
@@ -155,11 +115,12 @@
          */
 #ifdef MAC
         err = mac_check_vnode_open(td->td_ucred, devvp, VREAD|VWRITE);
-        if (! err)
+        if (!err)
 #endif
             err = VOP_ACCESS(devvp, VREAD|VWRITE, td->td_ucred, td);
         if (err) {
             vrele(devvp);
+            dev_rel(fdev);
             return err;
         }
     }
@@ -170,25 +131,67 @@
      */
     vrele(devvp);
 
-    FUSE_LOCK();
     if (!fdev->si_devsw ||
         strcmp("fuse", fdev->si_devsw->d_name)) {
-        FUSE_UNLOCK();
+        dev_rel(fdev);
         return ENXIO;
     }
 
-    data = fuse_get_devdata(fdev);
-    if (data && data->dataflags & FSESS_OPENED) {
-        data->mntco++;
-        debug_printf("a.inc:mntco = %d\n", data->mntco);
-    } else {
-        FUSE_UNLOCK();
-        dev_rel(fdev);
-        return ENXIO;
-    }	
-    FUSE_UNLOCK();
+    *fdevp = fdev;
+
+    return 0;
+}
+
+#define FUSE_FLAGOPT(fnam, fval) do {				\
+    vfs_flagopt(opts, #fnam, &mntopts, fval);		\
+    vfs_flagopt(opts, "__" #fnam, &__mntopts, fval);	\
+} while (0)
+
+static int
+fuse_vfsop_mount(struct mount *mp)
+{
+    int err     = 0;
+    int mntopts = 0;
+    int __mntopts = 0;
+    int max_read_set = 0;
+    uint32_t max_read = ~0;
+    int daemon_timeout;
+
+    size_t len;
+
+    struct cdev *fdev;
+    struct fuse_data *data;
+    struct thread *td = curthread;
+    char *fspec, *subtype = NULL;
+    struct vfsoptlist *opts;
+
+    fuse_trace_printf_vfsop();
+
+    if (mp->mnt_flag & MNT_UPDATE)
+        return EOPNOTSUPP;
+
+    mp->mnt_flag |= MNT_SYNCHRONOUS;
+    mp->mnt_data = NULL;
+    /* Get the new options passed to mount */
+    opts = mp->mnt_optnew;
+
+    if (!opts)
+        return EINVAL;
+
+    /* `fspath' contains the mount point (eg. /mnt/fuse/sshfs); REQUIRED */
+    if (!vfs_getopts(opts, "fspath", &err))
+        return err;
+
+    /* `from' contains the device name (eg. /dev/fuse0); REQUIRED */
+    fspec = vfs_getopts(opts, "from", &err);
+    if (!fspec)
+        return err;
+
+    err = fuse_getdevice(fspec, td, &fdev);
+    if (err != 0)
+        return err;
 
-    /* 
+    /*
      * With the help of underscored options the mount program
      * can inform us from the flags it sets by default
      */
@@ -215,40 +218,52 @@
     subtype = vfs_getopts(opts, "subtype=", &err);
     err = 0;
 
-    if (fdata_get_dead(data))
-        err = ENOTCONN;
-    if (mntopts & FSESS_DAEMON_CAN_SPY)
-        err = priv_check(td, PRIV_VFS_FUSE_ALLOWOTHER);
-
     DEBUG2G("mntopts 0x%x\n", mntopts);
 
-    /* Sanity + permission checks */ 
+    FUSE_LOCK();
+    data = fuse_get_devdata(fdev);
+    if (data == NULL || data->mp != NULL ||
+        (data->dataflags & FSESS_OPENED) == 0) {
+        DEBUG("invalid or not opened device: data=%p data.mp=%p\n",
+	    data, data != NULL ? data->mp : NULL);
+        err = ENXIO;
+        FUSE_UNLOCK();
+        goto out;
+    } else {
+        DEBUG("set mp: data=%p mp=%p\n", data, mp);
+        data->mp = mp;
+    }
+    if (fdata_get_dead(data)) {
+        DEBUG("device is dead during mount: data=%p\n", data);
+        err = ENOTCONN;
+        FUSE_UNLOCK();
+        goto out;
+    }
 
+    /* Sanity + permission checks */
     if (!data->daemoncred)
         panic("fuse daemon found, but identity unknown");
-
-    MPASS(data->mpri != FM_PRIMARY);
-    if (td->td_ucred->cr_uid != data->daemoncred->cr_uid)
+    if (mntopts & FSESS_DAEMON_CAN_SPY)
+        err = priv_check(td, PRIV_VFS_FUSE_ALLOWOTHER);
+    if (err == 0 && td->td_ucred->cr_uid != data->daemoncred->cr_uid)
         /* are we allowed to do the first mount? */
         err = priv_check(td, PRIV_VFS_FUSE_MOUNT_NONUSER);
-
     if (err) {
+        FUSE_UNLOCK();
         goto out;
     }
 
     /* We need this here as this slot is used by getnewvnode() */
     mp->mnt_stat.f_iosize = PAGE_SIZE;
-
     mp->mnt_data = data;
-
     data->mp = mp;
-    data->mpri = FM_PRIMARY;
     data->dataflags |= mntopts;
     data->max_read = max_read;
 #ifdef XXXIP
     if (!priv_check(td, PRIV_VFS_FUSE_SYNC_UNMOUNT))
         data->dataflags |= FSESS_CAN_SYNC_UNMOUNT;
 #endif
+    FUSE_UNLOCK();
 
     vfs_getnewfsid(mp);	
     mp->mnt_flag |= MNT_LOCAL;
@@ -266,11 +281,13 @@
 
 out:
     if (err) {
-        data->mntco--;
         FUSE_LOCK();
-        if (data->mntco == 0 && ! (data->dataflags & FSESS_OPENED)) {
-            fdev->si_drv1 = NULL;
-            fdata_destroy(data);
+        if (data->mp == mp) {
+            /* Destroy device only if we acquired reference to it */
+            DEBUG("mount failed, destroy device: data=%p mp=%p err=%d\n",
+                data, mp, err);
+            data->mp = NULL;
+            fdata_trydestroy(data);
         }
         FUSE_UNLOCK();
         dev_rel(fdev);
@@ -328,15 +345,10 @@
     fdata_set_dead(data);
 
 alreadydead:
-    data->mpri = FM_NOMOUNTED;
-    data->mntco--;
-
     FUSE_LOCK();
+    data->mp = NULL;
     fdev = data->fdev;
-    if (data->mntco == 0 && !(data->dataflags & FSESS_OPENED)) {
-        data->fdev->si_drv1 = NULL;
-        fdata_destroy(data);
-    }
+    fdata_trydestroy(data);
     FUSE_UNLOCK();
 
     MNT_ILOCK(mp);
@@ -347,7 +359,7 @@
     dev_rel(fdev);
 
     return 0;
-}        
+}
 
 static int
 fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp)

From owner-p4-projects@FreeBSD.ORG  Tue Jul 26 18:16:56 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69BCA1065672; Tue, 26 Jul 2011 18:16:56 +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 2B0F2106566C
	for <perforce@freebsd.org>; Tue, 26 Jul 2011 18:16:56 +0000 (UTC)
	(envelope-from peter@wemm.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 174788FC15
	for <perforce@freebsd.org>; Tue, 26 Jul 2011 18:16:56 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6QIGtXE090830
	for <perforce@freebsd.org>; Tue, 26 Jul 2011 18:16:55 GMT
	(envelope-from peter@wemm.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6QIGtXr090827
	for perforce@freebsd.org; Tue, 26 Jul 2011 18:16:55 GMT
	(envelope-from peter@wemm.org)
Date: Tue, 26 Jul 2011 18:16:55 GMT
Message-Id: <201107261816.p6QIGtXr090827@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	peter@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196751 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 26 Jul 2011 18:16:56 -0000

http://p4web.freebsd.org/@@196751?ac=10

Change 196751 by peter@peter_daintree on 2011/07/26 18:16:00

	IFC @196750

Affected files ...

.. //depot/projects/hammer/sbin/mount/mount.c#42 integrate
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/FARSI%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GREEK%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/INUIT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/THAI%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25FARSI.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GREEK.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25INUIT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25THAI.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP037%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP038%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10000%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10006%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10007%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10029%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1006%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10079%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP10081%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1026%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1046%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1124%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1125%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1129%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1131%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1133%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1161%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1162%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1163%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1250%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1251%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1252%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1253%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1254%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1255%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1256%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1257%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP1258%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP273%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP274%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP275%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP277%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP278%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP280%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP281%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP284%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP285%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP290%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP297%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP420%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP423%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP424%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP437%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP500%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP737%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP775%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP850%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP851%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP852%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP853%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP855%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP856%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP857%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP858%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP860%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP861%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP862%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP863%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP864%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP865%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP866%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP868%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP869%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP870%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP871%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP874%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP875%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP880%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP891%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP903%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP904%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP905%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP918%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP922%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP932UDA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP936EXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP942EXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP949EXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/CP950%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP037.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP038.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10000.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10006.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10007.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10029.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1006.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10079.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10081.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1026.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1046.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1124.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1125.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1129.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1131.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1133.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1161.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1162.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1163.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1250.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1251.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1252.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1253.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1254.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1255.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1256.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1257.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1258.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP273.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP274.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP275.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP277.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP278.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP280.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP281.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP284.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP285.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP290.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP297.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP420.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP423.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP424.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP437.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP500.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP737.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP775.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP850.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP851.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP852.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP853.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP855.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP856.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP857.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP858.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP860.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP861.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP862.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP863.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP864.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP865.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP866.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP868.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP869.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP870.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP871.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP874.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP875.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP880.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP891.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP903.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP904.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP905.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP918.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP922.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP932UDA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP936EXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP942EXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP949EXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP950.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB12345%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GBKEXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/GBKUDA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB12345.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKEXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKUDA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI7%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI7.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/JOHAB%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25JOHAB.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/ATARIST%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/DECMCS%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/TDS565%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25ATARIST.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25DECMCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25TDS565.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25VISCII.src#5 branch
.. //depot/projects/hammer/share/i18n/csmapper/TCVN/VISCII%25UCS.src#5 branch
.. //depot/projects/hammer/sys/boot/forth/loader.conf#58 integrate
.. //depot/projects/hammer/sys/conf/NOTES#178 integrate
.. //depot/projects/hammer/sys/conf/newvers.sh#32 integrate
.. //depot/projects/hammer/sys/conf/options#156 integrate
.. //depot/projects/hammer/sys/fs/cd9660/iso.h#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#16 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#10 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#10 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#58 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#68 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#114 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#154 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ether.c#41 integrate
.. //depot/projects/hammer/sys/netgraph/ng_mppc.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_parse.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/aim/locore32.S#4 integrate
.. //depot/projects/hammer/sys/sys/mount.h#71 integrate
.. //depot/projects/hammer/sys/sys/systm.h#73 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#71 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#97 integrate
.. //depot/projects/hammer/sys/ufs/ufs/inode.h#21 integrate

Differences ...

==== //depot/projects/hammer/sbin/mount/mount.c#42 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.113 2011/06/07 18:48:49 delphij Exp $");
+__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.114 2011/07/24 18:27:09 mckusick Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -109,6 +109,7 @@
 	{ MNT_NOCLUSTERW,	"noclusterw" },
 	{ MNT_SUIDDIR,		"suiddir" },
 	{ MNT_SOFTDEP,		"soft-updates" },
+	{ MNT_SUJ,		"journaled soft-updates" },
 	{ MNT_MULTILABEL,	"multilabel" },
 	{ MNT_ACLS,		"acls" },
 	{ MNT_NFS4ACLS,		"nfsv4acls" },
@@ -316,7 +317,7 @@
 	rval = 0;
 	switch (argc) {
 	case 0:
-		if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)
+		if ((mntsize = getmntinfo(&mntbuf, MNT_WAIT)) == 0)
 			err(1, "getmntinfo");
 		if (all) {
 			while ((fs = getfsent()) != NULL) {
@@ -665,7 +666,7 @@
 	struct statfs *mntbuf;
 	int i, mntsize;
 
-	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
+	mntsize = getmntinfo(&mntbuf, MNT_WAIT);
 	for (i = mntsize - 1; i >= 0; i--) {
 		if (strcmp(mntbuf[i].f_mntfromname, name) == 0 ||
 		    strcmp(mntbuf[i].f_mntonname, name) == 0)

==== //depot/projects/hammer/sys/boot/forth/loader.conf#58 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.157 2011/04/13 12:19:03 pluknet Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.158 2011/07/25 21:52:17 rodrigc Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -55,6 +55,11 @@
 #prompt="\\${interpret}"	# Set the command prompt
 #root_disk_unit="0"		# Force the root disk unit number
 #rootdev="disk1s1a"		# Set the root filesystem
+#tftp.blksize="1428"		# Set the RFC 2348 TFTP block size.
+				# If the TFTP server does not support RFC 2348,
+				# the block size is set to 512.  If the value
+				# is out of range ( < 8 || > 9008 ) an error is
+				# returned.
 
 
 ##############################################################

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1617 2011/07/19 00:37:24 attilio Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1618 2011/07/25 09:12:48 avg Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -499,16 +499,6 @@
 options 	REGRESSION
 
 #
-# RESTARTABLE_PANICS allows one to continue from a panic as if it were
-# a call to the debugger to continue from a panic as instead.  It is only
-# useful if a kernel debugger is present.  To restart from a panic, reset
-# the panicstr variable to NULL and continue execution.  This option is
-# for development use only and should NOT be used in production systems
-# to "workaround" a panic.
-#
-#options 	RESTARTABLE_PANICS
-
-#
 # This option lets some drivers co-exist that can't co-exist in a running
 # system.  This is used to be able to compile all kernel code in one go for
 # quality assurance purposes (like this file, which the option takes it name

==== //depot/projects/hammer/sys/conf/newvers.sh#32 (text+ko) ====

@@ -28,11 +28,11 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.93 2011/05/23 19:57:12 ru Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.94 2011/07/26 04:00:00 kensmith Exp $
 
 TYPE="FreeBSD"
 REVISION="9.0"
-BRANCH="CURRENT"
+BRANCH="BETA1"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

==== //depot/projects/hammer/sys/conf/options#156 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.737 2011/07/19 00:37:24 attilio Exp $
+# $FreeBSD: src/sys/conf/options,v 1.738 2011/07/25 09:12:48 avg Exp $
 #
 #        On the handling of kernel options
 #
@@ -579,7 +579,6 @@
 LOCK_PROFILING_FAST	opt_global.h
 MSIZE			opt_global.h
 REGRESSION		opt_global.h
-RESTARTABLE_PANICS	opt_global.h
 RWLOCK_NOINLINE		opt_global.h
 SX_NOINLINE		opt_global.h
 VFS_BIO_DEBUG		opt_global.h

==== //depot/projects/hammer/sys/fs/cd9660/iso.h#3 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD: src/sys/fs/cd9660/iso.h,v 1.33 2007/02/15 22:08:34 pjd Exp $
+ * $FreeBSD: src/sys/fs/cd9660/iso.h,v 1.34 2011/07/24 17:43:09 mckusick Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -220,7 +220,7 @@
 #endif
 
 struct iso_mnt {
-	int im_flags;
+	uint64_t im_flags;
 
 	struct mount *im_mountp;
 	struct cdev *im_dev;

==== //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#16 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.42 2010/10/10 07:05:47 kib Exp $ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.43 2011/07/24 17:43:09 mckusick Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
@@ -103,7 +103,7 @@
 	u_int pm_fatdiv;	/*	offset computation */
 	u_int pm_curfat;	/* current fat for FAT32 (0 otherwise) */
 	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
-	u_int pm_flags;		/* see below */
+	uint64_t pm_flags;	/* see below */
 	void *pm_u2w;	/* Local->Unicode iconv handle */
 	void *pm_w2u;	/* Unicode->Local iconv handle */
 	void *pm_u2d;	/* Unicode->DOS iconv handle */

==== //depot/projects/hammer/sys/fs/ntfs/ntfs.h#10 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.22 2009/12/07 15:15:08 guido Exp $
+ * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.23 2011/07/24 17:43:09 mckusick Exp $
  */
 
 /*#define NTFS_DEBUG 1*/
@@ -250,7 +250,7 @@
 	uid_t           ntm_uid;
 	gid_t           ntm_gid;
 	mode_t          ntm_mode;
-	u_int           ntm_flag;
+	uint64_t	ntm_flag;
 	cn_t		ntm_cfree;
 	struct ntvattrdef *ntm_ad;
 	int		ntm_adnum;

==== //depot/projects/hammer/sys/fs/smbfs/smbfs.h#10 (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/fs/smbfs/smbfs.h,v 1.14 2010/04/07 16:50:38 joel Exp $
+ * $FreeBSD: src/sys/fs/smbfs/smbfs.h,v 1.15 2011/07/24 17:43:09 mckusick Exp $
  */
 #ifndef _SMBFS_SMBFS_H_
 #define _SMBFS_SMBFS_H_
@@ -80,7 +80,7 @@
 	struct mount * 		sm_mp;
 	struct smbnode *	sm_root;
 	struct ucred *		sm_owner;
-	u_int			sm_flags;
+	uint64_t		sm_flags;
 	long			sm_nextino;
 	struct smb_share * 	sm_share;
 /*	struct simplelock	sm_npslock;*/

==== //depot/projects/hammer/sys/kern/kern_jail.c#58 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.146 2011/07/03 12:22:02 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.147 2011/07/24 17:43:09 mckusick Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -540,8 +540,8 @@
 #ifdef INET6
 	int ip6s, redo_ip6;
 #endif
-	unsigned pr_flags, ch_flags;
-	unsigned pr_allow, ch_allow, tallow;
+	uint64_t pr_allow, ch_allow, pr_flags, ch_flags;
+	unsigned tallow;
 	char numbuf[12];
 
 	error = priv_check(td, PRIV_JAIL_SET);

==== //depot/projects/hammer/sys/kern/kern_shutdown.c#68 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.211 2011/06/08 19:28:59 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.212 2011/07/25 09:12:48 avg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kdb.h"
@@ -594,15 +594,6 @@
 		kdb_backtrace();
 	if (debugger_on_panic)
 		kdb_enter(KDB_WHY_PANIC, "panic");
-#ifdef RESTARTABLE_PANICS
-	/* See if the user aborted the panic, in which case we continue. */
-	if (panicstr == NULL) {
-#ifdef SMP
-		atomic_store_rel_int(&panic_cpu, NOCPU);
-#endif
-		return;
-	}
-#endif
 #endif
 	/*thread_lock(td); */
 	td->td_flags |= TDF_INPANIC;

==== //depot/projects/hammer/sys/kern/vfs_mount.c#114 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.334 2011/07/11 05:17:46 ae Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.335 2011/07/24 17:43:09 mckusick Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -1496,7 +1496,8 @@
 }
 
 int
-vfs_flagopt(struct vfsoptlist *opts, const char *name, u_int *w, u_int val)
+vfs_flagopt(struct vfsoptlist *opts, const char *name, uint64_t *w,
+	uint64_t val)
 {
 	struct vfsopt *opt;
 

==== //depot/projects/hammer/sys/kern/vfs_subr.c#154 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.812 2011/06/29 16:40:41 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.813 2011/07/24 18:27:09 mckusick Exp $");
 
 #include "opt_ddb.h"
 #include "opt_watchdog.h"
@@ -2841,6 +2841,7 @@
 	MNT_FLAG(MNT_ASYNC);
 	MNT_FLAG(MNT_SUIDDIR);
 	MNT_FLAG(MNT_SOFTDEP);
+	MNT_FLAG(MNT_SUJ);
 	MNT_FLAG(MNT_NOSYMFOLLOW);
 	MNT_FLAG(MNT_GJOURNAL);
 	MNT_FLAG(MNT_MULTILABEL);
@@ -2866,7 +2867,6 @@
 	MNT_FLAG(MNT_FORCE);
 	MNT_FLAG(MNT_SNAPSHOT);
 	MNT_FLAG(MNT_BYFSID);
-	MNT_FLAG(MNT_SOFTDEP);
 #undef MNT_FLAG
 	if (flags != 0) {
 		if (buf[0] != '\0')
@@ -2894,7 +2894,6 @@
 	MNT_KERN_FLAG(MNTK_REFEXPIRE);
 	MNT_KERN_FLAG(MNTK_EXTENDED_SHARED);
 	MNT_KERN_FLAG(MNTK_SHARED_WRITES);
-	MNT_KERN_FLAG(MNTK_SUJ);
 	MNT_KERN_FLAG(MNTK_UNMOUNT);
 	MNT_KERN_FLAG(MNTK_MWAIT);
 	MNT_KERN_FLAG(MNTK_SUSPEND);

==== //depot/projects/hammer/sys/netgraph/ng_ether.c#41 (text+ko) ====

@@ -39,7 +39,7 @@
  * Authors: Archie Cobbs <archie@freebsd.org>
  *	    Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.80 2011/07/16 19:11:45 zec Exp $
+ * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.81 2011/07/25 09:12:48 avg Exp $
  */
 
 /*
@@ -604,9 +604,6 @@
 	NG_FREE_ITEM(item);
 
 	panic("%s: weird hook", __func__);
-#ifdef RESTARTABLE_PANICS /* so we don't get an error msg in LINT */
-	return (0);
-#endif
 }
 
 /*

==== //depot/projects/hammer/sys/netgraph/ng_mppc.c#15 (text+ko) ====

@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $
- * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.39 2011/04/18 09:12:27 glebius Exp $
+ * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.40 2011/07/25 09:12:48 avg Exp $
  */
 
 /*
@@ -404,9 +404,6 @@
 
 	/* Oops */
 	panic("%s: unknown hook", __func__);
-#ifdef RESTARTABLE_PANICS
-	return (EINVAL);
-#endif
 }
 
 /*

==== //depot/projects/hammer/sys/netgraph/ng_parse.c#14 (text+ko) ====

@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.31 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.32 2011/07/25 09:12:48 avg Exp $
  */
 
 #include <sys/types.h>
@@ -374,9 +374,6 @@
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -473,9 +470,6 @@
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -575,9 +569,6 @@
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -673,9 +664,6 @@
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);

==== //depot/projects/hammer/sys/powerpc/aim/locore32.S#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/powerpc/aim/locore32.S,v 1.4 2011/07/18 15:19:40 attilio Exp $ */
+/* $FreeBSD: src/sys/powerpc/aim/locore32.S,v 1.5 2011/07/25 20:10:01 andreast Exp $ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
@@ -91,13 +91,13 @@
 GLOBAL(intrnames)
 	.space	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 GLOBAL(sintrnames)
-	.word	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+	.long	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 
 	.align 4
 GLOBAL(intrcnt)
 	.space	INTRCNT_COUNT * 4 * 2
 GLOBAL(sintrcnt)
-	.word	INTRCNT_COUNT * 4 * 2
+	.long	INTRCNT_COUNT * 4 * 2
 
 	.text
 	.globl	btext

==== //depot/projects/hammer/sys/sys/mount.h#71 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/sys/mount.h,v 1.257 2011/05/22 01:07:54 rmacklem Exp $
+ * $FreeBSD: src/sys/sys/mount.h,v 1.259 2011/07/24 18:27:09 mckusick Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -166,8 +166,7 @@
 	int		mnt_nvnodelistsize;	/* (i) # of vnodes */
 	int		mnt_writeopcount;	/* (i) write syscalls pending */
 	int		mnt_kern_flag;		/* (i) kernel only flags */
-	u_int		mnt_flag;		/* (i) flags shared with user */
-	u_int		mnt_xflag;		/* (i) more flags shared with user */
+	uint64_t	mnt_flag;		/* (i) flags shared with user */
 	u_int		mnt_noasync;		/* (i) # noasync overrides */
 	struct vfsoptlist *mnt_opt;		/* current mount options */
 	struct vfsoptlist *mnt_optnew;		/* new options passed to fs */
@@ -224,43 +223,44 @@
 /*
  * User specifiable flags, stored in mnt_flag.
  */
-#define	MNT_RDONLY	0x00000001	/* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x00000002	/* filesystem written synchronously */
-#define	MNT_NOEXEC	0x00000004	/* can't exec from filesystem */
-#define	MNT_NOSUID	0x00000008	/* don't honor setuid bits on fs */
-#define	MNT_UNION	0x00000020	/* union with underlying filesystem */
-#define	MNT_ASYNC	0x00000040	/* filesystem written asynchronously */
-#define	MNT_SUIDDIR	0x00100000	/* special handling of SUID on dirs */
-#define	MNT_SOFTDEP	0x00200000	/* soft updates being done */
-#define	MNT_NOSYMFOLLOW	0x00400000	/* do not follow symlinks */
-#define	MNT_GJOURNAL	0x02000000	/* GEOM journal support enabled */
-#define	MNT_MULTILABEL	0x04000000	/* MAC support for individual objects */
-#define	MNT_ACLS	0x08000000	/* ACL support enabled */
-#define	MNT_NOATIME	0x10000000	/* disable update of file access time */
-#define	MNT_NOCLUSTERR	0x40000000	/* disable cluster read */
-#define	MNT_NOCLUSTERW	0x80000000	/* disable cluster write */
-#define	MNT_NFS4ACLS	0x00000010
+#define	MNT_RDONLY	0x0000000000000001ULL /* read only filesystem */
+#define	MNT_SYNCHRONOUS	0x0000000000000002ULL /* fs written synchronously */
+#define	MNT_NOEXEC	0x0000000000000004ULL /* can't exec from filesystem */
+#define	MNT_NOSUID	0x0000000000000008ULL /* don't honor setuid fs bits */
+#define	MNT_NFS4ACLS	0x0000000000000010ULL /* enable NFS version 4 ACLs */
+#define	MNT_UNION	0x0000000000000020ULL /* union with underlying fs */
+#define	MNT_ASYNC	0x0000000000000040ULL /* fs written asynchronously */
+#define	MNT_SUIDDIR	0x0000000000100000ULL /* special SUID dir handling */
+#define	MNT_SOFTDEP	0x0000000000200000ULL /* using soft updates */
+#define	MNT_NOSYMFOLLOW	0x0000000000400000ULL /* do not follow symlinks */
+#define	MNT_GJOURNAL	0x0000000002000000ULL /* GEOM journal support enabled */
+#define	MNT_MULTILABEL	0x0000000004000000ULL /* MAC support for objects */
+#define	MNT_ACLS	0x0000000008000000ULL /* ACL support enabled */
+#define	MNT_NOATIME	0x0000000010000000ULL /* dont update file access time */
+#define	MNT_NOCLUSTERR	0x0000000040000000ULL /* disable cluster read */
+#define	MNT_NOCLUSTERW	0x0000000080000000ULL /* disable cluster write */
+#define	MNT_SUJ		0x0000000100000000ULL /* using journaled soft updates */
 
 /*
  * NFS export related mount flags.
  */
-#define	MNT_EXRDONLY	0x00000080	/* exported read only */
-#define	MNT_EXPORTED	0x00000100	/* filesystem is exported */
-#define	MNT_DEFEXPORTED	0x00000200	/* exported to the world */
-#define	MNT_EXPORTANON	0x00000400	/* use anon uid mapping for everyone */
-#define	MNT_EXKERB	0x00000800	/* exported with Kerberos uid mapping */
-#define	MNT_EXPUBLIC	0x20000000	/* public export (WebNFS) */
+#define	MNT_EXRDONLY	0x0000000000000080ULL	/* exported read only */
+#define	MNT_EXPORTED	0x0000000000000100ULL	/* filesystem is exported */
+#define	MNT_DEFEXPORTED	0x0000000000000200ULL	/* exported to the world */
+#define	MNT_EXPORTANON	0x0000000000000400ULL	/* anon uid mapping for all */
+#define	MNT_EXKERB	0x0000000000000800ULL	/* exported with Kerberos */
+#define	MNT_EXPUBLIC	0x0000000020000000ULL	/* public export (WebNFS) */
 
 /*
  * Flags set by internal operations,
  * but visible to the user.
  * XXX some of these are not quite right.. (I've never seen the root flag set)
  */
-#define	MNT_LOCAL	0x00001000	/* filesystem is stored locally */
-#define	MNT_QUOTA	0x00002000	/* quotas are enabled on filesystem */
-#define	MNT_ROOTFS	0x00004000	/* identifies the root filesystem */
-#define	MNT_USER	0x00008000	/* mounted by a user */
-#define	MNT_IGNORE	0x00800000	/* do not show entry in df */
+#define	MNT_LOCAL	0x0000000000001000ULL /* filesystem is stored locally */
+#define	MNT_QUOTA	0x0000000000002000ULL /* quotas are enabled on fs */
+#define	MNT_ROOTFS	0x0000000000004000ULL /* identifies the root fs */
+#define	MNT_USER	0x0000000000008000ULL /* mounted by a user */
+#define	MNT_IGNORE	0x0000000000800000ULL /* do not show entry in df */
 
 /*
  * Mask of flags that are visible to statfs().
@@ -268,7 +268,7 @@
  * but the 'mount' program may need changing to handle this.
  */
 #define	MNT_VISFLAGMASK	(MNT_RDONLY	| MNT_SYNCHRONOUS | MNT_NOEXEC	| \
-			MNT_NOSUID	| MNT_UNION	| \
+			MNT_NOSUID	| MNT_UNION	| MNT_SUJ	| \
 			MNT_ASYNC	| MNT_EXRDONLY	| MNT_EXPORTED	| \
 			MNT_DEFEXPORTED	| MNT_EXPORTANON| MNT_EXKERB	| \
 			MNT_LOCAL	| MNT_USER	| MNT_QUOTA	| \
@@ -293,12 +293,12 @@
  * XXX: MNT_BYFSID collides with MNT_ACLS, but because MNT_ACLS is only used for
  *      mount(2) and MNT_BYFSID is only used for unmount(2) it's harmless.
  */
-#define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
-#define	MNT_RELOAD	0x00040000	/* reload filesystem data */
-#define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
-#define	MNT_SNAPSHOT	0x01000000	/* snapshot the filesystem */
-#define	MNT_BYFSID	0x08000000	/* specify filesystem by ID. */
+#define	MNT_UPDATE	0x0000000000010000ULL /* not real mount, just update */
+#define	MNT_DELEXPORT	0x0000000000020000ULL /* delete export host lists */
+#define	MNT_RELOAD	0x0000000000040000ULL /* reload filesystem data */
+#define	MNT_FORCE	0x0000000000080000ULL /* force unmount or readonly */
+#define	MNT_SNAPSHOT	0x0000000001000000ULL /* snapshot the filesystem */
+#define	MNT_BYFSID	0x0000000008000000ULL /* specify filesystem by ID. */
 #define MNT_CMDFLAGS   (MNT_UPDATE	| MNT_DELEXPORT	| MNT_RELOAD	| \
 			MNT_FORCE	| MNT_SNAPSHOT	| MNT_BYFSID)
 /*
@@ -325,7 +325,6 @@
 #define	MNTK_REFEXPIRE	0x00000020	/* refcount expiring is happening */
 #define MNTK_EXTENDED_SHARED	0x00000040 /* Allow shared locking for more ops */
 #define	MNTK_SHARED_WRITES	0x00000080 /* Allow shared locking for writes */
-#define	MNTK_SUJ	0x00000100	/* Softdep journaling enabled */
 #define MNTK_UNMOUNT	0x01000000	/* unmount in progress */
 #define	MNTK_MWAIT	0x02000000	/* waiting for unmount to finish */
 #define	MNTK_SUSPEND	0x08000000	/* request write suspension */
@@ -715,7 +714,8 @@
 void	vfs_freeopts(struct vfsoptlist *opts);
 void	vfs_deleteopt(struct vfsoptlist *opts, const char *name);
 int	vfs_buildopts(struct uio *auio, struct vfsoptlist **options);
-int	vfs_flagopt(struct vfsoptlist *opts, const char *name, u_int *w, u_int val);
+int	vfs_flagopt(struct vfsoptlist *opts, const char *name, uint64_t *w,
+	    uint64_t val);
 int	vfs_getopt(struct vfsoptlist *, const char *, void **, int *);
 int	vfs_getopt_pos(struct vfsoptlist *opts, const char *name);
 char	*vfs_getopts(struct vfsoptlist *, const char *, int *error);

==== //depot/projects/hammer/sys/sys/systm.h#73 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD: src/sys/sys/systm.h,v 1.299 2011/07/09 15:21:10 kib Exp $
+ * $FreeBSD: src/sys/sys/systm.h,v 1.300 2011/07/25 09:12:48 avg Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -160,11 +160,7 @@
 void	*phashinit(int count, struct malloc_type *type, u_long *nentries);
 void	g_waitidle(void);
 
-#ifdef RESTARTABLE_PANICS
-void	panic(const char *, ...) __printflike(1, 2);
-#else
 void	panic(const char *, ...) __dead2 __printflike(1, 2);
-#endif
 
 void	cpu_boot(int);
 void	cpu_flush_dcache(void *, size_t);


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

From owner-p4-projects@FreeBSD.ORG  Wed Jul 27 07:33:24 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 128CB1065670; Wed, 27 Jul 2011 07:33:24 +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 BD920106564A
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 07:33:23 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AA9638FC16
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 07:33:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6R7XNBj049265
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 07:33:23 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6R7XNMn049262
	for perforce@freebsd.org; Wed, 27 Jul 2011 07:33:23 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Wed, 27 Jul 2011 07:33:23 GMT
Message-Id: <201107270733.p6R7XNMn049262@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196777 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 27 Jul 2011 07:33:24 -0000

http://p4web.freebsd.org/@@196777?ac=10

Change 196777 by syuu@kikurage on 2011/07/27 07:32:47

	defined macro for tracker

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#19 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#8 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#19 (text+ko) ====

@@ -2107,10 +2107,10 @@
 #endif
 	u_int slen;
 	int gottime;
-	struct rm_priotracker tracker;
+	BPFIF_DEF_TRACKER(if_tracker);
 
 	gottime = BPF_TSTAMP_NONE;
-	BPFIF_RLOCK(bp, &tracker);
+	BPFIF_RLOCK(bp, &if_tracker);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
 		BPFD_LOCK(d);
 		if (d->bd_qmask.qm_enabled) {
@@ -2146,7 +2146,7 @@
 		}
 		BPFD_UNLOCK(d);
 	}
-	BPFIF_RUNLOCK(bp, &tracker);
+	BPFIF_RUNLOCK(bp, &if_tracker);
 }
 
 #define	BPF_CHECK_DIRECTION(d, r, i)				\
@@ -2163,7 +2163,8 @@
 #endif
 	u_int pktlen, slen;
 	int gottime;
-	struct rm_priotracker tracker;
+	BPFIF_DEF_TRACKER(if_tracker);
+	BPFQ_DEF_TRACKER(qm_tracker);
 
 	/* Skip outgoing duplicate packets. */
 	if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) {
@@ -2174,10 +2175,8 @@
 	pktlen = m_length(m, NULL);
 
 	gottime = BPF_TSTAMP_NONE;
-	BPFIF_RLOCK(bp, &tracker);
+	BPFIF_RLOCK(bp, &if_tracker);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
-		struct rm_priotracker qm_tracker;
-
 		BPFQ_RLOCK(&d->bd_qmask, &qm_tracker);
 		if (d->bd_qmask.qm_enabled) {
 			M_ASSERTPKTHDR(m);
@@ -2192,7 +2191,7 @@
 					if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
 						log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
-						BPFIF_RUNLOCK(bp, &tracker);
+						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
 					}
 					if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) {
@@ -2204,7 +2203,7 @@
 					if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
 						log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
-						BPFIF_RUNLOCK(bp, &tracker);
+						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
 					}
 					if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) {
@@ -2240,7 +2239,7 @@
 		}
 		BPFD_UNLOCK(d);
 	}
-	BPFIF_RUNLOCK(bp, &tracker);
+	BPFIF_RUNLOCK(bp, &if_tracker);
 }
 
 /*
@@ -2255,7 +2254,8 @@
 	struct bpf_d *d;
 	u_int pktlen, slen;
 	int gottime;
-	struct rm_priotracker tracker;
+	BPFIF_DEF_TRACKER(if_tracker);
+	BPFQ_DEF_TRACKER(qm_tracker);
 
 	/* Skip outgoing duplicate packets. */
 	if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) {
@@ -2275,10 +2275,8 @@
 	pktlen += dlen;
 
 	gottime = BPF_TSTAMP_NONE;
-	BPFIF_RLOCK(bp, &tracker);
+	BPFIF_RLOCK(bp, &if_tracker);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
-		struct rm_priotracker qm_tracker;
-
 		BPFQ_RLOCK(&d->bd_qmask, &qm_tracker);
 		if (d->bd_qmask.qm_enabled) {
 			M_ASSERTPKTHDR(m);
@@ -2293,7 +2291,7 @@
 					if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
 						log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
-						BPFIF_RUNLOCK(bp, &tracker);
+						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
 					}
 					if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) {
@@ -2305,7 +2303,7 @@
 					if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
 						log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
-						BPFIF_RUNLOCK(bp, &tracker);
+						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
 					}
 					if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) {
@@ -2334,7 +2332,7 @@
 		}
 		BPFD_UNLOCK(d);
 	}
-	BPFIF_RUNLOCK(bp, &tracker);
+	BPFIF_RUNLOCK(bp, &if_tracker);
 }
 
 #undef	BPF_CHECK_DIRECTION
@@ -2759,11 +2757,11 @@
 {
 	struct bpf_if *bp;
 	struct bpf_d *bd;
-	struct rm_priotracker tracker;
+	BPFIF_DEF_TRACKER(if_tracker);
 
 	mtx_lock(&bpf_mtx);
 	LIST_FOREACH(bp, &bpf_iflist, bif_next) {
-		BPFIF_RLOCK(bp, &tracker);
+		BPFIF_RLOCK(bp, &if_tracker);
 		LIST_FOREACH(bd, &bp->bif_dlist, bd_next) {
 			BPFD_LOCK(bd);
 			bd->bd_rcount = 0;
@@ -2774,7 +2772,7 @@
 			bd->bd_zcopy = 0;
 			BPFD_UNLOCK(bd);
 		}
-		BPFIF_RUNLOCK(bp, &tracker);
+		BPFIF_RUNLOCK(bp, &if_tracker);
 	}
 	mtx_unlock(&bpf_mtx);
 }
@@ -2817,7 +2815,7 @@
 	int index, error;
 	struct bpf_if *bp;
 	struct bpf_d *bd;
-	struct rm_priotracker tracker;
+	BPFIF_DEF_TRACKER(if_tracker);
 
 	/*
 	 * XXX This is not technically correct. It is possible for non
@@ -2856,14 +2854,14 @@
 	}
 	index = 0;
 	LIST_FOREACH(bp, &bpf_iflist, bif_next) {
-		BPFIF_RLOCK(bp, &tracker);
+		BPFIF_RLOCK(bp, &if_tracker);
 		LIST_FOREACH(bd, &bp->bif_dlist, bd_next) {
 			xbd = &xbdbuf[index++];
 			BPFD_LOCK(bd);
 			bpfstats_fill_xbpf(xbd, bd);
 			BPFD_UNLOCK(bd);
 		}
-		BPFIF_RUNLOCK(bp, &tracker);
+		BPFIF_RUNLOCK(bp, &if_tracker);
 	}
 	mtx_unlock(&bpf_mtx);
 	error = SYSCTL_OUT(req, xbdbuf, index * sizeof(*xbd));

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#8 (text+ko) ====

@@ -58,6 +58,7 @@
 #define BPFQ_LOCK_INIT(qm, d) \
 	rm_init_flags(&(qm)->qm_lock, (d), RM_NOWITNESS | RM_RECURSE);
 #define BPFQ_LOCK_DESTROY(qm)		rm_destroy(&(qm)->qm_lock)
+#define BPFQ_DEF_TRACKER(name)		struct rm_priotracker name
 #define BPFQ_RLOCK(qm, tracker)		rm_rlock(&(qm)->qm_lock, (tracker))
 #define BPFQ_RUNLOCK(qm, tracker)	rm_runlock(&(qm)->qm_lock, (tracker))
 #define BPFQ_WLOCK(qm)			rm_wlock(&(qm)->qm_lock)
@@ -166,6 +167,7 @@
 #define BPFIF_LOCK_INIT(bif, d) \
 	rm_init_flags(&(bif)->bif_lock, (d), RM_NOWITNESS | RM_RECURSE);
 #define BPFIF_LOCK_DESTROY(bif)		rm_destroy(&(bif)->bif_lock)
+#define BPFIF_DEF_TRACKER(name)		struct rm_priotracker name
 #define BPFIF_RLOCK(bif, tracker)	rm_rlock(&(bif)->bif_lock, (tracker))
 #define BPFIF_RUNLOCK(bif, tracker)	rm_runlock(&(bif)->bif_lock, (tracker))
 #define BPFIF_WLOCK(bif)		rm_wlock(&(bif)->bif_lock)

From owner-p4-projects@FreeBSD.ORG  Wed Jul 27 16:20:59 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69CF61065672; Wed, 27 Jul 2011 16:20: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 2BB19106564A
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:59 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 199F48FC14
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6RGKwW1056416
	for <perforce@FreeBSD.org>; Wed, 27 Jul 2011 16:20:58 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6RGKwNE056412
	for perforce@freebsd.org; Wed, 27 Jul 2011 16:20:58 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Wed, 27 Jul 2011 16:20:58 GMT
Message-Id: <201107271620.p6RGKwNE056412@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196790 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 27 Jul 2011 16:20:59 -0000

http://p4web.freebsd.org/@@196790?ac=10

Change 196790 by syuu@kikurage on 2011/07/27 16:20:08

	drop debug log

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#20 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#20 (text+ko) ====

@@ -58,7 +58,6 @@
 #include <sys/sockio.h>
 #include <sys/ttycom.h>
 #include <sys/uio.h>
-#include <sys/syslog.h>
 
 #include <sys/event.h>
 #include <sys/file.h>
@@ -1522,7 +1521,6 @@
 			struct ifnet *ifp;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1531,7 +1529,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1539,7 +1536,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			if (!(ifp->if_capabilities &
 				(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))) {
-				log(LOG_ERR, "if doesn't support multiqueue\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1561,7 +1557,6 @@
 	case BIOCDISQMASK:
 		{
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1570,7 +1565,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1589,7 +1583,6 @@
 			int index;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1598,7 +1591,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1606,7 +1598,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_rxqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCSTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1622,7 +1613,6 @@
 			struct ifnet *ifp;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1631,7 +1621,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1639,7 +1628,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_rxqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCCRRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1655,7 +1643,6 @@
 			struct ifnet *ifp;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1664,7 +1651,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1672,7 +1658,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_rxqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCGTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1688,7 +1673,6 @@
 			int index;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1697,7 +1681,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1706,7 +1689,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_txqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCSTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1722,7 +1704,6 @@
 			int index;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1731,7 +1712,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1740,7 +1720,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_txqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCCRTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1756,7 +1735,6 @@
 			struct ifnet *ifp;
 
 			if (d->bd_bif == NULL) {
-				log(LOG_ERR, "d->bd_bif == NULL\n");
 				/*
 				 * No interface attached yet.
 				 */
@@ -1765,7 +1743,6 @@
 			}
 			BPFQ_WLOCK(&d->bd_qmask);
 			if (!d->bd_qmask.qm_enabled) {
-				log(LOG_ERR, "!d->bd_qmask.qm_enabled\n");
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -1773,7 +1750,6 @@
 			ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
 			if (index > ifp->if_get_txqueue_len(ifp)) {
-				log(LOG_ERR, "BIOCGTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp));
 				BPFQ_WUNLOCK(&d->bd_qmask);
 				error = EINVAL;
 				break;
@@ -2189,7 +2165,6 @@
 				struct ifnet *ifp = bp->bif_ifp;
 				if (m->m_pkthdr.rxqueue != (uint32_t)-1) {
 					if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
-						log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
 						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
@@ -2201,7 +2176,6 @@
 				}
 				if (m->m_pkthdr.txqueue != (uint32_t)-1) {
 					if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
-						log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
 						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
@@ -2289,7 +2263,6 @@
 				struct ifnet *ifp = bp->bif_ifp;
 				if (m->m_pkthdr.rxqueue != (uint32_t)-1) {
 					if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
-						log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
 						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;
@@ -2301,7 +2274,6 @@
 				}
 				if (m->m_pkthdr.txqueue != (uint32_t)-1) {
 					if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
-						log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp));
 						BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker);
 						BPFIF_RUNLOCK(bp, &if_tracker);
 						return;

From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 00:44:34 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BBBC91065670; Thu, 28 Jul 2011 00:44: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 7E3F2106566B
	for <perforce@freebsd.org>; Thu, 28 Jul 2011 00:44:34 +0000 (UTC)
	(envelope-from jceel@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B6F78FC08
	for <perforce@freebsd.org>; Thu, 28 Jul 2011 00:44:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6S0iYVv055515
	for <perforce@freebsd.org>; Thu, 28 Jul 2011 00:44:34 GMT
	(envelope-from jceel@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6S0iY3x055512
	for perforce@freebsd.org; Thu, 28 Jul 2011 00:44:34 GMT
	(envelope-from jceel@freebsd.org)
Date: Thu, 28 Jul 2011 00:44:34 GMT
Message-Id: <201107280044.p6S0iY3x055512@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jceel@freebsd.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196806 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jul 2011 00:44:35 -0000

http://p4web.freebsd.org/@@196806?ac=10

Change 196806 by jceel@jceel_cyclone on 2011/07/28 00:43:41

	* Add SSP/SPI bus driver
	* Add SSD1289 LCD controller driver
	* Fixes in GPIO driver
	* Add framebuffer driver
	* Insert LCD configuration into .dts file

Affected files ...

.. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#7 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250.hints#1 add
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#6 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_fb.c#1 add
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#4 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_machdep.c#3 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_spi.c#1 add
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#6 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#4 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/ssd1289.c#1 add
.. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#7 edit

Differences ...

==== //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#7 (text+ko) ====

@@ -6,6 +6,7 @@
 
 ident		EA3250
 include		"../lpc/std.lpc"
+hints		"EA3250.hints"
 
 makeoptions	MODULES_OVERRIDE=""
 
@@ -18,13 +19,13 @@
 options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCL			#Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=lpe0
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=lpe0
 
-options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 #options		MD_ROOT			# MD is a potential root device
 #options		MD_ROOT_SIZE=8192	# 8MB ram disk
@@ -90,7 +91,11 @@
 device		gpioled
 device		lpcgpio
 
-#device		lpcfb
+device		spibus
+device		lpcspi
+device		ssd1289
+
+device		lpcfb
 
 # Flattened Device Tree
 options 	FDT

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#6 (text+ko) ====

@@ -12,7 +12,9 @@
 arm/lpc/if_lpe.c			optional	lpe
 arm/lpc/lpc_ohci.c			optional	ohci
 arm/lpc/lpc_mmc.c			optional	lpcmmc
-#arm/lpc/lpc_fb.c			optional	lpcfb
+arm/lpc/lpc_fb.c			optional	lpcfb
 arm/lpc/lpc_gpio.c			optional	lpcgpio
+arm/lpc/lpc_spi.c			optional	lpcspi
+arm/lpc/ssd1289.c			optional	ssd1289
 dev/uart/uart_dev_ns8250.c		optional	uart
 kern/kern_clocksource.c			standard

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#4 (text+ko) ====

@@ -78,6 +78,7 @@
 #include <machine/resource.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
+#include <machine/fdt.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
@@ -501,6 +502,17 @@
 	return lpc_gpio_pin_get(lpc_gpio_sc->lg_dev, pin, state);
 }
 
+void
+platform_gpio_init()
+{
+	/* Preset SPI devices CS pins to one */
+	bus_space_write_4(fdtbus_bs_tag, 
+	    LPC_GPIO_BASE, LPC_GPIO_P3_OUTP_SET,
+	    1 << (SSD1289_CS_PIN - LPC_GPIO_GPO_00(0)) |
+	    1 << (SSD1289_DC_PIN - LPC_GPIO_GPO_00(0)) |
+	    1 << (ADS7846_CS_PIN - LPC_GPIO_GPO_00(0)));	
+}
+
 static device_method_t lpc_gpio_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		lpc_gpio_probe),

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_machdep.c#3 (text+ko) ====

@@ -71,6 +71,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <arm/lpc/lpcreg.h>
+#include <arm/lpc/lpcvar.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -624,6 +625,11 @@
 	 */
 	physmap_init();
 
+	/*
+	 * Set initial values of GPIO output ports
+	 */
+	platform_gpio_init();
+
 	/* Do basic tuning, hz etc */
 	init_param2(physmem);
 	kdb_init();

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#6 (text+ko) ====

@@ -144,6 +144,14 @@
 #define	LPC_CLKPWR_FLASHCLK_CTRL	0xc8
 #define	LPC_CLKPWR_MACCLK_CTRL		0x90
 #define	LPC_CLKPWR_LCDCLK_CTRL		0x54
+#define	LPC_CLKPWR_LCDCLK_CTRL_DISPTYPE	(1 << 8)
+#define	LPC_CLKPWR_LCDCLK_CTRL_MODE(_n)	((_n & 0x3) << 6)
+#define	LPC_CLKPWR_LCDCLK_CTRL_MODE_12	0x0
+#define	LPC_CLKPWR_LCDCLK_CTRL_MODE_15	0x1
+#define	LPC_CLKPWR_LCDCLK_CTRL_MODE_16	0x2
+#define	LPC_CLKPWR_LCDCLK_CTRL_MODE_24	0x3
+#define	LPC_CLKPWR_LCDCLK_CTRL_HCLKEN	(1 << 5)
+#define	LPC_CLKPWR_LCDCLK_CTRL_CLKDIV(_n) ((_n) & 0x1f)
 #define	LPC_CLKPWR_I2S_CTRL		0x7c
 #define	LPC_CLKPWR_SSP_CTRL		0x78
 #define	LPC_CLKPWR_SSP_CTRL_SSP1RXDMA	(1 << 5)
@@ -351,12 +359,52 @@
  * LCD Controller (from UM10326: LPC32x0 User manual, page 229)
  */
 #define	LPC_LCD_TIMH			0x00
+#define	LPC_LCD_TIMH_HBP(_n)		(((_n) & 0xff) << 24)
+#define	LPC_LCD_TIMH_HFP(_n)		(((_n) & 0xff) << 16)
+#define	LPC_LCD_TIMH_HSW(_n)		(((_n) & 0xff) << 8)
+#define	LPC_LCD_TIMH_PPL(_n)		(((_n) / 16 - 1) << 2)
 #define	LPC_LCD_TIMV			0x04
+#define	LPC_LCD_TIMV_VBP(_n)		(((_n) & 0xff) << 24)
+#define	LPC_LCD_TIMV_VFP(_n)		(((_n) & 0xff) << 16)
+#define	LPC_LCD_TIMV_VSW(_n)		(((_n) & 0x3f) << 10)
+#define	LPC_LCD_TIMV_LPP(_n)		((_n) & 0x1ff)
 #define	LPC_LCD_POL			0x08
+#define	LPC_LCD_POL_PCD_HI		(((_n) & 0x1f) << 27)
+#define	LPC_LCD_POL_BCD			(1 << 26)
+#define	LPC_LCD_POL_CPL(_n)		(((_n) & 0x3ff) << 16)
+#define	LPC_LCD_POL_IOE			(1 << 14)
+#define	LPC_LCD_POL_IPC			(1 << 13)
+#define	LPC_LCD_POL_IHS			(1 << 12)
+#define	LPC_LCD_POL_IVS			(1 << 11)
+#define	LPC_LCD_POL_ACB(_n)		((_n & 0x1f) << 6)
+#define	LPC_LCD_POL_CLKSEL		(1 << 5)
+#define	LPC_LCD_POL_PCD_LO(_n)		((_n) & 0x1f)
 #define	LPC_LCD_LE			0x0c
+#define	LPC_LCD_LE_LEE			(1 << 16)
+#define	LPC_LCD_LE_LED			((_n) & 0x7f)
 #define	LPC_LCD_UPBASE			0x10
 #define	LPC_LCD_LPBASE			0x14
 #define	LPC_LCD_CTRL			0x18
+#define	LPC_LCD_CTRL_WATERMARK		(1 << 16)
+#define	LPC_LCD_CTRL_LCDVCOMP(_n)	(((_n) & 0x3) << 12)
+#define	LPC_LCD_CTRL_LCDPWR		(1 << 11)
+#define	LPC_LCD_CTRL_BEPO		(1 << 10)
+#define	LPC_LCD_CTRL_BEBO		(1 << 9)
+#define	LPC_LCD_CTRL_BGR		(1 << 8)
+#define	LPC_LCD_CTRL_LCDDUAL		(1 << 7)
+#define	LPC_LCD_CTRL_LCDMONO8		(1 << 6)
+#define	LPC_LCD_CTRL_LCDTFT		(1 << 5)
+#define	LPC_LCD_CTRL_LCDBW		(1 << 4)
+#define	LPC_LCD_CTRL_LCDBPP(_n)		(((_n) & 0x7) << 1)
+#define	LPC_LCD_CTRL_BPP1		0
+#define	LPC_LCD_CTRL_BPP2		1
+#define	LPC_LCD_CTRL_BPP4		2
+#define	LPC_LCD_CTRL_BPP8		3
+#define	LPC_LCD_CTRL_BPP16		4
+#define	LPC_LCD_CTRL_BPP24		5
+#define	LPC_LCD_CTRL_BPP16_565		6
+#define	LPC_LCD_CTRL_BPP12_444		7
+#define	LPC_LCD_CTRL_LCDEN		(1 << 0)
 #define	LPC_LCD_INTMSK			0x1c
 #define	LPC_LCD_INTRAW			0x20
 #define	LPC_LCD_INTSTAT			0x24
@@ -453,6 +501,7 @@
 /*
  * GPIO (from UM10326: LPC32x0 User manual, page 606)
  */
+#define	LPC_GPIO_BASE			(LPC_DEV_BASE + 0x28000)
 #define	LPC_GPIO_P0_COUNT		8
 #define	LPC_GPIO_P1_COUNT		24
 #define	LPC_GPIO_P2_COUNT		13
@@ -488,6 +537,11 @@
 #define	LPC_GPIO_GPI_27(_n)		(20 + _n)
 #define	LPC_GPIO_GPO_00(_n)		(22 + _n)
 #define	LPC_GPIO_GPIO_00(_n)		(46 + _n)
+/* SPI devices chip selects: */
+#define	SSD1289_CS_PIN			LPC_GPIO_GPO_00(4)
+#define	SSD1289_DC_PIN			LPC_GPIO_GPO_00(5)
+#define	ADS7846_CS_PIN			LPC_GPIO_GPO_00(11)
+#define	ADS7846_INTR_PIN		LPC_GPIO_GPIO_00(0)
 
 /*
  * GPDMA controller (from UM10326: LPC32x0 User manual, page 106)

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#4 (text+ko) ====

@@ -36,8 +36,24 @@
 void lpc_pwr_write(device_t, int, uint32_t);
 
 /* GPIO */
+void platform_gpio_init(void);
 int lpc_gpio_set_flags(device_t, int, int);
 int lpc_gpio_set_state(device_t, int, int);
 int lpc_gpio_get_state(device_t, int, int *);
 
+/* DMA */
+struct lpc_dmac_channel_config
+{
+	int		ldc_src_periph;
+	int		ldc_dst_periph;
+	int		ldc_src_width;
+	int		ldc_dst_width;
+	void		(*ldc_success_handler)(void);
+	void		(*ldc_error_handler)(void);
+};
+
+int lpc_dmac_config_channel(device_t, int, struct lpc_dmac_channel_config *);
+int lpc_dmac_setup_transfer(device_t, int, bus_addr_t, bus_addr_t, bus_size_t, int);
+int lpc_dmac_enable_transfer(device_t, int);
+
 #endif	/* _ARM_LPC_LPCVAR_H */

==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#7 (text+ko) ====

@@ -191,6 +191,19 @@
 			reg = <0x1040000 0x20000>;
 			interrupts = <14>;
 			interrupt-parent = <&PIC>;
+			
+			/* Screen parameters: */
+			is-tft = <1>;
+			horizontal-resolution = <240>;
+			vertical-resolution = <320>;
+			bits-per-pixel = <16>;
+			pixel-clock = <121654>;
+			left-margin = <28>;
+			right-margin = <10>;
+			upper-margin = <2>;
+			lower-margin = <2>;
+			hsync-len = <3>;
+			vsync-len = <2>;
 		};
 	
 		lpe@1060000 {
@@ -218,6 +231,21 @@
 		compatible = "simple-bus";
 		ranges = <0x0 0x20000000 0x10000000>;
 
+		spi0@84000 {
+			compatible = "lpc,spi";
+			reg = <0x84000 0x4000>;
+			interrupts = <20>;
+			interrupt-parent = <&PIC>;
+		};
+
+		spi1@8c000 {
+			compatible = "lpc,spi";
+			status = "disabled";
+			reg = <0x8c000 0x4000>;
+			interrupts = <21>;
+			interrupt-parent = <&PIC>;
+		};
+
 		lpcmmc@98000 {
 			compatible = "lpc,mmc";
 			reg = <0x98000 0x4000>;

From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 04:59:45 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 949DA1065670; Thu, 28 Jul 2011 04:59: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 47FE5106566B
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 04:59:45 +0000 (UTC)
	(envelope-from goda@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3016D8FC0C
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 04:59:45 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6S4xjjt005122
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 04:59:45 GMT
	(envelope-from goda@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6S4xgR0005117
	for perforce@freebsd.org; Thu, 28 Jul 2011 04:59:42 GMT
	(envelope-from goda@FreeBSD.org)
Date: Thu, 28 Jul 2011 04:59:42 GMT
Message-Id: <201107280459.p6S4xgR0005117@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	goda@FreeBSD.org using -f
From: Kazuya Goda <goda@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196813 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jul 2011 04:59:45 -0000

http://p4web.freebsd.org/@@196813?ac=10

Change 196813 by goda@kaffierlime on 2011/07/28 04:59:32

	integrate from latest 

Affected files ...

.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/TOUR#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/alias.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/arith_yacc.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/builtins.def#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/cd.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/eval.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/expand.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/input.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/jobs.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/main.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/bin/sh/options.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/FAQ.xml#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/README.idnkit#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.pdf#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/acconfig.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/dig.1#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/dig.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/dig.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/host.1#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/host.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/host.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dig/nslookup.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/bind9.xsl#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/config.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/controlconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/convertxsl.pl#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/client.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/config.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/control.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/log.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/main.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/server.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/statschannel.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/types.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/update.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/listenlist.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/log.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/logconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwaddr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwdclient.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwderror.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwresd.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwresd.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwresd.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/lwsearch.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.conf.5#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.conf.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/named.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/notify.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/sortlist.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/statschannel.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/tsigconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/unix/os.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/named/zoneconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/rndc.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/util.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/bin/rndc/util.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/arm/README-SGML#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/dnssec#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/format-options.pl#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/ipv6#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/migration#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/migration-4to9#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/rfc-compliance#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/roadmap#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/sdb#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/doc/misc/sort-options.pl#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/isc-config.sh.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/bind9/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/acache.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/acl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/byaddr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/cache.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/callbacks.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/compress.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/db.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dbtable.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/diff.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dispatch.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dlz.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dnssec.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/ds.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/dst_result.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/forward.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/gen.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/iptable.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/iptable.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/key.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/keytable.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/lib.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/log.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/lookup.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/master.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/masterdump.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/nsec.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/nsec3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/order.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/peer.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/portlist.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rbt.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rcode.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/request.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/soa.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/spnego.asn1#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/spnego.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/spnego.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/spnego_asn1.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/spnego_asn1.pl#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/ssu.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/stats.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/timer.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/ttl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/xfrin.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/zonekey.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/dns/zt.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/assertions.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/base32.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/base64.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/bitstring.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/buffer.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/commandline.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/error.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/event.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/hash.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/heap.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/hex.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/httpd.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/base32.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/httpd.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/iterated_hash.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/radix.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/random.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/region.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/result.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/stats.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/types.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/util.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/include/isc/xml.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/inet_aton.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/inet_ntop.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/iterated_hash.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/lex.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/lfsr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/lib.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/log.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/md5.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/mutexblock.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/netaddr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/netscope.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/noatomic/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ondestroy.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/parseint.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/portset.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/powerpc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/quota.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/radix.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/random.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/ratelimiter.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/refcount.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/region.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/result.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/rwlock.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/serial.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sha1.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sha2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sockaddr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sparc64/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/stats.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/string.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/strtoul.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/symtab.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/task_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/taskpool.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/timer.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/timer_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/app.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/dir.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/entropy.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/file.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/net.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/os.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/resource.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/stdio.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/strerror.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/syslog.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/unix/time.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_32/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_64/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/alist.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/base64.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/cc.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/ccmsg.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/lib.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/result.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/sexpr.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/symtab.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccc/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/aclconf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/log.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/parser.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/isccfg/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/assert_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/context.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/context_p.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/gethost.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/getrrset.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/herror.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwconfig.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwpacket.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/lwresutil.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/print.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/strtoul.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/unix/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/unix/include/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/unix/include/lwres/net.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/lib/lwres/version.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/make/Makefile.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/make/includes.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/make/rules.in#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/mkinstalldirs#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/bind9/version#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/binutils/ld/emulparams/elf64bmip-defs.sh#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/CREDITS.TXT#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/LICENSE.TXT#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/README.txt#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/abi.h#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/absvdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/absvsi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/absvti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/adddf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/addsf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/addvdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/addvsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/addvti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/apple_versioning.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/adddf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/addsf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/bswapdi2.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/bswapsi2.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/comparesf2.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/divdf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/divmodsi4.S#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/divsf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/divsi3.S#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/eqdf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/eqsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/extendsfdf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/fixdfsivfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/fixsfsivfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/fixunsdfsivfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/fixunssfsivfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/floatsidfvfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/floatsisfvfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/floatunssidfvfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/floatunssisfvfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/gedf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/gesf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/gtdf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/gtsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/ledf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/lesf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/ltdf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/ltsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/modsi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/muldf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/mulsf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/nedf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/negdf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/negsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/nesf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/restore_vfp_d8_d15_regs.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/save_vfp_d8_d15_regs.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/softfloat-alias.list#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/subdf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/subsf3vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/switch16.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/switch32.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/switch8.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/switchu8.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/sync_synchronize.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/truncdfsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/udivmodsi4.S#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/udivsi3.S#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/umodsi3.S#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/unorddf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/arm/unordsf2vfp.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ashldi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ashlti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ashrdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ashrti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/assembly.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/clear_cache.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/clzdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/clzsi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/clzti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/cmpdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/cmpti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/comparedf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/comparesf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ctzdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ctzsi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ctzti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divdc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divdf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divmoddi4.c#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divmodsi4.c#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divsc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divsf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/divxc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/enable_execute_stack.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/endianness.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/eprintf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/extendsfdf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ffsdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ffsti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixdfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixdfsi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixdfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixsfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixsfsi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixsfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsdfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsdfsi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsdfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunssfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunssfsi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunssfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsxfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsxfsi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixunsxfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixxfdi.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fixxfti.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatdidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatdisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatdixf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatsidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatsisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floattidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floattisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floattixf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatundidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatundisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatundixf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatunsidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatunsisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatuntidf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatuntisf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/floatuntixf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/fp_lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/gcc_personality_v0.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/ashldi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/ashrdi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/divdi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatdidf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatdisf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatdixf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatundidf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatundisf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/floatundixf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/lshrdi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/moddi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/muldi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/udivdi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/i386/umoddi3.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/int_lib.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/lshrdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/lshrti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/moddi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/modsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/modti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/muldc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/muldf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/muldi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulsc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulsf3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/multi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulvdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulvsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulvti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/mulxc3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negdf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negsf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negvdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negvsi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/negvti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/paritydi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/paritysi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/parityti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/popcountdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/popcountsi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/popcountti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/powidf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/powisf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/powitf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/powixf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ppc/restFP.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ppc/saveFP.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/subdf3.c#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/subsf3.c#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/subvdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/subvsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/subvti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/trampoline_setup.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/truncdfsf2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ucmpdi2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/ucmpti2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivdi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivmoddi4.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivmodsi4.c#1 branch
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivmodti4.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/udivti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/umoddi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/umodsi3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/umodti3.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/x86_64/floatundidf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/x86_64/floatundisf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/compiler-rt/lib/x86_64/floatundixf.S#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/groff/tmac/troffrc#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/libpcap/pcap-bpf.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/ntp/ntpd/ntp_io.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/top/commands.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/top/machine.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/top/top.X#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/contrib/top/top.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/etc/defaults/rc.conf#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/etc/network.subr#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/gnu/usr.bin/Makefile#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/gnu/usr.bin/grep/Makefile#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/libc/gen/feature_present.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/libc/gen/posix_spawn.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/libc/iconv/Symbol.map#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/libc/iconv/iconvctl.3#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/libcompiler_rt/Makefile#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/msun/ld128/e_rem_pio2l.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/msun/ld80/e_rem_pio2l.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/msun/src/s_cosl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/msun/src/s_sinl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/lib/msun/src/s_tanl.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/libexec/tftpd/tftp-io.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/hastd/primary.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/hastd/proto_common.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/Makefile#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/af_inet.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/af_inet6.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/af_nd6.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/setkey/setkey.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/umount/umount.8#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/sbin/umount/umount.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/examples/Makefile#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/examples/ses/srcs/eltsub.c#2 integrate
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/FARSI%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/GREEK%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#2 delete
.. //depot/projects/soc2011/kgoda_rpsrfs/src/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#2 delete

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

From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 20:55:39 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60C5C106572B; Thu, 28 Jul 2011 20:55:39 +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 E0626106570C
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id CD0A68FC0A
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SKtcMG096845
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6SKtcQP096842
	for perforce@freebsd.org; Thu, 28 Jul 2011 20:55:38 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 28 Jul 2011 20:55:38 GMT
Message-Id: <201107282055.p6SKtcQP096842@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196839 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jul 2011 20:55:39 -0000

http://p4web.freebsd.org/@@196839?ac=10

Change 196839 by rene@rene_acer on 2011/07/28 20:55:01

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#98 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#29 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#40 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#47 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#30 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Makefile.inc#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/Makefile#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/Makefile.inc#1 branch
.. //depot/projects/docproj_nl/www/share/mk/web.site.mk#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#98 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1007 2011/07/15 21:07:31 zi Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1008 2011/07/27 15:18:15 crees Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -6495,6 +6495,10 @@
     </listitem>
 
     <listitem>
+      <para>Maxim Ignatenko
+	<email>gelraen.ua@gmail.com</email></para>
+
+    <listitem>
       <para>Maxim Loginov
         <email>zeliboba@mail.ru</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#8 (text+ko) ====

@@ -37,7 +37,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.86 2011/01/15 12:51:40 jkois Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.87 2011/07/24 21:27:50 gjb Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -560,11 +560,9 @@
     fast machine and access to a source repository. (That should be
     everyone, since we offer anonymous CVS! See The Handbook for
     details.)  The <emphasis>only</emphasis> special requirement is
-    that the &man.vn.4; device must be available. (On -CURRENT, this
-    device has been replaced by the new &man.md.4;
-    memory disk driver.)  If the
+    that the &man.md.4; device must be available. If the
     device is not loaded into your kernel, then the kernel module
-    should be automatically loaded when &man.vnconfig.8; is executed
+    should be automatically loaded when &man.mdconfig.8; is executed
     during the boot media creation phase.  All of the tools necessary
     to build a release are available from the CVS repository in
     <filename>src/release</filename>.  These tools aim to provide a

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#21 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.105 2011/03/28 08:48:54 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.106 2011/07/28 15:15:51 blackend Exp $
 -->
 
 <chapter id="desktop">
@@ -181,7 +181,7 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>This will install <application>Firefox</application> 4.0,
+      <para>This will install <application>Firefox</application> 5.0,
         if you want to run <application>Firefox</application> 3.6,
         use instead:</para>
 
@@ -280,19 +280,26 @@
 	</step>
 
 	<step>
-	  <title>For Firefox 3.6 and 4.0</title>
+	  <title>For Firefox 3.6 and 5.0</title>
 
       <para>Install <application>OpenJDK 6</application>
         through the Ports Collection by typing:</para>
         
       <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
-&prompt.root; <userinput>make config install clean</userinput></screen>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>Then install the <filename
+	role="package">java/icedtea-web</filename> port:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Make sure you have selected the WEB option.</para>
+      <para>Make sure you have kept the default configuration options
+	for both ports.</para>
 
       <para>Each user will have to run the following command:</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/openjdk6/jre/lib/IcedTeaPlugin.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>Start your browser, enter <literal>about:plugins</literal>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#29 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.135 2011/07/23 21:30:36 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.136 2011/07/24 10:08:00 rene Exp $
 -->
 
 <chapter id="network-servers">
@@ -4125,7 +4125,7 @@
 	  sign the zone <hostid role="domainname">example.com</hostid>, located
 	  in <filename>example.com.db</filename> would look similar to</para>
 
-	<screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com+005+nnnnn.KSK example.com.db Kexample.com+005+nnnnn.ZSK.key</userinput></screen>
+	<screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com.+005+nnnnn.KSK example.com.db Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
 
 	<para>The key supplied to the <option>-k</option> argument is the
 	  <acronym>KSK</acronym> and the other key file is the

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#17 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.7 2011/03/20 10:57:10 rene Exp $
+# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.8 2011/07/24 10:49:09 rene Exp $
 
 # %SOURCE%	en_US.ISO8859-1/articles/Makefile
 # %SRCID%	1.63

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.29 2011/07/11 19:17:34 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.30 2011/07/24 10:49:09 rene Exp $
      Vertaald door: Siebrand Mazeland
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#47 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.32 2011/05/28 09:38:36 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.33 2011/07/24 10:49:09 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
      %SRCID%	1.136

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#30 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.25 2011/07/11 19:17:35 rene Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.26 2011/07/24 10:49:09 rene Exp $
     Vertaald door: Siebrand Mazeland
 
     %SOURCE%	en_US.ISO8859-1/share/sgml/mailing-lists.ent

==== //depot/projects/docproj_nl/www/en/cgi/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.35 2011/07/20 23:52:12 shaun Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.36 2011/07/25 07:35:42 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -16,18 +16,6 @@
 DATA+=	cvsweb.conf-freebsd
 DATA+=	query-pr-lib.pl
 
-CGI_SUBDIRS=	GnatsPR GnatsPR/Section
-
-CGI_SUBFILES+=	GnatsPR/MIMEIterator.pm
-CGI_SUBFILES+=	GnatsPR/Section.pm
-CGI_SUBFILES+=	GnatsPR/Section/Email.pm
-CGI_SUBFILES+=	GnatsPR/Section/FieldStart.pm
-CGI_SUBFILES+=	GnatsPR/Section/MIME.pm
-CGI_SUBFILES+=	GnatsPR/Section/Patch.pm
-CGI_SUBFILES+=	GnatsPR/Section/StateChange.pm
-CGI_SUBFILES+=	GnatsPR/Section/Text.pm
-CGI_SUBFILES+=	GnatsPR/SectionIterator.pm
-
 CGI=
 CGI+=	confirm-code.cgi
 CGI+=	cvsweb.cgi
@@ -46,6 +34,8 @@
 CGI+=	search.cgi
 CGI+=	url.cgi
 
+SUBDIR=	GnatsPR
+
 .SUFFIXES:	.C .cgi
 
 .C.cgi:

==== //depot/projects/docproj_nl/www/share/mk/web.site.mk#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $FreeBSD: www/share/mk/web.site.mk,v 1.79 2011/07/21 00:42:50 shaun Exp $
+# $FreeBSD: www/share/mk/web.site.mk,v 1.80 2011/07/25 07:35:42 hrs Exp $
 
 #
 # Build and install a web site.
@@ -358,14 +358,6 @@
 .endif
 .if defined(CGI) && !empty(CGI)
 	@${MKDIR} -p ${CGIINSTALLDIR}
-.if defined(CGI_SUBDIRS) && !empty(CGI_SUBDIRS)
-.for sd in ${CGI_SUBDIRS}
-	@${MKDIR} -p ${CGIINSTALLDIR}/${sd}
-.endfor
-.for sf in ${CGI_SUBFILES}
-	${INSTALL_CGI} ${.CURDIR}/${sf} ${CGIINSTALLDIR}/${sf}
-.endfor
-.endif
 .for entry in ${CGI}
 	${INSTALL_CGI} ${.CURDIR}/${entry} ${CGIINSTALLDIR}
 .endfor

From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 21:12:06 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8867B1065670; Thu, 28 Jul 2011 21:12: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 4B2B2106566B
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 21:12:06 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id DC1288FC08
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 21:12:05 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SLC5QI000446
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 21:12:05 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6SLC50U000443
	for perforce@freebsd.org; Thu, 28 Jul 2011 21:12:05 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 28 Jul 2011 21:12:05 GMT
Message-Id: <201107282112.p6SLC50U000443@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196840 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jul 2011 21:12:06 -0000

http://p4web.freebsd.org/@@196840?ac=10

Change 196840 by rene@rene_acer on 2011/07/28 21:11:50

	MFen the Dutch Handbook:
	- desktop 1.105 -> 1.106

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#32 edit

Differences ...

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

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.28 2011/05/12 16:50:14 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
-     %SRCID%	1.105
+     %SRCID%	1.106
 -->
 
 <chapter id="desktop">
@@ -207,7 +207,7 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>Dit zal <application>Firefox</application> 4.0 installeren,
+      <para>Dit zal <application>Firefox</application> 5.0 installeren,
 	als u in plaats hiervan <application>Firefox</application> 3.6
 	wilt draaien, gebruik dan:</para>
 
@@ -312,19 +312,26 @@
 	</step>
 
 	<step>
-	  <title>Voor Firefox 3.6 en 4.0</title>
+	  <title>Voor Firefox 3.6 en 5.0</title>
 
 	  <para>Installeer <application>OpenJDK 6</application> vanuit
 	    de Ports Collectie door het volgende typen:</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
-&prompt.root; <userinput>make config install clean</userinput></screen>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+	  <para>Installeer daarna de port <filename
+	    role="package">java/icedtea-web</filename>:</para>
+
+	  <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
 
-	  <para>Zorg ervoor dat de WEB optie geselecteerd is.</para>
+	  <para>Zorg ervoor dat de standaard configuratieopties voor beide ports
+	    zijn geselecteerd.</para>
 
 	  <para>Elke gebruiker moet het volgende commando uitvoeren:</para>
 
-	  <screen>&prompt.user; <userinput>ln -s /usr/local/openjdk6/jre/lib/IcedTeaPlugin.so \
+	  <screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
 	  <para>Start de browser en voer <literal>about:plugins</literal> in
@@ -850,7 +857,7 @@
 
       <para>Als er geen pakket voor <application>LibreOffice</application>
 	beschikbaar is, heeft u nog altijd de optie om de port te compileren.
-	Denk er echter aan dat dit veel schijfruimte en redelijk veel 
+	Denk er echter aan dat dit veel schijfruimte en redelijk veel
 	tijd kost.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/libreoffice</userinput>

From owner-p4-projects@FreeBSD.ORG  Sat Jul 30 09:54:08 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 751071065673; Sat, 30 Jul 2011 09:54:08 +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 2A62D106564A
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 09:54:08 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 181A08FC12
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 09:54:08 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6U9s7Bj044370
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 09:54:07 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6U9s7Vi044367
	for perforce@freebsd.org; Sat, 30 Jul 2011 09:54:07 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 30 Jul 2011 09:54:07 GMT
Message-Id: <201107300954.p6U9s7Vi044367@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196905 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 30 Jul 2011 09:54:08 -0000

http://p4web.freebsd.org/@@196905?ac=10

Change 196905 by rene@rene_acer on 2011/07/30 09:53:35

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/MIME.pm#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Patch.pm#2 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#22 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.106 2011/07/28 15:15:51 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.107 2011/07/29 09:39:30 blackend Exp $
 -->
 
 <chapter id="desktop">
@@ -280,7 +280,7 @@
 	</step>
 
 	<step>
-	  <title>For Firefox 3.6 and 5.0</title>
+	  <title>For Firefox 3.6 and 5.0<anchor id="moz-java-plugin-5"></title>
 
       <para>Install <application>OpenJDK 6</application>
         through the Ports Collection by typing:</para>
@@ -456,13 +456,28 @@
       <para>To install the Linux version of
 	<application>Opera</application>, substitute
 	<literal>linux-opera</literal> in place of
-	<literal>opera</literal> in the examples above.  The Linux
-	version is useful in situations requiring the use of plug-ins
-	that are only available for Linux, such as <application>Adobe
-	&acrobat.reader;</application>.  In all other respects, the
-	FreeBSD and Linux versions should be functionally
-	identical.</para>
+	<literal>opera</literal> in the example above.</para>
+
+      <para>The &adobe; &flash; plugin is not available for &os;.
+	However, a &linux; version of the plugin exists.  To install
+	this version, the <filename
+	role="package">www/linux-f10-flashplugin10</filename> port has
+	to be installed, then install the port <filename
+	role="package">www/opera-linuxplugins</filename>:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin10</userinput>
+&prompt.root; <userinput>make install clean</userinput>
+&prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>You can check the presence of the plugin: start your
+	browser, enter <literal>opera:plugins</literal> in the
+	location bar and press <keycap>Enter</keycap>.  A list should
+	appear with all the currently available plugins.</para>
 
+      <para>To add the <application>&java;</application> plugin,
+	follow the <link linkend="moz-java-plugin-5">instructions for
+	Firefox</link>.</para>
     </sect2>
 
     <sect2>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.28 2011/05/12 16:50:14 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.29 2011/07/28 21:14:37 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
      %SRCID%	1.106

==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/GnatsPR.pm,v 1.2 2011/07/21 02:09:02 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR.pm,v 1.4 2011/07/29 22:59:32 shaun Exp $
 #------------------------------------------------------------------------------
 
 package GnatsPR;
@@ -204,7 +204,7 @@
 			#$ismulti = ($2 and $2 eq "\n");
 
 			# It's multi-liners from here on in
-			$key eq 'Description'
+			$key eq 'Organization'
 				and $ismulti = 1;
 		} else {
 			# Hmm...
@@ -539,7 +539,12 @@
 	# UUencoded file. Characteristics:
 	#   - Has header and footer.
 	$$text =~ /^begin \d\d\d (.*)/m
-		and return {start => $-[0], type => 'uuencoded'};
+		and return {start => $-[0], type => 'uuencoded', name => $1};
+
+	# Base64 encoded file. Characteristics:
+	#   - Has header and footer.
+	$$text =~ /^begin-base64 \d\d\d (.*)/m
+		and return {start => $-[0], type => 'base64', name => $1};
 
 	return undef;
 }
@@ -583,6 +588,9 @@
 	} elsif ($pi->{type} eq 'uuencoded') {
 		$$text =~ /^end$/m
 			and $pi->{size} = $+[0];
+	} elsif ($pi->{type} eq 'base64') {
+		$$text =~ /^====$/m
+			and $pi->{size} = $+[0];
 	}
 
 	if ($pi->{size} == 0) {

==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/MIME.pm#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/GnatsPR/Section/MIME.pm,v 1.2 2011/07/23 02:42:59 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR/Section/MIME.pm,v 1.3 2011/07/29 21:27:44 shaun Exp $
 #------------------------------------------------------------------------------
 
 package GnatsPR::Section::MIME;
@@ -300,6 +300,11 @@
 
 		$self->{headers}->{$key} =~ s/;.*$//;
 	}
+
+	# Normalise
+
+	$self->{headers}->{'content-type'} =
+		lc $self->{headers}->{'content-type'};
 }
 
 

==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Patch.pm#2 (text+ko) ====

@@ -24,11 +24,14 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/GnatsPR/Section/Patch.pm,v 1.1 2011/07/20 22:23:23 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR/Section/Patch.pm,v 1.2 2011/07/29 22:59:32 shaun Exp $
 #------------------------------------------------------------------------------
 
 package GnatsPR::Section::Patch;
 
+use MIME::Base64;                      # ports/converters/p5-MIME-Base64
+use Convert::UU qw(uudecode uuencode); # ports/converters/p5-Convert-UU
+
 use strict;
 
 require 5.006;
@@ -53,6 +56,8 @@
 	my $self = {
 		text     => '',
 		filename => 'patch.txt',
+		binary   => 0,
+		encoded  => 0,
 		type     => 'unknown'
 	};
 
@@ -63,6 +68,17 @@
 	$self->{filename} = $filename if $filename;
 	$self->{type} = $type if $type;
 
+	$self->{filename} =~ '(?:\.gz|\.bz2|\.zip|\.tar)$'
+		and $self->{binary} = 1;
+
+	if ($self->{type} eq 'uuencoded') {
+		$self->{encoded} = 1;
+		$self->{decoded_text} = uudecode($self->{text});
+	} elsif ($self->{type} eq 'base64') {
+		$self->{encoded} = 1;
+		$self->{decoded_text} = decode_base64($self->{text});
+	}
+
 	return $self;
 }
 
@@ -97,7 +113,7 @@
 {
 	my $self = shift;
 
-	return length($self->{text});
+	return length($self->{encoded} ? $self->{decoded_text} : $self->{text});
 }
 
 
@@ -114,7 +130,7 @@
 {
 	my $self = shift;
 
-	return $self->{text};
+	return $self->{encoded} ? $self->{decoded_text} : $self->{text};
 }
 
 
@@ -165,7 +181,7 @@
 {
 	my $self = shift;
 
-	return 0;
+	return $self->{binary};
 }
 
 

From owner-p4-projects@FreeBSD.ORG  Sat Jul 30 10:22:26 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89EFD106566C; Sat, 30 Jul 2011 10:22:26 +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 40163106564A
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 10:22:26 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 153CF8FC12
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 10:22:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6UAMP0P050711
	for <perforce@FreeBSD.org>; Sat, 30 Jul 2011 10:22:25 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6UAMP2v050708
	for perforce@freebsd.org; Sat, 30 Jul 2011 10:22:25 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 30 Jul 2011 10:22:25 GMT
Message-Id: <201107301022.p6UAMP2v050708@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196906 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 30 Jul 2011 10:22:26 -0000

http://p4web.freebsd.org/@@196906?ac=10

Change 196906 by rene@rene_acer on 2011/07/30 10:21:57

	MFen handbook/desktop 1.106 -> 1.107

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#34 edit

Differences ...

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

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.29 2011/07/28 21:14:37 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
-     %SRCID%	1.106
+     %SRCID%	1.107
 -->
 
 <chapter id="desktop">
@@ -312,7 +312,7 @@
 	</step>
 
 	<step>
-	  <title>Voor Firefox 3.6 en 5.0</title>
+	  <title>Voor Firefox 3.6 en 5.0<anchor id="moz-java-plugin-5"></title>
 
 	  <para>Installeer <application>OpenJDK 6</application> vanuit
 	    de Ports Collectie door het volgende typen:</para>
@@ -480,14 +480,30 @@
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>De &linux; versie van <application>Opera</application> kan
-	ge&iuml;nstlleerd worden door bij de bovenstaande voorbeelden
+	ge&iuml;nstalleerd worden door bij de bovenstaande voorbeelden
 	<literal>linux-opera</literal> te gebruiken in plaats van
-	<literal>opera</literal>.  De &linux; versie is nuttig in
-	situaties waarin plugins nodig zijn die alleen voor &linux;
-	beschikbaar zijn, zoals
-	<application>Adobe &acrobat.reader;</application>.  In alle
-	andere opzichten zouden de &os; en &linux; versies identiek
-	moeten zijn.</para>
+	<literal>opera</literal>.</para>
+
+      <para>De &adobe; &flash; plugin is niet beschikbaar voor &os;.  Er bestaat
+	echter een &linux; versie van de plugin.  Om deze versie te installeren
+	moet de port <filename
+	  role="package">www/linux-f10-flashplugin10</filename>
+	ge&iuml;nstalleerd zijn, installeer daarna de port <filename
+	  role="package">www/opera-linuxplugins</filename>:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin10</userinput>
+&prompt.root; <userinput>make install clean</userinput>
+&prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>U kunt controleren of de plugin aanwezig is: start uw browser, geef
+	<literal>opera:plugins</literal> in op de adresbalk en druk op
+	<keycap>Enter</keycap>.  Er zou een lijst moeten verschijnen met alle
+	huidig beschikbare plugins.</para>
+
+      <para>Volg de <link linkend="moz-java-plugin-5">instructies voor
+	Firefox</link> om de <application>&java;</application> plugin te
+	installeren.</para>
     </sect2>
 
     <sect2>