From owner-p4-projects@FreeBSD.ORG Sun Dec 27 18:24:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B565A106568F; Sun, 27 Dec 2009 18:24: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 60B6A106568B for ; Sun, 27 Dec 2009 18:24:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DAA88FC14 for ; Sun, 27 Dec 2009 18:24:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBRIOjcO033463 for ; Sun, 27 Dec 2009 18:24:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBRIOj11033461 for perforce@freebsd.org; Sun, 27 Dec 2009 18:24:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 27 Dec 2009 18:24:45 GMT Message-Id: <200912271824.nBRIOj11033461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2009 18:24:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=172292 Change 172292 by rene@rene_self on 2009/12/27 18:24:01 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#41 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#34 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#63 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#28 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#41 integrate .. //depot/projects/docproj_nl/share/mk/doc.images.mk#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#30 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#27 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ryusuke.key#1 branch .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#11 integrate .. //depot/projects/docproj_nl/www/en/cgi/query-pr-lib.pl#2 integrate .. //depot/projects/docproj_nl/www/en/copyright/daemon.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#28 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#22 integrate .. //depot/projects/docproj_nl/www/en/news/status/README#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#15 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#61 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#41 (text+ko) ==== @@ -1,4 +1,4 @@ - + + pkg-plist. + If your port installs files conditionally on the options + set in the port, the usual way of handling it is prefixing + the pkg-plist lines with + a %%TAG%% and adding that TAG + to the PLIST_SUB variable inside the + Makefile with a special value of + @comment, which makes package tools to ignore the + line: + + .if defined(WITH_X11) +PLIST_SUB+= X11="" +.else +PLIST_SUB+= X11="@comment " +.endif + + and in the pkg-plist: + + %%X11%%bin/foo-gui + This substitution (as well as addition of any manual pages) will be done between the pre-install and ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#28 (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.492 2009/11/18 13:39:41 mandree Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.493 2009/12/22 15:43:15 ryusuke Exp $ --> aaron@FreeBSD.org"> @@ -956,6 +956,8 @@ rwatson@FreeBSD.org"> +ryusuke@FreeBSD.org"> + sada@FreeBSD.org"> sah@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#41 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1311,6 +1311,11 @@ &pgpkey.metal; + + &a.ryusuke; + &pgpkey.ryusuke; + + &a.garys; &pgpkey.garys; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#27 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -260,6 +260,7 @@ + ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/perl -T # -# Copyright (c) 1996-2008 Wolfram Schneider +# Copyright (c) 1996-2010 Wolfram Schneider # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.239 2009/11/23 18:45:05 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -201,9 +201,11 @@ "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD Ports', "$manLocalDir/FreeBSD-ports", - 'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man", + 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", + 'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man", + 'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable", 'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", @@ -520,7 +522,7 @@ 'freebsd-stable7', 'FreeBSD 7.2-stable', 'freebsd-stable6', 'FreeBSD 6.4-stable', - 'freebsd-current', 'FreeBSD 8-current', + 'freebsd-current', 'FreeBSD 9-current', 'freebsd-release-ports', 'FreeBSD 8.0-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', @@ -1427,10 +1429,10 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.239 2009/11/23 18:45:05 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $'; return qq{\ 
-Copyright (c) 1996-2008 Wolfram Schneider
+Copyright (c) 1996-2010 Wolfram Schneider
 Copyright (c) 1993-1995 Berkeley Software Design, Inc.
 
 This data is part of a licensed program from BERKELEY SOFTWARE

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

@@ -144,7 +144,9 @@
 Release:
 
 
-
+
+
+
 
 
 

==== //depot/projects/docproj_hu/www/en/copyright/daemon.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -45,9 +45,7 @@
 
     
Various size stuffed and beanie daemons are available from
     the FreeBSD Mall
-    beanie daemon.  In Europe, German-made
-    stuffed daemons are also available from
-    Liebscher & Partner.
+    beanie daemon.  
 
     
ScotGold
     produce 1" case badges featuring BSD Daemon.

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

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.235 2009/12/09 20:46:21 gavin Exp $
+$FreeBSD: www/en/developers.sgml,v 1.236 2009/12/22 15:48:47 ryusuke Exp $
 
 -->
 
@@ -477,6 +477,7 @@
 
 
 
+
 
 
 

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

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2650,6 +2650,13 @@
      cracauer 
      Received 
   
+
+  
+     Ivan Jedek 
+     2 Sun Fire V65 
+     miwi (for pkg build cluster) 
+     Received 
+  
 
 
 &footer;

==== //depot/projects/docproj_hu/www/en/java/dists/16.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
-
-
+
+
 
 ]>
 
@@ -9,7 +9,29 @@
 
 
-	

       

+        
+
+

+May 5, 2009: Brian
+Gardner's update to Build 16 of the
+OpenJDK 6 port is committed.
+This update also fixes a problem with the port using the HotSpot JVM
+from the bootstrap JDK rather building and installing it's version of HotSpot.
+

+
+

+February 23, 2009: Brian
+Gardner's port of OpenJDK 6 is
+committed to the &os; Ports Collection.
+

+
+

+February 6, 2009: Brian
+Gardner has announced a port of
+OpenJDK 6 to &os; 7.0.  The patch
+can be found at
+http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html.
+

 
 

 February 14, 2008: Greg
@@ -44,7 +66,7 @@
 August 2, 2007: Greg
 Lewis has released the first patchset (patchlevel 1, "Brumby")
 for the &jdk; 1.6.0 software.  This first release supports both
-FreeBSD and OpenBSD on the i386 and amd64 architectures.  Information
+&os; and OpenBSD on the i386 and amd64 architectures.  Information
 on downloading the patchset can be found at
 http://www.eyesbeyond.com/freebsddom/java/jdk16.html.
 


==== //depot/projects/docproj_hu/www/en/java/news.xml#4 (text+ko) ====

@@ -20,7 +20,7 @@
 
   
     
-      $FreeBSD: www/en/java/news.xml,v 1.8 2009/07/12 22:53:00 glewis Exp $
+      $FreeBSD: www/en/java/news.xml,v 1.9 2009/12/28 05:58:29 glewis Exp $
     
   
 
@@ -28,6 +28,25 @@
     2009
 
     
+      May
+
+      
+        5
+
+        
+          <a href="http://openjdk.java.net/">OpenJDK</a> 6 updated
+            to Build 16.
+
+          
Brian Gardner has
+            released an update of the
+            OpenJDK 6 port to Build 16.
+            See the JDK 1.6.x page
+            for more details.

+        
+      
+    
+
+    
       March
 
       
@@ -44,6 +63,40 @@
         
       
     
+
+    
+      February
+
+      
+        23
+
+        
+          Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6
+            committed
+
+          
Brian Gardner's
+            port of OpenJDK 6 is
+            committed to the Ports Collection as java/openjdk6.
+            See the JDK 1.6.x page for more
+            details.

+        
+      
+
+      
+        6
+
+        
+          Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6
+            announced
+
+          
Brian Gardner has
+            announced a port of OpenJDK
+            6 to FreeBSD 7.x.
+            See the JDK 1.6.x page for more
+            details.

+        
+      
+    
   
 
   
@@ -55,7 +108,7 @@
       
         18
 
-	
+        
           The FreeBSD Foundation has announced binary releases
             of the JDK 1.6 and JRE 1.6
 
@@ -157,7 +210,7 @@
 
       
         2
-   
+
         
           Patchset 1 for &jdk; 1.6 released
 
@@ -179,7 +232,7 @@
         
           Patchset 6 for &jdk; 1.5 released
 
-	  
Greg Lewis has
+          
Greg Lewis has
             released the sixth patchset (patchset 6) in the
             &jdk; 1.5 series.  See the JDK 1.5.x page for more
@@ -242,13 +295,13 @@
             &jdk; 1.5 series.  See the JDK 1.5.x page for more
             details.

-	
+        
       
 
       
         5
 
-	
+        
           The FreeBSD Foundation has announced binary releases
           of the JDK 1.5 and JRE 1.5
 
@@ -461,7 +514,7 @@
         
       
     
-	
+
     
       March
 
@@ -755,7 +808,7 @@
             1.2.x for more details.

 
           
All the issues noted below are still in place,
-	    however.

+            however.

 
           
So anyone who has a Java2 port you've been waiting on
             submitting, now is your chance.


==== //depot/projects/docproj_hu/www/en/news/status/README#2 (text+ko) ====

@@ -29,10 +29,9 @@
     the closing "/>" which is the cause for most of the errors you will
     encounter.  Sometimes other closing tags are missing.
   - Invoking tidy with the following options seems to cause the fewest
-    problems: tidy -xml -i -wrap 74 -latin1
+    problems: tidy -xml -i -wrap 74 -latin1 -preserve
   - Some special characters still break with that - noticed when sos@
-    submits a report.  The o with the slash is "ø" in xml.  Our current
-    tools don't support "ø" from html.
+    submits a report.
   - Remove empty "" sections, they cause a strange looking
     newline.
   - The  part usually needs a hand to make it proper html.  Use 
-
+
 
   
     July-September

==== //depot/projects/docproj_hu/www/en/releases/8.0R/errata.html#2 (text+ko) ====

@@ -16,12 +16,10 @@
 
 
The FreeBSD Project

 
-
Copyright © 2000, 2001, 2002, 2003, 2004, 2005 The FreeBSD
-Documentation Project

+
Copyright © 2009 The FreeBSD Documentation Project

 
-
$FreeBSD:
-release/8.0.0/release/doc/en_US.ISO8859-1/errata/article.sgml 145264 2005-04-19 09:42:25Z
-hrs $

+
$FreeBSD: stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml
+200588 2009-12-15 20:47:51Z delphij $

 

 
 

@@ -45,7 +43,7 @@
 

 
 

-

+

 
This document lists errata items for FreeBSD 8.0-RELEASE, containing significant
 information discovered after the release or too late in the release cycle to be otherwise
 included in the release documentation. This information includes security advisories, as
@@ -75,8 +73,8 @@
 target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date
 mirrors of this location.

 
-
Source and binary snapshots of FreeBSD 8.0-STABLE also contain up-to-date copies of
-this document (as of the time of the snapshot).

+
Source and binary snapshots of FreeBSD 8-STABLE also contain up-to-date copies of this
+document (as of the time of the snapshot).

 
 
For a list of all FreeBSD CERT security advisories, see 
 
2 Security Advisories

 
-
No advisories.

+
The following security advisories pertain to FreeBSD 8.0-RELEASE. For more
+information, consult the individual advisories available from http://security.FreeBSD.org/.

+
+

+
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




AdvisoryDateTopic
SA-09:17.freebsd-update03 December 2009
+
Inappropriate directory permissions in freebsd-update(8)

+
SA-09:16.rtld03 December 2009
+
Improper environment sanitization in rtld(1)

+
SA-09:15.ssl03 December 2009
+
SSL protocol flaw

+

+

 

 
 

@@ -101,7 +145,8 @@
 
 

 

-
4 Late-Breaking News

+
4 Late-Breaking News and
+Corrections

 
 
No news.

 

@@ -109,8 +154,7 @@
 
 

 
This file, and other release-related documents, can be
-downloaded from http://www.FreeBSD.org/.

+downloaded from ftp://ftp.FreeBSD.org/.

 
 
For questions about FreeBSD, read the documentation before contacting <
 
-
+
 
 
  %developers;

==== //depot/projects/docproj_hu/www/hu/where.sgml#19 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 

==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#18 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.67 2009/11/10 15:12:36 roam Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $
     
   
 
@@ -1370,6 +1370,20 @@
     
   
 
+  
+    White Queue Consulting
+    http://whitequeue.com/
+    
+      White Queue Consulting provides embedded FreeBSD kernel and
+      userland development.  Our services include device driver
+      development, kernel porting, software design and development in
+      the kernel and userland.  We are able to work with clients in any
+      location.  For further information contact us through our contact form or visit
+      the White Queue website.
+    
+  
+  
   
     Crepido Systems AB
     http://www.crepido.com

==== //depot/projects/docproj_hu/www/share/sgml/commercial.hardware.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.7 2008/08/26 08:58:07 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.8 2009/12/20 22:53:09 jkois Exp $
     
   
 
@@ -792,6 +792,49 @@
     
   
 
+  
+    Servaris Corporation
+    http://www.servaris.com
+    
+      
Servaris builds Premium Rack Mount, Blade Servers and Tower Servers as well as RAID Storage Subsystems.

+ 
+      
Servaris ProServ 1U Rack Servers and ProServ  2U Rack Servers and 4U High Performance Computing Server are
+	all FreeBSD compatible.  Almost all the ProServ Servers have
+	lights-out remote management via java enabled web browser.
+	Servaris will pre-install FreeBSD AMD/64 or i386 with a Generic
+	or fully customized FreeBSD installation.  Servaris Blade Servers are an 'all in one'
+	clustering and fail-over solution with complete remote management
+	via any java enabled web browser and feature Intel's latest 5500
+	Quad Core Xeon Processors.   Servaris iStor RAID Storage Subsystems are 4GB/8GB
+	Fibre to SAS/SATA and are available in 12-Bay, 16-Bay and 24-Bay
+	Chassis.  asily expandable, simple to maintain and completely
+	manageable via web browser.

+
+      
Servaris has friendly staff that can answer your questions.
+	Please give Servaris a call at 1.877.963.1900 or contact them from
+	here.  Servaris will provide you with Superior Quality
+	Servers and RAID Systems with excellent Warranties at
+	reasonable prices:  "Servaris, Excellence through Passion."

+    
+  
+
   
     Servprise International
     http://www.servprise.com

==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#17 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.52 2009/11/05 12:39:39 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.53 2009/12/21 21:20:43 jkois Exp $
     
   
 
@@ -109,6 +109,18 @@
     
   
 
+  
+    BSDiX
+    http://www.bsdix.com
+    
+      BSDiX is a hosting company specializing in FreeBSD hosting
+      including shared hosting, VPS (Virtual Private Servers), fully
+      managed dedicated servers, website hosting, e-mail hosting, dns
+      hosting and other hosting services exclusively on FreeBSD.
+      Our headquarters is in Oslo, Norway.
+    
+  
+
   
     DBI Hosting
     http://www.dbihosting.com

==== //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#8 (text+ko) ====


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

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.282 2009/12/09 21:15:22 gavin Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.283 2009/12/22 15:48:47 ryusuke Exp $
     
   
 
@@ -34,7 +34,16 @@
 
     
       12
-      
+
+      
+	20
+
+	
+	  
New committer: Ryusuke
+	    SUZUKI (doc/ja_JP, www/ja)

+	
+      
+
       
         7
 

From owner-p4-projects@FreeBSD.ORG  Mon Dec 28 21:51:16 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A5FD10656A4; Mon, 28 Dec 2009 21:51:16 +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 E41BC106566C
	for ; Mon, 28 Dec 2009 21:51:15 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D33938FC1D
	for ; Mon, 28 Dec 2009 21:51:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBSLpF1g055158
	for ; Mon, 28 Dec 2009 21:51:15 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBSLpFsN055156
	for perforce@freebsd.org; Mon, 28 Dec 2009 21:51:15 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 28 Dec 2009 21:51:15 GMT
Message-Id: <200912282151.nBSLpFsN055156@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172330 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 28 Dec 2009 21:51:16 -0000

http://p4web.freebsd.org/chv.cgi?CH=172330

Change 172330 by pgj@Binturong on 2009/12/28 21:51:10

	MFen (www):
		1.282      -> 1.283      hu/share/sgml/news.xml

Affected files ...

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

Differences ...

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

@@ -22,6 +22,15 @@
       12
 
       
+	20
+
+	
+	  
Új tag: Ryusuke
+	    SUZUKI (doc/ja_JP, www/ja)

+	
+      
+
+      
 	7
 
 	

From owner-p4-projects@FreeBSD.ORG  Mon Dec 28 22:01:26 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C58C106568F; Mon, 28 Dec 2009 22:01: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 40DA3106568B
	for ; Mon, 28 Dec 2009 22:01:26 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FEA58FC25
	for ; Mon, 28 Dec 2009 22:01:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBSM1QBU055848
	for ; Mon, 28 Dec 2009 22:01:26 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBSM1QaD055846
	for perforce@freebsd.org; Mon, 28 Dec 2009 22:01:26 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 28 Dec 2009 22:01:26 GMT
Message-Id: <200912282201.nBSM1QaD055846@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172331 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 28 Dec 2009 22:01:26 -0000

http://p4web.freebsd.org/chv.cgi?CH=172331

Change 172331 by pgj@Binturong on 2009/12/28 22:00:44

	MFen (doc):
		1.473      -> 1.474 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#42 edit

Differences ...

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

@@ -7,7 +7,7 @@
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
-     %SRCID%	1.473
+     %SRCID%	1.474
 -->
 
 
@@ -427,7 +427,8 @@
 	      használatával tetszõleges jelszó
 	      megadható), ssh (nincs jelszó))
 
-	    SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub
+	    SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub
+SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub
 
 	  
 	  

From owner-p4-projects@FreeBSD.ORG  Mon Dec 28 22:09:35 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D38DF106568B; Mon, 28 Dec 2009 22:09: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 9837C1065670
	for ; Mon, 28 Dec 2009 22:09:34 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DF178FC0A
	for ; Mon, 28 Dec 2009 22:09:34 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBSM9Yuu057402
	for ; Mon, 28 Dec 2009 22:09:34 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBSM9Yjb057400
	for perforce@freebsd.org; Mon, 28 Dec 2009 22:09:34 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 28 Dec 2009 22:09:34 GMT
Message-Id: <200912282209.nBSM9Yjb057400@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172332 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 28 Dec 2009 22:09:35 -0000

http://p4web.freebsd.org/chv.cgi?CH=172332

Change 172332 by pgj@Binturong on 2009/12/28 22:08:34

	Update %SRCID% for news.xml

Affected files ...

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

Differences ...

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

@@ -5,7 +5,7 @@
 
 
 

From owner-p4-projects@FreeBSD.ORG  Mon Dec 28 22:43:09 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E096310656A4; Mon, 28 Dec 2009 22:43: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 A4243106568B
	for ; Mon, 28 Dec 2009 22:43:08 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 795358FC16
	for ; Mon, 28 Dec 2009 22:43:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBSMh8IZ060004
	for ; Mon, 28 Dec 2009 22:43:08 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBSMh8df060002
	for perforce@freebsd.org; Mon, 28 Dec 2009 22:43:08 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 28 Dec 2009 22:43:08 GMT
Message-Id: <200912282243.nBSMh8df060002@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172335 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 28 Dec 2009 22:43:09 -0000

http://p4web.freebsd.org/chv.cgi?CH=172335

Change 172335 by pgj@Binturong on 2009/12/28 22:42:12

	Fix country matching routines for generating FreeBSD-related
	events map chart.
	
	Submitted by:	bland

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#6 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#6 (text+ko) ====

@@ -66,7 +66,7 @@
     use="concat(startdate/year, format-number(startdate/month, '00'))"/>
 
   
+    use="location/country/@code" />
 
   
+    use="location/country/@code" />
 
   
 
@@ -83,8 +83,8 @@
   
     
-      
+	generate-id(key('event-by-country', location/country/@code)[1])]">
+      
         
     
   
@@ -92,10 +92,10 @@
   
     
-      
-        100.0
-        .0
+	generate-id(key('event-by-country', location/country/@code)[1])]">
+      
+        100.0
+        .0
         ,
   
 

From owner-p4-projects@FreeBSD.ORG  Wed Dec 30 16:52:23 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9837B1065679; Wed, 30 Dec 2009 16:52:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5BBDE106566B
	for ; Wed, 30 Dec 2009 16:52:23 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 483108FC16
	for ; Wed, 30 Dec 2009 16:52:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBUGqNwi008308
	for ; Wed, 30 Dec 2009 16:52:23 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBUGqM5m008306
	for perforce@freebsd.org; Wed, 30 Dec 2009 16:52:22 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 30 Dec 2009 16:52:22 GMT
Message-Id: <200912301652.nBUGqM5m008306@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172392 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Dec 2009 16:52:23 -0000

http://p4web.freebsd.org/chv.cgi?CH=172392

Change 172392 by mav@mav_mavbook on 2009/12/30 16:51:33

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/MAINTAINERS#7 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#21 integrate
.. //depot/projects/scottl-camlock/src/bin/kenv/kenv.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/ftree.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/util.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/arith.y#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/cd.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#9 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.c#8 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mkbuiltins#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mkinit.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mystring.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/options.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/options.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.h#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#10 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.h#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.h#3 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/telnet/telnetd/sys_term.c#3 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#12 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#7 integrate
.. //depot/projects/scottl-camlock/src/etc/network.subr#10 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.firewall#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#9 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/strfile/strfile.c#3 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/unstr/unstr.c#2 integrate
.. //depot/projects/scottl-camlock/src/games/number/number.c#3 integrate
.. //depot/projects/scottl-camlock/src/include/paths.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_check_magic.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_crc32.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_stat.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_xattr.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_hash.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_platform.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_fd.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_file.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_filename.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_all.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_compress.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_program.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_uu.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_compression_xz.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_ar.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_mtree.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_raw.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_string.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_string.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_util.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_util.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_virtual.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_open_fd.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_private.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_compress.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_none.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_program.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_compression_xz.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_ar.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_by_name.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_mtree.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_zip.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/config_freebsd.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/filter_fork.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/libarchive-formats.5#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/tar.5#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_acl_pax.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_bzip2.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_cpio.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_entry.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_entry_strmode.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_extattr_freebsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_open_fd.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_open_file.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_compress_program.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_data_large.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_disk.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_extract.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_ar.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#2 delete
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_mtree.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tar.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tbz.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_tlz.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_large.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_uu.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_tar_large.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_compress_program.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_failures.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_perms.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_secure.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_sparse.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_symlink.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_disk_times.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip_empty.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/time.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/time.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/clock_gettime.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libexpat/libbsdxml.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_mech_switch.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libnetgraph/debug.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/ulog.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/ulog_setutxfile.3#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/rusers_proc.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/rusersd.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-aout/shlib.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-aout/support.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/talkd/process.c#3 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#5 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/build/mfs.mtree#2 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#5 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/master.passwd#2 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch
.. //depot/projects/scottl-camlock/src/release/picobsd/qemu/PICOBSD#1 branch
.. //depot/projects/scottl-camlock/src/release/picobsd/qemu/PICOBSD.hints#1 branch
.. //depot/projects/scottl-camlock/src/release/picobsd/qemu/config#1 branch
.. //depot/projects/scottl-camlock/src/release/picobsd/qemu/crunch.conf#1 branch
.. //depot/projects/scottl-camlock/src/release/picobsd/qemu/floppy.tree.exclude#1 branch
.. //depot/projects/scottl-camlock/src/sbin/comcontrol/comcontrol.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/gjournal.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ggate/ggated/ggated.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ldconfig/ldconfig.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/vfslist.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_nullfs/mount_nullfs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/natd/natd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/nfsiod/nfsiod.8#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/nfsiod/nfsiod.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/rcorder/ealloc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/rcorder/hash.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/rcorder/rcorder.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/routed/if.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/shutdown/shutdown.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/umount/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/umount/umount.c#3 integrate
.. //depot/projects/scottl-camlock/src/secure/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/share/examples/pppd/auth-down.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/auth-up.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/chap-secrets.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/chat.sh.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/ip-down.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/ip-up.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/options.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/pap-secrets.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/ppp.deny.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/pppd/ppp.shells.sample#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/slattach/unit-command.sh#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.hosts#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.login#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.logout#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/sliplogin/slip.slparms#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/startslip/sldown.sh#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/startslip/slip.sh#2 delete
.. //depot/projects/scottl-camlock/src/share/examples/startslip/slup.sh#2 delete
.. //depot/projects/scottl-camlock/src/share/man/man4/ifmib.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/termios.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/tty.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/u3g.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ucom.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#12 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_disk.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#46 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#60 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.sparc64#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_vm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/fb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/fbreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/machfb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ksyms/ksyms.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/led/led.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tdfx/tdfx_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mem.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xbox/xboxfb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sscdisk.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_devstat.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_accf.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn1000/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn4965/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5000/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn6000/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if.c#39 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/atm/uni/ng_uni.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_encap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/krpc_subr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/gdc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/firereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/firevar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/conf.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/file.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ttydevsw.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/xen/gnttab.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-crossfs.test#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/acpyacc.y#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/read.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/find/function.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/extern.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/lprint.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/net.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/sprint.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/util.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mklocale/lex.l#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mklocale/yacc.y#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/wall/wall.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/wc/wc.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/lang.l#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/cpucontrol.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/crunch/examples/really-big.conf#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/eeprom.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/lib/getdate.y#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsd.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ntp/config.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/pmcannotate.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ppp/ppp.8.m4#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/mounttab.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/rwhod.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sa/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sa/pdb.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sa/usrdb.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/service/service.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/service/service.sh#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/watchdogd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/ypinit.sh#2 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/MAINTAINERS#7 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.155 2009/12/06 23:48:38 cperciva Exp $
+$FreeBSD: src/MAINTAINERS,v 1.156 2009/12/30 14:41:02 mjacob Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -48,7 +48,6 @@
 cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
-isp(4)		mjacob	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
 tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.215 2009/12/05 17:46:51 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.216 2009/12/29 20:20:51 trasz Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,29 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091229: remove no longer relevant examples
+OLD_FILES+=usr/share/examples/pppd/auth-down.sample
+OLD_FILES+=usr/share/examples/pppd/auth-up.sample
+OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
+OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
+OLD_FILES+=usr/share/examples/pppd/ip-down.sample
+OLD_FILES+=usr/share/examples/pppd/ip-up.sample
+OLD_FILES+=usr/share/examples/pppd/options.sample
+OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
+OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
+OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
+OLD_DIRS+=usr/share/examples/pppd
+OLD_FILES+=usr/share/examples/slattach/unit-command.sh
+OLD_DIRS+=usr/share/examples/slattach
+OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
+OLD_FILES+=usr/share/examples/sliplogin/slip.login
+OLD_FILES+=usr/share/examples/sliplogin/slip.logout
+OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
+OLD_DIRS+=usr/share/examples/sliplogin
+OLD_FILES+=usr/share/examples/startslip/sldown.sh
+OLD_FILES+=usr/share/examples/startslip/slip.sh
+OLD_FILES+=usr/share/examples/startslip/slup.sh
+OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6.
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6

==== //depot/projects/scottl-camlock/src/bin/kenv/kenv.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.8 2005/09/13 19:01:53 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.9 2009/12/29 08:45:07 ed Exp $");
 
 #include 
 #include 
@@ -118,7 +118,7 @@
 }
 
 static int
-kdumpenv()
+kdumpenv(void)
 {
 	char *buf, *cp;
 	int buflen, envlen;

==== //depot/projects/scottl-camlock/src/bin/pax/ftree.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.25 2009/12/29 08:45:50 ed Exp $");
 
 #include 
 #include 
@@ -219,7 +219,7 @@
  */
 
 void
-ftree_notsel()
+ftree_notsel(void)
 {
 	if (ftent != NULL)
 		(void)fts_set(ftsp, ftent, FTS_SKIP);

==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.4 2009/05/17 04:34:14 brian Exp $");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.5 2009/12/28 22:56:30 antoine Exp $");
 
 #include 
 #include 
@@ -113,14 +113,14 @@
 static kvm_t	*kd;
 static pid_t	mypid;
 
-static struct listhead euidlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead sidlist = SLIST_HEAD_INITIALIZER(list);
-static struct listhead jidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead euidlist = SLIST_HEAD_INITIALIZER(euidlist);
+static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(ruidlist);
+static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(rgidlist);
+static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(pgrplist);
+static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(ppidlist);
+static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(tdevlist);
+static struct listhead sidlist = SLIST_HEAD_INITIALIZER(sidlist);
+static struct listhead jidlist = SLIST_HEAD_INITIALIZER(jidlist);
 
 static void	usage(void) __attribute__((__noreturn__));
 static int	killact(const struct kinfo_proc *);

==== //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.10 2009/12/26 10:06:45 trasz Exp $");
 
 #include 
 #include 
@@ -100,11 +100,10 @@
 	acl_get_brand_np(acl, &acl_brand);
 	acl_get_brand_np(*prev_acl, &prev_acl_brand);
 
-	if (acl_brand != prev_acl_brand) {
+	if (branding_mismatch(acl_brand, prev_acl_brand)) {
 		warnx("%s: branding mismatch; existing ACL is %s, "
 		    "entry to be merged is %s", filename,
-		    prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
-		    acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
+		    brand_name(prev_acl_brand), brand_name(acl_brand));
 		return (-1);
 	}
 
@@ -252,9 +251,10 @@
 		return (-1);
 	}
 
-	if (acl_brand != ACL_BRAND_NFS4) {
+	if (branding_mismatch(acl_brand, ACL_BRAND_NFS4)) {
 		warnx("%s: branding mismatch; existing ACL is NFSv4, "
-		    "entry to be added is POSIX.1e", filename);
+		    "entry to be added is %s", filename,
+		    brand_name(acl_brand));
 		return (-1);
 	}
 

==== //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.8 2009/12/26 10:06:45 trasz Exp $");
 
 #include 
 #include 
@@ -53,11 +53,10 @@
 	acl_get_brand_np(acl, &acl_brand);
 	acl_get_brand_np(*prev_acl, &prev_acl_brand);
 
-	if (acl_brand != prev_acl_brand) {
+	if (branding_mismatch(acl_brand, prev_acl_brand)) {
 		warnx("%s: branding mismatch; existing ACL is %s, "
 		    "entry to be removed is %s", filename,
-		    prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
-		    acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
+		    brand_name(prev_acl_brand), brand_name(acl_brand));
 		return (-1);
 	}
 

==== //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.6 2009/09/07 16:19:32 trasz Exp $
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.7 2009/12/26 10:06:45 trasz Exp $
  */
 
 #ifndef _SETFACL_H
@@ -71,6 +71,8 @@
 int    set_acl_mask(acl_t *prev_acl, const char *filename);
 /* util.c */
 void  *zmalloc(size_t size);
+const char *brand_name(int brand);
+int    branding_mismatch(int brand1, int brand2);
 
 uint       have_mask;
 uint       need_mask;

==== //depot/projects/scottl-camlock/src/bin/setfacl/util.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.8 2009/12/26 11:03:10 trasz Exp $");
 
 #include 
 #include 
@@ -43,3 +43,26 @@
 		err(1, "calloc() failed");
 	return (ptr);
 }
+
+const char *
+brand_name(int brand)
+{
+	switch (brand) {
+	case ACL_BRAND_NFS4:
+		return "NFSv4";
+	case ACL_BRAND_POSIX:
+		return "POSIX.1e";
+	default:
+		return "unknown";
+	}
+}
+
+int
+branding_mismatch(int brand1, int brand2)
+{
+	if (brand1 == ACL_BRAND_UNKNOWN || brand2 == ACL_BRAND_UNKNOWN)
+		return (0);
+	if (brand1 != brand2)
+		return (1);
+	return (0);
+}

==== //depot/projects/scottl-camlock/src/bin/sh/arith.y#4 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.25 2009/12/30 15:59:40 jilles Exp $");
 
 #include 
 #include 
@@ -85,9 +85,9 @@
 	ARITH_LPAREN expr ARITH_RPAREN
 		{ $$ = $2; } |
 	expr ARITH_OR expr
-		{ $$ = $1 ? $1 : $3 ? $3 : 0; } |
+		{ $$ = $1 || $3; } |
 	expr ARITH_AND expr
-		{ $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } |
+		{ $$ = $1 && $3; } |
 	expr ARITH_BOR expr
 		{ $$ = $1 | $3; } |
 	expr ARITH_BXOR expr
@@ -314,7 +314,7 @@
 int
 expcmd(int argc, char **argv)
 {
-	char *p;
+	const char *p;
 	char *concat;
 	char **ap;
 	arith_t i;

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

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.39 2009/12/27 18:04:05 jilles Exp $");
 
 #include 
 #include 
@@ -79,7 +79,7 @@
 int
 cdcmd(int argc, char **argv)
 {
-	char *dest;
+	const char *dest;
 	const char *path;
 	char *p;
 	struct stat statb;

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

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.71 2009/12/27 18:04:05 jilles Exp $");
 
 #include 
 #include 
@@ -74,7 +74,7 @@
 #endif
 
 
-MKINIT int evalskip;		/* set if we are skipping commands */
+int evalskip;			/* set if we are skipping commands */
 STATIC int skipcount;		/* number of levels to skip */
 MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
@@ -407,8 +407,7 @@
 			flags &=~ EV_TESTED;
 		redirect(n->nredir.redirect, 0);
 		evaltree(n->nredir.n, flags | EV_EXIT);	/* never returns */
-	}
-	if (! backgnd) {
+	} else if (! backgnd) {
 		INTOFF;
 		exitstatus = waitforjob(jp, (int *)NULL);
 		INTON;
@@ -849,7 +848,7 @@
 			listsetvar(cmdenviron);
 		commandname = argv[0];
 		argptr = argv + 1;
-		optptr = NULL;			/* initialize nextopt */
+		nextopt_optptr = NULL;		/* initialize nextopt */
 		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();

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

@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/eval.h,v 1.13 2009/06/13 21:17:45 jilles Exp $
+ * $FreeBSD: src/bin/sh/eval.h,v 1.14 2009/12/27 18:04:05 jilles Exp $
  */
 
 extern char *commandname;	/* currently executing command */
 extern int exitstatus;		/* exit status of last command */
+extern int oexitstatus;		/* saved exit status */
 extern struct strlist *cmdenviron;  /* environment for builtin command */
 
 

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

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.39 2009/12/27 18:04:05 jilles Exp $");
 
 #include 
 #include 
@@ -109,7 +109,7 @@
  */
 
 void
-shellexec(char **argv, char **envp, const char *path, int index)
+shellexec(char **argv, char **envp, const char *path, int idx)
 {
 	char *cmdname;
 	int e;
@@ -120,7 +120,7 @@
 	} else {
 		e = ENOENT;
 		while ((cmdname = padvance(&path, argv[0])) != NULL) {
-			if (--index < 0 && pathopt == NULL) {
+			if (--idx < 0 && pathopt == NULL) {
 				tryexec(cmdname, argv, envp);
 				if (errno != ENOENT && errno != ENOTDIR)
 					e = errno;
@@ -268,17 +268,17 @@
 STATIC void
 printentry(struct tblentry *cmdp, int verbose)
 {
-	int index;
+	int idx;
 	const char *path;
 	char *name;
 
 	if (cmdp->cmdtype == CMDNORMAL) {
-		index = cmdp->param.index;
+		idx = cmdp->param.index;
 		path = pathval();
 		do {
 			name = padvance(&path, cmdp->cmdname);
 			stunalloc(name);
-		} while (--index >= 0);
+		} while (--idx >= 0);
 		out1str(name);
 	} else if (cmdp->cmdtype == CMDBUILTIN) {
 		out1fmt("builtin %s", cmdp->cmdname);
@@ -314,7 +314,7 @@
     const char *path)
 {
 	struct tblentry *cmdp;
-	int index;
+	int idx;
 	int prev;
 	char *fullname;
 	struct stat statb;
@@ -354,11 +354,11 @@
 	}
 
 	e = ENOENT;
-	index = -1;
+	idx = -1;
 loop:
 	while ((fullname = padvance(&path, name)) != NULL) {
 		stunalloc(fullname);
-		index++;
+		idx++;
 		if (pathopt) {
 			if (prefix("builtin", pathopt)) {
 				if ((i = find_builtin(name, &spec)) < 0)
@@ -377,8 +377,8 @@
 			}
 		}
 		/* if rehash, don't redo absolute path names */
-		if (fullname[0] == '/' && index <= prev) {
-			if (index < prev)
+		if (fullname[0] == '/' && idx <= prev) {
+			if (idx < prev)
 				goto loop;
 			TRACE(("searchexec \"%s\": no change\n", name));
 			goto success;
@@ -415,7 +415,7 @@
 		INTOFF;
 		cmdp = cmdlookup(name, 1);
 		cmdp->cmdtype = CMDNORMAL;
-		cmdp->param.index = index;
+		cmdp->param.index = idx;
 		INTON;
 		goto success;
 	}
@@ -494,18 +494,18 @@
 changepath(const char *newval)
 {
 	const char *old, *new;
-	int index;
+	int idx;
 	int firstchange;
 	int bltin;
 
 	old = pathval();
 	new = newval;
 	firstchange = 9999;	/* assume no change */
-	index = 0;
+	idx = 0;
 	bltin = -1;
 	for (;;) {
 		if (*old != *new) {
-			firstchange = index;
+			firstchange = idx;
 			if ((*old == '\0' && *new == ':')
 			 || (*old == ':' && *new == '\0'))
 				firstchange++;
@@ -514,9 +514,9 @@
 		if (*new == '\0')
 			break;
 		if (*new == '%' && bltin < 0 && prefix("builtin", new + 1))
-			bltin = index;
+			bltin = idx;
 		if (*new == ':') {
-			index++;
+			idx++;
 		}
 		new++, old++;
 	}
@@ -724,15 +724,14 @@
 {
 	struct cmdentry entry;
 	struct tblentry *cmdp;
-	char **pp;
+	const char *const *pp;
 	struct alias *ap;
 	int i;
-	int error = 0;
-	extern char *const parsekwd[];
+	int error1 = 0;
 
 	for (i = 1; i < argc; i++) {
 		/* First look at the keywords */
-		for (pp = (char **)parsekwd; *pp; pp++)
+		for (pp = parsekwd; *pp; pp++)
 			if (**pp == *argv[i] && equal(*pp, argv[i]))
 				break;
 
@@ -793,7 +792,7 @@
 					if (cmd != TYPECMD_SMALLV)
 						outfmt(out2, "%s: %s\n",
 						    argv[i], strerror(errno));
-					error |= 127;
+					error1 |= 127;
 				}
 			}
 			break;
@@ -818,11 +817,11 @@
 		default:
 			if (cmd != TYPECMD_SMALLV)
 				outfmt(out2, "%s: not found\n", argv[i]);
-			error |= 127;
+			error1 |= 127;
 			break;
 		}
 	}
-	return error;
+	return error1;
 }
 
 /*


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

From owner-p4-projects@FreeBSD.ORG  Thu Dec 31 00:52:32 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1976D1065679; Thu, 31 Dec 2009 00:52:32 +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 D15DA106566C
	for ; Thu, 31 Dec 2009 00:52:31 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BD60A8FC0C
	for ; Thu, 31 Dec 2009 00:52:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBV0qVI9076824
	for ; Thu, 31 Dec 2009 00:52:31 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBV0qULx076822
	for perforce@freebsd.org; Thu, 31 Dec 2009 00:52:30 GMT
	(envelope-from thompsa@freebsd.org)
Date: Thu, 31 Dec 2009 00:52:30 GMT
Message-Id: <200912310052.nBV0qULx076822@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 172419 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 31 Dec 2009 00:52:32 -0000

http://p4web.freebsd.org/chv.cgi?CH=172419

Change 172419 by thompsa@thompsa_pea on 2009/12/31 00:51:43

	IFC @172418

Affected files ...

.. //depot/projects/usb/src/sys/amd64/amd64/mem.c#5 integrate
.. //depot/projects/usb/src/sys/arm/arm/mem.c#5 integrate
.. //depot/projects/usb/src/sys/arm/conf/AVILA#19 integrate
.. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#11 integrate
.. //depot/projects/usb/src/sys/arm/include/pmc_mdep.h#3 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#10 integrate
.. //depot/projects/usb/src/sys/boot/common/dev_net.c#4 integrate
.. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_disk.c#3 integrate
.. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#9 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_all.c#7 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#9 integrate
.. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate
.. //depot/projects/usb/src/sys/conf/files#89 integrate
.. //depot/projects/usb/src/sys/conf/files.arm#10 integrate
.. //depot/projects/usb/src/sys/conf/files.ia64#15 integrate
.. //depot/projects/usb/src/sys/conf/files.sun4v#9 integrate
.. //depot/projects/usb/src/sys/conf/options.sparc64#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#16 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pfvar.h#7 integrate
.. //depot/projects/usb/src/sys/dev/adlink/adlink.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ae/if_ae.c#7 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#9 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/Makefile#3 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate
.. //depot/projects/usb/src/sys/dev/bktr/bktr_os.c#7 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#8 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#6 integrate
.. //depot/projects/usb/src/sys/dev/fb/creator.c#9 integrate
.. //depot/projects/usb/src/sys/dev/fb/fb.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/fbreg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/machfb.c#5 integrate
.. //depot/projects/usb/src/sys/dev/fb/s3_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.c#7 integrate
.. //depot/projects/usb/src/sys/dev/fb/vga.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/vgareg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/firewire/fwdev.c#9 integrate
.. //depot/projects/usb/src/sys/dev/firewire/fwmem.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hifn/hifn7751.c#5 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_arm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#6 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#16 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_xscale.c#1 branch
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_xscale.h#1 branch
.. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#8 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#13 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#5 integrate
.. //depot/projects/usb/src/sys/dev/jme/if_jme.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ksyms/ksyms.c#4 integrate
.. //depot/projects/usb/src/sys/dev/led/led.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mc146818/mc146818.c#3 integrate
.. //depot/projects/usb/src/sys/dev/mc146818/mc146818reg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mc146818/mc146818var.h#3 integrate
.. //depot/projects/usb/src/sys/dev/md/md.c#14 integrate
.. //depot/projects/usb/src/sys/dev/mge/if_mge.c#8 integrate
.. //depot/projects/usb/src/sys/dev/mk48txx/mk48txx.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mk48txx/mk48txxreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mk48txx/mk48txxvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#10 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#32 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#9 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.h#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/channel.c#9 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/dsp.c#10 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/sndstat.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ste/if_ste.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ste/if_stereg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#19 integrate
.. //depot/projects/usb/src/sys/dev/tdfx/tdfx_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/twe/twe.c#6 integrate
.. //depot/projects/usb/src/sys/dev/twe/twe_freebsd.c#6 integrate
.. //depot/projects/usb/src/sys/dev/twe/twevar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_ebus.c#2 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_cpu_sparc64.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#43 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#93 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#20 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#19 integrate
.. //depot/projects/usb/src/sys/dev/vge/if_vge.c#14 integrate
.. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#9 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#6 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#7 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs.h#3 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#8 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#14 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#9 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#5 integrate
.. //depot/projects/usb/src/sys/geom/concat/g_concat.c#6 integrate
.. //depot/projects/usb/src/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/usb/src/sys/geom/geom_dev.c#13 integrate
.. //depot/projects/usb/src/sys/geom/geom_io.c#12 integrate
.. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#10 integrate
.. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#10 integrate
.. //depot/projects/usb/src/sys/geom/stripe/g_stripe.c#7 integrate
.. //depot/projects/usb/src/sys/i386/i386/elan-mmcr.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/mem.c#3 integrate
.. //depot/projects/usb/src/sys/i386/xbox/xboxfb.c#4 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/bus_machdep.c#1 branch
.. //depot/projects/usb/src/sys/ia64/ia64/clock.c#7 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#17 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/mem.c#3 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/nexus.c#7 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/sscdisk.c#4 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/sys_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/ia64/include/bus.h#3 integrate
.. //depot/projects/usb/src/sys/ia64/include/clock.h#4 integrate
.. //depot/projects/usb/src/sys/ia64/include/cpufunc.h#4 integrate
.. //depot/projects/usb/src/sys/ia64/include/mca.h#3 integrate
.. //depot/projects/usb/src/sys/ia64/include/md_var.h#7 integrate
.. //depot/projects/usb/src/sys/isa/vga_isa.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_conf.c#20 integrate
.. //depot/projects/usb/src/sys/kern/kern_jail.c#35 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#25 integrate
.. //depot/projects/usb/src/sys/kern/kern_rmlock.c#6 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#22 integrate
.. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#4 integrate
.. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#7 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#36 integrate
.. //depot/projects/usb/src/sys/kern/subr_devstat.c#4 integrate
.. //depot/projects/usb/src/sys/kern/subr_witness.c#22 integrate
.. //depot/projects/usb/src/sys/kern/tty.c#34 integrate
.. //depot/projects/usb/src/sys/kern/uipc_accf.c#3 integrate
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#33 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#29 integrate
.. //depot/projects/usb/src/sys/mips/mips/mem.c#3 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/Makefile#4 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn1000/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn4965/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn5000/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn6000/Makefile#1 branch
.. //depot/projects/usb/src/sys/net/if.c#43 integrate
.. //depot/projects/usb/src/sys/net/if.h#14 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#22 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#26 integrate
.. //depot/projects/usb/src/sys/net/if_llatbl.c#9 integrate
.. //depot/projects/usb/src/sys/net/if_llatbl.h#5 integrate
.. //depot/projects/usb/src/sys/net/if_var.h#32 integrate
.. //depot/projects/usb/src/sys/net/if_vlan.c#20 integrate
.. //depot/projects/usb/src/sys/net/netisr.c#14 integrate
.. //depot/projects/usb/src/sys/net/route.c#28 integrate
.. //depot/projects/usb/src/sys/net/route.h#13 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#34 integrate
.. //depot/projects/usb/src/sys/netgraph/atm/uni/ng_uni.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_base.c#22 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ipfw.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#40 integrate
.. //depot/projects/usb/src/sys/netinet/in.h#16 integrate
.. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip_encap.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#31 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#2 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.c#3 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#36 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#29 integrate
.. //depot/projects/usb/src/sys/nfsclient/krpc_subr.c#8 integrate
.. //depot/projects/usb/src/sys/pc98/cbus/gdc.c#4 integrate
.. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/mem.c#5 integrate
.. //depot/projects/usb/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#5 integrate
.. //depot/projects/usb/src/sys/sparc64/include/intr_machdep.h#8 integrate
.. //depot/projects/usb/src/sys/sparc64/include/iommureg.h#5 integrate
.. //depot/projects/usb/src/sys/sparc64/include/iommuvar.h#5 integrate
.. //depot/projects/usb/src/sys/sparc64/pci/fire.c#1 branch
.. //depot/projects/usb/src/sys/sparc64/pci/firereg.h#1 branch
.. //depot/projects/usb/src/sys/sparc64/pci/firevar.h#1 branch
.. //depot/projects/usb/src/sys/sparc64/pci/ofw_pci.h#7 integrate
.. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcib.c#8 integrate
.. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcibus.c#11 integrate
.. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/eeprom.c#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/identcpu.c#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/interrupt.S#3 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/intr_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/iommu.c#8 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#7 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/ofw_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/rtc.c#5 integrate
.. //depot/projects/usb/src/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/usb/src/sys/sys/ata.h#11 integrate
.. //depot/projects/usb/src/sys/sys/conf.h#22 integrate
.. //depot/projects/usb/src/sys/sys/disk.h#6 integrate
.. //depot/projects/usb/src/sys/sys/file.h#8 integrate
.. //depot/projects/usb/src/sys/sys/pmc.h#9 integrate
.. //depot/projects/usb/src/sys/sys/ttydevsw.h#3 integrate
.. //depot/projects/usb/src/sys/vm/device_pager.c#12 integrate
.. //depot/projects/usb/src/sys/vm/uma_core.c#12 integrate
.. //depot/projects/usb/src/sys/xen/gnttab.c#7 integrate

Differences ...

==== //depot/projects/usb/src/sys/amd64/amd64/mem.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.124 2008/09/27 08:51:18 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.125 2009/12/29 21:51:28 rnoland Exp $");
 
 /*
  * Memory special file
@@ -144,8 +144,8 @@
  */
 /* ARGSUSED */
 int
-memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr,
-    int prot __unused)
+memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot __unused, vm_memattr_t *memattr __unused)
 {
 	if (dev2unit(dev) == CDEV_MINOR_MEM)
 		*paddr = offset;

==== //depot/projects/usb/src/sys/arm/arm/mem.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.6 2008/09/27 08:51:18 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.7 2009/12/29 21:51:28 rnoland Exp $");
 
 /*
  * Memory special file
@@ -153,8 +153,8 @@
 /* ARGSUSED */
 
 int
-memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr,
-    int prot __unused)
+memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot __unused, vm_memattr_t *memattr __unused)
 {
 	if (dev2unit(dev) == CDEV_MINOR_MEM)
 		*paddr = offset;

==== //depot/projects/usb/src/sys/arm/conf/AVILA#19 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.35 2009/12/23 23:16:54 rpaulo Exp $
 
 ident		AVILA
 
@@ -61,6 +61,10 @@
 #options 	PREEMPTION
 #options 	VERBOSE_SYSINIT
 
+# Hardware performance counters
+options 	HWPMC_HOOKS
+device		hwpmc
+
 #device		saarm
 
 device		pci

==== //depot/projects/usb/src/sys/arm/conf/CAMBRIA#11 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $
+# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.16 2009/12/23 23:16:54 rpaulo Exp $
 
 ident		CAMBRIA
 
@@ -58,6 +58,10 @@
 options 	BOOTP_WIRED_TO=npe0
 options 	BOOTP_COMPAT
 
+# Hardware performance counters
+options 	HWPMC_HOOKS
+device		hwpmc
+
 #options 	VERBOSE_SYSINIT
 options 	VERBOSE_INIT_ARM
 

==== //depot/projects/usb/src/sys/arm/include/pmc_mdep.h#3 (text+ko) ====

@@ -1,12 +1,42 @@
 /*-
- * This file is in the public domain.
+ * Copyright (c) 2009 Rui Paulo 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/pmc_mdep.h,v 1.3 2007/12/07 13:45:46 jkoshy Exp $
+ * $FreeBSD: src/sys/arm/include/pmc_mdep.h,v 1.4 2009/12/23 23:16:54 rpaulo Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
 #define	_MACHINE_PMC_MDEP_H_
 
+#define	PMC_MDEP_CLASS_INDEX_XSCALE	0
+/*
+ * On the ARM platform we support the following PMCs.
+ *
+ * XSCALE	Intel XScale processors
+ */
+#include 
+
 union pmc_md_op_pmcallocate {
 	uint64_t	__pad[4];
 };
@@ -15,14 +45,20 @@
 #define	PMCLOG_READADDR		PMCLOG_READ32
 #define	PMCLOG_EMITADDR		PMCLOG_EMIT32
 
-#if	_KERNEL
+#ifdef	_KERNEL
 union pmc_md_pmc {
+	struct pmc_md_xscale_pmc	pm_xscale;
 };
 
-#define	PMC_TRAPFRAME_TO_PC(TF)	(0)	/* Stubs */
-#define	PMC_TRAPFRAME_TO_FP(TF)	(0)
-#define	PMC_TRAPFRAME_TO_SP(TF)	(0)
+#define	PMC_TRAPFRAME_TO_PC(TF)	((TF)->tf_pc)
+#define	PMC_TRAPFRAME_TO_FP(TF)	((TF)->tf_usr_lr)
+#define	PMC_TRAPFRAME_TO_SP(TF)	((TF)->tf_usr_sp)
 
-#endif
+/*
+ * Prototypes
+ */
+struct pmc_mdep *pmc_xscale_initialize(void);
+void		pmc_xscale_finalize(struct pmc_mdep *_md);
+#endif /* _KERNEL */
 
 #endif /* !_MACHINE_PMC_MDEP_H_ */

==== //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#10 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.12 2009/12/23 23:16:54 rpaulo Exp $
 arm/arm/bus_space_generic.c		standard
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
@@ -16,6 +16,7 @@
 arm/xscale/ixp425/ixp425_a4x_space.c	optional	uart
 arm/xscale/ixp425/ixp425_a4x_io.S	optional	uart
 dev/cfi/cfi_bus_ixp4xx.c		optional	cfi
+dev/hwpmc/hwpmc_xscale.c		optional	hwpmc
 dev/uart/uart_dev_ns8250.c		optional	uart
 #
 # NPE-based Ethernet support (requires qmgr also).

==== //depot/projects/usb/src/sys/boot/common/dev_net.c#4 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.18 2008/09/10 20:53:22 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.19 2009/12/24 15:16:16 marius Exp $");
 
 /*-
  * This module implements a "raw device" interface suitable for
@@ -76,7 +76,9 @@
 #include "dev_net.h"
 #include "bootstrap.h"
 
+#ifdef	NETIF_DEBUG
 int debug = 0;
+#endif
 
 static int netdev_sock = -1;
 static int netdev_opens;
@@ -100,7 +102,7 @@
 	net_print
 };
 
-int
+static int
 net_init(void)
 {
 
@@ -112,7 +114,7 @@
  * This opens the low-level device and sets f->f_devdata.
  * This is declared with variable arguments...
  */
-int
+static int
 net_open(struct open_file *f, ...)
 {
 	va_list args;
@@ -132,8 +134,10 @@
 				printf("net_open: netif_open() failed\n");
 				return (ENXIO);
 			}
+#ifdef	NETIF_DEBUG
 			if (debug)
-			printf("net_open: netif_open() succeeded\n");
+				printf("net_open: netif_open() succeeded\n");
+#endif
 		}
 		if (rootip.s_addr == 0) {
 			/* Get root IP address, and path, etc. */
@@ -154,7 +158,7 @@
 	return (error);
 }
 
-int
+static int
 net_close(struct open_file *f)
 {
 #ifdef	NETIF_DEBUG
@@ -173,15 +177,17 @@
 		return(0);
 	rootip.s_addr = 0;
 	if (netdev_sock >= 0) {
+#ifdef	NETIF_DEBUG
 		if (debug)
 			printf("net_close: calling netif_close()\n");
+#endif
 		netif_close(netdev_sock);
 		netdev_sock = -1;
 	}
 	return (0);
 }
 
-int
+static int
 net_strategy()
 {
 
@@ -227,9 +233,11 @@
 		bootp(sock, BOOTP_NONE);
 	if (myip.s_addr != 0)
 		goto exit;
+#ifdef	NETIF_DEBUG
 	if (debug)
 		printf("net_open: BOOTP failed, trying RARP/RPC...\n");
 #endif
+#endif
 
 	/*
 	 * Use RARP to get our IP address.  This also sets our
@@ -246,8 +254,10 @@
 		printf("net_open: bootparam/whoami RPC failed\n");
 		return (EIO);
 	}
+#ifdef	NETIF_DEBUG
 	if (debug)
 		printf("net_open: client name: %s\n", hostname);
+#endif
 
 	/*
 	 * Ignore the gateway from whoami (unreliable).
@@ -261,11 +271,15 @@
 	}
 	if (smask) {
 		netmask = smask;
+#ifdef	NETIF_DEBUG
 		if (debug)
-		printf("net_open: subnet mask: %s\n", intoa(netmask));
+			printf("net_open: subnet mask: %s\n", intoa(netmask));
+#endif
 	}
+#ifdef	NETIF_DEBUG
 	if (gateip.s_addr && debug)
 		printf("net_open: net gateway: %s\n", inet_ntoa(gateip));
+#endif
 
 	/* Get the root server and pathname. */
 	if (bp_getfile(sock, "root", &rootip, rootpath)) {
@@ -288,10 +302,12 @@
 		bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1);
 		bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1);
 	}
+#ifdef	NETIF_DEBUG
 	if (debug) {
 		printf("net_open: server addr: %s\n", inet_ntoa(rootip));
 		printf("net_open: server path: %s\n", rootpath);
 	}
+#endif
 
 	d = socktodesc(sock);
 	sprintf(temp, "%6D", d->myea, ":");

==== //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_disk.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.14 2008/10/13 17:14:29 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.15 2009/12/28 22:56:30 antoine Exp $");
 
 /*
  * Disk I/O routines using Open Firmware
@@ -67,7 +67,7 @@
 	SLIST_ENTRY(opened_dev)	link;
 };
 
-SLIST_HEAD(, opened_dev) opened_devs = SLIST_HEAD_INITIALIZER(opened_dev);
+SLIST_HEAD(, opened_dev) opened_devs = SLIST_HEAD_INITIALIZER(opened_devs);
 
 static int
 ofwd_init(void)

==== //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#9 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.42 2009/04/14 19:02:34 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.44 2009/12/24 15:23:51 marius Exp $");
 
 /*
  * FreeBSD/sparc64 kernel loader - machine dependent part
@@ -261,7 +261,6 @@
 sparc64_autoload(void)
 {
 
-	setenv("hw.ata.atapi_dma", "0", 0);
 	return (0);
 }
 
@@ -387,6 +386,8 @@
 	pmap_print_tlb_sun4u();
 #endif
 
+	dev_cleanup();
+
 	entry = e->e_entry;
 
 	OF_release((void *)heapva, HEAPSZ);

==== //depot/projects/usb/src/sys/cam/ata/ata_all.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.11 2009/12/07 16:23:25 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.12 2009/12/28 20:08:01 mav Exp $");
 
 #include 
 
@@ -75,6 +75,11 @@
 	switch (cmd->command) {
 	case 0x00: return ("NOP");
 	case 0x03: return ("CFA_REQUEST_EXTENDED_ERROR");
+	case 0x06:
+		switch (cmd->features) {
+	        case 0x01: return ("DSM TRIM");
+	        }
+	        return "DSM";
 	case 0x08: return ("DEVICE_RESET");
 	case 0x20: return ("READ");
 	case 0x24: return ("READ48");
@@ -338,7 +343,8 @@
 	    cmd == ATA_WRITE_DMA_FUA48 ||
 	    cmd == ATA_WRITE_DMA_QUEUED48 ||
 	    cmd == ATA_WRITE_DMA_QUEUED_FUA48 ||
-	    cmd == ATA_WRITE_STREAM_DMA48)
+	    cmd == ATA_WRITE_STREAM_DMA48 ||
+	    cmd == ATA_DATA_SET_MANAGEMENT)
 		ataio->cmd.flags |= CAM_ATAIO_DMA;
 	ataio->cmd.command = cmd;
 	ataio->cmd.features = features;

==== //depot/projects/usb/src/sys/cam/ata/ata_da.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.12 2009/12/06 11:48:53 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.14 2009/12/28 20:08:01 mav Exp $");
 
 #include 
 
@@ -74,8 +74,10 @@
 	ADA_FLAG_CAN_DMA	= 0x010,
 	ADA_FLAG_NEED_OTAG	= 0x020,
 	ADA_FLAG_WENT_IDLE	= 0x040,
+	ADA_FLAG_CAN_TRIM	= 0x080,
 	ADA_FLAG_OPEN		= 0x100,
-	ADA_FLAG_SCTX_INIT	= 0x200
+	ADA_FLAG_SCTX_INIT	= 0x200,
+	ADA_FLAG_CAN_CFA        = 0x400
 } ada_flags;
 
 typedef enum {
@@ -86,6 +88,7 @@
 	ADA_CCB_BUFFER_IO	= 0x03,
 	ADA_CCB_WAITING		= 0x04,
 	ADA_CCB_DUMP		= 0x05,
+	ADA_CCB_TRIM		= 0x06,
 	ADA_CCB_TYPE_MASK	= 0x0F,
 } ada_ccb_state;
 
@@ -101,13 +104,23 @@
 	u_int64_t sectors;	/* Total number sectors */
 };
 
+#define TRIM_MAX_BLOCKS	4
+#define TRIM_MAX_RANGES	TRIM_MAX_BLOCKS * 64
+struct trim_request {
+	uint8_t		data[TRIM_MAX_RANGES * 8];
+	struct bio	*bps[TRIM_MAX_RANGES];
+};
+
 struct ada_softc {
 	struct	 bio_queue_head bio_queue;
+	struct	 bio_queue_head trim_queue;
 	ada_state state;
 	ada_flags flags;	
 	ada_quirks quirks;
 	int	 ordered_tag_count;
 	int	 outstanding_cmds;
+	int	 trim_max_ranges;
+	int	 trim_running;
 	struct	 disk_params params;
 	struct	 disk *disk;
 	union	 ccb saved_ccb;
@@ -115,6 +128,7 @@
 	struct sysctl_ctx_list	sysctl_ctx;
 	struct sysctl_oid	*sysctl_tree;
 	struct callout		sendordered_c;
+	struct trim_request	trim_req;
 };
 
 struct ada_quirk_entry {
@@ -309,6 +323,18 @@
 	return (0);	
 }
 
+static void
+adaschedule(struct cam_periph *periph)
+{
+	struct ada_softc *softc = (struct ada_softc *)periph->softc;
+
+	if (bioq_first(&softc->bio_queue) ||
+	    (!softc->trim_running && bioq_first(&softc->trim_queue))) {
+		/* Have more work to do, so ensure we stay scheduled */
+		xpt_schedule(periph, CAM_PRIORITY_NORMAL);
+	}
+}
+
 /*
  * Actually translate the requested transfer into one the physical driver
  * can understand.  The transfer is described by a buf and will include
@@ -341,12 +367,16 @@
 	/*
 	 * Place it in the queue of disk activities for this disk
 	 */
-	bioq_disksort(&softc->bio_queue, bp);
+	if (bp->bio_cmd == BIO_DELETE &&
+	    (softc->flags & ADA_FLAG_CAN_TRIM))
+		bioq_disksort(&softc->trim_queue, bp);
+	else
+		bioq_disksort(&softc->bio_queue, bp);
 
 	/*
 	 * Schedule ourselves for performing the work.
 	 */
-	xpt_schedule(periph, CAM_PRIORITY_NORMAL);
+	adaschedule(periph);
 	cam_periph_unlock(periph);
 
 	return;
@@ -485,6 +515,7 @@
 	 *     with XPT_ABORT_CCB.
 	 */
 	bioq_flush(&softc->bio_queue, NULL, ENXIO);
+	bioq_flush(&softc->trim_queue, NULL, ENXIO);
 
 	disk_gone(softc->disk);
 	xpt_print(periph->path, "lost device\n");
@@ -618,6 +649,7 @@
 	}
 
 	bioq_init(&softc->bio_queue);
+	bioq_init(&softc->trim_queue);
 
 	if (cgd->ident_data.capabilities1 & ATA_SUPPORT_DMA)
 		softc->flags |= ADA_FLAG_CAN_DMA;
@@ -628,6 +660,17 @@
 	if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ &&
 	    cgd->inq_flags & SID_CmdQue)
 		softc->flags |= ADA_FLAG_CAN_NCQ;
+	if (cgd->ident_data.support_dsm & ATA_SUPPORT_DSM_TRIM) {
+		softc->flags |= ADA_FLAG_CAN_TRIM;
+		softc->trim_max_ranges = TRIM_MAX_RANGES;
+		if (cgd->ident_data.max_dsm_blocks != 0) {
+			softc->trim_max_ranges =
+			    min(cgd->ident_data.max_dsm_blocks * 64,
+				softc->trim_max_ranges);
+		}
+	}
+	if (cgd->ident_data.support.command2 & ATA_SUPPORT_CFA)
+		softc->flags |= ADA_FLAG_CAN_CFA;
 	softc->state = ADA_STATE_NORMAL;
 
 	periph->softc = softc;
@@ -672,7 +715,7 @@
 		maxio = DFLTPHYS;	/* traditional default */
 	else if (maxio > MAXPHYS)
 		maxio = MAXPHYS;	/* for safety */
-	if (cgd->ident_data.support.command2 & ATA_SUPPORT_ADDRESS48)
+	if (softc->flags & ADA_FLAG_CAN_48BIT)
 		maxio = min(maxio, 65536 * softc->params.secsize);
 	else					/* 28bit ATA command limit */
 		maxio = min(maxio, 256 * softc->params.secsize);
@@ -681,15 +724,24 @@
 	softc->disk->d_flags = 0;
 	if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE)
 		softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
+	if ((softc->flags & ADA_FLAG_CAN_TRIM) ||
+	    ((softc->flags & ADA_FLAG_CAN_CFA) &&
+	    !(softc->flags & ADA_FLAG_CAN_48BIT)))
+		softc->disk->d_flags |= DISKFLAG_CANDELETE;
 	strlcpy(softc->disk->d_ident, cgd->serial_num,
 	    MIN(sizeof(softc->disk->d_ident), cgd->serial_num_len + 1));
 
 	softc->disk->d_sectorsize = softc->params.secsize;
 	softc->disk->d_mediasize = (off_t)softc->params.sectors *
 	    softc->params.secsize;
-	softc->disk->d_stripesize = ata_physical_sector_size(&cgd->ident_data);
-	softc->disk->d_stripeoffset = softc->disk->d_stripesize -
-	    ata_logical_sector_offset(&cgd->ident_data);
+	if (ata_physical_sector_size(&cgd->ident_data) !=
+	    softc->params.secsize) {
+		softc->disk->d_stripesize =
+		    ata_physical_sector_size(&cgd->ident_data);
+		softc->disk->d_stripeoffset = (softc->disk->d_stripesize -
+		    ata_logical_sector_offset(&cgd->ident_data)) %
+		    softc->disk->d_stripesize;
+	}
 	/* XXX: these are not actually "firmware" values, so they may be wrong */
 	softc->disk->d_fwsectors = softc->params.secs_per_track;
 	softc->disk->d_fwheads = softc->params.heads;
@@ -738,13 +790,10 @@
 	switch (softc->state) {
 	case ADA_STATE_NORMAL:
 	{
-		/* Pull a buffer from the queue and get going on it */		
 		struct bio *bp;
+		u_int8_t tag_code;
 
-		/*
-		 * See if there is a buf with work for us to do..
-		 */
-		bp = bioq_first(&softc->bio_queue);
+		/* Execute immediate CCB if waiting. */
 		if (periph->immediate_priority <= periph->pinfo.priority) {
 			CAM_DEBUG_PRINT(CAM_DEBUG_SUBTRACE,
 					("queuing for immediate ccb\n"));
@@ -753,115 +802,188 @@
 					  periph_links.sle);
 			periph->immediate_priority = CAM_PRIORITY_NONE;
 			wakeup(&periph->ccb_list);
-		} else if (bp == NULL) {
+			/* Have more work to do, so ensure we stay scheduled */
+			adaschedule(periph);
+			break;
+		}
+		/* Run TRIM if not running yet. */
+		if (!softc->trim_running &&
+		    (bp = bioq_first(&softc->trim_queue)) != 0) {
+			struct trim_request *req = &softc->trim_req;
+			struct bio *bp1;
+			int bps = 0, ranges = 0;
+
+			softc->trim_running = 1;
+			bzero(req, sizeof(*req));
+			bp1 = bp;
+			do {
+				uint64_t lba = bp1->bio_pblkno;
+				int count = bp1->bio_bcount /
+				    softc->params.secsize;
+
+				bioq_remove(&softc->trim_queue, bp1);
+				while (count > 0) {
+					int c = min(count, 0xffff);
+					int off = ranges * 8;
+
+					req->data[off + 0] = lba & 0xff;
+					req->data[off + 1] = (lba >> 8) & 0xff;
+					req->data[off + 2] = (lba >> 16) & 0xff;
+					req->data[off + 3] = (lba >> 24) & 0xff;
+					req->data[off + 4] = (lba >> 32) & 0xff;
+					req->data[off + 5] = (lba >> 40) & 0xff;
+					req->data[off + 6] = c & 0xff;
+					req->data[off + 7] = (c >> 8) & 0xff;
+					lba += c;
+					count -= c;
+					ranges++;
+				}
+				req->bps[bps++] = bp1;
+				bp1 = bioq_first(&softc->trim_queue);
+				if (bp1 == NULL ||
+				    bp1->bio_bcount / softc->params.secsize >
+				    (softc->trim_max_ranges - ranges) * 0xffff)
+					break;
+			} while (1);
+			cam_fill_ataio(ataio,
+			    ada_retry_count,
+			    adadone,
+			    CAM_DIR_OUT,
+			    0,
+			    req->data,
+			    ((ranges + 63) / 64) * 512,
+			    ada_default_timeout * 1000);
+			ata_48bit_cmd(ataio, ATA_DATA_SET_MANAGEMENT,
+			    ATA_DSM_TRIM, 0, (ranges + 63) / 64);
+			start_ccb->ccb_h.ccb_state = ADA_CCB_TRIM;
+			goto out;
+		}
+		/* Run regular command. */
+		bp = bioq_first(&softc->bio_queue);
+		if (bp == NULL) {
 			xpt_release_ccb(start_ccb);
+			break;
+		}
+		bioq_remove(&softc->bio_queue, bp);
+
+		if ((softc->flags & ADA_FLAG_NEED_OTAG) != 0) {
+			softc->flags &= ~ADA_FLAG_NEED_OTAG;
+			softc->ordered_tag_count++;
+			tag_code = 0;
 		} else {
-			u_int8_t tag_code;
+			tag_code = 1;
+		}
+		switch (bp->bio_cmd) {
+		case BIO_READ:
+		case BIO_WRITE:
+		{
+			uint64_t lba = bp->bio_pblkno;
+			uint16_t count = bp->bio_bcount / softc->params.secsize;
 
-			bioq_remove(&softc->bio_queue, bp);
+			cam_fill_ataio(ataio,
+			    ada_retry_count,
+			    adadone,
+			    bp->bio_cmd == BIO_READ ?
+			        CAM_DIR_IN : CAM_DIR_OUT,
+			    tag_code,
+			    bp->bio_data,
+			    bp->bio_bcount,
+			    ada_default_timeout*1000);
 
-			if ((softc->flags & ADA_FLAG_NEED_OTAG) != 0) {
-				softc->flags &= ~ADA_FLAG_NEED_OTAG;
-				softc->ordered_tag_count++;
-				tag_code = 0;
-			} else {
-				tag_code = 1;
-			}
-			switch (bp->bio_cmd) {
-			case BIO_READ:
-			case BIO_WRITE:
-			{
-				uint64_t lba = bp->bio_pblkno;
-				uint16_t count = bp->bio_bcount / softc->params.secsize;
-
-				cam_fill_ataio(ataio,
-				    ada_retry_count,
-				    adadone,
-				    bp->bio_cmd == BIO_READ ?
-				        CAM_DIR_IN : CAM_DIR_OUT,
-				    tag_code,
-				    bp->bio_data,
-				    bp->bio_bcount,
-				    ada_default_timeout*1000);
-
-				if ((softc->flags & ADA_FLAG_CAN_NCQ) && tag_code) {
+			if ((softc->flags & ADA_FLAG_CAN_NCQ) && tag_code) {
+				if (bp->bio_cmd == BIO_READ) {
+					ata_ncq_cmd(ataio, ATA_READ_FPDMA_QUEUED,
+					    lba, count);
+				} else {
+					ata_ncq_cmd(ataio, ATA_WRITE_FPDMA_QUEUED,
+					    lba, count);
+				}
+			} else if ((softc->flags & ADA_FLAG_CAN_48BIT) &&
+			    (lba + count >= ATA_MAX_28BIT_LBA ||
+			    count > 256)) {
+				if (softc->flags & ADA_FLAG_CAN_DMA) {
+					if (bp->bio_cmd == BIO_READ) {
+						ata_48bit_cmd(ataio, ATA_READ_DMA48,
+						    0, lba, count);
+					} else {
+						ata_48bit_cmd(ataio, ATA_WRITE_DMA48,
+						    0, lba, count);
+					}
+				} else {
 					if (bp->bio_cmd == BIO_READ) {
-						ata_ncq_cmd(ataio, ATA_READ_FPDMA_QUEUED,
-						    lba, count);
+						ata_48bit_cmd(ataio, ATA_READ_MUL48,
+						    0, lba, count);
 					} else {
-						ata_ncq_cmd(ataio, ATA_WRITE_FPDMA_QUEUED,
-						    lba, count);
+						ata_48bit_cmd(ataio, ATA_WRITE_MUL48,
+						    0, lba, count);
 					}
-				} else if ((softc->flags & ADA_FLAG_CAN_48BIT) &&
-				    (lba + count >= ATA_MAX_28BIT_LBA ||
-				    count > 256)) {
-					if (softc->flags & ADA_FLAG_CAN_DMA) {
-						if (bp->bio_cmd == BIO_READ) {
-							ata_48bit_cmd(ataio, ATA_READ_DMA48,
-							    0, lba, count);
-						} else {
-							ata_48bit_cmd(ataio, ATA_WRITE_DMA48,
-							    0, lba, count);
-						}
+				}
+			} else {
+				if (count == 256)
+					count = 0;
+				if (softc->flags & ADA_FLAG_CAN_DMA) {
+					if (bp->bio_cmd == BIO_READ) {
+						ata_28bit_cmd(ataio, ATA_READ_DMA,
+						    0, lba, count);
 					} else {
-						if (bp->bio_cmd == BIO_READ) {
-							ata_48bit_cmd(ataio, ATA_READ_MUL48,
-							    0, lba, count);
-						} else {
-							ata_48bit_cmd(ataio, ATA_WRITE_MUL48,

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