From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 10:43:20 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE0851065670;
	Mon,  8 Jun 2009 10:43:20 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D6548FC16;
	Mon,  8 Jun 2009 10:43:20 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58AhKQZ026959;
	Mon, 8 Jun 2009 10:43:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58AhKYE026958;
	Mon, 8 Jun 2009 10:43:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081043.n58AhKYE026958@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 10:43:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193701 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 10:43:20 -0000

Author: rpaulo
Date: Mon Jun  8 10:43:20 2009
New Revision: 193701
URL: http://svn.freebsd.org/changeset/base/193701

Log:
  Initialize i_len and return ENOMEM if len is bigger than i_len.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun  8 10:05:05 2009	(r193700)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun  8 10:43:20 2009	(r193701)
@@ -969,7 +969,8 @@ hwmp_ioctl_get80211(struct ieee80211vap 
 		}
 		mtx_unlock(&hs->hs_lock);
 		if (len > ireq->i_len || ireq->i_len < sizeof(*fi))
-			return EFAULT;
+			return ENOMEM;
+		ireq->i_len = len;
 		p = malloc(len, M_TEMP, M_NOWAIT | M_ZERO);
 		if (p == NULL)
 			return ENOMEM;

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:05:04 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E36DB106564A;
	Mon,  8 Jun 2009 11:05:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B83498FC1C;
	Mon,  8 Jun 2009 11:05:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58B54Vq027440;
	Mon, 8 Jun 2009 11:05:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58B54op027439;
	Mon, 8 Jun 2009 11:05:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081105.n58B54op027439@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:05:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193703 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:05:05 -0000

Author: rpaulo
Date: Mon Jun  8 11:05:04 2009
New Revision: 193703
URL: http://svn.freebsd.org/changeset/base/193703

Log:
  Add a new ifconfig list command, ifconfig list routes that prints the
  HWMP routing table.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Mon Jun  8 10:53:18 2009	(r193702)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Mon Jun  8 11:05:04 2009	(r193703)
@@ -84,6 +84,7 @@
 #include <net80211/ieee80211_superg.h>
 #include <net80211/ieee80211_tdma.h>
 #include <net80211/ieee80211_mesh.h>
+#include <net80211/ieee80211_hwmp.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -3878,6 +3879,42 @@ list_regdomain(int s, int channelsalso)
 		print_regdomain(&regdomain, verbose);
 }
 
+static void
+list_routes(int s)
+{
+	int i;
+	struct ieee80211req ireq;
+	struct ieee80211_hwmp_fi routes[100];
+
+	(void) memset(&ireq, 0, sizeof(ireq));
+	(void) strncpy(ireq.i_name, name, sizeof(ireq.i_name));
+	ireq.i_type = IEEE80211_IOC_HWMP_TABLE;
+	ireq.i_data = &routes;
+	ireq.i_len = sizeof(routes);
+	if (ioctl(s, SIOCG80211, &ireq) < 0)
+	 	err(1, "unable to get HWMP routing table");
+
+	printf("%-17.17s %-17.17s %4s %4s %4s %4s %4s\n"
+		, "DEST"
+		, "NEXT HOP"
+		, "HOPS"
+		, "METRIC"
+		, "LIFETIME"
+		, "SEQ"
+		, "PREQID");
+
+	for (i = 0; i < ireq.i_len / sizeof(*routes); i++) {
+		printf("%s %s %4u   %4d   %6d %4d %6d\n",
+			ether_ntoa((const struct ether_addr *)
+			    routes[i].fi_dest),
+			ether_ntoa((const struct ether_addr *)
+			    routes[i].fi_nexthop),
+			routes[i].fi_nhops, routes[i].fi_metric,
+			routes[i].fi_lifetime, routes[i].fi_seq,
+			routes[i].fi_preqid);
+	}
+}
+
 static
 DECL_CMD_FUNC(set80211list, arg, d)
 {
@@ -3913,6 +3950,8 @@ DECL_CMD_FUNC(set80211list, arg, d)
 		list_countries();
 	else if (iseq(arg, "mesh"))
 		list_mesh(s);
+	else if (iseq(arg, "routes"))
+		list_routes(s);
 	else
 		errx(1, "Don't know how to list %s for %s", arg, name);
 	LINE_BREAK();

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:08:16 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3378810656AD;
	Mon,  8 Jun 2009 11:08:16 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 007B18FC20;
	Mon,  8 Jun 2009 11:08:16 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58B8FWY027529;
	Mon, 8 Jun 2009 11:08:15 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58B8FIW027528;
	Mon, 8 Jun 2009 11:08:15 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081108.n58B8FIW027528@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:08:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193704 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:08:17 -0000

Author: rpaulo
Date: Mon Jun  8 11:08:15 2009
New Revision: 193704
URL: http://svn.freebsd.org/changeset/base/193704

Log:
  Mark the BSS QoS capable.
  
  Pointed out by:	sam

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:05:04 2009	(r193703)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:08:15 2009	(r193704)
@@ -1213,6 +1213,8 @@ ieee80211_create_mbss(struct ieee80211va
 	ni->ni_meshidlen = vap->iv_meshidlen;
 	memcpy(ni->ni_meshid, vap->iv_meshid, ni->ni_meshidlen);
 	ni->ni_intval = ic->ic_bintval;
+	/* NB: mesh nodes must be QoS capable */
+	ni->ni_flags |= IEEE80211_NODE_QOS;
 	/*
 	 * Fix the channel and related attributes.
 	 */

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:10:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0029E1065680;
	Mon,  8 Jun 2009 11:10:55 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DF79D8FC14;
	Mon,  8 Jun 2009 11:10:55 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58BAtpl027610;
	Mon, 8 Jun 2009 11:10:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BAtoq027609;
	Mon, 8 Jun 2009 11:10:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081110.n58BAtoq027609@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:10:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193705 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:10:58 -0000

Author: rpaulo
Date: Mon Jun  8 11:10:55 2009
New Revision: 193705
URL: http://svn.freebsd.org/changeset/base/193705

Log:
  Mesh frame not standard; remove it as it will be handled on another way.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.h

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Mon Jun  8 11:08:15 2009	(r193704)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Mon Jun  8 11:10:55 2009	(r193705)
@@ -107,19 +107,6 @@ struct ieee80211_qosframe_addr4 {
 	uint8_t		i_qos[2];
 } __packed;
 
-struct ieee80211_meshframe {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
-	uint8_t		i_seq[2];
-	uint8_t		i_addr4[IEEE80211_ADDR_LEN];
-	uint8_t		i_qos[2];
-	uint8_t		i_mflags;	/* address extension flags */
-	uint8_t		i_mttl;		/* mesh ttl */
-	uint8_t		i_mseq[4];	/* mesh sequence no */
-} __packed;
 
 #define	IEEE80211_FC0_VERSION_MASK		0x03
 #define	IEEE80211_FC0_VERSION_SHIFT		0

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:18:06 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0490010656B1;
	Mon,  8 Jun 2009 11:18:06 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E62E18FC08;
	Mon,  8 Jun 2009 11:18:05 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58BI5Md027768;
	Mon, 8 Jun 2009 11:18:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BI5Fs027767;
	Mon, 8 Jun 2009 11:18:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081118.n58BI5Fs027767@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:18:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193706 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:18:07 -0000

Author: rpaulo
Date: Mon Jun  8 11:18:05 2009
New Revision: 193706
URL: http://svn.freebsd.org/changeset/base/193706

Log:
  Introduce different mesh control structures based on the value of the AE
  bit.
  Rename the struct fields to avoid redudancy.
  
  Idea by:	sam
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Mon Jun  8 11:10:55 2009	(r193705)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Mon Jun  8 11:18:05 2009	(r193706)
@@ -338,12 +338,42 @@ enum {
 	/* 2-255 reserved */
 };
 
+/*
+ * Different mesh control structures based on the AE
+ * (Address Extension) bits.
+ *
+ * NB: not __packed because mc_seq isn't uint32_t.
+ */
 struct ieee80211_meshcntl {
-	uint8_t		mc_flags;
-	uint8_t		mc_ttl;
-	uint32_t	mc_seq;
-	/* more mesh addresses follow */
-} __packed;
+	uint8_t		mc_flags;	/* Address Extension 00 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	/* NB: more addresses may follow */
+};
+
+struct ieee80211_meshcntl_ae01 {
+	uint8_t		mc_flags;	/* Address Extension 01 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr4[IEEE80211_ADDR_LEN];
+};
+
+struct ieee80211_meshcntl_ae10 {
+	uint8_t		mc_flags;	/* Address Extension 10 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr5[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr6[IEEE80211_ADDR_LEN];
+};
+
+struct ieee80211_meshcntl_ae11 {
+	uint8_t		mc_flags;	/* Address Extension 11 */
+	uint8_t		mc_ttl;		/* TTL */
+	uint8_t		mc_seq[4];	/* Sequence No. */
+	uint8_t		mc_addr4[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr5[IEEE80211_ADDR_LEN];
+	uint8_t		mc_addr6[IEEE80211_ADDR_LEN];
+};
 
 #ifdef _KERNEL
 void		ieee80211_mesh_attach(struct ieee80211com *);

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:21:10 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55369106564A;
	Mon,  8 Jun 2009 11:21:10 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44BA38FC12;
	Mon,  8 Jun 2009 11:21:10 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58BLAqc027869;
	Mon, 8 Jun 2009 11:21:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BLAmN027868;
	Mon, 8 Jun 2009 11:21:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081121.n58BLAmN027868@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:21:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193707 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:21:10 -0000

Author: rpaulo
Date: Mon Jun  8 11:21:09 2009
New Revision: 193707
URL: http://svn.freebsd.org/changeset/base/193707

Log:
  Rework decap() to accomodate space for all AE bits.
  
  Idea by:	sam
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_input.c

Modified: projects/mesh11s/sys/net80211/ieee80211_input.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_input.c	Mon Jun  8 11:18:05 2009	(r193706)
+++ projects/mesh11s/sys/net80211/ieee80211_input.c	Mon Jun  8 11:21:09 2009	(r193707)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_input.h>
+#include <net80211/ieee80211_mesh.h>
 
 #include <net/bpf.h>
 
@@ -225,7 +226,12 @@ ieee80211_deliver_data(struct ieee80211v
 struct mbuf *
 ieee80211_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen)
 {
-	struct ieee80211_meshframe wh;	/* Max size address frames */
+	union {
+		struct ieee80211_qosframe_addr4 wh4;
+		uint8_t b[sizeof(struct ieee80211_qosframe_addr4) +
+			  sizeof(struct ieee80211_meshcntl_ae11)];
+	} whu;
+#define	wh	whu.wh4
 	struct ether_header *eh;
 	struct llc *llc;
 
@@ -322,6 +328,7 @@ ieee80211_decap(struct ieee80211vap *vap
 		eh->ether_type = htons(m->m_pkthdr.len - sizeof(*eh));
 	}
 	return m;
+#undef	wh
 }
 
 /*

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:24:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D2AF106568B;
	Mon,  8 Jun 2009 11:24:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C1C58FC1E;
	Mon,  8 Jun 2009 11:24:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58BONhp027971;
	Mon, 8 Jun 2009 11:24:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BONDC027970;
	Mon, 8 Jun 2009 11:24:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081124.n58BONDC027970@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:24:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193708 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:24:24 -0000

Author: rpaulo
Date: Mon Jun  8 11:24:23 2009
New Revision: 193708
URL: http://svn.freebsd.org/changeset/base/193708

Log:
  Accept from ds frames.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:21:09 2009	(r193707)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:24:23 2009	(r193708)
@@ -282,6 +282,13 @@ mesh_input(struct ieee80211_node *ni, st
 			    "peer link not yet established (%s)",
 			    nodemeshstates[ni->ni_mlstate]);
 		}	
+		if (dir != IEEE80211_FC1_DIR_FROMDS &&
+		    dir != IEEE80211_FC1_DIR_DSTODS) {
+			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
+			    wh, "data", "incorrect dir 0x%x", dir);
+			vap->iv_stats.is_rx_wrongdir++;
+			goto err;
+		}
 		/* NB: not ieee80211_hdrspace, datapad is not honored */
 		hdrlen = ieee80211_hdrsize(wh)
 		    + sizeof(struct ieee80211_meshcntl);
@@ -293,12 +300,6 @@ mesh_input(struct ieee80211_node *ni, st
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
-		if (dir != IEEE80211_FC1_DIR_DSTODS) {
-			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
-			    wh, "data", "incorrect dir 0x%x", dir);
-			vap->iv_stats.is_rx_wrongdir++;
-			goto err;
-		}
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:39:04 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BA1B1065672;
	Mon,  8 Jun 2009 11:39:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79D238FC1B;
	Mon,  8 Jun 2009 11:39:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58Bd4Nc028272;
	Mon, 8 Jun 2009 11:39:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58Bd42D028270;
	Mon, 8 Jun 2009 11:39:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081139.n58Bd42D028270@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:39:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193709 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 11:39:04 -0000

Author: rpaulo
Date: Mon Jun  8 11:39:04 2009
New Revision: 193709
URL: http://svn.freebsd.org/changeset/base/193709

Log:
  Rework the encap logic to comply with F_DATAPAD issues.
  
  Idea from:	sam
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:24:23 2009	(r193708)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:39:04 2009	(r193709)
@@ -232,7 +232,8 @@ mesh_input(struct ieee80211_node *ni, st
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = vap->iv_ifp;
 	struct ieee80211_frame *wh;
-	int hdrlen, need_tap;
+	const struct ieee80211_meshcntl *mc;
+	int hdrspace, need_tap;
 	uint8_t dir, type, subtype, qos;
 
 	KASSERT(ni != NULL, ("null node"));
@@ -289,18 +290,27 @@ mesh_input(struct ieee80211_node *ni, st
 			vap->iv_stats.is_rx_wrongdir++;
 			goto err;
 		}
-		/* NB: not ieee80211_hdrspace, datapad is not honored */
-		hdrlen = ieee80211_hdrsize(wh)
-		    + sizeof(struct ieee80211_meshcntl);
-		if (m->m_len < hdrlen &&
-		    (m = m_pullup(m, hdrlen)) == NULL) {
+		/* pull up enough to get to the mesh control */
+		hdrspace = ieee80211_hdrspace(ic, wh);
+		if (m->m_len < hdrspace + sizeof(struct ieee80211_meshcntl) &&
+		    (m = m_pullup(m, hdrspace +
+		        sizeof(struct ieee80211_meshcntl) )) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
-			    "data too short: expecting %u", hdrlen);
+			    "data too short: expecting %u", hdrspace);
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
 		/*
+		 * Now calculate the full extent of the headers. Note
+		 * ieee80211_decap will pull up anything we didn't get
+		 * above when it strips the 802.11 headers.
+		 */
+		mc = (const struct ieee80211_meshcntl *)
+		    (mtod(m, const uint8_t *) + hdrspace);
+		hdrspace += sizeof(struct ieee80211_meshcntl) +
+		    (mc->mc_flags & 3) * IEEE80211_ADDR_LEN;
+		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */
 		if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
@@ -313,7 +323,7 @@ mesh_input(struct ieee80211_node *ni, st
 		 * Next up, any fragmentation.
 		 */
 		if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-			m = ieee80211_defrag(ni, m, hdrlen);
+			m = ieee80211_defrag(ni, m, hdrspace);
 			if (m == NULL) {
 				/* Fragment dropped or frame not complete yet */
 				goto out;
@@ -326,7 +336,7 @@ mesh_input(struct ieee80211_node *ni, st
 		/*
 		 * Finally, strip the 802.11 header.
 		 */
-		m = ieee80211_decap(vap, m, hdrlen);
+		m = ieee80211_decap(vap, m, hdrspace);
 		if (m == NULL) {
 			/* XXX mask bit to check for both */
 			/* don't count Null data frames as errors */

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 11:24:23 2009	(r193708)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 11:39:04 2009	(r193709)
@@ -1220,6 +1220,9 @@ ieee80211_encap(struct ieee80211vap *vap
 	struct llc *llc;
 	int hdrsize, hdrspace, datalen, addqos, txfrag, is4addr;
 	ieee80211_seq seqno;
+	int meshhdrsize, meshae;
+	struct ieee80211_meshcntl_ae11 *mc;
+	uint32_t seq;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The
@@ -1272,43 +1275,65 @@ ieee80211_encap(struct ieee80211vap *vap
 		hdrsize = sizeof(struct ieee80211_qosframe);
 	else
 		hdrsize = sizeof(struct ieee80211_frame);
-	/*
-	 * 4-address frames need to be generated for:
-	 * o packets sent through a WDS vap (IEEE80211_M_WDS)
-	 * o packets sent through a Mesh vap (IEEE80211_M_MBSS)
-	 * o packets sent through a vap marked for relaying
-	 *   (e.g. a station operating with dynamic WDS)
-	 */
-	is4addr = vap->iv_opmode == IEEE80211_M_WDS ||
-	    vap->iv_opmode == IEEE80211_M_MBSS ||
-	    ((vap->iv_flags_ext & IEEE80211_FEXT_4ADDR) &&
-	     !IEEE80211_ADDR_EQ(eh.ether_shost, vap->iv_myaddr));
-	if (is4addr)
-		hdrsize += IEEE80211_ADDR_LEN;
 	if (vap->iv_opmode == IEEE80211_M_MBSS) {
 		/*
-		 * Mesh data frames have a Mesh Control field.
-		 * XXX also cannot honor DATAPAD as this is used by
-		 * hardware and that hardware does not (yet) understand
-		 * 11s headers so will be confused.
+		 * Mesh data frames are encapsulated according to the
+		 * rules of Section 11B.8.5 (p.139 of D3.0 spec).
+		 * o Group Addressed data (aka multicast) originating
+		 *   at the local sta are sent w/ 3-address format and
+		 *   address extension mode 00
+		 * o Individually Addressed data (aka unicast) originating
+		 *   at the local sta are sent w/ 4-address format and
+		 *   address extension mode 00
+		 * o Group Addressed data forwarded from a non-mesh sta are
+		 *   sent w/ 3-address format and address extension mode 01
+		 * o Individually Address data from another sta are sent
+		 *   w/ 4-address format and address extension mode 10
 		 */
-		hdrsize += sizeof(struct ieee80211_meshcntl);
-		hdrspace = hdrsize;
+		is4addr = 0;		/* NB: don't use, disable */
+		meshhdrsize = sizeof(struct ieee80211_meshcntl);
+		/* XXX defines for AE modes */
+		/* XXX not right, need to check if from non-mesh-sta */
+		if (IEEE80211_ADDR_EQ(eh.ether_shost, vap->iv_myaddr)) {
+			if (!IEEE80211_IS_MULTICAST(eh.ether_dhost)) {
+				hdrsize += IEEE80211_ADDR_LEN;
+				meshae = 0;
+			} else
+				meshae = 4;		/* NB: pseudo */
+		} else if (IEEE80211_IS_MULTICAST(eh.ether_dhost)) {
+			meshae = 1;
+			meshhdrsize += 2*IEEE80211_ADDR_LEN;
+		} else {
+			meshae = 2;
+			meshhdrsize += 3*IEEE80211_ADDR_LEN;
+		}
 	} else {
 		/*
-		 * Honor driver DATAPAD requirement.
+		 * 4-address frames need to be generated for:
+		 * o packets sent through a WDS vap (IEEE80211_M_WDS)
+		 * o packets sent through a vap marked for relaying
+		 *   (e.g. a station operating with dynamic WDS)
 		 */
-		if (ic->ic_flags & IEEE80211_F_DATAPAD)
-			hdrspace = roundup(hdrsize, sizeof(uint32_t));
-		else
-			hdrspace = hdrsize;
+		is4addr = vap->iv_opmode == IEEE80211_M_WDS ||
+		    ((vap->iv_flags_ext & IEEE80211_FEXT_4ADDR) &&
+		     !IEEE80211_ADDR_EQ(eh.ether_shost, vap->iv_myaddr));
+		if (is4addr)
+			hdrsize += IEEE80211_ADDR_LEN;
+		meshhdrsize = meshae = 0;
 	}
+	/*
+	 * Honor driver DATAPAD requirement.
+	 */
+	if (ic->ic_flags & IEEE80211_F_DATAPAD)
+		hdrspace = roundup(hdrsize, sizeof(uint32_t));
+	else
+		hdrspace = hdrsize;
 
 	if (__predict_true((m->m_flags & M_FF) == 0)) {
 		/*
 		 * Normal frame.
 		 */
-		m = ieee80211_mbuf_adjust(vap, hdrspace, key, m);
+		m = ieee80211_mbuf_adjust(vap, hdrspace + meshhdrsize, key, m);
 		if (m == NULL) {
 			/* NB: ieee80211_mbuf_adjust handles msgs+statistics */
 			goto bad;
@@ -1327,14 +1352,14 @@ ieee80211_encap(struct ieee80211vap *vap
 		/*
 		 * Aggregated frame.
 		 */
-		m = ieee80211_ff_encap(vap, m, hdrspace, key);
+		m = ieee80211_ff_encap(vap, m, hdrspace + meshhdrsize, key);
 		if (m == NULL)
 #endif
 			goto bad;
 	}
 	datalen = m->m_pkthdr.len;		/* NB: w/o 802.11 header */
 
-	M_PREPEND(m, hdrspace, M_DONTWAIT);
+	M_PREPEND(m, hdrspace + meshhdrsize, M_DONTWAIT);
 	if (m == NULL) {
 		vap->iv_stats.is_tx_nobuf++;
 		goto bad;
@@ -1373,11 +1398,55 @@ ieee80211_encap(struct ieee80211vap *vap
 		IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost);
 		break;
 	case IEEE80211_M_MBSS:
-		wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
-		IEEE80211_ADDR_COPY(wh->i_addr1, ni->ni_macaddr);
-		IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
-		IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_dhost);
-		IEEE80211_ADDR_COPY(WH4(wh)->i_addr4, eh.ether_shost);
+		/* NB: offset by hdrspace to deal with DATAPAD */
+		mc = (struct ieee80211_meshcntl_ae11 *)
+		     (mtod(m, uint8_t *) + hdrspace);
+		switch (meshae) {
+		case 0:			/* ucast, no proxy */
+			wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
+			IEEE80211_ADDR_COPY(wh->i_addr1, ni->ni_macaddr);
+			IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
+			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_dhost);
+			IEEE80211_ADDR_COPY(WH4(wh)->i_addr4, eh.ether_shost);
+			mc->mc_flags = 0;
+			break;
+		case 4:			/* mcast, no proxy */
+			wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
+			IEEE80211_ADDR_COPY(wh->i_addr1, eh.ether_dhost);
+			IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
+			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost);
+			mc->mc_flags = 0;		/* NB: AE is really 0 */
+			break;
+		case 1:			/* mcast, proxy */
+			wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
+			IEEE80211_ADDR_COPY(wh->i_addr1, eh.ether_dhost);
+			IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
+			/* XXX not right, need MeshSA */
+			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost);
+			mc->mc_flags = 1;
+			IEEE80211_ADDR_COPY(mc->mc_addr4, eh.ether_shost);
+			break;
+		case 2:			/* ucast, proxy */
+			wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
+			IEEE80211_ADDR_COPY(wh->i_addr1, ni->ni_macaddr);
+			IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
+			/* XXX not right, need MeshDA+MeshSA */
+			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_dhost);
+			IEEE80211_ADDR_COPY(WH4(wh)->i_addr4, eh.ether_shost);
+			mc->mc_flags = 2;
+			IEEE80211_ADDR_COPY(mc->mc_addr5, eh.ether_shost);
+			IEEE80211_ADDR_COPY(mc->mc_addr6, eh.ether_shost);
+			break;
+		default:
+			KASSERT(0, ("meshae %d", meshae));
+			break;
+		}
+		mc->mc_ttl = 160;
+		seq = ieee80211_mesh_getseq();
+		mc->mc_seq[0] = seq & 0xff;
+		mc->mc_seq[1] = (seq >> 8) & 0xff;
+		mc->mc_seq[2] = (seq >> 16) & 0xff;
+		mc->mc_seq[3] = (seq >> 24) & 0xff;
 		break;
 	case IEEE80211_M_MONITOR:
 	case IEEE80211_M_WDS:		/* NB: is4addr should always be true */
@@ -1420,19 +1489,6 @@ ieee80211_encap(struct ieee80211vap *vap
 			    htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
 			M_SEQNO_SET(m, seqno);
 		}
-		if (vap->iv_opmode == IEEE80211_M_MBSS) {
-			struct ieee80211_meshframe *mwh;
-			uint32_t seq;
-				
-			mwh = (struct ieee80211_meshframe *)wh;
-			mwh->i_mflags	= 0;	/* address extension bit */
-			mwh->i_mttl	= 160;
-			seq = ieee80211_mesh_getseq();
-			mwh->i_mseq[0] = seq & 0xff;
-			mwh->i_mseq[1] = (seq >> 8) & 0xff;
-			mwh->i_mseq[2] = (seq >> 16) & 0xff;
-			mwh->i_mseq[3] = (seq >> 24) & 0xff;
-		}
 	} else {
 		seqno = ni->ni_txseqs[IEEE80211_NONQOS_TID]++;
 		*(uint16_t *)wh->i_seq =

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 20:02:15 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C5F811065673;
	Mon,  8 Jun 2009 20:02:15 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9ACE08FC19;
	Mon,  8 Jun 2009 20:02:15 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58K2FOT041548;
	Mon, 8 Jun 2009 20:02:15 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58K2Fod041547;
	Mon, 8 Jun 2009 20:02:15 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906082002.n58K2Fod041547@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Mon, 8 Jun 2009 20:02:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193746 - projects/openssl_098_merge_8
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 20:02:16 -0000

Author: simon
Date: Mon Jun  8 20:02:15 2009
New Revision: 193746
URL: http://svn.freebsd.org/changeset/base/193746

Log:
  Branch head for OpenSSL 0.9.8k import work.

Added:
  projects/openssl_098_merge_8/   (props changed)
     - copied from r193745, head/

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:05:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 82F951065674;
	Mon,  8 Jun 2009 21:05:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B75B8FC14;
	Mon,  8 Jun 2009 21:05:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58L5UC8043490;
	Mon, 8 Jun 2009 21:05:30 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58L5TsI043469;
	Mon, 8 Jun 2009 21:05:29 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906082105.n58L5TsI043469@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:05:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
	cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
	contrib/llvm/autoconf contrib/llvm/cmake
	contrib/llvm/cmake/modules contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:05:31 -0000

Author: ed
Date: Mon Jun  8 21:05:27 2009
New Revision: 193755
URL: http://svn.freebsd.org/changeset/base/193755

Log:
  Update sources again.
  
  We're now using LLVM and Clang r73070.
  
  It took me a couple of days to get this working again, because an
  additional optimizer pass got enabled, which causes miscompilations.
  I've disabled the pass again, but I should really figure out a way to
  submit a reduced testcase.
  
  Also change cdefs.h to use __printf__ instead of __printf0__ to keep the
  compiler happy.

Added:
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELF.h
     - copied unchanged from r193728, vendor/llvm/dist/lib/CodeGen/ELF.h
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2009-06-04-MissingLiveIn.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/ARM/2009-06-04-MissingLiveIn.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CBackend/fneg.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/CBackend/fneg.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2009-06-03-UnreachableSplitPad.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/Generic/2009-06-03-UnreachableSplitPad.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/vec_shift.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/PowerPC/vec_shift.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-04-VirtualLiveIn.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-04-VirtualLiveIn.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-05-ScalarToVectorByteMMX.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-05-ScalarToVectorByteMMX.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-05-VZextByteShort.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-05-VZextByteShort.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-05-sitofpCrash.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-05-sitofpCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-06-ConcatVectors.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-06-ConcatVectors.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-06-07-ExpandMMXBitcast.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/2009-06-07-ExpandMMXBitcast.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fmul-zero.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/fmul-zero.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/red-zone2.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/red-zone2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_loadsingles.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/CodeGen/X86/vec_loadsingles.ll
  projects/clangbsd/contrib/llvm/test/Other/2009-06-05-no-implicit-float.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/Other/2009-06-05-no-implicit-float.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll
     - copied unchanged from r193728, vendor/llvm/dist/test/Transforms/InstCombine/vec_demanded_elts-3.ll
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/TargetABIInfo.cpp
     - copied unchanged from r193728, vendor/clang/dist/lib/CodeGen/TargetABIInfo.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp
     - copied unchanged from r193728, vendor/clang/dist/lib/Sema/SemaTemplateDeduction.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/CMakeLists.txt
     - copied unchanged from r193728, vendor/clang/dist/test/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGenObjC/blocks-3.m
     - copied unchanged from r193728, vendor/clang/dist/test/CodeGenObjC/blocks-3.m
  projects/clangbsd/contrib/llvm/tools/clang/test/Driver/redzone.c
     - copied unchanged from r193728, vendor/clang/dist/test/Driver/redzone.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Parser/pragma-weak.c
     - copied unchanged from r193728, vendor/clang/dist/test/Parser/pragma-weak.c
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaObjCXX/references.mm
     - copied unchanged from r193728, vendor/clang/dist/test/SemaObjCXX/references.mm
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaTemplate/ackermann.cpp
     - copied unchanged from r193728, vendor/clang/dist/test/SemaTemplate/ackermann.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaTemplate/instantiate-objc-1.mm
     - copied unchanged from r193728, vendor/clang/dist/test/SemaTemplate/instantiate-objc-1.mm
  projects/clangbsd/contrib/llvm/tools/llvmc/example/mcc16/
     - copied from r193728, vendor/llvm/dist/tools/llvmc/example/mcc16/
  projects/clangbsd/etc/ntp.conf
     - copied unchanged from r193727, head/etc/ntp.conf
  projects/clangbsd/sbin/ifconfig/ifgif.c
     - copied unchanged from r193727, head/sbin/ifconfig/ifgif.c
  projects/clangbsd/share/man/man9/netisr.9
     - copied unchanged from r193727, head/share/man/man9/netisr.9
  projects/clangbsd/sys/contrib/dev/acpica/changes.txt
     - copied unchanged from r193727, head/sys/contrib/dev/acpica/changes.txt
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslstartup.c
     - copied unchanged from r193727, head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/clangbsd/sys/contrib/dev/acpica/debugger/
     - copied from r193727, head/sys/contrib/dev/acpica/debugger/
  projects/clangbsd/sys/contrib/dev/acpica/disassembler/
     - copied from r193727, head/sys/contrib/dev/acpica/disassembler/
  projects/clangbsd/sys/contrib/dev/acpica/dispatcher/
     - copied from r193727, head/sys/contrib/dev/acpica/dispatcher/
  projects/clangbsd/sys/contrib/dev/acpica/events/
     - copied from r193727, head/sys/contrib/dev/acpica/events/
  projects/clangbsd/sys/contrib/dev/acpica/executer/
     - copied from r193727, head/sys/contrib/dev/acpica/executer/
  projects/clangbsd/sys/contrib/dev/acpica/hardware/
     - copied from r193727, head/sys/contrib/dev/acpica/hardware/
  projects/clangbsd/sys/contrib/dev/acpica/include/
     - copied from r193727, head/sys/contrib/dev/acpica/include/
  projects/clangbsd/sys/contrib/dev/acpica/namespace/
     - copied from r193727, head/sys/contrib/dev/acpica/namespace/
  projects/clangbsd/sys/contrib/dev/acpica/parser/
     - copied from r193727, head/sys/contrib/dev/acpica/parser/
  projects/clangbsd/sys/contrib/dev/acpica/resources/
     - copied from r193727, head/sys/contrib/dev/acpica/resources/
  projects/clangbsd/sys/contrib/dev/acpica/tables/
     - copied from r193727, head/sys/contrib/dev/acpica/tables/
  projects/clangbsd/sys/contrib/dev/acpica/tools/
     - copied from r193727, head/sys/contrib/dev/acpica/tools/
  projects/clangbsd/sys/contrib/dev/acpica/utilities/
     - copied from r193727, head/sys/contrib/dev/acpica/utilities/
  projects/clangbsd/sys/dev/sec/
     - copied from r193727, head/sys/dev/sec/
  projects/clangbsd/sys/dev/sound/pcm/feeder_chain.c
     - copied unchanged from r193727, head/sys/dev/sound/pcm/feeder_chain.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_eq.c
     - copied unchanged from r193727, head/sys/dev/sound/pcm/feeder_eq.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_format.c
     - copied unchanged from r193727, head/sys/dev/sound/pcm/feeder_format.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_matrix.c
     - copied unchanged from r193727, head/sys/dev/sound/pcm/feeder_matrix.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_mixer.c
     - copied unchanged from r193727, head/sys/dev/sound/pcm/feeder_mixer.c
  projects/clangbsd/sys/dev/sound/pcm/g711.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/g711.h
  projects/clangbsd/sys/dev/sound/pcm/intpcm.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/intpcm.h
  projects/clangbsd/sys/dev/sound/pcm/matrix.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/matrix.h
  projects/clangbsd/sys/dev/sound/pcm/matrix_map.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/matrix_map.h
  projects/clangbsd/sys/dev/sound/pcm/pcm.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/pcm.h
  projects/clangbsd/sys/dev/sound/pcm/sndstat.h
     - copied unchanged from r193727, head/sys/dev/sound/pcm/sndstat.h
  projects/clangbsd/sys/netinet/ipfw/
     - copied from r193727, head/sys/netinet/ipfw/
  projects/clangbsd/sys/tools/feeder_eq_mkfilter.awk
     - copied unchanged from r193727, head/sys/tools/feeder_eq_mkfilter.awk
  projects/clangbsd/sys/tools/feeder_rate_mkfilter.awk
     - copied unchanged from r193727, head/sys/tools/feeder_rate_mkfilter.awk
  projects/clangbsd/sys/tools/snd_fxdiv_gen.awk
     - copied unchanged from r193727, head/sys/tools/snd_fxdiv_gen.awk
  projects/clangbsd/tools/tools/vimage/
     - copied from r193727, head/tools/tools/vimage/
Deleted:
  projects/clangbsd/sys/contrib/dev/acpica/CHANGES.txt
  projects/clangbsd/sys/contrib/dev/acpica/acapps.h
  projects/clangbsd/sys/contrib/dev/acpica/acconfig.h
  projects/clangbsd/sys/contrib/dev/acpica/acdebug.h
  projects/clangbsd/sys/contrib/dev/acpica/acdisasm.h
  projects/clangbsd/sys/contrib/dev/acpica/acdispat.h
  projects/clangbsd/sys/contrib/dev/acpica/acefi.h
  projects/clangbsd/sys/contrib/dev/acpica/acenv.h
  projects/clangbsd/sys/contrib/dev/acpica/acevents.h
  projects/clangbsd/sys/contrib/dev/acpica/acexcep.h
  projects/clangbsd/sys/contrib/dev/acpica/acfreebsd.h
  projects/clangbsd/sys/contrib/dev/acpica/acgcc.h
  projects/clangbsd/sys/contrib/dev/acpica/acglobal.h
  projects/clangbsd/sys/contrib/dev/acpica/achware.h
  projects/clangbsd/sys/contrib/dev/acpica/acinterp.h
  projects/clangbsd/sys/contrib/dev/acpica/aclocal.h
  projects/clangbsd/sys/contrib/dev/acpica/acmacros.h
  projects/clangbsd/sys/contrib/dev/acpica/acnames.h
  projects/clangbsd/sys/contrib/dev/acpica/acnamesp.h
  projects/clangbsd/sys/contrib/dev/acpica/acobject.h
  projects/clangbsd/sys/contrib/dev/acpica/acopcode.h
  projects/clangbsd/sys/contrib/dev/acpica/acoutput.h
  projects/clangbsd/sys/contrib/dev/acpica/acparser.h
  projects/clangbsd/sys/contrib/dev/acpica/acpi.h
  projects/clangbsd/sys/contrib/dev/acpica/acpiosxf.h
  projects/clangbsd/sys/contrib/dev/acpica/acpixf.h
  projects/clangbsd/sys/contrib/dev/acpica/acresrc.h
  projects/clangbsd/sys/contrib/dev/acpica/acstruct.h
  projects/clangbsd/sys/contrib/dev/acpica/actables.h
  projects/clangbsd/sys/contrib/dev/acpica/actbl.h
  projects/clangbsd/sys/contrib/dev/acpica/actbl1.h
  projects/clangbsd/sys/contrib/dev/acpica/actbl2.h
  projects/clangbsd/sys/contrib/dev/acpica/actypes.h
  projects/clangbsd/sys/contrib/dev/acpica/acutils.h
  projects/clangbsd/sys/contrib/dev/acpica/aecommon.h
  projects/clangbsd/sys/contrib/dev/acpica/amlcode.h
  projects/clangbsd/sys/contrib/dev/acpica/amlresrc.h
  projects/clangbsd/sys/contrib/dev/acpica/dbcmds.c
  projects/clangbsd/sys/contrib/dev/acpica/dbdisply.c
  projects/clangbsd/sys/contrib/dev/acpica/dbexec.c
  projects/clangbsd/sys/contrib/dev/acpica/dbfileio.c
  projects/clangbsd/sys/contrib/dev/acpica/dbhistry.c
  projects/clangbsd/sys/contrib/dev/acpica/dbinput.c
  projects/clangbsd/sys/contrib/dev/acpica/dbstats.c
  projects/clangbsd/sys/contrib/dev/acpica/dbutils.c
  projects/clangbsd/sys/contrib/dev/acpica/dbxface.c
  projects/clangbsd/sys/contrib/dev/acpica/dmbuffer.c
  projects/clangbsd/sys/contrib/dev/acpica/dmnames.c
  projects/clangbsd/sys/contrib/dev/acpica/dmobject.c
  projects/clangbsd/sys/contrib/dev/acpica/dmopcode.c
  projects/clangbsd/sys/contrib/dev/acpica/dmresrc.c
  projects/clangbsd/sys/contrib/dev/acpica/dmresrcl.c
  projects/clangbsd/sys/contrib/dev/acpica/dmresrcs.c
  projects/clangbsd/sys/contrib/dev/acpica/dmutils.c
  projects/clangbsd/sys/contrib/dev/acpica/dmwalk.c
  projects/clangbsd/sys/contrib/dev/acpica/dsfield.c
  projects/clangbsd/sys/contrib/dev/acpica/dsinit.c
  projects/clangbsd/sys/contrib/dev/acpica/dsmethod.c
  projects/clangbsd/sys/contrib/dev/acpica/dsmthdat.c
  projects/clangbsd/sys/contrib/dev/acpica/dsobject.c
  projects/clangbsd/sys/contrib/dev/acpica/dsopcode.c
  projects/clangbsd/sys/contrib/dev/acpica/dsutils.c
  projects/clangbsd/sys/contrib/dev/acpica/dswexec.c
  projects/clangbsd/sys/contrib/dev/acpica/dswload.c
  projects/clangbsd/sys/contrib/dev/acpica/dswscope.c
  projects/clangbsd/sys/contrib/dev/acpica/dswstate.c
  projects/clangbsd/sys/contrib/dev/acpica/evevent.c
  projects/clangbsd/sys/contrib/dev/acpica/evgpe.c
  projects/clangbsd/sys/contrib/dev/acpica/evgpeblk.c
  projects/clangbsd/sys/contrib/dev/acpica/evmisc.c
  projects/clangbsd/sys/contrib/dev/acpica/evregion.c
  projects/clangbsd/sys/contrib/dev/acpica/evrgnini.c
  projects/clangbsd/sys/contrib/dev/acpica/evsci.c
  projects/clangbsd/sys/contrib/dev/acpica/evxface.c
  projects/clangbsd/sys/contrib/dev/acpica/evxfevnt.c
  projects/clangbsd/sys/contrib/dev/acpica/evxfregn.c
  projects/clangbsd/sys/contrib/dev/acpica/exconfig.c
  projects/clangbsd/sys/contrib/dev/acpica/exconvrt.c
  projects/clangbsd/sys/contrib/dev/acpica/excreate.c
  projects/clangbsd/sys/contrib/dev/acpica/exdump.c
  projects/clangbsd/sys/contrib/dev/acpica/exfield.c
  projects/clangbsd/sys/contrib/dev/acpica/exfldio.c
  projects/clangbsd/sys/contrib/dev/acpica/exmisc.c
  projects/clangbsd/sys/contrib/dev/acpica/exmutex.c
  projects/clangbsd/sys/contrib/dev/acpica/exnames.c
  projects/clangbsd/sys/contrib/dev/acpica/exoparg1.c
  projects/clangbsd/sys/contrib/dev/acpica/exoparg2.c
  projects/clangbsd/sys/contrib/dev/acpica/exoparg3.c
  projects/clangbsd/sys/contrib/dev/acpica/exoparg6.c
  projects/clangbsd/sys/contrib/dev/acpica/exprep.c
  projects/clangbsd/sys/contrib/dev/acpica/exregion.c
  projects/clangbsd/sys/contrib/dev/acpica/exresnte.c
  projects/clangbsd/sys/contrib/dev/acpica/exresolv.c
  projects/clangbsd/sys/contrib/dev/acpica/exresop.c
  projects/clangbsd/sys/contrib/dev/acpica/exstore.c
  projects/clangbsd/sys/contrib/dev/acpica/exstoren.c
  projects/clangbsd/sys/contrib/dev/acpica/exstorob.c
  projects/clangbsd/sys/contrib/dev/acpica/exsystem.c
  projects/clangbsd/sys/contrib/dev/acpica/exutils.c
  projects/clangbsd/sys/contrib/dev/acpica/hwacpi.c
  projects/clangbsd/sys/contrib/dev/acpica/hwgpe.c
  projects/clangbsd/sys/contrib/dev/acpica/hwregs.c
  projects/clangbsd/sys/contrib/dev/acpica/hwsleep.c
  projects/clangbsd/sys/contrib/dev/acpica/hwtimer.c
  projects/clangbsd/sys/contrib/dev/acpica/nsaccess.c
  projects/clangbsd/sys/contrib/dev/acpica/nsalloc.c
  projects/clangbsd/sys/contrib/dev/acpica/nsdump.c
  projects/clangbsd/sys/contrib/dev/acpica/nsdumpdv.c
  projects/clangbsd/sys/contrib/dev/acpica/nseval.c
  projects/clangbsd/sys/contrib/dev/acpica/nsinit.c
  projects/clangbsd/sys/contrib/dev/acpica/nsload.c
  projects/clangbsd/sys/contrib/dev/acpica/nsnames.c
  projects/clangbsd/sys/contrib/dev/acpica/nsobject.c
  projects/clangbsd/sys/contrib/dev/acpica/nsparse.c
  projects/clangbsd/sys/contrib/dev/acpica/nssearch.c
  projects/clangbsd/sys/contrib/dev/acpica/nsutils.c
  projects/clangbsd/sys/contrib/dev/acpica/nswalk.c
  projects/clangbsd/sys/contrib/dev/acpica/nsxfeval.c
  projects/clangbsd/sys/contrib/dev/acpica/nsxfname.c
  projects/clangbsd/sys/contrib/dev/acpica/nsxfobj.c
  projects/clangbsd/sys/contrib/dev/acpica/psargs.c
  projects/clangbsd/sys/contrib/dev/acpica/psloop.c
  projects/clangbsd/sys/contrib/dev/acpica/psopcode.c
  projects/clangbsd/sys/contrib/dev/acpica/psparse.c
  projects/clangbsd/sys/contrib/dev/acpica/psscope.c
  projects/clangbsd/sys/contrib/dev/acpica/pstree.c
  projects/clangbsd/sys/contrib/dev/acpica/psutils.c
  projects/clangbsd/sys/contrib/dev/acpica/pswalk.c
  projects/clangbsd/sys/contrib/dev/acpica/psxface.c
  projects/clangbsd/sys/contrib/dev/acpica/rsaddr.c
  projects/clangbsd/sys/contrib/dev/acpica/rscalc.c
  projects/clangbsd/sys/contrib/dev/acpica/rscreate.c
  projects/clangbsd/sys/contrib/dev/acpica/rsdump.c
  projects/clangbsd/sys/contrib/dev/acpica/rsinfo.c
  projects/clangbsd/sys/contrib/dev/acpica/rsio.c
  projects/clangbsd/sys/contrib/dev/acpica/rsirq.c
  projects/clangbsd/sys/contrib/dev/acpica/rslist.c
  projects/clangbsd/sys/contrib/dev/acpica/rsmemory.c
  projects/clangbsd/sys/contrib/dev/acpica/rsmisc.c
  projects/clangbsd/sys/contrib/dev/acpica/rsutils.c
  projects/clangbsd/sys/contrib/dev/acpica/rsxface.c
  projects/clangbsd/sys/contrib/dev/acpica/tbfadt.c
  projects/clangbsd/sys/contrib/dev/acpica/tbfind.c
  projects/clangbsd/sys/contrib/dev/acpica/tbinstal.c
  projects/clangbsd/sys/contrib/dev/acpica/tbutils.c
  projects/clangbsd/sys/contrib/dev/acpica/tbxface.c
  projects/clangbsd/sys/contrib/dev/acpica/tbxfroot.c
  projects/clangbsd/sys/contrib/dev/acpica/utalloc.c
  projects/clangbsd/sys/contrib/dev/acpica/utcache.c
  projects/clangbsd/sys/contrib/dev/acpica/utclib.c
  projects/clangbsd/sys/contrib/dev/acpica/utcopy.c
  projects/clangbsd/sys/contrib/dev/acpica/utdebug.c
  projects/clangbsd/sys/contrib/dev/acpica/utdelete.c
  projects/clangbsd/sys/contrib/dev/acpica/uteval.c
  projects/clangbsd/sys/contrib/dev/acpica/utglobal.c
  projects/clangbsd/sys/contrib/dev/acpica/utinit.c
  projects/clangbsd/sys/contrib/dev/acpica/utmath.c
  projects/clangbsd/sys/contrib/dev/acpica/utmisc.c
  projects/clangbsd/sys/contrib/dev/acpica/utmutex.c
  projects/clangbsd/sys/contrib/dev/acpica/utobject.c
  projects/clangbsd/sys/contrib/dev/acpica/utresrc.c
  projects/clangbsd/sys/contrib/dev/acpica/utstate.c
  projects/clangbsd/sys/contrib/dev/acpica/uttrack.c
  projects/clangbsd/sys/contrib/dev/acpica/utxface.c
  projects/clangbsd/sys/dev/sound/pcm/fake.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_fmt.c
  projects/clangbsd/sys/kern/subr_clist.c
  projects/clangbsd/sys/netinet/ip_dummynet.c
  projects/clangbsd/sys/netinet/ip_fw2.c
  projects/clangbsd/sys/netinet/ip_fw_nat.c
  projects/clangbsd/sys/netinet/ip_fw_pfil.c
  projects/clangbsd/sys/sys/clist.h
Modified:
  projects/clangbsd/   (props changed)
  projects/clangbsd/ObsoleteFiles.inc
  projects/clangbsd/bin/df/df.1
  projects/clangbsd/bin/df/df.c
  projects/clangbsd/bin/sh/sh.1
  projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  projects/clangbsd/contrib/llvm/   (props changed)
  projects/clangbsd/contrib/llvm/CMakeLists.txt
  projects/clangbsd/contrib/llvm/Makefile.rules
  projects/clangbsd/contrib/llvm/autoconf/configure.ac
  projects/clangbsd/contrib/llvm/cmake/config-ix.cmake
  projects/clangbsd/contrib/llvm/cmake/modules/AddLLVM.cmake
  projects/clangbsd/contrib/llvm/cmake/modules/AddPartiallyLinkedObject.cmake
  projects/clangbsd/contrib/llvm/cmake/modules/LLVMConfig.cmake
  projects/clangbsd/contrib/llvm/configure
  projects/clangbsd/contrib/llvm/docs/CMake.html
  projects/clangbsd/contrib/llvm/docs/GoldPlugin.html
  projects/clangbsd/contrib/llvm/docs/LangRef.html
  projects/clangbsd/contrib/llvm/include/llvm-c/lto.h
  projects/clangbsd/contrib/llvm/include/llvm/Analysis/Dominators.h
  projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h
  projects/clangbsd/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h
  projects/clangbsd/contrib/llvm/include/llvm/Attributes.h
  projects/clangbsd/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h
  projects/clangbsd/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
  projects/clangbsd/contrib/llvm/include/llvm/Config/config.h.cmake
  projects/clangbsd/contrib/llvm/include/llvm/Constants.h
  projects/clangbsd/contrib/llvm/include/llvm/DerivedTypes.h
  projects/clangbsd/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h
  projects/clangbsd/contrib/llvm/include/llvm/InstrTypes.h
  projects/clangbsd/contrib/llvm/include/llvm/Instruction.def
  projects/clangbsd/contrib/llvm/include/llvm/Support/ConstantFolder.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/IRBuilder.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/NoFolder.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/OutputBuffer.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/PatternMatch.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/StandardPasses.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/TargetFolder.h
  projects/clangbsd/contrib/llvm/include/llvm/Support/raw_ostream.h
  projects/clangbsd/contrib/llvm/include/llvm/System/Process.h
  projects/clangbsd/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h
  projects/clangbsd/contrib/llvm/include/llvm/Target/TargetLowering.h
  projects/clangbsd/contrib/llvm/include/llvm/Target/TargetOptions.h
  projects/clangbsd/contrib/llvm/include/llvm/Type.h
  projects/clangbsd/contrib/llvm/lib/Analysis/InstCount.cpp
  projects/clangbsd/contrib/llvm/lib/Analysis/LoopInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Analysis/ScalarEvolution.cpp
  projects/clangbsd/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
  projects/clangbsd/contrib/llvm/lib/Analysis/ValueTracking.cpp
  projects/clangbsd/contrib/llvm/lib/AsmParser/LLLexer.cpp
  projects/clangbsd/contrib/llvm/lib/AsmParser/LLParser.cpp
  projects/clangbsd/contrib/llvm/lib/AsmParser/LLToken.h
  projects/clangbsd/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
  projects/clangbsd/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/ELFWriter.h
  projects/clangbsd/contrib/llvm/lib/CodeGen/MachineInstr.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
  projects/clangbsd/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
  projects/clangbsd/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
  projects/clangbsd/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
  projects/clangbsd/contrib/llvm/lib/Support/raw_ostream.cpp
  projects/clangbsd/contrib/llvm/lib/System/Unix/Process.inc
  projects/clangbsd/contrib/llvm/lib/System/Win32/Process.inc
  projects/clangbsd/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp
  projects/clangbsd/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
  projects/clangbsd/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td
  projects/clangbsd/contrib/llvm/lib/Target/Alpha/AlphaMachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/CBackend/CBackend.cpp
  projects/clangbsd/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp
  projects/clangbsd/contrib/llvm/lib/Target/IA64/IA64MachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/MSIL/MSILWriter.cpp
  projects/clangbsd/contrib/llvm/lib/Target/MSP430/MSP430MachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
  projects/clangbsd/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
  projects/clangbsd/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/TargetMachine.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86ISelLowering.h
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86InstrMMX.td
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86InstrSSE.td
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86MachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp
  projects/clangbsd/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp
  projects/clangbsd/contrib/llvm/lib/Target/XCore/XCoreMachineFunctionInfo.h
  projects/clangbsd/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/GVNPRE.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp
  projects/clangbsd/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Attributes.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/ConstantFold.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Constants.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Instruction.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Instructions.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Type.cpp
  projects/clangbsd/contrib/llvm/lib/VMCore/Verifier.cpp
  projects/clangbsd/contrib/llvm/test/Analysis/ScalarEvolution/sext-iv-0.ll
  projects/clangbsd/contrib/llvm/test/Analysis/ScalarEvolution/sext-iv-1.ll
  projects/clangbsd/contrib/llvm/test/Analysis/ScalarEvolution/trip-count4.ll
  projects/clangbsd/contrib/llvm/test/Assembler/2002-04-07-HexFloatConstants.ll
  projects/clangbsd/contrib/llvm/test/Assembler/2002-04-07-InfConstant.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2007-01-19-InfiniteLoop.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2008-11-19-ScavengerAssert.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2009-02-27-SpillerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2009-03-07-SpillerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/cse-libcalls.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/fixunsdfdi.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/fnmul.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/fparith.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/fpmem.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/illegal-vector-bitcast.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/lsr-scale-addr-mode.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/memcpy-inline.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/str_pre-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/ARM/vfp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CBackend/vectors.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CellSPU/dp_farith.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CellSPU/fneg-fabs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/CellSPU/sp_farith.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2006-07-03-schedulers.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2007-05-15-InfiniteRecursion.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2008-02-04-ExtractSubvector.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2008-02-25-NegateZero.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/2008-02-26-NegatableCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/fneg-fabs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/print-arith-fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/select.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/storetrunc-fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/v-split.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Generic/vector.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/MSP430/2009-05-19-DoubleSplit.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Mips/2008-07-06-fadd64.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Mips/2008-07-22-Cstpool.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Mips/2008-07-23-fpcmp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Mips/2008-08-03-fabs64.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/Mips/2008-11-10-xint_to_fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2006-01-11-darwin-fp-argument.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2006-10-11-combiner-aa-regression.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2007-03-30-SpillerCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2007-11-19-VectorSplitting.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2008-07-15-Fabs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2008-07-17-Fneg.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2008-09-12-CoalescerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2008-10-28-UnprocessedNode.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/buildvec_canonicalize.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/fma.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/fnabs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/fneg.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/int-fp-conv-1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/itofp128.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/mem-rr-addr-mode.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/multiple-return-values.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/ppcf128-1-opt.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/ppcf128-1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/ppcf128-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/ppcf128-4.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/return-val-i128.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/unsafe-math.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/vec_fneg.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/vec_splat.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/vec_zero.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/PowerPC/vector.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/SPARC/2006-01-22-BitConvertLegalize.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2005-05-08-FPStackifierPHI.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2006-05-25-CycleInDAG.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-01-08-InstrSched.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-04-11-InlineAsmVectorResult.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-04-24-VectorCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-06-29-VecFPConstantCSEBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-07-10-StackerAssert.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-09-18-ShuffleXformBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-10-12-SpillerUnfold1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-11-02-BadAsm.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-11-06-InstrSched.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2007-12-11-FoldImpDefSpill.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-01-16-FPStackifierAssert.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-02-06-LoadFoldingBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-02-08-LoadFoldingBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-02-27-DeadSlotElimBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-02-27-PEICrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-03-18-CoalescerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-03-25-TwoAddrPassBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-07-19-movups-spills.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-07-23-VSetCC.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-11-03-F80VAARG.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2008-12-05-SpillerCrash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-01-16-UIntToFP.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-02-12-SpillerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-03-03-BitcastLongDouble.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-03-09-SpillerBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-03-12-CPAlignBug.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/2009-03-23-MultiUseSched.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/abi-isel.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/break-anti-dependencies.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/coalescer-commute1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/coalescer-commute2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/coalescer-commute4.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/complex-fca.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/constant-pool-remat-0.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/dagcombine-buildvector.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/extract-combine.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fabs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fast-isel.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fold-pcmpeqd-0.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fold-pcmpeqd-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fp-in-intregs.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fp-stack-compare.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fp_constant_op.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fp_load_fold.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/fsxor-alignment.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/full-lsr.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/ga-offset.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/illegal-vector-args-return.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/inline-asm-fpstack.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/inline-asm-mrv.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/inline-asm-x-scalar.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/iv-users-in-other-loops.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/masked-iv-safe.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/masked-iv-unsafe.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/multiple-return-values.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/neg_fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/negate-add-zero.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/negative-sin.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/peep-test-0.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/peep-test-1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/phys_subreg_coalesce.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pr2656.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pr3154.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pr3457.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split10.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split4.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split5.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split6.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split7.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split8.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/pre-split9.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/remat-constant.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/shrink-fp-const1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/small-byval-memcpy.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/soft-fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/sse-align-0.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/sse-align-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/sse-fcopysign.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/sse41-extractps-bitcast-1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/sse41-pmovx.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/stack-align.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/storetrunc-fp.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/stride-reuse.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_extract.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_fneg.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_ins_extract.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_insert.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_logical.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_select.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_set-5.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_set-6.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_shuffle-27.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_shuffle-3.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_shuffle-5.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_splat.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_ss_load_fold.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vec_zero.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/vector.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/widen_arith-6.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/widen_shuffle-1.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/X86/widen_shuffle-2.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/XCore/2009-01-14-Remat-Crash.ll
  projects/clangbsd/contrib/llvm/test/CodeGen/XCore/fneg.ll
  projects/clangbsd/contrib/llvm/test/ExecutionEngine/2003-01-10-FUCOM.ll
  projects/clangbsd/contrib/llvm/test/ExecutionEngine/test-fp.ll
  projects/clangbsd/contrib/llvm/test/ExecutionEngine/test-setcond-fp.ll
  projects/clangbsd/contrib/llvm/test/Feature/ppcld.ll
  projects/clangbsd/contrib/llvm/test/Feature/sparcld.ll
  projects/clangbsd/contrib/llvm/test/Feature/x86ld.ll
  projects/clangbsd/contrib/llvm/test/FrontendC/2009-01-20-k8.c
  projects/clangbsd/contrib/llvm/test/FrontendC/2009-05-04-EnumInreg.c
  projects/clangbsd/contrib/llvm/test/Other/2004-08-16-PackedSelect.ll
  projects/clangbsd/contrib/llvm/test/Other/2004-08-16-PackedSimple.ll
  projects/clangbsd/contrib/llvm/test/Other/2004-08-20-PackedControlFlow.ll
  projects/clangbsd/contrib/llvm/test/Transforms/ConstProp/calls.ll
  projects/clangbsd/contrib/llvm/test/Transforms/DeadStoreElimination/2006-06-27-AST-Remove.ll
  projects/clangbsd/contrib/llvm/test/Transforms/GVNPRE/2007-06-18-ConstantInPhi.ll
  projects/clangbsd/contrib/llvm/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
  projects/clangbsd/contrib/llvm/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
  projects/clangbsd/contrib/llvm/test/Transforms/GlobalOpt/constantexpr-dangle.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/2006-12-10-BitCast.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/2008-11-03-Floating.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/2008-11-17-Floating.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/2008-11-25-APFloatAssert.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/2009-04-27-Floating.ll
  projects/clangbsd/contrib/llvm/test/Transforms/IndVarSimplify/iv-zext.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/add-sitofp.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/dce-iterate.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/fpextend.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/mul.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/multi-use-or.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/shufflemask-undef.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/signed-comparison.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/sitofp.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/vec_demanded_elts.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/vec_narrow.ll
  projects/clangbsd/contrib/llvm/test/Transforms/InstCombine/zero-point-zero-add.ll
  projects/clangbsd/contrib/llvm/test/Transforms/LCSSA/2007-07-12-LICM-2.ll
  projects/clangbsd/contrib/llvm/test/Transforms/LCSSA/2007-07-12-LICM-3.ll
  projects/clangbsd/contrib/llvm/test/Transforms/LCSSA/2007-07-12-LICM.ll
  projects/clangbsd/contrib/llvm/test/Transforms/LoopIndexSplit/2007-09-24-UpdateIterationSpace.ll
  projects/clangbsd/contrib/llvm/test/Transforms/LoopIndexSplit/2007-09-25-UpdateIterationSpace-2.ll
  projects/clangbsd/contrib/llvm/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
  projects/clangbsd/contrib/llvm/test/Transforms/MemCpyOpt/memcpy.ll
  projects/clangbsd/contrib/llvm/test/Transforms/MemCpyOpt/sret.ll
  projects/clangbsd/contrib/llvm/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll
  projects/clangbsd/contrib/llvm/test/Transforms/Reassociate/2006-04-27-ReassociateVector.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SCCP/2006-12-04-PackedType.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SCCP/apint-ipsccp4.ll
  projects/clangbsd/contrib/llvm/test/Transforms/ScalarRepl/2009-03-17-CleanUp.ll
  projects/clangbsd/contrib/llvm/test/Transforms/ScalarRepl/copy-aggregate.ll
  projects/clangbsd/contrib/llvm/test/Transforms/ScalarRepl/memcpy-from-global.ll
  projects/clangbsd/contrib/llvm/test/Transforms/ScalarRepl/vector_promote.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SimplifyCFG/2008-04-27-MultipleReturnCrash.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SimplifyCFG/2009-05-12-externweak.ll
  projects/clangbsd/contrib/llvm/test/Transforms/SimplifyLibCalls/half-powr.ll
  projects/clangbsd/contrib/llvm/tools/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/   (props changed)
  projects/clangbsd/contrib/llvm/tools/clang/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/clang.xcodeproj/project.pbxproj
  projects/clangbsd/contrib/llvm/tools/clang/docs/PCHInternals.html
  projects/clangbsd/contrib/llvm/tools/clang/docs/UsersManual.html
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/Builtins.def
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/Decl.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/AST/X86Builtins.def
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/Options.def
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Frontend/CompileOptions.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Parse/Action.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Parse/AttributeList.h
  projects/clangbsd/contrib/llvm/tools/clang/include/clang/Parse/Parser.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/Decl.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/Expr.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/AST/Type.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Analysis/CFRefCount.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGCXXTemp.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/PCHReader.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/PCHWriter.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/PrintParserCallbacks.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/RewriteBlocks.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Headers/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Headers/mmintrin.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Headers/tmmintrin.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/AttributeList.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Parse/Parser.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/CMakeLists.txt
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/Sema.h
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
  projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/Analysis/ptr-arith.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Analysis/retain-release-gc-only.m
  projects/clangbsd/contrib/llvm/tools/clang/test/Analysis/retain-release.m
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/attributes.c
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/builtins-x86.c
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/vector.c
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/x86.c
  projects/clangbsd/contrib/llvm/tools/clang/test/CodeGen/x86_64-arguments.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Driver/flags.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Sema/block-args.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Sema/block-call.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Sema/block-misc.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Sema/builtins.c
  projects/clangbsd/contrib/llvm/tools/clang/test/Sema/const-eval.c
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaObjC/blocks.m
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaTemplate/default-arguments.cpp
  projects/clangbsd/contrib/llvm/tools/clang/test/SemaTemplate/temp_class_spec.cpp
  projects/clangbsd/contrib/llvm/tools/clang/tools/clang-cc/clang-cc.cpp
  projects/clangbsd/contrib/llvm/tools/clang/utils/test/MultiTestRunner.py
  projects/clangbsd/contrib/llvm/tools/clang/www/latest_checker.html.incl
  projects/clangbsd/contrib/llvm/tools/clang/www/menu.html.incl
  projects/clangbsd/contrib/llvm/tools/gold/gold-plugin.cpp
  projects/clangbsd/contrib/llvm/tools/llc/llc.cpp
  projects/clangbsd/contrib/llvm/tools/llvm-ld/Optimize.cpp
  projects/clangbsd/contrib/llvm/tools/lto/LTOCodeGenerator.cpp
  projects/clangbsd/contrib/llvm/tools/lto/LTOCodeGenerator.h
  projects/clangbsd/contrib/llvm/tools/lto/lto.cpp
  projects/clangbsd/contrib/llvm/tools/lto/lto.exports
  projects/clangbsd/contrib/llvm/utils/llvm.grm
  projects/clangbsd/contrib/llvm/utils/vim/llvm.vim
  projects/clangbsd/etc/Makefile
  projects/clangbsd/games/fortune/datfiles/fortunes
  projects/clangbsd/games/fortune/datfiles/fortunes-o.real
  projects/clangbsd/lib/libc/rpc/svc_dg.c
  projects/clangbsd/lib/libusb/   (props changed)
  projects/clangbsd/lib/libutil/flopen.3
  projects/clangbsd/lib/libutil/flopen.c
  projects/clangbsd/lib/libutil/pidfile.3
  projects/clangbsd/sbin/geom/class/part/geom_part.c
  projects/clangbsd/sbin/geom/core/geom.c
  projects/clangbsd/sbin/geom/core/geom.h
  projects/clangbsd/sbin/ifconfig/Makefile
  projects/clangbsd/sbin/ifconfig/ifieee80211.c
  projects/clangbsd/sbin/ipfw/dummynet.c
  projects/clangbsd/sbin/ipfw/ipfw.8
  projects/clangbsd/sbin/ipfw/ipfw2.c
  projects/clangbsd/sbin/kldload/kldload.8
  projects/clangbsd/sbin/kldload/kldload.c
  projects/clangbsd/share/man/man4/gif.4
  projects/clangbsd/share/man/man4/if_bridge.4
  projects/clangbsd/share/man/man4/ral.4
  projects/clangbsd/share/man/man4/rum.4
  projects/clangbsd/share/man/man4/ural.4
  projects/clangbsd/share/man/man5/fstab.5
  projects/clangbsd/share/man/man9/Makefile
  projects/clangbsd/share/misc/pci_vendors
  projects/clangbsd/share/timedef/de_DE.ISO8859-1.src
  projects/clangbsd/share/timedef/de_DE.UTF-8.src
  projects/clangbsd/share/timedef/pt_PT.ISO8859-1.src
  projects/clangbsd/share/timedef/pt_PT.UTF-8.src
  projects/clangbsd/sys/amd64/acpica/OsdEnvironment.c
  projects/clangbsd/sys/amd64/acpica/acpi_machdep.c
  projects/clangbsd/sys/amd64/acpica/acpi_wakeup.c
  projects/clangbsd/sys/amd64/acpica/madt.c
  projects/clangbsd/sys/amd64/amd64/support.S
  projects/clangbsd/sys/arm/arm/pmap.c
  projects/clangbsd/sys/boot/i386/libi386/Makefile
  projects/clangbsd/sys/boot/i386/libi386/biosacpi.c
  projects/clangbsd/sys/boot/i386/libi386/biosdisk.c
  projects/clangbsd/sys/boot/i386/libi386/biospnp.c
  projects/clangbsd/sys/boot/ia64/ski/acpi_stub.c
  projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/clangbsd/sys/compat/linux/linux_file.c
  projects/clangbsd/sys/compat/linux/linux_getcwd.c
  projects/clangbsd/sys/compat/linux/linux_misc.c
  projects/clangbsd/sys/compat/linux/linux_stats.c
  projects/clangbsd/sys/compat/ndis/subr_usbd.c
  projects/clangbsd/sys/compat/svr4/svr4_fcntl.c
  projects/clangbsd/sys/compat/svr4/svr4_misc.c
  projects/clangbsd/sys/conf/NOTES
  projects/clangbsd/sys/conf/files
  projects/clangbsd/sys/conf/files.powerpc
  projects/clangbsd/sys/conf/options
  projects/clangbsd/sys/contrib/dev/acpica/   (props changed)
  projects/clangbsd/sys/contrib/dev/acpica/acpica_prep.sh
  projects/clangbsd/sys/contrib/dev/acpica/common/adfile.c
  projects/clangbsd/sys/contrib/dev/acpica/common/adisasm.c
  projects/clangbsd/sys/contrib/dev/acpica/common/adwalk.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmrestag.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmtable.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/clangbsd/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/clangbsd/sys/contrib/dev/acpica/common/getopt.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asllength.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslload.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asltree.c
  projects/clangbsd/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/clangbsd/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/clangbsd/sys/contrib/dev/acpica/osunixxf.c
  projects/clangbsd/sys/contrib/pf/net/pf.c
  projects/clangbsd/sys/dev/acpi_support/acpi_aiboost.c
  projects/clangbsd/sys/dev/acpi_support/acpi_asus.c
  projects/clangbsd/sys/dev/acpi_support/acpi_fujitsu.c
  projects/clangbsd/sys/dev/acpi_support/acpi_ibm.c
  projects/clangbsd/sys/dev/acpi_support/acpi_panasonic.c
  projects/clangbsd/sys/dev/acpi_support/acpi_sony.c
  projects/clangbsd/sys/dev/acpi_support/acpi_toshiba.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdDebug.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdHardware.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdInterrupt.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdMemory.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdSchedule.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdStream.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdSynch.c
  projects/clangbsd/sys/dev/acpica/Osd/OsdTable.c
  projects/clangbsd/sys/dev/acpica/acpi.c
  projects/clangbsd/sys/dev/acpica/acpi_acad.c
  projects/clangbsd/sys/dev/acpica/acpi_battery.c
  projects/clangbsd/sys/dev/acpica/acpi_button.c
  projects/clangbsd/sys/dev/acpica/acpi_cmbat.c
  projects/clangbsd/sys/dev/acpica/acpi_cpu.c
  projects/clangbsd/sys/dev/acpica/acpi_dock.c
  projects/clangbsd/sys/dev/acpica/acpi_ec.c
  projects/clangbsd/sys/dev/acpica/acpi_hpet.c
  projects/clangbsd/sys/dev/acpica/acpi_if.m
  projects/clangbsd/sys/dev/acpica/acpi_isab.c
  projects/clangbsd/sys/dev/acpica/acpi_lid.c
  projects/clangbsd/sys/dev/acpica/acpi_package.c
  projects/clangbsd/sys/dev/acpica/acpi_pci.c
  projects/clangbsd/sys/dev/acpica/acpi_pci_link.c
  projects/clangbsd/sys/dev/acpica/acpi_pcib.c
  projects/clangbsd/sys/dev/acpica/acpi_pcib_acpi.c
  projects/clangbsd/sys/dev/acpica/acpi_pcib_pci.c
  projects/clangbsd/sys/dev/acpica/acpi_perf.c
  projects/clangbsd/sys/dev/acpica/acpi_powerres.c
  projects/clangbsd/sys/dev/acpica/acpi_quirk.c
  projects/clangbsd/sys/dev/acpica/acpi_resource.c
  projects/clangbsd/sys/dev/acpica/acpi_smbat.c
  projects/clangbsd/sys/dev/acpica/acpi_thermal.c
  projects/clangbsd/sys/dev/acpica/acpi_throttle.c
  projects/clangbsd/sys/dev/acpica/acpi_timer.c
  projects/clangbsd/sys/dev/acpica/acpi_video.c
  projects/clangbsd/sys/dev/asmc/asmc.c
  projects/clangbsd/sys/dev/ata/ata-pci.h
  projects/clangbsd/sys/dev/ata/chipsets/ata-nvidia.c
  projects/clangbsd/sys/dev/fdc/fdc_acpi.c
  projects/clangbsd/sys/dev/ipmi/ipmi_acpi.c
  projects/clangbsd/sys/dev/kbd/kbd.c
  projects/clangbsd/sys/dev/kbdmux/kbdmux.c
  projects/clangbsd/sys/dev/mwl/if_mwl.c
  projects/clangbsd/sys/dev/pci/pci.c
  projects/clangbsd/sys/dev/sound/clone.c
  projects/clangbsd/sys/dev/sound/driver.c
  projects/clangbsd/sys/dev/sound/isa/ad1816.c
  projects/clangbsd/sys/dev/sound/isa/ess.c
  projects/clangbsd/sys/dev/sound/isa/gusc.c
  projects/clangbsd/sys/dev/sound/isa/mss.c
  projects/clangbsd/sys/dev/sound/isa/sb16.c
  projects/clangbsd/sys/dev/sound/isa/sb8.c
  projects/clangbsd/sys/dev/sound/isa/sbc.c
  projects/clangbsd/sys/dev/sound/isa/sndbuf_dma.c
  projects/clangbsd/sys/dev/sound/macio/aoa.c
  projects/clangbsd/sys/dev/sound/macio/davbus.c
  projects/clangbsd/sys/dev/sound/macio/i2s.c
  projects/clangbsd/sys/dev/sound/macio/snapper.c
  projects/clangbsd/sys/dev/sound/macio/tumbler.c
  projects/clangbsd/sys/dev/sound/midi/midi.c
  projects/clangbsd/sys/dev/sound/midi/mpu401.c
  projects/clangbsd/sys/dev/sound/midi/sequencer.c
  projects/clangbsd/sys/dev/sound/midi/sequencer.h
  projects/clangbsd/sys/dev/sound/pci/als4000.c
  projects/clangbsd/sys/dev/sound/pci/atiixp.c
  projects/clangbsd/sys/dev/sound/pci/aureal.c
  projects/clangbsd/sys/dev/sound/pci/cmi.c
  projects/clangbsd/sys/dev/sound/pci/cs4281.c
  projects/clangbsd/sys/dev/sound/pci/csa.c
  projects/clangbsd/sys/dev/sound/pci/csapcm.c
  projects/clangbsd/sys/dev/sound/pci/ds1.c
  projects/clangbsd/sys/dev/sound/pci/emu10k1.c
  projects/clangbsd/sys/dev/sound/pci/emu10kx-midi.c
  projects/clangbsd/sys/dev/sound/pci/emu10kx-pcm.c
  projects/clangbsd/sys/dev/sound/pci/emu10kx.c
  projects/clangbsd/sys/dev/sound/pci/envy24.c
  projects/clangbsd/sys/dev/sound/pci/envy24ht.c
  projects/clangbsd/sys/dev/sound/pci/es137x.c
  projects/clangbsd/sys/dev/sound/pci/fm801.c
  projects/clangbsd/sys/dev/sound/pci/hda/hdac.c
  projects/clangbsd/sys/dev/sound/pci/ich.c
  projects/clangbsd/sys/dev/sound/pci/maestro.c
  projects/clangbsd/sys/dev/sound/pci/maestro3.c
  projects/clangbsd/sys/dev/sound/pci/neomagic.c
  projects/clangbsd/sys/dev/sound/pci/solo.c
  projects/clangbsd/sys/dev/sound/pci/spicds.c
  projects/clangbsd/sys/dev/sound/pci/t4dwave.c
  projects/clangbsd/sys/dev/sound/pci/via8233.c
  projects/clangbsd/sys/dev/sound/pci/via82c686.c
  projects/clangbsd/sys/dev/sound/pci/vibes.c
  projects/clangbsd/sys/dev/sound/pcm/ac97.c
  projects/clangbsd/sys/dev/sound/pcm/ac97_patch.c
  projects/clangbsd/sys/dev/sound/pcm/buffer.c
  projects/clangbsd/sys/dev/sound/pcm/buffer.h
  projects/clangbsd/sys/dev/sound/pcm/channel.c
  projects/clangbsd/sys/dev/sound/pcm/channel.h
  projects/clangbsd/sys/dev/sound/pcm/channel_if.m
  projects/clangbsd/sys/dev/sound/pcm/dsp.c
  projects/clangbsd/sys/dev/sound/pcm/dsp.h
  projects/clangbsd/sys/dev/sound/pcm/feeder.c
  projects/clangbsd/sys/dev/sound/pcm/feeder.h
  projects/clangbsd/sys/dev/sound/pcm/feeder_rate.c
  projects/clangbsd/sys/dev/sound/pcm/feeder_volume.c
  projects/clangbsd/sys/dev/sound/pcm/mixer.c
  projects/clangbsd/sys/dev/sound/pcm/mixer.h
  projects/clangbsd/sys/dev/sound/pcm/sndstat.c
  projects/clangbsd/sys/dev/sound/pcm/sound.c
  projects/clangbsd/sys/dev/sound/pcm/sound.h
  projects/clangbsd/sys/dev/sound/pcm/vchan.c
  projects/clangbsd/sys/dev/sound/pcm/vchan.h
  projects/clangbsd/sys/dev/sound/sbus/cs4231.c
  projects/clangbsd/sys/dev/sound/unit.c
  projects/clangbsd/sys/dev/sound/usb/uaudio.c
  projects/clangbsd/sys/dev/sound/usb/uaudio.h
  projects/clangbsd/sys/dev/sound/usb/uaudio_pcm.c
  projects/clangbsd/sys/dev/sound/version.h
  projects/clangbsd/sys/dev/usb/controller/at91dci.c
  projects/clangbsd/sys/dev/usb/controller/atmegadci.c
  projects/clangbsd/sys/dev/usb/controller/avr32dci.c
  projects/clangbsd/sys/dev/usb/controller/ehci.c
  projects/clangbsd/sys/dev/usb/controller/musb_otg.c
  projects/clangbsd/sys/dev/usb/controller/ohci.c
  projects/clangbsd/sys/dev/usb/controller/uhci.c
  projects/clangbsd/sys/dev/usb/controller/uss820dci.c
  projects/clangbsd/sys/dev/usb/input/ukbd.c
  projects/clangbsd/sys/dev/usb/serial/ugensa.c
  projects/clangbsd/sys/dev/usb/serial/umct.c
  projects/clangbsd/sys/dev/usb/storage/ustorage_fs.c
  projects/clangbsd/sys/dev/usb/usb.h
  projects/clangbsd/sys/dev/usb/usb_compat_linux.c
  projects/clangbsd/sys/dev/usb/usb_compat_linux.h
  projects/clangbsd/sys/dev/usb/usb_controller.h
  projects/clangbsd/sys/dev/usb/usb_core.h
  projects/clangbsd/sys/dev/usb/usb_debug.c
  projects/clangbsd/sys/dev/usb/usb_debug.h
  projects/clangbsd/sys/dev/usb/usb_dev.c
  projects/clangbsd/sys/dev/usb/usb_device.c
  projects/clangbsd/sys/dev/usb/usb_device.h
  projects/clangbsd/sys/dev/usb/usb_generic.c
  projects/clangbsd/sys/dev/usb/usb_handle_request.c
  projects/clangbsd/sys/dev/usb/usb_hub.c
  projects/clangbsd/sys/dev/usb/usb_request.c
  projects/clangbsd/sys/dev/usb/usb_transfer.c
  projects/clangbsd/sys/dev/usb/usb_transfer.h
  projects/clangbsd/sys/dev/usb/wlan/if_zyd.c
  projects/clangbsd/sys/dev/usb/wlan/if_zydreg.h
  projects/clangbsd/sys/dev/xen/netfront/   (props changed)
  projects/clangbsd/sys/dev/xen/netfront/netfront.c
  projects/clangbsd/sys/dev/xen/xenpci/   (props changed)
  projects/clangbsd/sys/fs/devfs/devfs_devs.c
  projects/clangbsd/sys/fs/devfs/devfs_vnops.c
  projects/clangbsd/sys/fs/nfs/nfs_commonacl.c
  projects/clangbsd/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/clangbsd/sys/fs/pseudofs/pseudofs_vncache.c
  projects/clangbsd/sys/fs/udf/osta.c
  projects/clangbsd/sys/fs/unionfs/union_subr.c
  projects/clangbsd/sys/geom/geom_subr.c
  projects/clangbsd/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/clangbsd/sys/i386/acpica/OsdEnvironment.c
  projects/clangbsd/sys/i386/acpica/acpi_machdep.c
  projects/clangbsd/sys/i386/acpica/acpi_wakeup.c
  projects/clangbsd/sys/i386/acpica/madt.c
  projects/clangbsd/sys/i386/cpufreq/est.c
  projects/clangbsd/sys/i386/cpufreq/hwpstate.c
  projects/clangbsd/sys/i386/cpufreq/p4tcc.c
  projects/clangbsd/sys/i386/i386/sys_machdep.c
  projects/clangbsd/sys/i386/ibcs2/ibcs2_misc.c
  projects/clangbsd/sys/i386/include/apicvar.h
  projects/clangbsd/sys/ia64/acpica/OsdEnvironment.c
  projects/clangbsd/sys/ia64/acpica/acpi_machdep.c
  projects/clangbsd/sys/ia64/acpica/acpi_wakeup.c
  projects/clangbsd/sys/ia64/acpica/madt.c
  projects/clangbsd/sys/ia64/ia64/nexus.c
  projects/clangbsd/sys/kern/init_main.c
  projects/clangbsd/sys/kern/kern_acct.c
  projects/clangbsd/sys/kern/kern_alq.c
  projects/clangbsd/sys/kern/kern_environment.c
  projects/clangbsd/sys/kern/kern_exec.c
  projects/clangbsd/sys/kern/kern_exit.c
  projects/clangbsd/sys/kern/kern_fork.c
  projects/clangbsd/sys/kern/kern_jail.c
  projects/clangbsd/sys/kern/kern_ktrace.c
  projects/clangbsd/sys/kern/kern_linker.c
  projects/clangbsd/sys/kern/kern_malloc.c
  projects/clangbsd/sys/kern/kern_mbuf.c
  projects/clangbsd/sys/kern/kern_priv.c
  projects/clangbsd/sys/kern/kern_prot.c
  projects/clangbsd/sys/kern/kern_shutdown.c
  projects/clangbsd/sys/kern/kern_sysctl.c
  projects/clangbsd/sys/kern/link_elf.c
  projects/clangbsd/sys/kern/link_elf_obj.c
  projects/clangbsd/sys/kern/subr_trap.c
  projects/clangbsd/sys/kern/sys_pipe.c
  projects/clangbsd/sys/kern/sys_socket.c
  projects/clangbsd/sys/kern/sysv_msg.c
  projects/clangbsd/sys/kern/sysv_sem.c
  projects/clangbsd/sys/kern/sysv_shm.c
  projects/clangbsd/sys/kern/tty.c
  projects/clangbsd/sys/kern/uipc_mbuf.c
  projects/clangbsd/sys/kern/uipc_mbuf2.c
  projects/clangbsd/sys/kern/uipc_sem.c
  projects/clangbsd/sys/kern/uipc_shm.c
  projects/clangbsd/sys/kern/uipc_socket.c
  projects/clangbsd/sys/kern/uipc_syscalls.c
  projects/clangbsd/sys/kern/uipc_usrreq.c
  projects/clangbsd/sys/kern/vfs_acl.c
  projects/clangbsd/sys/kern/vfs_bio.c
  projects/clangbsd/sys/kern/vfs_cache.c
  projects/clangbsd/sys/kern/vfs_cluster.c
  projects/clangbsd/sys/kern/vfs_default.c
  projects/clangbsd/sys/kern/vfs_extattr.c
  projects/clangbsd/sys/kern/vfs_lookup.c
  projects/clangbsd/sys/kern/vfs_mount.c
  projects/clangbsd/sys/kern/vfs_subr.c
  projects/clangbsd/sys/kern/vfs_syscalls.c
  projects/clangbsd/sys/kern/vfs_vnops.c
  projects/clangbsd/sys/modules/acpi/acpi/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_aiboost/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_asus/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_dock/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_fujitsu/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_ibm/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_panasonic/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_sony/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_toshiba/Makefile
  projects/clangbsd/sys/modules/acpi/acpi_video/Makefile
  projects/clangbsd/sys/modules/cpufreq/Makefile
  projects/clangbsd/sys/modules/cxgb/tom/Makefile
  projects/clangbsd/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/clangbsd/sys/modules/dummynet/Makefile
  projects/clangbsd/sys/modules/fdc/Makefile
  projects/clangbsd/sys/modules/firewire/fwip/Makefile
  projects/clangbsd/sys/modules/ibcs2/Makefile
  projects/clangbsd/sys/modules/if_gif/Makefile
  projects/clangbsd/sys/modules/if_ppp/Makefile
  projects/clangbsd/sys/modules/if_stf/Makefile
  projects/clangbsd/sys/modules/if_tun/Makefile
  projects/clangbsd/sys/modules/ip6_mroute_mod/   (props changed)
  projects/clangbsd/sys/modules/ip6_mroute_mod/Makefile
  projects/clangbsd/sys/modules/ip_mroute_mod/Makefile
  projects/clangbsd/sys/modules/ipfw/Makefile
  projects/clangbsd/sys/modules/ipfw_nat/Makefile
  projects/clangbsd/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/clangbsd/sys/modules/linux/Makefile
  projects/clangbsd/sys/modules/mac_lomac/Makefile
  projects/clangbsd/sys/modules/nfsserver/Makefile
  projects/clangbsd/sys/modules/pf/Makefile
  projects/clangbsd/sys/modules/pseudofs/Makefile
  projects/clangbsd/sys/modules/sem/Makefile
  projects/clangbsd/sys/modules/sound/sound/Makefile
  projects/clangbsd/sys/modules/svr4/Makefile
  projects/clangbsd/sys/modules/sysvipc/sysvmsg/Makefile
  projects/clangbsd/sys/modules/sysvipc/sysvsem/Makefile
  projects/clangbsd/sys/modules/sysvipc/sysvshm/Makefile
  projects/clangbsd/sys/modules/ufs/Makefile
  projects/clangbsd/sys/modules/usb/zyd/Makefile
  projects/clangbsd/sys/net/bpf.c
  projects/clangbsd/sys/net/if.c
  projects/clangbsd/sys/net/if_atmsubr.c
  projects/clangbsd/sys/net/if_bridge.c
  projects/clangbsd/sys/net/if_ethersubr.c
  projects/clangbsd/sys/net/if_fddisubr.c
  projects/clangbsd/sys/net/if_fwsubr.c
  projects/clangbsd/sys/net/if_gif.c
  projects/clangbsd/sys/net/if_gif.h
  projects/clangbsd/sys/net/if_iso88025subr.c
  projects/clangbsd/sys/net/if_loop.c
  projects/clangbsd/sys/net/if_stf.c
  projects/clangbsd/sys/net/if_tun.c
  projects/clangbsd/sys/net80211/ieee80211.c
  projects/clangbsd/sys/net80211/ieee80211.h
  projects/clangbsd/sys/net80211/ieee80211_crypto.c
  projects/clangbsd/sys/net80211/ieee80211_crypto.h
  projects/clangbsd/sys/net80211/ieee80211_crypto_ccmp.c
  projects/clangbsd/sys/net80211/ieee80211_crypto_tkip.c
  projects/clangbsd/sys/net80211/ieee80211_ddb.c
  projects/clangbsd/sys/net80211/ieee80211_dfs.c
  projects/clangbsd/sys/net80211/ieee80211_freebsd.c
  projects/clangbsd/sys/net80211/ieee80211_hostap.c
  projects/clangbsd/sys/net80211/ieee80211_ht.c
  projects/clangbsd/sys/net80211/ieee80211_input.c
  projects/clangbsd/sys/net80211/ieee80211_ioctl.c
  projects/clangbsd/sys/net80211/ieee80211_ioctl.h
  projects/clangbsd/sys/net80211/ieee80211_node.c
  projects/clangbsd/sys/net80211/ieee80211_node.h
  projects/clangbsd/sys/net80211/ieee80211_output.c
  projects/clangbsd/sys/net80211/ieee80211_proto.c
  projects/clangbsd/sys/net80211/ieee80211_proto.h
  projects/clangbsd/sys/net80211/ieee80211_scan.h
  projects/clangbsd/sys/net80211/ieee80211_scan_sta.c
  projects/clangbsd/sys/net80211/ieee80211_sta.c
  projects/clangbsd/sys/net80211/ieee80211_var.h
  projects/clangbsd/sys/netatalk/aarp.c
  projects/clangbsd/sys/netatalk/ddp_input.c
  projects/clangbsd/sys/netatalk/ddp_output.c
  projects/clangbsd/sys/netinet/if_ether.c
  projects/clangbsd/sys/netinet/igmp.c
  projects/clangbsd/sys/netinet/in_gif.c
  projects/clangbsd/sys/netinet/in_pcb.c
  projects/clangbsd/sys/netinet/ip_divert.c
  projects/clangbsd/sys/netinet/ip_dummynet.h
  projects/clangbsd/sys/netinet/ip_fw.h
  projects/clangbsd/sys/netinet/ip_icmp.c
  projects/clangbsd/sys/netinet/ip_input.c
  projects/clangbsd/sys/netinet/ip_ipsec.c
  projects/clangbsd/sys/netinet/ip_ipsec.h
  projects/clangbsd/sys/netinet/ip_mroute.c
  projects/clangbsd/sys/netinet/ip_options.c
  projects/clangbsd/sys/netinet/ip_output.c
  projects/clangbsd/sys/netinet/ip_var.h
  projects/clangbsd/sys/netinet/raw_ip.c
  projects/clangbsd/sys/netinet/tcp_input.c
  projects/clangbsd/sys/netinet/tcp_output.c
  projects/clangbsd/sys/netinet/tcp_subr.c
  projects/clangbsd/sys/netinet/tcp_syncache.c
  projects/clangbsd/sys/netinet/tcp_syncache.h
  projects/clangbsd/sys/netinet/tcp_timewait.c
  projects/clangbsd/sys/netinet/udp_usrreq.c
  projects/clangbsd/sys/netinet6/frag6.c
  projects/clangbsd/sys/netinet6/in6_gif.c
  projects/clangbsd/sys/netinet6/in6_pcb.c
  projects/clangbsd/sys/netinet6/nd6.c
  projects/clangbsd/sys/netinet6/udp6_usrreq.c
  projects/clangbsd/sys/nfsserver/nfs_srvkrpc.c
  projects/clangbsd/sys/nfsserver/nfs_srvsock.c
  projects/clangbsd/sys/nlm/nlm_advlock.c
  projects/clangbsd/sys/powerpc/booke/platform_bare.c
  projects/clangbsd/sys/powerpc/booke/pmap.c
  projects/clangbsd/sys/powerpc/conf/MPC85XX
  projects/clangbsd/sys/powerpc/include/ocpbus.h
  projects/clangbsd/sys/powerpc/include/pio.h
  projects/clangbsd/sys/powerpc/mpc85xx/ocpbus.c
  projects/clangbsd/sys/powerpc/mpc85xx/ocpbus.h
  projects/clangbsd/sys/powerpc/powerpc/bus_machdep.c
  projects/clangbsd/sys/rpc/clnt_dg.c
  projects/clangbsd/sys/rpc/clnt_vc.c
  projects/clangbsd/sys/rpc/svc.c
  projects/clangbsd/sys/rpc/svc.h
  projects/clangbsd/sys/rpc/svc_auth.c
  projects/clangbsd/sys/rpc/svc_vc.c
  projects/clangbsd/sys/security/audit/audit_syscalls.c
  projects/clangbsd/sys/sys/cdefs.h
  projects/clangbsd/sys/sys/mount.h
  projects/clangbsd/sys/sys/param.h
  projects/clangbsd/sys/sys/pcpu.h
  projects/clangbsd/sys/sys/priv.h
  projects/clangbsd/sys/sys/soundcard.h
  projects/clangbsd/sys/sys/vimage.h
  projects/clangbsd/sys/ufs/ffs/ffs_vfsops.c
  projects/clangbsd/sys/ufs/ufs/ufs_vnops.c
  projects/clangbsd/sys/vm/swap_pager.c
  projects/clangbsd/sys/vm/vm_contig.c
  projects/clangbsd/sys/vm/vm_fault.c
  projects/clangbsd/sys/vm/vm_glue.c
  projects/clangbsd/sys/vm/vm_map.c
  projects/clangbsd/sys/vm/vm_mmap.c
  projects/clangbsd/sys/vm/vm_pager.h
  projects/clangbsd/tools/regression/lib/libutil/test-flopen.c
  projects/clangbsd/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/clangbsd/tools/tools/README
  projects/clangbsd/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/clangbsd/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/clangbsd/tools/tools/pciid/mk_pci_vendors.pl
  projects/clangbsd/usr.bin/calendar/calendars/calendar.music
  projects/clangbsd/usr.bin/clang/lib/libclangcodegen/Makefile
  projects/clangbsd/usr.bin/clang/lib/libclangsema/Makefile
  projects/clangbsd/usr.bin/tail/extern.h
  projects/clangbsd/usr.bin/tail/forward.c
  projects/clangbsd/usr.bin/tail/misc.c
  projects/clangbsd/usr.bin/tail/read.c
  projects/clangbsd/usr.bin/tail/reverse.c
  projects/clangbsd/usr.bin/tail/tail.1
  projects/clangbsd/usr.bin/tail/tail.c
  projects/clangbsd/usr.sbin/acpi/Makefile.inc
  projects/clangbsd/usr.sbin/acpi/acpiconf/acpiconf.c
  projects/clangbsd/usr.sbin/acpi/acpidb/Makefile
  projects/clangbsd/usr.sbin/acpi/acpidb/acpidb.c
  projects/clangbsd/usr.sbin/acpi/acpidump/acpi.c
  projects/clangbsd/usr.sbin/acpi/iasl/Makefile
  projects/clangbsd/usr.sbin/jail/jail.8
  projects/clangbsd/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/clangbsd/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/clangbsd/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/clangbsd/usr.sbin/makefs/getid.c   (props changed)
  projects/clangbsd/usr.sbin/mountd/mountd.c
  projects/clangbsd/usr.sbin/nfsd/nfsv4.4
  projects/clangbsd/usr.sbin/wpa/hostapd/driver_freebsd.c

Modified: projects/clangbsd/ObsoleteFiles.inc
==============================================================================
--- projects/clangbsd/ObsoleteFiles.inc	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/ObsoleteFiles.inc	Mon Jun  8 21:05:27 2009	(r193755)
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090605: removal of clists
+OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz

Modified: projects/clangbsd/bin/df/df.1
==============================================================================
--- projects/clangbsd/bin/df/df.1	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/bin/df/df.1	Mon Jun  8 21:05:27 2009	(r193755)
@@ -78,15 +78,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 10 for sizes.
 .It Fl h
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 2 for sizes.
+Inodes statistics, if enabled with
+.Fl i ,
+are always printed in base 10.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

Modified: projects/clangbsd/bin/df/df.c
==============================================================================
--- projects/clangbsd/bin/df/df.c	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/bin/df/df.c	Mon Jun  8 21:05:27 2009	(r193755)
@@ -369,6 +369,23 @@ prthumanval(int64_t bytes)
 }
 
 /*
+ * Print an inode count in "human-readable" format.
+ */
+static void
+prthumanvalinode(int64_t bytes)
+{
+	char buf[6];
+	int flags;
+
+	flags = HN_NOSPACE | HN_DECIMAL | HN_DIVISOR_1000;
+
+	humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
+	    bytes, "", HN_AUTOSCALE, flags);
+
+	(void)printf(" %5s", buf);
+}
+
+/*
  * Convert statfs returned file system size into BLOCKSIZE units.
  * Attempts to avoid overflow for large file systems.
  */
@@ -413,8 +430,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
-			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
-			mwp->ifree = imax(mwp->ifree, (int)strlen("ifree"));
+			mwp->iused = imax(hflag ? 0 : mwp->iused,
+			    (int)strlen("  iused"));
+			mwp->ifree = imax(hflag ? 0 : mwp->ifree,
+			    (int)strlen("ifree"));
 			(void)printf(" %*s %*s %%iused",
 			    mwp->iused - 2, "iused", mwp->ifree, "ifree");
 		}
@@ -440,8 +459,15 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used,
-		    mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 :
+		if (hflag) {
+			(void)printf("  ");
+			prthumanvalinode(used);
+			prthumanvalinode(sfsp->f_ffree);
+		} else {
+			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			    mwp->ifree, (intmax_t)sfsp->f_ffree);
+		}
+		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
 		    (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");

Modified: projects/clangbsd/bin/sh/sh.1
==============================================================================
--- projects/clangbsd/bin/sh/sh.1	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/bin/sh/sh.1	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1682,6 +1682,7 @@ If
 is given
 it is used as the exit status of the shell;
 otherwise the exit status of the preceding command is used.
+The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p
 The specified names are exported so that they will

Modified: projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1171,7 +1171,6 @@ dataset_cmp(const void *a, const void *b
  * we have the list of all filesystems, we iterate over them in order and mount
  * and/or share each one.
  */
-#pragma weak zpool_mount_datasets = zpool_enable_datasets
 int
 zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
 {
@@ -1275,7 +1274,6 @@ mountpoint_compare(const void *a, const 
  * arbitrarily (on I/O error, for example).  Instead, we walk /etc/mnttab and
  * gather all the filesystems that are currently mounted.
  */
-#pragma weak zpool_unmount_datasets = zpool_disable_datasets
 int
 zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
 {

Modified: projects/clangbsd/contrib/llvm/CMakeLists.txt
==============================================================================
--- projects/clangbsd/contrib/llvm/CMakeLists.txt	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/CMakeLists.txt	Mon Jun  8 21:05:27 2009	(r193755)
@@ -58,13 +58,22 @@ endif( MSVC )
 option(LLVM_ENABLE_THREADS "Use threads if available." ON)
 
 if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
-  option(LLVM_ENABLE_ASSERTS "Enable asserts" OFF)
+  option(LLVM_ENABLE_ASSERTIONS "Enable assertions" OFF)
 else()
-  option(LLVM_ENABLE_ASSERTS "Enable asserts" ON)
+  option(LLVM_ENABLE_ASSERTIONS "Enable assertions" ON)
 endif()
 
-if( LLVM_ENABLE_ASSERTS )
-  add_definitions( -D_DEBUG -UNDEBUG )
+if( LLVM_ENABLE_ASSERTIONS )
+  add_definitions( -D_DEBUG )
+  # On Release builds cmake automatically defines NDEBUG, so we
+  # explicitly undefine it:
+  if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
+    add_definitions( -UNDEBUG )
+  endif()
+else()
+  if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
+    add_definitions( -DNDEBUG )
+  endif()
 endif()
 
 if( LLVM_TARGETS_TO_BUILD STREQUAL "all" )
@@ -81,6 +90,24 @@ endforeach(c)
 
 set(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm)
 
+# The USE_EXPLICIT_DEPENDENCIES variable will be TRUE to indicate that
+# we should use the library dependencies explicitly specified in the
+# CMakeLists.txt files rather than those determined by
+# llvm-config. This value must be true for non-make and IDE
+# generators.
+if (MSVC_IDE)
+  set(DEFAULT_USE_EXPLICIT_DEPENDENCIES ON)
+elseif (XCODE)
+  set(DEFAULT_USE_EXPLICIT_DEPENDENCIES ON)
+else ()
+ set(DEFAULT_USE_EXPLICIT_DEPENDENCIES OFF)
+endif ()
+
+option(USE_EXPLICIT_DEPENDENCIES 
+  "Use explicit dependencies instead of llvm-config" 
+  ${DEFAULT_USE_EXPLICIT_DEPENDENCIES})
+mark_as_advanced(USE_EXPLICIT_DEPENDENCIES)
+
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
@@ -123,11 +150,13 @@ include(config-ix)
 
 option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF)
 
+set(ENABLE_PIC 0)
 if( LLVM_ENABLE_PIC )
   if( SUPPORTS_FPIC_FLAG )
     message(STATUS "Building with -fPIC")
     add_llvm_definitions(-fPIC)
-  else( SUPPORTS_FPIC_FLAG )
+    set(ENABLE_PIC 1)
+ else( SUPPORTS_FPIC_FLAG )
     message(STATUS "Warning: -fPIC not supported.")
   endif()
 endif()

Modified: projects/clangbsd/contrib/llvm/Makefile.rules
==============================================================================
--- projects/clangbsd/contrib/llvm/Makefile.rules	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/Makefile.rules	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1066,7 +1066,7 @@ all-local:: $(LibName.O)
 
 $(LibName.O): $(ObjectsO) $(LibDir)/.dir
 	$(Echo) Linking $(BuildMode) Object Library $(notdir $@)
-	$(Verb) $(Relink) -Wl,-r -nodefaultlibs -nostdlib -nostartfiles -o $@ $(ObjectsO)
+	$(Verb) $(Relink) -r -nodefaultlibs -nostdlib -nostartfiles -o $@ $(ObjectsO)
 
 clean-local::
 ifneq ($(strip $(LibName.O)),)

Modified: projects/clangbsd/contrib/llvm/autoconf/configure.ac
==============================================================================
--- projects/clangbsd/contrib/llvm/autoconf/configure.ac	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/autoconf/configure.ac	Mon Jun  8 21:05:27 2009	(r193755)
@@ -279,7 +279,7 @@ dnl===----------------------------------
 
 dnl --enable-optimized : check whether they want to do an optimized build:
 AC_ARG_ENABLE(optimized, AS_HELP_STRING(
- [--enable-optimized,Compile with optimizations enabled (default is NO)]),,enableval=$optimize)
+ --enable-optimized,[Compile with optimizations enabled (default is NO)]),,enableval=$optimize)
 if test ${enableval} = "no" ; then
   AC_SUBST(ENABLE_OPTIMIZED,[[]])
 else
@@ -288,7 +288,7 @@ fi
 
 dnl --enable-profiling : check whether they want to do a profile build:
 AC_ARG_ENABLE(profiling, AS_HELP_STRING(
- [--enable-profiling,Compile with profiling enabled (default is NO)]),,enableval="no")
+ --enable-profiling,[Compile with profiling enabled (default is NO)]),,enableval="no")
 if test ${enableval} = "no" ; then
   AC_SUBST(ENABLE_PROFILING,[[]])
 else
@@ -297,7 +297,7 @@ fi
 
 dnl --enable-assertions : check whether they want to turn on assertions or not:
 AC_ARG_ENABLE(assertions,AS_HELP_STRING(
-  [--enable-assertions,Compile with assertion checks enabled (default is YES)]),, enableval="yes")
+  --enable-assertions,[Compile with assertion checks enabled (default is YES)]),, enableval="yes")
 if test ${enableval} = "yes" ; then
   AC_SUBST(DISABLE_ASSERTIONS,[[]])
 else
@@ -306,7 +306,7 @@ fi
 
 dnl --enable-expensive-checks : check whether they want to turn on expensive debug checks:
 AC_ARG_ENABLE(expensive-checks,AS_HELP_STRING(
-  [--enable-expensive-checks,Compile with expensive debug checks enabled (default is NO)]),, enableval="no")
+  --enable-expensive-checks,[Compile with expensive debug checks enabled (default is NO)]),, enableval="no")
 if test ${enableval} = "yes" ; then
   AC_SUBST(ENABLE_EXPENSIVE_CHECKS,[[ENABLE_EXPENSIVE_CHECKS=1]])
   AC_SUBST(EXPENSIVE_CHECKS,[[yes]])
@@ -317,7 +317,7 @@ fi
 
 dnl --enable-debug-runtime : should runtime libraries have debug symbols?
 AC_ARG_ENABLE(debug-runtime,
-   AS_HELP_STRING([--enable-debug-runtime,Build runtime libs with debug symbols (default is NO)]),,enableval=no)
+   AS_HELP_STRING(--enable-debug-runtime,[Build runtime libs with debug symbols (default is NO)]),,enableval=no)
 if test ${enableval} = "no" ; then
   AC_SUBST(DEBUG_RUNTIME,[[]])
 else
@@ -553,6 +553,16 @@ if test "x$WITH_BINUTILS_INCDIR" != xdef
   fi
 fi
 
+dnl --enable-libffi : check whether the user wants to turn off libffi:
+AC_ARG_ENABLE(libffi,AS_HELP_STRING(
+  --enable-libffi,[Check for the presence of libffi (default is YES)]),,
+  enableval=yes)
+case "$enableval" in
+  yes) llvm_cv_enable_libffi="yes" ;;
+  no)  llvm_cv_enable_libffi="no"  ;;
+  *) AC_MSG_ERROR([Invalid setting for --enable-libffi. Use "yes" or "no"]) ;;
+esac
+
 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 4: Check for programs we need and that they are the right version
@@ -769,9 +779,11 @@ AC_SEARCH_LIBS(dlopen,dl,AC_DEFINE([HAVE
                AC_MSG_WARN([dlopen() not found - disabling plugin support]))
 
 dnl libffi is optional; used to call external functions from the interpreter
-AC_SEARCH_LIBS(ffi_call,ffi,AC_DEFINE([HAVE_FFI_CALL],[1],
-               [Define if libffi is available on this platform.]),
-               AC_MSG_WARN([libffi not found - disabling external calls from interpreter]))
+if test "$llvm_cv_enable_libffi" = "yes" ; then
+  AC_SEARCH_LIBS(ffi_call,ffi,AC_DEFINE([HAVE_FFI_CALL],[1],
+                 [Define if libffi is available on this platform.]),
+                 AC_MSG_WARN([libffi not found - disabling external calls from interpreter]))
+fi
 
 dnl mallinfo is optional; the code can compile (minus features) without it
 AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],
@@ -836,7 +848,9 @@ else
 fi
 
 dnl Try to find ffi.h.
-AC_CHECK_HEADERS([ffi.h ffi/ffi.h])
+if test "$llvm_cv_enable_libffi" = "yes" ; then
+  AC_CHECK_HEADERS([ffi.h ffi/ffi.h])
+fi
 
 dnl===-----------------------------------------------------------------------===
 dnl===

Modified: projects/clangbsd/contrib/llvm/cmake/config-ix.cmake
==============================================================================
--- projects/clangbsd/contrib/llvm/cmake/config-ix.cmake	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/cmake/config-ix.cmake	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1,6 +1,7 @@
 
 # include checks
 include(CheckIncludeFile)
+check_include_file(alloca.h HAVE_ALLOCA_H)
 check_include_file(argz.h HAVE_ARGZ_H)
 check_include_file(assert.h HAVE_ASSERT_H)
 check_include_file(dirent.h HAVE_DIRENT_H)
@@ -34,6 +35,7 @@ check_include_file(sys/resource.h HAVE_S
 check_include_file(sys/stat.h HAVE_SYS_STAT_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
 check_include_file(termios.h HAVE_TERMIOS_H)
 check_include_file(unistd.h HAVE_UNISTD_H)
 check_include_file(utime.h HAVE_UTIME_H)
@@ -47,6 +49,7 @@ check_library_exists(dl dlopen "" HAVE_L
 # function checks
 include(CheckSymbolExists)
 include(CheckFunctionExists)
+check_symbol_exists(alloca alloca.h HAVE_ALLOCA)
 check_symbol_exists(getpagesize unistd.h HAVE_GETPAGESIZE)
 check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE)
 check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT)
@@ -58,6 +61,8 @@ check_symbol_exists(isnan math.h HAVE_IS
 check_symbol_exists(ceilf math.h HAVE_CEILF)
 check_symbol_exists(floorf math.h HAVE_FLOORF)
 check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
+check_symbol_exists(malloc_zone_statistics malloc/malloc.h
+                    HAVE_MALLOC_ZONE_STATISTICS)
 check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK)
 check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL)
 

Modified: projects/clangbsd/contrib/llvm/cmake/modules/AddLLVM.cmake
==============================================================================
--- projects/clangbsd/contrib/llvm/cmake/modules/AddLLVM.cmake	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/cmake/modules/AddLLVM.cmake	Mon Jun  8 21:05:27 2009	(r193755)
@@ -26,11 +26,11 @@ macro(add_llvm_executable name)
   if( LLVM_LINK_COMPONENTS )
     llvm_config(${name} ${LLVM_LINK_COMPONENTS})
   endif( LLVM_LINK_COMPONENTS )
-  if( MSVC )
+  if( USE_EXPLICIT_DEPENDENCIES )
     target_link_libraries(${name} ${llvm_libs})
-  else( MSVC )
+  else( )
     add_dependencies(${name} llvm-config.target)
-  endif( MSVC )
+  endif( )
   get_system_libs(llvm_system_libs)
   if( llvm_system_libs )
     target_link_libraries(${name} ${llvm_system_libs})

Modified: projects/clangbsd/contrib/llvm/cmake/modules/AddPartiallyLinkedObject.cmake
==============================================================================
--- projects/clangbsd/contrib/llvm/cmake/modules/AddPartiallyLinkedObject.cmake	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/cmake/modules/AddPartiallyLinkedObject.cmake	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1,18 +1,18 @@
 include(LLVMProcessSources)
 
 macro(target_name_of_partially_linked_object lib var)
-  if( MSVC )
+  if( USE_EXPLICIT_DEPENDENCIES )
     set(${var} ${lib})
-  else( MSVC )
+  else( )
     set(${var} ${lib}_pll)
-  endif( MSVC )
+  endif( )
 endmacro(target_name_of_partially_linked_object lib var)
 
 
 macro(add_partially_linked_object lib)
-  if( MSVC )
+  if( USE_EXPLICIT_DEPENDENCIES )
     add_llvm_library( ${lib} ${ARGN})
-  else( MSVC )
+  else( )
     set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${lib}.o)
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
@@ -36,7 +36,7 @@ macro(add_partially_linked_object lib)
     add_custom_target(${tnplo} ALL DEPENDS ${pll})
     set( llvm_libs ${llvm_libs} ${pll} PARENT_SCOPE)
     set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE )
-  endif( MSVC )
+  endif( )
   install(FILES ${pll}
     DESTINATION lib)
 endmacro(add_partially_linked_object lib)

Modified: projects/clangbsd/contrib/llvm/cmake/modules/LLVMConfig.cmake
==============================================================================
--- projects/clangbsd/contrib/llvm/cmake/modules/LLVMConfig.cmake	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/cmake/modules/LLVMConfig.cmake	Mon Jun  8 21:05:27 2009	(r193755)
@@ -21,36 +21,40 @@ endfunction(get_system_libs)
 
 macro(llvm_config executable)
   # extra args is the list of link components.
-  if( MSVC )
-    msvc_llvm_config(${executable} ${ARGN})
-  else( MSVC )
+  if( USE_EXPLICIT_DEPENDENCIES )
+    explicit_llvm_config(${executable} ${ARGN})
+  else( )
     nix_llvm_config(${executable} ${ARGN})
-  endif( MSVC )
+  endif( )
 endmacro(llvm_config)
 
 
-function(msvc_llvm_config executable)
+function(explicit_llvm_config executable)
   set( link_components ${ARGN} )
-  if( CMAKE_CL_64 )
-    set(include_lflag "/INCLUDE:")
-  else( CMAKE_CL_64 )
-    set(include_lflag "/INCLUDE:_")
-  endif()
-  foreach(c ${link_components})
-    if( c STREQUAL "jit" )
-      set(lfgs "${lfgs} ${include_lflag}X86TargetMachineModule")
-    endif( c STREQUAL "jit" )
-    list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
-    if( NOT idx LESS 0 )
-      set(lfgs "${lfgs} ${include_lflag}${c}TargetMachineModule")
-      list(FIND LLVM_ASMPRINTERS_FORCE_LINK ${c} idx)
+
+  set(lfgs)
+  if (MSVC)
+    if( CMAKE_CL_64 )
+      set(include_lflag "/INCLUDE:")
+    else( CMAKE_CL_64 )
+      set(include_lflag "/INCLUDE:_")
+    endif()
+    foreach(c ${link_components})
+      if( c STREQUAL "jit" )
+        set(lfgs "${lfgs} ${include_lflag}X86TargetMachineModule")
+      endif( c STREQUAL "jit" )
+      list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
       if( NOT idx LESS 0 )
-	set(lfgs "${lfgs} ${include_lflag}${c}AsmPrinterForceLink")
+        set(lfgs "${lfgs} ${include_lflag}${c}TargetMachineModule")
+        list(FIND LLVM_ASMPRINTERS_FORCE_LINK ${c} idx)
+        if( NOT idx LESS 0 )
+	  set(lfgs "${lfgs} ${include_lflag}${c}AsmPrinterForceLink")
+        endif()
       endif()
-    endif()
-  endforeach(c)
+    endforeach(c)
+  endif ()
 
-  msvc_map_components_to_libraries(LIBRARIES ${link_components})
+  explicit_map_components_to_libraries(LIBRARIES ${link_components})
   target_link_libraries(${executable} ${LIBRARIES})
 
   if( lfgs )
@@ -58,10 +62,10 @@ function(msvc_llvm_config executable)
       PROPERTIES
       LINK_FLAGS ${lfgs})
   endif()
-endfunction(msvc_llvm_config)
+endfunction(explicit_llvm_config)
 
 
-function(msvc_map_components_to_libraries out_libs)
+function(explicit_map_components_to_libraries out_libs)
   set( link_components ${ARGN} )
   foreach(c ${link_components})
     # add codegen/asmprinter
@@ -121,7 +125,7 @@ function(msvc_map_components_to_librarie
   endwhile( ${curr_idx} LESS ${lst_size} )
   list(REMOVE_DUPLICATES result)
   set(${out_libs} ${result} PARENT_SCOPE)
-endfunction(msvc_map_components_to_libraries)
+endfunction(explicit_map_components_to_libraries)
 
 
 macro(nix_llvm_config executable)

Modified: projects/clangbsd/contrib/llvm/configure
==============================================================================
--- projects/clangbsd/contrib/llvm/configure	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/configure	Mon Jun  8 21:05:27 2009	(r193755)
@@ -1533,12 +1533,15 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-optimized
-  --enable-profiling
-  --enable-assertions
+  --enable-optimized      Compile with optimizations enabled (default is NO)
+  --enable-profiling      Compile with profiling enabled (default is NO)
+  --enable-assertions     Compile with assertion checks enabled (default is
+                          YES)
   --enable-expensive-checks
-
-  --enable-debug-runtime
+                          Compile with expensive debug checks enabled (default
+                          is NO)
+  --enable-debug-runtime  Build runtime libs with debug symbols (default is
+                          NO)
   --enable-jit            Enable Just In Time Compiling (default is YES)
   --enable-doxygen        Build doxygen documentation (default is NO)
   --enable-threads        Use threads if available (default is YES)
@@ -1550,6 +1553,7 @@ Optional Features:
                           %a (default is YES)
   --enable-bindings       Build specific language bindings:
                           all,auto,none,{binding-name} (default=auto)
+  --enable-libffi         Check for the presence of libffi (default is YES)
   --enable-ltdl-install   install libltdl
   --enable-shared[=PKGS]  build shared libraries
                           [default=yes]
@@ -5111,6 +5115,21 @@ echo "$as_me: error: Invalid path to dir
   fi
 fi
 
+# Check whether --enable-libffi was given.
+if test "${enable_libffi+set}" = set; then
+  enableval=$enable_libffi;
+else
+  enableval=yes
+fi
+
+case "$enableval" in
+  yes) llvm_cv_enable_libffi="yes" ;;
+  no)  llvm_cv_enable_libffi="no"  ;;
+  *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-libffi. Use \"yes\" or \"no\"" >&5
+echo "$as_me: error: Invalid setting for --enable-libffi. Use \"yes\" or \"no\"" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -10575,7 +10594,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10578 "configure"
+#line 10597 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12719,7 +12738,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 12722 "configure"' > conftest.$ac_ext
+  echo '#line 12741 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14437,11 +14456,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14440: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14459: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14444: \$? = $ac_status" >&5
+   echo "$as_me:14463: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14705,11 +14724,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14708: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14727: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14712: \$? = $ac_status" >&5
+   echo "$as_me:14731: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14809,11 +14828,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14812: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14831: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14816: \$? = $ac_status" >&5
+   echo "$as_me:14835: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17261,7 +17280,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17264 "configure"
+#line 17283 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17361,7 +17380,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17364 "configure"
+#line 17383 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19729,11 +19748,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19732: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19751: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19736: \$? = $ac_status" >&5
+   echo "$as_me:19755: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19833,11 +19852,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19836: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19855: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19840: \$? = $ac_status" >&5
+   echo "$as_me:19859: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21403,11 +21422,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21406: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21425: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21410: \$? = $ac_status" >&5
+   echo "$as_me:21429: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -21507,11 +21526,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21510: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21529: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21514: \$? = $ac_status" >&5
+   echo "$as_me:21533: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23742,11 +23761,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23745: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23764: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:23749: \$? = $ac_status" >&5
+   echo "$as_me:23768: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -24010,11 +24029,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24013: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24032: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:24017: \$? = $ac_status" >&5
+   echo "$as_me:24036: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -24114,11 +24133,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:24117: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:24136: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:24121: \$? = $ac_status" >&5
+   echo "$as_me:24140: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -27473,7 +27492,8 @@ echo "$as_me: WARNING: dlopen() not foun
 fi
 
 
-{ echo "$as_me:$LINENO: checking for library containing ffi_call" >&5
+if test "$llvm_cv_enable_libffi" = "yes" ; then
+  { echo "$as_me:$LINENO: checking for library containing ffi_call" >&5
 echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" >&6; }
 if test "${ac_cv_search_ffi_call+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27579,6 +27599,7 @@ else
 echo "$as_me: WARNING: libffi not found - disabling external calls from interpreter" >&2;}
 fi
 
+fi
 
 { echo "$as_me:$LINENO: checking for library containing mallinfo" >&5
 echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" >&6; }
@@ -29824,6 +29845,7 @@ else
 
 fi
 
+if test "$llvm_cv_enable_libffi" = "yes" ; then
 
 
 for ac_header in ffi.h ffi/ffi.h
@@ -29994,6 +30016,7 @@ fi
 
 done
 
+fi
 
 
 

Modified: projects/clangbsd/contrib/llvm/docs/CMake.html
==============================================================================
--- projects/clangbsd/contrib/llvm/docs/CMake.html	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/docs/CMake.html	Mon Jun  8 21:05:27 2009	(r193755)
@@ -248,8 +248,8 @@
   <dt><b>LLVM_ENABLE_THREADS</b>:BOOL</dt>
   <dd>Build with threads support, if available. Defaults to ON.</dd>
 
-  <dt><b>LLVM_ENABLE_ASSERTS</b>:BOOL</dt>
-  <dd>Enables code asserts. Defaults to ON if and only if
+  <dt><b>LLVM_ENABLE_ASSERTIONS</b>:BOOL</dt>
+  <dd>Enables code assertions. Defaults to ON if and only if
     CMAKE_BUILD_TYPE is <i>Release</i>.</dd>
 
   <dt><b>LLVM_ENABLE_PIC</b>:BOOL</dt>

Modified: projects/clangbsd/contrib/llvm/docs/GoldPlugin.html
==============================================================================
--- projects/clangbsd/contrib/llvm/docs/GoldPlugin.html	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/docs/GoldPlugin.html	Mon Jun  8 21:05:27 2009	(r193755)
@@ -153,11 +153,20 @@ $ llvm-gcc -use-gold-plugin a.o b.o -o m
     <pre class="doc_code">
 export CC="$PREFIX/bin/llvm-gcc -use-gold-plugin"
 export CXX="$PREFIX/bin/llvm-g++ -use-gold-plugin"
-export AR="$PREFIX/bin/ar --plugin libLLVMgold.so"
-export NM="$PREFIX/bin/nm --plugin libLLVMgold.so"
+export AR="$PREFIX/bin/ar"
+export NM="$PREFIX/bin/nm"
 export RANLIB=/bin/true #ranlib is not needed, and doesn't support .bc files in .a
 export CFLAGS="-O4"
-     </pre>
+</pre>
+     </li>
+     <li>Or you can just set your path:
+    <pre class="doc_code">
+export PATH="$PREFIX/bin:$PATH"
+export CC="llvm-gcc -use-gold-plugin"
+export CXX="llvm-g++ -use-gold-plugin"
+export RANLIB=/bin/true
+export CFLAGS="-O4"
+</pre>
      </li>
      <li>Configure &amp; build the project as usual: <tt>./configure &amp;&amp; make &amp;&amp; make check</tt> </li>
    </ul>

Modified: projects/clangbsd/contrib/llvm/docs/LangRef.html
==============================================================================
--- projects/clangbsd/contrib/llvm/docs/LangRef.html	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/docs/LangRef.html	Mon Jun  8 21:05:27 2009	(r193755)
@@ -89,8 +89,11 @@
       <li><a href="#binaryops">Binary Operations</a>
         <ol>
           <li><a href="#i_add">'<tt>add</tt>' Instruction</a></li>
+          <li><a href="#i_fadd">'<tt>fadd</tt>' Instruction</a></li>
           <li><a href="#i_sub">'<tt>sub</tt>' Instruction</a></li>
+          <li><a href="#i_fsub">'<tt>fsub</tt>' Instruction</a></li>
           <li><a href="#i_mul">'<tt>mul</tt>' Instruction</a></li>
+          <li><a href="#i_fmul">'<tt>fmul</tt>' Instruction</a></li>
           <li><a href="#i_udiv">'<tt>udiv</tt>' Instruction</a></li>
           <li><a href="#i_sdiv">'<tt>sdiv</tt>' Instruction</a></li>
           <li><a href="#i_fdiv">'<tt>fdiv</tt>' Instruction</a></li>
@@ -2503,16 +2506,15 @@ The result value has the same type as it
 <h5>Arguments:</h5>
 
 <p>The two arguments to the '<tt>add</tt>' instruction must be <a
- href="#t_integer">integer</a>, <a href="#t_floating">floating point</a>, or
- <a href="#t_vector">vector</a> values. Both arguments must have identical
- types.</p>
+ href="#t_integer">integer</a> or
+ <a href="#t_vector">vector</a> of integer values. Both arguments must
+ have identical types.</p>
 
 <h5>Semantics:</h5>
 
-<p>The value produced is the integer or floating point sum of the two
-operands.</p>
+<p>The value produced is the integer sum of the two operands.</p>
 
-<p>If an integer sum has unsigned overflow, the result returned is the
+<p>If the sum has unsigned overflow, the result returned is the
 mathematical result modulo 2<sup>n</sup>, where n is the bit width of
 the result.</p>
 
@@ -2527,6 +2529,39 @@ instruction is appropriate for both sign
 </div>
 <!-- _______________________________________________________________________ -->
 <div class="doc_subsubsection">
+  <a name="i_fadd">'<tt>fadd</tt>' Instruction</a>
+</div>
+
+<div class="doc_text">
+
+<h5>Syntax:</h5>
+
+<pre>
+  &lt;result&gt; = fadd &lt;ty&gt; &lt;op1&gt;, &lt;op2&gt;   <i>; yields {ty}:result</i>
+</pre>
+
+<h5>Overview:</h5>
+
+<p>The '<tt>fadd</tt>' instruction returns the sum of its two operands.</p>
+
+<h5>Arguments:</h5>
+
+<p>The two arguments to the '<tt>fadd</tt>' instruction must be
+<a href="#t_floating">floating point</a> or <a href="#t_vector">vector</a> of
+floating point values. Both arguments must have identical types.</p>
+
+<h5>Semantics:</h5>
+
+<p>The value produced is the floating point sum of the two operands.</p>
+
+<h5>Example:</h5>
+
+<pre>
+  &lt;result&gt; = fadd float 4.0, %var          <i>; yields {float}:result = 4.0 + %var</i>
+</pre>
+</div>
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
    <a name="i_sub">'<tt>sub</tt>' Instruction</a>
 </div>
 
@@ -2550,16 +2585,14 @@ representations.</p>
 <h5>Arguments:</h5>
 
 <p>The two arguments to the '<tt>sub</tt>' instruction must be <a
- href="#t_integer">integer</a>, <a href="#t_floating">floating point</a>,
- or <a href="#t_vector">vector</a> values.  Both arguments must have identical
- types.</p>
+ href="#t_integer">integer</a> or <a href="#t_vector">vector</a> of
+ integer values.  Both arguments must have identical types.</p>
 
 <h5>Semantics:</h5>
 
-<p>The value produced is the integer or floating point difference of
-the two operands.</p>
+<p>The value produced is the integer difference of the two operands.</p>
 
-<p>If an integer difference has unsigned overflow, the result returned is the
+<p>If the difference has unsigned overflow, the result returned is the
 mathematical result modulo 2<sup>n</sup>, where n is the bit width of
 the result.</p>
 
@@ -2575,6 +2608,45 @@ instruction is appropriate for both sign
 
 <!-- _______________________________________________________________________ -->
 <div class="doc_subsubsection">
+   <a name="i_fsub">'<tt>fsub</tt>' Instruction</a>
+</div>
+
+<div class="doc_text">
+
+<h5>Syntax:</h5>
+
+<pre>
+  &lt;result&gt; = fsub &lt;ty&gt; &lt;op1&gt;, &lt;op2&gt;   <i>; yields {ty}:result</i>
+</pre>
+
+<h5>Overview:</h5>
+
+<p>The '<tt>fsub</tt>' instruction returns the difference of its two
+operands.</p>
+
+<p>Note that the '<tt>fsub</tt>' instruction is used to represent the
+'<tt>fneg</tt>' instruction present in most other intermediate
+representations.</p>
+
+<h5>Arguments:</h5>
+
+<p>The two arguments to the '<tt>fsub</tt>' instruction must be <a
+ <a href="#t_floating">floating point</a> or <a href="#t_vector">vector</a>
+ of floating point values.  Both arguments must have identical types.</p>
+
+<h5>Semantics:</h5>
+
+<p>The value produced is the floating point difference of the two operands.</p>
+
+<h5>Example:</h5>
+<pre>
+  &lt;result&gt; = fsub float 4.0, %var           <i>; yields {float}:result = 4.0 - %var</i>
+  &lt;result&gt; = fsub float -0.0, %val          <i>; yields {float}:result = -%var</i>
+</pre>
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
   <a name="i_mul">'<tt>mul</tt>' Instruction</a>
 </div>
 
@@ -2590,16 +2662,14 @@ operands.</p>
 <h5>Arguments:</h5>
 
 <p>The two arguments to the '<tt>mul</tt>' instruction must be <a
-href="#t_integer">integer</a>, <a href="#t_floating">floating point</a>,
-or <a href="#t_vector">vector</a> values.  Both arguments must have identical
-types.</p>
+href="#t_integer">integer</a> or <a href="#t_vector">vector</a> of integer
+values.  Both arguments must have identical types.</p>
  
 <h5>Semantics:</h5>
 
-<p>The value produced is the integer or floating point product of the
-two operands.</p>
+<p>The value produced is the integer product of the two operands.</p>
 
-<p>If the result of an integer multiplication has unsigned overflow,
+<p>If the result of the multiplication has unsigned overflow,
 the result returned is the mathematical result modulo 
 2<sup>n</sup>, where n is the bit width of the result.</p>
 <p>Because LLVM integers use a two's complement representation, and the
@@ -2614,6 +2684,35 @@ width of the full product.</p>
 </div>
 
 <!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="i_fmul">'<tt>fmul</tt>' Instruction</a>
+</div>
+
+<div class="doc_text">
+
+<h5>Syntax:</h5>
+<pre>  &lt;result&gt; = fmul &lt;ty&gt; &lt;op1&gt;, &lt;op2&gt;   <i>; yields {ty}:result</i>
+</pre>
+<h5>Overview:</h5>
+<p>The  '<tt>fmul</tt>' instruction returns the product of its two
+operands.</p>
+
+<h5>Arguments:</h5>
+
+<p>The two arguments to the '<tt>fmul</tt>' instruction must be
+<a href="#t_floating">floating point</a> or <a href="#t_vector">vector</a>
+of floating point values.  Both arguments must have identical types.</p>
+
+<h5>Semantics:</h5>
+
+<p>The value produced is the floating point product of the two operands.</p>
+
+<h5>Example:</h5>
+<pre>  &lt;result&gt; = fmul float 4.0, %var          <i>; yields {float}:result = 4.0 * %var</i>
+</pre>
+</div>
+
+<!-- _______________________________________________________________________ -->
 <div class="doc_subsubsection"> <a name="i_udiv">'<tt>udiv</tt>' Instruction
 </a></div>
 <div class="doc_text">
@@ -7110,7 +7209,7 @@ declare void @llvm.stackprotector( i8* &
 
   <a href="mailto:sabre@nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2009-06-03 12:20:10 +0200 (Wed, 03 Jun 2009) $
+  Last modified: $Date: 2009-06-05 00:49:04 +0200 (Fri, 05 Jun 2009) $
 </address>
 
 </body>

Modified: projects/clangbsd/contrib/llvm/include/llvm-c/lto.h
==============================================================================
--- projects/clangbsd/contrib/llvm/include/llvm-c/lto.h	Mon Jun  8 21:01:14 2009	(r193754)
+++ projects/clangbsd/contrib/llvm/include/llvm-c/lto.h	Mon Jun  8 21:05:27 2009	(r193755)
@@ -19,6 +19,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 
+#define LTO_API_VERSION 3
+
 typedef enum {
     LTO_SYMBOL_ALIGNMENT_MASK         = 0x0000001F,    /* log2 of alignment */
     LTO_SYMBOL_PERMISSIONS_MASK       = 0x000000E0,    
@@ -208,6 +210,14 @@ lto_codegen_set_gcc_path(lto_code_gen_t 
 
 
 /**
+ * Sets the location of the assembler tool to run. If not set, libLTO
+ * will use gcc to invoke the assembler.
+ */
+extern void
+lto_codegen_set_assembler_path(lto_code_gen_t cg, const char* path);
+
+
+/**
  * Adds to a list of all global symbols that must exist in the final

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:09:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 420071065673;
	Mon,  8 Jun 2009 21:09:50 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 310A88FC15;
	Mon,  8 Jun 2009 21:09:50 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58L9o72043601;
	Mon, 8 Jun 2009 21:09:50 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58L9ors043600;
	Mon, 8 Jun 2009 21:09:50 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906082109.n58L9ors043600@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:09:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193756 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:09:50 -0000

Author: rpaulo
Date: Mon Jun  8 21:09:49 2009
New Revision: 193756
URL: http://svn.freebsd.org/changeset/base/193756

Log:
  Properly setup data packets.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 21:05:27 2009	(r193755)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 21:09:49 2009	(r193756)
@@ -508,7 +508,7 @@ ieee80211_send_setup(
 			break;
 		case IEEE80211_M_MBSS:
 			/* XXX add support for proxied addresses */
-			if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+			if (IEEE80211_IS_MULTICAST(da)) {
 				wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
 				/* XXX next hop */
 				IEEE80211_ADDR_COPY(wh->i_addr1, da);
@@ -516,6 +516,7 @@ ieee80211_send_setup(
 				    vap->iv_myaddr);
 			} else {
 				wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
+				IEEE80211_ADDR_COPY(wh->i_addr1, da);
 				IEEE80211_ADDR_COPY(wh->i_addr2,
 				    vap->iv_myaddr);
 				IEEE80211_ADDR_COPY(wh->i_addr3, da);

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:10:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 322D01065674;
	Mon,  8 Jun 2009 21:10:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20BD68FC1F;
	Mon,  8 Jun 2009 21:10:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58LAUUe043657;
	Mon, 8 Jun 2009 21:10:30 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58LATmC043655;
	Mon, 8 Jun 2009 21:10:29 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906082110.n58LATmC043655@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:10:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193757 - in projects/clangbsd/lib/libc: . gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:10:30 -0000

Author: ed
Date: Mon Jun  8 21:10:29 2009
New Revision: 193757
URL: http://svn.freebsd.org/changeset/base/193757

Log:
  Build our C library with Clang.
  
  Because we now have support for #pragma weak, we can build a working C
  library with Clang.

Modified:
  projects/clangbsd/lib/libc/Makefile
  projects/clangbsd/lib/libc/gen/dlfcn.c

Modified: projects/clangbsd/lib/libc/Makefile
==============================================================================
--- projects/clangbsd/lib/libc/Makefile	Mon Jun  8 21:09:49 2009	(r193756)
+++ projects/clangbsd/lib/libc/Makefile	Mon Jun  8 21:10:29 2009	(r193757)
@@ -5,11 +5,6 @@ SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
-# XXX: LLVM PR3679
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=	gcc
-.endif
-
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS

Modified: projects/clangbsd/lib/libc/gen/dlfcn.c
==============================================================================
--- projects/clangbsd/lib/libc/gen/dlfcn.c	Mon Jun  8 21:09:49 2009	(r193756)
+++ projects/clangbsd/lib/libc/gen/dlfcn.c	Mon Jun  8 21:10:29 2009	(r193757)
@@ -46,36 +46,35 @@ static const char sorry[] = "Service una
  * be weak symbols so that the dynamic linker can override them.
  */
 
-#pragma weak _rtld_error
 void
 _rtld_error(const char *fmt, ...)
 {
 }
+#pragma weak _rtld_error
 
-#pragma weak dladdr
 int
 dladdr(const void *addr, Dl_info *dlip)
 {
 	_rtld_error(sorry);
 	return 0;
 }
+#pragma weak dladdr
 
-#pragma weak dlclose
 int
 dlclose(void *handle)
 {
 	_rtld_error(sorry);
 	return -1;
 }
+#pragma weak dlclose
 
-#pragma weak dlerror
 const char *
 dlerror(void)
 {
 	return sorry;
 }
+#pragma weak dlerror
 
-#pragma weak dllockinit
 void
 dllockinit(void *context,
 	   void *(*lock_create)(void *context),
@@ -88,32 +87,32 @@ dllockinit(void *context,
 	if (context_destroy != NULL)
 		context_destroy(context);
 }
+#pragma weak dllockinit
 
-#pragma weak dlopen
 void *
 dlopen(const char *name, int mode)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
+#pragma weak dlopen
 
-#pragma weak dlsym
 void *
 dlsym(void * __restrict handle, const char * __restrict name)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
+#pragma weak dlsym
 
-#pragma weak dlfunc
 dlfunc_t
 dlfunc(void * __restrict handle, const char * __restrict name)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
+#pragma weak dlfunc
 
-#pragma weak dlvsym
 void *
 dlvsym(void * __restrict handle, const char * __restrict name,
     const char * __restrict version)
@@ -121,23 +120,23 @@ dlvsym(void * __restrict handle, const c
 	_rtld_error(sorry);
 	return NULL;
 }
+#pragma weak dlvsym
 
-#pragma weak dlinfo
 int
 dlinfo(void * __restrict handle, int request, void * __restrict p)
 {
 	_rtld_error(sorry);
 	return 0;
 }
+#pragma weak dlinfo
 
-#pragma weak _rtld_thread_init
 void
 _rtld_thread_init(void * li)
 {
 	_rtld_error(sorry);
 }
+#pragma weak _rtld_thread_init
 
-#pragma weak dl_iterate_phdr
 int
 dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
     void *data)
@@ -145,15 +144,16 @@ dl_iterate_phdr(int (*callback)(struct d
 	_rtld_error(sorry);
 	return 0;
 }
+#pragma weak dl_iterate_phdr
 
-#pragma weak _rtld_atfork_pre
 void
 _rtld_atfork_pre(int *locks)
 {
 }
+#pragma weak _rtld_atfork_pre
 
-#pragma weak _rtld_atfork_post
 void
 _rtld_atfork_post(int *locks)
 {
 }
+#pragma weak _rtld_atfork_post

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:13:20 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95F41106568F;
	Mon,  8 Jun 2009 21:13:20 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 84F128FC20;
	Mon,  8 Jun 2009 21:13:20 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58LDKmU043757;
	Mon, 8 Jun 2009 21:13:20 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58LDKrZ043756;
	Mon, 8 Jun 2009 21:13:20 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906082113.n58LDKrZ043756@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:13:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193758 - projects/clangbsd/sys/modules
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:13:21 -0000

Author: ed
Date: Mon Jun  8 21:13:20 2009
New Revision: 193758
URL: http://svn.freebsd.org/changeset/base/193758

Log:
  Disable ce(4) on i386 for now.
  
  The obfuscated ce(4) driver uses inline assembly that's unsupported by Clang.
  
  Reported by:	Dominique Goncalves <dominique goncalves gmail com>

Modified:
  projects/clangbsd/sys/modules/Makefile

Modified: projects/clangbsd/sys/modules/Makefile
==============================================================================
--- projects/clangbsd/sys/modules/Makefile	Mon Jun  8 21:10:29 2009	(r193757)
+++ projects/clangbsd/sys/modules/Makefile	Mon Jun  8 21:13:20 2009	(r193758)
@@ -45,7 +45,6 @@ SUBDIR=	${_3dfx} \
 	${_cbb} \
 	cd9660 \
 	cd9660_iconv \
-	${_ce} \
 	${_ciss} \
 	${_cm} \
 	${_cmx} \
@@ -340,7 +339,6 @@ _arcnet=	arcnet
 _bktr=		bktr
 _cardbus=	cardbus
 _cbb=		cbb
-_ce=		ce
 _coff=		coff
 _cp=		cp
 _cpuctl=	cpuctl

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:44:04 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4586E1065672;
	Mon,  8 Jun 2009 21:44:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 191F58FC13;
	Mon,  8 Jun 2009 21:44:04 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58Li3iN044756;
	Mon, 8 Jun 2009 21:44:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58Li3ZG044755;
	Mon, 8 Jun 2009 21:44:03 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906082144.n58Li3ZG044755@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:44:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193766 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:44:04 -0000

Author: rpaulo
Date: Mon Jun  8 21:44:03 2009
New Revision: 193766
URL: http://svn.freebsd.org/changeset/base/193766

Log:
  Set the qos variable for MBSS case.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 21:42:30 2009	(r193765)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 21:44:03 2009	(r193766)
@@ -1224,6 +1224,7 @@ ieee80211_encap(struct ieee80211vap *vap
 	int meshhdrsize, meshae;
 	struct ieee80211_meshcntl_ae11 *mc;
 	uint32_t seq;
+	uint8_t *qos;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The
@@ -1368,6 +1369,7 @@ ieee80211_encap(struct ieee80211vap *vap
 	wh = mtod(m, struct ieee80211_frame *);
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA;
 	*(uint16_t *)wh->i_dur = 0;
+	qos = NULL;	/* NB: quiet compiler */
 	if (is4addr) {
 		wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
 		IEEE80211_ADDR_COPY(wh->i_addr1, ni->ni_macaddr);
@@ -1410,6 +1412,7 @@ ieee80211_encap(struct ieee80211vap *vap
 			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_dhost);
 			IEEE80211_ADDR_COPY(WH4(wh)->i_addr4, eh.ether_shost);
 			mc->mc_flags = 0;
+			qos = ((struct ieee80211_qosframe_addr4 *) wh)->i_qos;
 			break;
 		case 4:			/* mcast, no proxy */
 			wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
@@ -1417,6 +1420,7 @@ ieee80211_encap(struct ieee80211vap *vap
 			IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
 			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost);
 			mc->mc_flags = 0;		/* NB: AE is really 0 */
+			qos = ((struct ieee80211_qosframe *) wh)->i_qos;
 			break;
 		case 1:			/* mcast, proxy */
 			wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
@@ -1426,6 +1430,7 @@ ieee80211_encap(struct ieee80211vap *vap
 			IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost);
 			mc->mc_flags = 1;
 			IEEE80211_ADDR_COPY(mc->mc_addr4, eh.ether_shost);
+			qos = ((struct ieee80211_qosframe *) wh)->i_qos;
 			break;
 		case 2:			/* ucast, proxy */
 			wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
@@ -1437,6 +1442,7 @@ ieee80211_encap(struct ieee80211vap *vap
 			mc->mc_flags = 2;
 			IEEE80211_ADDR_COPY(mc->mc_addr5, eh.ether_shost);
 			IEEE80211_ADDR_COPY(mc->mc_addr6, eh.ether_shost);
+			qos = ((struct ieee80211_qosframe_addr4 *) wh)->i_qos;
 			break;
 		default:
 			KASSERT(0, ("meshae %d", meshae));
@@ -1456,12 +1462,12 @@ ieee80211_encap(struct ieee80211vap *vap
 	if (m->m_flags & M_MORE_DATA)
 		wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
 	if (addqos) {
-		uint8_t *qos;
 		int ac, tid;
 
 		if (is4addr) {
 			qos = ((struct ieee80211_qosframe_addr4 *) wh)->i_qos;
-		} else
+		/* NB: mesh case handled earlier */
+		} else if (vap->iv_opmode != IEEE80211_M_MBSS)
 			qos = ((struct ieee80211_qosframe *) wh)->i_qos;
 		ac = M_WME_GETAC(m);
 		/* map from access class/queue to 11e header priorty value */

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:47:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 422F5106568A;
	Mon,  8 Jun 2009 21:47:56 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F5068FC12;
	Mon,  8 Jun 2009 21:47:56 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58Llu5W044896;
	Mon, 8 Jun 2009 21:47:56 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58Lltp7044893;
	Mon, 8 Jun 2009 21:47:55 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906082147.n58Lltp7044893@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:47:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193767 - in projects/clangbsd: cddl/lib/libzpool
	lib/librt sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:47:56 -0000

Author: ed
Date: Mon Jun  8 21:47:55 2009
New Revision: 193767
URL: http://svn.freebsd.org/changeset/base/193767

Log:
  Build librt and libzpool with Clang.
  
  Unfortunately #pragma weak isn't yet good enough to build libzpool, so
  change it slightly to use a construct that does work.

Modified:
  projects/clangbsd/cddl/lib/libzpool/Makefile
  projects/clangbsd/lib/librt/Makefile
  projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c

Modified: projects/clangbsd/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/clangbsd/cddl/lib/libzpool/Makefile	Mon Jun  8 21:44:03 2009	(r193766)
+++ projects/clangbsd/cddl/lib/libzpool/Makefile	Mon Jun  8 21:47:55 2009	(r193767)
@@ -23,13 +23,6 @@ ATOMIC_SRCS=	opensolaris_atomic.c
 
 LIB=		zpool
 
-.include <bsd.own.mk>
-
-# XXX: LLVM PR3679
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=		gcc
-.endif
-
 ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c
 ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
 KERNEL_SRCS=	kernel.c taskq.c util.c

Modified: projects/clangbsd/lib/librt/Makefile
==============================================================================
--- projects/clangbsd/lib/librt/Makefile	Mon Jun  8 21:44:03 2009	(r193766)
+++ projects/clangbsd/lib/librt/Makefile	Mon Jun  8 21:47:55 2009	(r193767)
@@ -1,12 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-# XXX: LLVM PR3678
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=	gcc
-.endif
-
 LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}

Modified: projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Mon Jun  8 21:44:03 2009	(r193766)
+++ projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Mon Jun  8 21:47:55 2009	(r193767)
@@ -1232,7 +1232,6 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_
 	return (0);
 }
 
-#pragma weak dmu_buf_will_dirty = dbuf_will_dirty
 void
 dbuf_will_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 {
@@ -1246,6 +1245,7 @@ dbuf_will_dirty(dmu_buf_impl_t *db, dmu_
 	(void) dbuf_read(db, NULL, rf);
 	(void) dbuf_dirty(db, tx);
 }
+__weak_reference(dbuf_will_dirty, dmu_buf_will_dirty);
 
 void
 dmu_buf_will_fill(dmu_buf_t *db_fake, dmu_tx_t *tx)
@@ -1264,7 +1264,6 @@ dmu_buf_will_fill(dmu_buf_t *db_fake, dm
 	(void) dbuf_dirty(db, tx);
 }
 
-#pragma weak dmu_buf_fill_done = dbuf_fill_done
 /* ARGSUSED */
 void
 dbuf_fill_done(dmu_buf_impl_t *db, dmu_tx_t *tx)
@@ -1285,6 +1284,7 @@ dbuf_fill_done(dmu_buf_impl_t *db, dmu_t
 	}
 	mutex_exit(&db->db_mtx);
 }
+__weak_reference(dbuf_fill_done, dmu_buf_fill_done);
 
 /*
  * "Clear" the contents of this dbuf.  This will mark the dbuf
@@ -1707,15 +1707,14 @@ dbuf_create_bonus(dnode_t *dn)
 	dn->dn_bonus = dbuf_create(dn, 0, DB_BONUS_BLKID, dn->dn_dbuf, NULL);
 }
 
-#pragma weak dmu_buf_add_ref = dbuf_add_ref
 void
 dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
 {
 	int64_t holds = refcount_add(&db->db_holds, tag);
 	ASSERT(holds > 1);
 }
+__weak_reference(dbuf_add_ref, dmu_buf_add_ref);
 
-#pragma weak dmu_buf_rele = dbuf_rele
 void
 dbuf_rele(dmu_buf_impl_t *db, void *tag)
 {
@@ -1768,13 +1767,14 @@ dbuf_rele(dmu_buf_impl_t *db, void *tag)
 		mutex_exit(&db->db_mtx);
 	}
 }
+__weak_reference(dbuf_rele, dmu_buf_rele);
 
-#pragma weak dmu_buf_refcount = dbuf_refcount
 uint64_t
 dbuf_refcount(dmu_buf_impl_t *db)
 {
 	return (refcount_count(&db->db_holds));
 }
+__weak_reference(dbuf_refcount, dmu_buf_refcount);
 
 void *
 dmu_buf_set_user(dmu_buf_t *db_fake, void *user_ptr, void *user_data_ptr_ptr,

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:48:40 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3964106578C;
	Mon,  8 Jun 2009 21:48:40 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C19498FC1F;
	Mon,  8 Jun 2009 21:48:40 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58LmenF044985;
	Mon, 8 Jun 2009 21:48:40 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58Lme4P044984;
	Mon, 8 Jun 2009 21:48:40 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906082148.n58Lme4P044984@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:48:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193769 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:48:41 -0000

Author: rpaulo
Date: Mon Jun  8 21:48:40 2009
New Revision: 193769
URL: http://svn.freebsd.org/changeset/base/193769

Log:
  Remove bogus comments.
  Style.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 21:48:13 2009	(r193768)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 21:48:40 2009	(r193769)
@@ -276,7 +276,7 @@ mesh_input(struct ieee80211_node *ni, st
 		if (ni == vap->iv_bss)
 			goto out;
 		IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni,
-		    "%s", "received data frame");
+		    "received data frame, dir 0x%x", dir);
 		if (ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 			    ni->ni_macaddr, NULL,
@@ -294,7 +294,7 @@ mesh_input(struct ieee80211_node *ni, st
 		hdrspace = ieee80211_hdrspace(ic, wh);
 		if (m->m_len < hdrspace + sizeof(struct ieee80211_meshcntl) &&
 		    (m = m_pullup(m, hdrspace +
-		        sizeof(struct ieee80211_meshcntl) )) == NULL) {
+		        sizeof(struct ieee80211_meshcntl))) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, NULL,
 			    "data too short: expecting %u", hdrspace);
@@ -349,7 +349,6 @@ mesh_input(struct ieee80211_node *ni, st
 			IEEE80211_NODE_STAT(ni, rx_decap);
 			goto err;
 		}
-		/* XXX require HT? */
 		if (qos & IEEE80211_QOS_AMSDU) {
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
@@ -361,7 +360,6 @@ mesh_input(struct ieee80211_node *ni, st
 				return IEEE80211_FC0_TYPE_DATA;
 #endif
 		}		
-		/* XXX SuperG/HT */
 		ieee80211_deliver_data(vap, ni, m);
 		return type;
 	case IEEE80211_FC0_TYPE_MGT:

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:55:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5312E106571C;
	Mon,  8 Jun 2009 21:55:19 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 41F568FC1C;
	Mon,  8 Jun 2009 21:55:19 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58LtJ6g045269;
	Mon, 8 Jun 2009 21:55:19 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58LtJRZ045268;
	Mon, 8 Jun 2009 21:55:19 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906082155.n58LtJRZ045268@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:55:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193771 - projects/clangbsd/libexec/rtld-elf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:55:19 -0000

Author: ed
Date: Mon Jun  8 21:55:18 2009
New Revision: 193771
URL: http://svn.freebsd.org/changeset/base/193771

Log:
  rtld-elf also works now. Build it with Clang.

Modified:
  projects/clangbsd/libexec/rtld-elf/Makefile

Modified: projects/clangbsd/libexec/rtld-elf/Makefile
==============================================================================
--- projects/clangbsd/libexec/rtld-elf/Makefile	Mon Jun  8 21:52:20 2009	(r193770)
+++ projects/clangbsd/libexec/rtld-elf/Makefile	Mon Jun  8 21:55:18 2009	(r193771)
@@ -3,11 +3,6 @@
 .include <bsd.own.mk>
 MK_SSP=		no
 
-# XXX: prevents failed assertion on startup
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=	gcc
-.endif
-
 PROG?=		ld-elf.so.1
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \

From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:58:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5075A10656DB;
	Mon,  8 Jun 2009 21:58:39 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 37EDE8FC13;
	Mon,  8 Jun 2009 21:58:39 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58LwcNS045418;
	Mon, 8 Jun 2009 21:58:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58LwbvK045388;
	Mon, 8 Jun 2009 21:58:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906082158.n58LwbvK045388@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:58:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193772 - in projects/mesh11s: . bin/chflags bin/cp
	bin/df bin/ps bin/rm bin/sh bin/test
	cddl/contrib/opensolaris/cmd/lockstat cddl/usr.sbin
	cddl/usr.sbin/lockstat contrib/bind9 contrib...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 21:58:39 -0000

Author: rpaulo
Date: Mon Jun  8 21:58:34 2009
New Revision: 193772
URL: http://svn.freebsd.org/changeset/base/193772

Log:
  MFC 192402:193753

Added:
  projects/mesh11s/cddl/contrib/opensolaris/cmd/lockstat/
     - copied from r193753, head/cddl/contrib/opensolaris/cmd/lockstat/
  projects/mesh11s/cddl/usr.sbin/lockstat/
     - copied from r193753, head/cddl/usr.sbin/lockstat/
  projects/mesh11s/contrib/bind9/NSEC3-NOTES
     - copied unchanged from r193753, head/contrib/bind9/NSEC3-NOTES
  projects/mesh11s/contrib/bind9/README.pkcs11
     - copied unchanged from r193753, head/contrib/bind9/README.pkcs11
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
     - copied unchanged from r193753, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  projects/mesh11s/contrib/bind9/bin/named/bind9.xsl
     - copied unchanged from r193753, head/contrib/bind9/bin/named/bind9.xsl
  projects/mesh11s/contrib/bind9/bin/named/bind9.xsl.h
     - copied unchanged from r193753, head/contrib/bind9/bin/named/bind9.xsl.h
  projects/mesh11s/contrib/bind9/bin/named/convertxsl.pl
     - copied unchanged from r193753, head/contrib/bind9/bin/named/convertxsl.pl
  projects/mesh11s/contrib/bind9/bin/named/include/named/statschannel.h
     - copied unchanged from r193753, head/contrib/bind9/bin/named/include/named/statschannel.h
  projects/mesh11s/contrib/bind9/bin/named/statschannel.c
     - copied unchanged from r193753, head/contrib/bind9/bin/named/statschannel.c
  projects/mesh11s/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
     - copied unchanged from r193753, head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/mesh11s/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
     - copied unchanged from r193753, head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/mesh11s/contrib/bind9/doc/arm/man.nsupdate.html
     - copied unchanged from r193753, head/contrib/bind9/doc/arm/man.nsupdate.html
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/iptable.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/include/dns/iptable.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/nsec3.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/mesh11s/contrib/bind9/lib/dns/iptable.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/iptable.c
  projects/mesh11s/contrib/bind9/lib/dns/nsec3.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/nsec3.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
  projects/mesh11s/contrib/bind9/lib/dns/spnego.asn1
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/spnego.asn1
  projects/mesh11s/contrib/bind9/lib/dns/spnego.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/spnego.c
  projects/mesh11s/contrib/bind9/lib/dns/spnego.h
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/spnego.h
  projects/mesh11s/contrib/bind9/lib/dns/spnego_asn1.c
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/spnego_asn1.c
  projects/mesh11s/contrib/bind9/lib/dns/spnego_asn1.pl
     - copied unchanged from r193753, head/contrib/bind9/lib/dns/spnego_asn1.pl
  projects/mesh11s/contrib/bind9/lib/isc/base32.c
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/base32.c
  projects/mesh11s/contrib/bind9/lib/isc/httpd.c
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/httpd.c
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/base32.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/base32.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/httpd.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/httpd.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/iterated_hash.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/iterated_hash.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/radix.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/radix.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/stats.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/stats.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/xml.h
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/include/isc/xml.h
  projects/mesh11s/contrib/bind9/lib/isc/iterated_hash.c
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/iterated_hash.c
  projects/mesh11s/contrib/bind9/lib/isc/radix.c
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/radix.c
  projects/mesh11s/contrib/bind9/lib/isc/stats.c
     - copied unchanged from r193753, head/contrib/bind9/lib/isc/stats.c
  projects/mesh11s/contrib/ee/   (props changed)
     - copied from r193753, head/contrib/ee/
  projects/mesh11s/crypto/openssh/auth2-jpake.c
     - copied unchanged from r193753, head/crypto/openssh/auth2-jpake.c
  projects/mesh11s/crypto/openssh/jpake.c
     - copied unchanged from r193753, head/crypto/openssh/jpake.c
  projects/mesh11s/crypto/openssh/jpake.h
     - copied unchanged from r193753, head/crypto/openssh/jpake.h
  projects/mesh11s/crypto/openssh/schnorr.c
     - copied unchanged from r193753, head/crypto/openssh/schnorr.c
  projects/mesh11s/etc/ntp.conf
     - copied unchanged from r193753, head/etc/ntp.conf
  projects/mesh11s/etc/rc.d/nfscbd
     - copied unchanged from r193753, head/etc/rc.d/nfscbd
  projects/mesh11s/etc/rc.d/nfsuserd
     - copied unchanged from r193753, head/etc/rc.d/nfsuserd
  projects/mesh11s/lib/libc/posix1e/acl_compat.c
     - copied unchanged from r193753, head/lib/libc/posix1e/acl_compat.c
  projects/mesh11s/sbin/ifconfig/ifgif.c
     - copied unchanged from r193753, head/sbin/ifconfig/ifgif.c
  projects/mesh11s/share/man/man4/ksyms.4
     - copied unchanged from r193753, head/share/man/man4/ksyms.4
  projects/mesh11s/share/man/man4/mld.4
     - copied unchanged from r193753, head/share/man/man4/mld.4
  projects/mesh11s/share/man/man9/fail.9
     - copied unchanged from r193753, head/share/man/man9/fail.9
  projects/mesh11s/share/man/man9/netisr.9
     - copied unchanged from r193753, head/share/man/man9/netisr.9
  projects/mesh11s/share/man/man9/sglist.9
     - copied unchanged from r193753, head/share/man/man9/sglist.9
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c
     - copied unchanged from r193753, head/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c
  projects/mesh11s/sys/cddl/compat/opensolaris/sys/acl.h
     - copied unchanged from r193753, head/sys/cddl/compat/opensolaris/sys/acl.h
  projects/mesh11s/sys/cddl/dev/lockstat/
     - copied from r193753, head/sys/cddl/dev/lockstat/
  projects/mesh11s/sys/contrib/dev/acpica/changes.txt
     - copied unchanged from r193753, head/sys/contrib/dev/acpica/changes.txt
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslstartup.c
     - copied unchanged from r193753, head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/mesh11s/sys/contrib/dev/acpica/debugger/
     - copied from r193753, head/sys/contrib/dev/acpica/debugger/
  projects/mesh11s/sys/contrib/dev/acpica/disassembler/
     - copied from r193753, head/sys/contrib/dev/acpica/disassembler/
  projects/mesh11s/sys/contrib/dev/acpica/dispatcher/
     - copied from r193753, head/sys/contrib/dev/acpica/dispatcher/
  projects/mesh11s/sys/contrib/dev/acpica/events/
     - copied from r193753, head/sys/contrib/dev/acpica/events/
  projects/mesh11s/sys/contrib/dev/acpica/executer/
     - copied from r193753, head/sys/contrib/dev/acpica/executer/
  projects/mesh11s/sys/contrib/dev/acpica/hardware/
     - copied from r193753, head/sys/contrib/dev/acpica/hardware/
  projects/mesh11s/sys/contrib/dev/acpica/include/
     - copied from r193753, head/sys/contrib/dev/acpica/include/
  projects/mesh11s/sys/contrib/dev/acpica/namespace/
     - copied from r193753, head/sys/contrib/dev/acpica/namespace/
  projects/mesh11s/sys/contrib/dev/acpica/parser/
     - copied from r193753, head/sys/contrib/dev/acpica/parser/
  projects/mesh11s/sys/contrib/dev/acpica/resources/
     - copied from r193753, head/sys/contrib/dev/acpica/resources/
  projects/mesh11s/sys/contrib/dev/acpica/tables/
     - copied from r193753, head/sys/contrib/dev/acpica/tables/
  projects/mesh11s/sys/contrib/dev/acpica/tools/
     - copied from r193753, head/sys/contrib/dev/acpica/tools/
  projects/mesh11s/sys/contrib/dev/acpica/utilities/
     - copied from r193753, head/sys/contrib/dev/acpica/utilities/
  projects/mesh11s/sys/contrib/dev/mwl/
     - copied from r193753, head/sys/contrib/dev/mwl/
  projects/mesh11s/sys/dev/ksyms/
     - copied from r193753, head/sys/dev/ksyms/
  projects/mesh11s/sys/dev/mwl/
     - copied from r193753, head/sys/dev/mwl/
  projects/mesh11s/sys/dev/sec/
     - copied from r193753, head/sys/dev/sec/
  projects/mesh11s/sys/dev/sound/pcm/feeder_chain.c
     - copied unchanged from r193753, head/sys/dev/sound/pcm/feeder_chain.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_eq.c
     - copied unchanged from r193753, head/sys/dev/sound/pcm/feeder_eq.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_format.c
     - copied unchanged from r193753, head/sys/dev/sound/pcm/feeder_format.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_matrix.c
     - copied unchanged from r193753, head/sys/dev/sound/pcm/feeder_matrix.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_mixer.c
     - copied unchanged from r193753, head/sys/dev/sound/pcm/feeder_mixer.c
  projects/mesh11s/sys/dev/sound/pcm/g711.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/g711.h
  projects/mesh11s/sys/dev/sound/pcm/intpcm.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/intpcm.h
  projects/mesh11s/sys/dev/sound/pcm/matrix.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/matrix.h
  projects/mesh11s/sys/dev/sound/pcm/matrix_map.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/matrix_map.h
  projects/mesh11s/sys/dev/sound/pcm/pcm.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/pcm.h
  projects/mesh11s/sys/dev/sound/pcm/sndstat.h
     - copied unchanged from r193753, head/sys/dev/sound/pcm/sndstat.h
  projects/mesh11s/sys/dev/usb/wlan/if_urtw.c
     - copied unchanged from r193753, head/sys/dev/usb/wlan/if_urtw.c
  projects/mesh11s/sys/dev/usb/wlan/if_urtwreg.h
     - copied unchanged from r193753, head/sys/dev/usb/wlan/if_urtwreg.h
  projects/mesh11s/sys/dev/usb/wlan/if_urtwvar.h
     - copied unchanged from r193753, head/sys/dev/usb/wlan/if_urtwvar.h
  projects/mesh11s/sys/i386/include/xen/xen_clock_util.h
     - copied unchanged from r193753, head/sys/i386/include/xen/xen_clock_util.h
  projects/mesh11s/sys/i386/xen/xen_clock_util.c
     - copied unchanged from r193753, head/sys/i386/xen/xen_clock_util.c
  projects/mesh11s/sys/i386/xen/xen_rtc.c
     - copied unchanged from r193753, head/sys/i386/xen/xen_rtc.c
  projects/mesh11s/sys/kern/kern_fail.c
     - copied unchanged from r193753, head/sys/kern/kern_fail.c
  projects/mesh11s/sys/kern/kern_lockstat.c
     - copied unchanged from r193753, head/sys/kern/kern_lockstat.c
  projects/mesh11s/sys/kern/subr_sglist.c
     - copied unchanged from r193753, head/sys/kern/subr_sglist.c
  projects/mesh11s/sys/modules/ksyms/
     - copied from r193753, head/sys/modules/ksyms/
  projects/mesh11s/sys/modules/mwl/
     - copied from r193753, head/sys/modules/mwl/
  projects/mesh11s/sys/modules/mwlfw/
     - copied from r193753, head/sys/modules/mwlfw/
  projects/mesh11s/sys/modules/nfscl/
     - copied from r193753, head/sys/modules/nfscl/
  projects/mesh11s/sys/modules/nfscommon/
     - copied from r193753, head/sys/modules/nfscommon/
  projects/mesh11s/sys/modules/nfsd/
     - copied from r193753, head/sys/modules/nfsd/
  projects/mesh11s/sys/modules/usb/urtw/
     - copied from r193753, head/sys/modules/usb/urtw/
  projects/mesh11s/sys/netinet/ipfw/
     - copied from r193753, head/sys/netinet/ipfw/
  projects/mesh11s/sys/netipx/spx_reass.c
     - copied unchanged from r193753, head/sys/netipx/spx_reass.c
  projects/mesh11s/sys/powerpc/cpufreq/
     - copied from r193753, head/sys/powerpc/cpufreq/
  projects/mesh11s/sys/powerpc/ofw/ofw_cpu.c
     - copied unchanged from r193753, head/sys/powerpc/ofw/ofw_cpu.c
  projects/mesh11s/sys/powerpc/powermac/vcoregpio.c
     - copied unchanged from r193753, head/sys/powerpc/powermac/vcoregpio.c
  projects/mesh11s/sys/sys/fail.h
     - copied unchanged from r193753, head/sys/sys/fail.h
  projects/mesh11s/sys/sys/ksyms.h
     - copied unchanged from r193753, head/sys/sys/ksyms.h
  projects/mesh11s/sys/sys/lockstat.h
     - copied unchanged from r193753, head/sys/sys/lockstat.h
  projects/mesh11s/sys/sys/sglist.h
     - copied unchanged from r193753, head/sys/sys/sglist.h
  projects/mesh11s/sys/tools/feeder_eq_mkfilter.awk
     - copied unchanged from r193753, head/sys/tools/feeder_eq_mkfilter.awk
  projects/mesh11s/sys/tools/feeder_rate_mkfilter.awk
     - copied unchanged from r193753, head/sys/tools/feeder_rate_mkfilter.awk
  projects/mesh11s/sys/tools/snd_fxdiv_gen.awk
     - copied unchanged from r193753, head/sys/tools/snd_fxdiv_gen.awk
  projects/mesh11s/tools/build/options/WITH_BIND_IDN
     - copied unchanged from r193753, head/tools/build/options/WITH_BIND_IDN
  projects/mesh11s/tools/build/options/WITH_BIND_LARGE_FILE
     - copied unchanged from r193753, head/tools/build/options/WITH_BIND_LARGE_FILE
  projects/mesh11s/tools/build/options/WITH_BIND_SIGCHASE
     - copied unchanged from r193753, head/tools/build/options/WITH_BIND_SIGCHASE
  projects/mesh11s/tools/build/options/WITH_BIND_XML
     - copied unchanged from r193753, head/tools/build/options/WITH_BIND_XML
  projects/mesh11s/tools/regression/bin/sh/builtins/eval1.0
     - copied unchanged from r193753, head/tools/regression/bin/sh/builtins/eval1.0
  projects/mesh11s/tools/regression/bin/sh/set-e/eval1.0
     - copied unchanged from r193753, head/tools/regression/bin/sh/set-e/eval1.0
  projects/mesh11s/tools/regression/bin/sh/set-e/eval2.1
     - copied unchanged from r193753, head/tools/regression/bin/sh/set-e/eval2.1
  projects/mesh11s/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21
     - copied unchanged from r193753, head/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21
  projects/mesh11s/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22
     - copied unchanged from r193753, head/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22
  projects/mesh11s/tools/regression/vfs/
     - copied from r193753, head/tools/regression/vfs/
  projects/mesh11s/tools/tools/iso/
     - copied from r193753, head/tools/tools/iso/
  projects/mesh11s/tools/tools/mwl/
     - copied from r193753, head/tools/tools/mwl/
  projects/mesh11s/tools/tools/npe/
     - copied from r193753, head/tools/tools/npe/
  projects/mesh11s/tools/tools/vimage/
     - copied from r193753, head/tools/tools/vimage/
  projects/mesh11s/usr.bin/ee/nls/hu_HU.ISO8859-2/
     - copied from r193753, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
  projects/mesh11s/usr.sbin/dnssec-dsfromkey/
     - copied from r193753, head/usr.sbin/dnssec-dsfromkey/
  projects/mesh11s/usr.sbin/dnssec-keyfromlabel/
     - copied from r193753, head/usr.sbin/dnssec-keyfromlabel/
  projects/mesh11s/usr.sbin/nfscbd/
     - copied from r193753, head/usr.sbin/nfscbd/
  projects/mesh11s/usr.sbin/nfsd/nfsv4.4
     - copied unchanged from r193753, head/usr.sbin/nfsd/nfsv4.4
  projects/mesh11s/usr.sbin/nfsd/stablerestart.5
     - copied unchanged from r193753, head/usr.sbin/nfsd/stablerestart.5
  projects/mesh11s/usr.sbin/nfsdumpstate/
     - copied from r193753, head/usr.sbin/nfsdumpstate/
  projects/mesh11s/usr.sbin/nfsrevoke/
     - copied from r193753, head/usr.sbin/nfsrevoke/
  projects/mesh11s/usr.sbin/nfsuserd/
     - copied from r193753, head/usr.sbin/nfsuserd/
Replaced:
  projects/mesh11s/contrib/bind9/isc-config.sh.in
     - copied unchanged from r193753, head/contrib/bind9/isc-config.sh.in
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
     - copied unchanged from r193753, head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
     - copied unchanged from r193753, head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
     - copied unchanged from r193753, head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/mesh11s/tools/build/options/WITH_BIND_LIBS
     - copied unchanged from r193753, head/tools/build/options/WITH_BIND_LIBS
Deleted:
  projects/mesh11s/contrib/bind9/doc/draft/
  projects/mesh11s/contrib/bind9/doc/rfc/
  projects/mesh11s/contrib/bind9/lib/bind/
  projects/mesh11s/etc/rc.d/early.sh
  projects/mesh11s/etc/rc.d/idmapd
  projects/mesh11s/lib/bind/bind/
  projects/mesh11s/libexec/makekey/
  projects/mesh11s/sbin/idmapd/
  projects/mesh11s/sys/amd64/conf/MAC
  projects/mesh11s/sys/arm/at91/ohci_atmelarm.c
  projects/mesh11s/sys/contrib/dev/acpica/CHANGES.txt
  projects/mesh11s/sys/contrib/dev/acpica/acapps.h
  projects/mesh11s/sys/contrib/dev/acpica/acconfig.h
  projects/mesh11s/sys/contrib/dev/acpica/acdebug.h
  projects/mesh11s/sys/contrib/dev/acpica/acdisasm.h
  projects/mesh11s/sys/contrib/dev/acpica/acdispat.h
  projects/mesh11s/sys/contrib/dev/acpica/acefi.h
  projects/mesh11s/sys/contrib/dev/acpica/acenv.h
  projects/mesh11s/sys/contrib/dev/acpica/acevents.h
  projects/mesh11s/sys/contrib/dev/acpica/acexcep.h
  projects/mesh11s/sys/contrib/dev/acpica/acfreebsd.h
  projects/mesh11s/sys/contrib/dev/acpica/acgcc.h
  projects/mesh11s/sys/contrib/dev/acpica/acglobal.h
  projects/mesh11s/sys/contrib/dev/acpica/achware.h
  projects/mesh11s/sys/contrib/dev/acpica/acinterp.h
  projects/mesh11s/sys/contrib/dev/acpica/aclocal.h
  projects/mesh11s/sys/contrib/dev/acpica/acmacros.h
  projects/mesh11s/sys/contrib/dev/acpica/acnames.h
  projects/mesh11s/sys/contrib/dev/acpica/acnamesp.h
  projects/mesh11s/sys/contrib/dev/acpica/acobject.h
  projects/mesh11s/sys/contrib/dev/acpica/acopcode.h
  projects/mesh11s/sys/contrib/dev/acpica/acoutput.h
  projects/mesh11s/sys/contrib/dev/acpica/acparser.h
  projects/mesh11s/sys/contrib/dev/acpica/acpi.h
  projects/mesh11s/sys/contrib/dev/acpica/acpiosxf.h
  projects/mesh11s/sys/contrib/dev/acpica/acpixf.h
  projects/mesh11s/sys/contrib/dev/acpica/acresrc.h
  projects/mesh11s/sys/contrib/dev/acpica/acstruct.h
  projects/mesh11s/sys/contrib/dev/acpica/actables.h
  projects/mesh11s/sys/contrib/dev/acpica/actbl.h
  projects/mesh11s/sys/contrib/dev/acpica/actbl1.h
  projects/mesh11s/sys/contrib/dev/acpica/actbl2.h
  projects/mesh11s/sys/contrib/dev/acpica/actypes.h
  projects/mesh11s/sys/contrib/dev/acpica/acutils.h
  projects/mesh11s/sys/contrib/dev/acpica/aecommon.h
  projects/mesh11s/sys/contrib/dev/acpica/amlcode.h
  projects/mesh11s/sys/contrib/dev/acpica/amlresrc.h
  projects/mesh11s/sys/contrib/dev/acpica/dbcmds.c
  projects/mesh11s/sys/contrib/dev/acpica/dbdisply.c
  projects/mesh11s/sys/contrib/dev/acpica/dbexec.c
  projects/mesh11s/sys/contrib/dev/acpica/dbfileio.c
  projects/mesh11s/sys/contrib/dev/acpica/dbhistry.c
  projects/mesh11s/sys/contrib/dev/acpica/dbinput.c
  projects/mesh11s/sys/contrib/dev/acpica/dbstats.c
  projects/mesh11s/sys/contrib/dev/acpica/dbutils.c
  projects/mesh11s/sys/contrib/dev/acpica/dbxface.c
  projects/mesh11s/sys/contrib/dev/acpica/dmbuffer.c
  projects/mesh11s/sys/contrib/dev/acpica/dmnames.c
  projects/mesh11s/sys/contrib/dev/acpica/dmobject.c
  projects/mesh11s/sys/contrib/dev/acpica/dmopcode.c
  projects/mesh11s/sys/contrib/dev/acpica/dmresrc.c
  projects/mesh11s/sys/contrib/dev/acpica/dmresrcl.c
  projects/mesh11s/sys/contrib/dev/acpica/dmresrcs.c
  projects/mesh11s/sys/contrib/dev/acpica/dmutils.c
  projects/mesh11s/sys/contrib/dev/acpica/dmwalk.c
  projects/mesh11s/sys/contrib/dev/acpica/dsfield.c
  projects/mesh11s/sys/contrib/dev/acpica/dsinit.c
  projects/mesh11s/sys/contrib/dev/acpica/dsmethod.c
  projects/mesh11s/sys/contrib/dev/acpica/dsmthdat.c
  projects/mesh11s/sys/contrib/dev/acpica/dsobject.c
  projects/mesh11s/sys/contrib/dev/acpica/dsopcode.c
  projects/mesh11s/sys/contrib/dev/acpica/dsutils.c
  projects/mesh11s/sys/contrib/dev/acpica/dswexec.c
  projects/mesh11s/sys/contrib/dev/acpica/dswload.c
  projects/mesh11s/sys/contrib/dev/acpica/dswscope.c
  projects/mesh11s/sys/contrib/dev/acpica/dswstate.c
  projects/mesh11s/sys/contrib/dev/acpica/evevent.c
  projects/mesh11s/sys/contrib/dev/acpica/evgpe.c
  projects/mesh11s/sys/contrib/dev/acpica/evgpeblk.c
  projects/mesh11s/sys/contrib/dev/acpica/evmisc.c
  projects/mesh11s/sys/contrib/dev/acpica/evregion.c
  projects/mesh11s/sys/contrib/dev/acpica/evrgnini.c
  projects/mesh11s/sys/contrib/dev/acpica/evsci.c
  projects/mesh11s/sys/contrib/dev/acpica/evxface.c
  projects/mesh11s/sys/contrib/dev/acpica/evxfevnt.c
  projects/mesh11s/sys/contrib/dev/acpica/evxfregn.c
  projects/mesh11s/sys/contrib/dev/acpica/exconfig.c
  projects/mesh11s/sys/contrib/dev/acpica/exconvrt.c
  projects/mesh11s/sys/contrib/dev/acpica/excreate.c
  projects/mesh11s/sys/contrib/dev/acpica/exdump.c
  projects/mesh11s/sys/contrib/dev/acpica/exfield.c
  projects/mesh11s/sys/contrib/dev/acpica/exfldio.c
  projects/mesh11s/sys/contrib/dev/acpica/exmisc.c
  projects/mesh11s/sys/contrib/dev/acpica/exmutex.c
  projects/mesh11s/sys/contrib/dev/acpica/exnames.c
  projects/mesh11s/sys/contrib/dev/acpica/exoparg1.c
  projects/mesh11s/sys/contrib/dev/acpica/exoparg2.c
  projects/mesh11s/sys/contrib/dev/acpica/exoparg3.c
  projects/mesh11s/sys/contrib/dev/acpica/exoparg6.c
  projects/mesh11s/sys/contrib/dev/acpica/exprep.c
  projects/mesh11s/sys/contrib/dev/acpica/exregion.c
  projects/mesh11s/sys/contrib/dev/acpica/exresnte.c
  projects/mesh11s/sys/contrib/dev/acpica/exresolv.c
  projects/mesh11s/sys/contrib/dev/acpica/exresop.c
  projects/mesh11s/sys/contrib/dev/acpica/exstore.c
  projects/mesh11s/sys/contrib/dev/acpica/exstoren.c
  projects/mesh11s/sys/contrib/dev/acpica/exstorob.c
  projects/mesh11s/sys/contrib/dev/acpica/exsystem.c
  projects/mesh11s/sys/contrib/dev/acpica/exutils.c
  projects/mesh11s/sys/contrib/dev/acpica/hwacpi.c
  projects/mesh11s/sys/contrib/dev/acpica/hwgpe.c
  projects/mesh11s/sys/contrib/dev/acpica/hwregs.c
  projects/mesh11s/sys/contrib/dev/acpica/hwsleep.c
  projects/mesh11s/sys/contrib/dev/acpica/hwtimer.c
  projects/mesh11s/sys/contrib/dev/acpica/nsaccess.c
  projects/mesh11s/sys/contrib/dev/acpica/nsalloc.c
  projects/mesh11s/sys/contrib/dev/acpica/nsdump.c
  projects/mesh11s/sys/contrib/dev/acpica/nsdumpdv.c
  projects/mesh11s/sys/contrib/dev/acpica/nseval.c
  projects/mesh11s/sys/contrib/dev/acpica/nsinit.c
  projects/mesh11s/sys/contrib/dev/acpica/nsload.c
  projects/mesh11s/sys/contrib/dev/acpica/nsnames.c
  projects/mesh11s/sys/contrib/dev/acpica/nsobject.c
  projects/mesh11s/sys/contrib/dev/acpica/nsparse.c
  projects/mesh11s/sys/contrib/dev/acpica/nssearch.c
  projects/mesh11s/sys/contrib/dev/acpica/nsutils.c
  projects/mesh11s/sys/contrib/dev/acpica/nswalk.c
  projects/mesh11s/sys/contrib/dev/acpica/nsxfeval.c
  projects/mesh11s/sys/contrib/dev/acpica/nsxfname.c
  projects/mesh11s/sys/contrib/dev/acpica/nsxfobj.c
  projects/mesh11s/sys/contrib/dev/acpica/psargs.c
  projects/mesh11s/sys/contrib/dev/acpica/psloop.c
  projects/mesh11s/sys/contrib/dev/acpica/psopcode.c
  projects/mesh11s/sys/contrib/dev/acpica/psparse.c
  projects/mesh11s/sys/contrib/dev/acpica/psscope.c
  projects/mesh11s/sys/contrib/dev/acpica/pstree.c
  projects/mesh11s/sys/contrib/dev/acpica/psutils.c
  projects/mesh11s/sys/contrib/dev/acpica/pswalk.c
  projects/mesh11s/sys/contrib/dev/acpica/psxface.c
  projects/mesh11s/sys/contrib/dev/acpica/rsaddr.c
  projects/mesh11s/sys/contrib/dev/acpica/rscalc.c
  projects/mesh11s/sys/contrib/dev/acpica/rscreate.c
  projects/mesh11s/sys/contrib/dev/acpica/rsdump.c
  projects/mesh11s/sys/contrib/dev/acpica/rsinfo.c
  projects/mesh11s/sys/contrib/dev/acpica/rsio.c
  projects/mesh11s/sys/contrib/dev/acpica/rsirq.c
  projects/mesh11s/sys/contrib/dev/acpica/rslist.c
  projects/mesh11s/sys/contrib/dev/acpica/rsmemory.c
  projects/mesh11s/sys/contrib/dev/acpica/rsmisc.c
  projects/mesh11s/sys/contrib/dev/acpica/rsutils.c
  projects/mesh11s/sys/contrib/dev/acpica/rsxface.c
  projects/mesh11s/sys/contrib/dev/acpica/tbfadt.c
  projects/mesh11s/sys/contrib/dev/acpica/tbfind.c
  projects/mesh11s/sys/contrib/dev/acpica/tbinstal.c
  projects/mesh11s/sys/contrib/dev/acpica/tbutils.c
  projects/mesh11s/sys/contrib/dev/acpica/tbxface.c
  projects/mesh11s/sys/contrib/dev/acpica/tbxfroot.c
  projects/mesh11s/sys/contrib/dev/acpica/utalloc.c
  projects/mesh11s/sys/contrib/dev/acpica/utcache.c
  projects/mesh11s/sys/contrib/dev/acpica/utclib.c
  projects/mesh11s/sys/contrib/dev/acpica/utcopy.c
  projects/mesh11s/sys/contrib/dev/acpica/utdebug.c
  projects/mesh11s/sys/contrib/dev/acpica/utdelete.c
  projects/mesh11s/sys/contrib/dev/acpica/uteval.c
  projects/mesh11s/sys/contrib/dev/acpica/utglobal.c
  projects/mesh11s/sys/contrib/dev/acpica/utinit.c
  projects/mesh11s/sys/contrib/dev/acpica/utmath.c
  projects/mesh11s/sys/contrib/dev/acpica/utmisc.c
  projects/mesh11s/sys/contrib/dev/acpica/utmutex.c
  projects/mesh11s/sys/contrib/dev/acpica/utobject.c
  projects/mesh11s/sys/contrib/dev/acpica/utresrc.c
  projects/mesh11s/sys/contrib/dev/acpica/utstate.c
  projects/mesh11s/sys/contrib/dev/acpica/uttrack.c
  projects/mesh11s/sys/contrib/dev/acpica/utxface.c
  projects/mesh11s/sys/dev/sound/pcm/fake.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_fmt.c
  projects/mesh11s/sys/dev/usb/README.TXT
  projects/mesh11s/sys/dev/usb/bluetooth/
  projects/mesh11s/sys/gnu/fs/ext2fs/sparc64-bitops.h
  projects/mesh11s/sys/i386/conf/MAC
  projects/mesh11s/sys/ia64/conf/MAC
  projects/mesh11s/sys/kern/subr_clist.c
  projects/mesh11s/sys/legacy/
  projects/mesh11s/sys/modules/nfs4client/
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/TODO
  projects/mesh11s/sys/netinet/ip_dummynet.c
  projects/mesh11s/sys/netinet/ip_fw2.c
  projects/mesh11s/sys/netinet/ip_fw_nat.c
  projects/mesh11s/sys/netinet/ip_fw_pfil.c
  projects/mesh11s/sys/nfs4client/
  projects/mesh11s/sys/pc98/conf/MAC
  projects/mesh11s/sys/powerpc/conf/MAC
  projects/mesh11s/sys/rpc/rpcclnt.c
  projects/mesh11s/sys/rpc/rpcclnt.h
  projects/mesh11s/sys/sparc64/conf/MAC
  projects/mesh11s/sys/sun4v/conf/MAC
  projects/mesh11s/sys/sys/clist.h
  projects/mesh11s/usr.bin/ee/Artistic
  projects/mesh11s/usr.bin/ee/FREEBSD-upgrade
  projects/mesh11s/usr.bin/ee/README
  projects/mesh11s/usr.bin/ee/ee.1
  projects/mesh11s/usr.bin/ee/ee.c
  projects/mesh11s/usr.bin/ee/ee.i18n.guide
  projects/mesh11s/usr.bin/ee/new_curse.c
  projects/mesh11s/usr.bin/ee/new_curse.h
  projects/mesh11s/usr.bin/ee/nls/en_US.US-ASCII/
  projects/mesh11s/usr.bin/window/
  projects/mesh11s/usr.sbin/zic/Arts.htm
  projects/mesh11s/usr.sbin/zic/tz-art.htm
  projects/mesh11s/usr.sbin/zic/tz-link.htm
Modified:
  projects/mesh11s/   (props changed)
  projects/mesh11s/ObsoleteFiles.inc
  projects/mesh11s/UPDATING
  projects/mesh11s/bin/chflags/chflags.c
  projects/mesh11s/bin/cp/Makefile
  projects/mesh11s/bin/cp/utils.c
  projects/mesh11s/bin/df/df.1
  projects/mesh11s/bin/df/df.c
  projects/mesh11s/bin/ps/print.c
  projects/mesh11s/bin/rm/rm.c
  projects/mesh11s/bin/sh/alias.c
  projects/mesh11s/bin/sh/eval.c
  projects/mesh11s/bin/sh/eval.h
  projects/mesh11s/bin/sh/exec.c
  projects/mesh11s/bin/sh/histedit.c
  projects/mesh11s/bin/sh/main.c
  projects/mesh11s/bin/sh/memalloc.c
  projects/mesh11s/bin/sh/memalloc.h
  projects/mesh11s/bin/sh/miscbltin.c
  projects/mesh11s/bin/sh/mkinit.c
  projects/mesh11s/bin/sh/mksyntax.c
  projects/mesh11s/bin/sh/parser.c
  projects/mesh11s/bin/sh/sh.1
  projects/mesh11s/bin/sh/trap.c
  projects/mesh11s/bin/sh/var.c
  projects/mesh11s/bin/test/TEST.sh
  projects/mesh11s/bin/test/test.c
  projects/mesh11s/cddl/usr.sbin/Makefile
  projects/mesh11s/contrib/bind9/   (props changed)
  projects/mesh11s/contrib/bind9/CHANGES
  projects/mesh11s/contrib/bind9/COPYRIGHT
  projects/mesh11s/contrib/bind9/FAQ
  projects/mesh11s/contrib/bind9/FAQ.xml
  projects/mesh11s/contrib/bind9/Makefile.in
  projects/mesh11s/contrib/bind9/README
  projects/mesh11s/contrib/bind9/README.idnkit
  projects/mesh11s/contrib/bind9/acconfig.h
  projects/mesh11s/contrib/bind9/bin/Makefile.in
  projects/mesh11s/contrib/bind9/bin/check/Makefile.in
  projects/mesh11s/contrib/bind9/bin/check/check-tool.c
  projects/mesh11s/contrib/bind9/bin/check/check-tool.h
  projects/mesh11s/contrib/bind9/bin/check/named-checkconf.8
  projects/mesh11s/contrib/bind9/bin/check/named-checkconf.c
  projects/mesh11s/contrib/bind9/bin/check/named-checkconf.docbook
  projects/mesh11s/contrib/bind9/bin/check/named-checkconf.html
  projects/mesh11s/contrib/bind9/bin/check/named-checkzone.8
  projects/mesh11s/contrib/bind9/bin/check/named-checkzone.c
  projects/mesh11s/contrib/bind9/bin/check/named-checkzone.docbook
  projects/mesh11s/contrib/bind9/bin/check/named-checkzone.html
  projects/mesh11s/contrib/bind9/bin/dig/Makefile.in
  projects/mesh11s/contrib/bind9/bin/dig/dig.1
  projects/mesh11s/contrib/bind9/bin/dig/dig.c
  projects/mesh11s/contrib/bind9/bin/dig/dig.docbook
  projects/mesh11s/contrib/bind9/bin/dig/dig.html
  projects/mesh11s/contrib/bind9/bin/dig/dighost.c
  projects/mesh11s/contrib/bind9/bin/dig/host.1
  projects/mesh11s/contrib/bind9/bin/dig/host.c
  projects/mesh11s/contrib/bind9/bin/dig/host.docbook
  projects/mesh11s/contrib/bind9/bin/dig/host.html
  projects/mesh11s/contrib/bind9/bin/dig/include/dig/dig.h
  projects/mesh11s/contrib/bind9/bin/dig/nslookup.1
  projects/mesh11s/contrib/bind9/bin/dig/nslookup.c
  projects/mesh11s/contrib/bind9/bin/dig/nslookup.docbook
  projects/mesh11s/contrib/bind9/bin/dig/nslookup.html
  projects/mesh11s/contrib/bind9/bin/dnssec/Makefile.in
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keygen.8
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-keygen.html
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-signzone.8
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssec-signzone.html
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssectool.c
  projects/mesh11s/contrib/bind9/bin/dnssec/dnssectool.h
  projects/mesh11s/contrib/bind9/bin/named/Makefile.in
  projects/mesh11s/contrib/bind9/bin/named/builtin.c
  projects/mesh11s/contrib/bind9/bin/named/client.c
  projects/mesh11s/contrib/bind9/bin/named/config.c
  projects/mesh11s/contrib/bind9/bin/named/control.c
  projects/mesh11s/contrib/bind9/bin/named/controlconf.c
  projects/mesh11s/contrib/bind9/bin/named/include/named/builtin.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/client.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/config.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/control.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/globals.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/interfacemgr.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/listenlist.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/log.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/logconf.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/lwaddr.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/lwdclient.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/lwresd.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/lwsearch.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/main.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/notify.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/ns_smf_globals.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/query.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/server.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/sortlist.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/tkeyconf.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/tsigconf.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/types.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/update.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/xfrout.h
  projects/mesh11s/contrib/bind9/bin/named/include/named/zoneconf.h
  projects/mesh11s/contrib/bind9/bin/named/interfacemgr.c
  projects/mesh11s/contrib/bind9/bin/named/listenlist.c
  projects/mesh11s/contrib/bind9/bin/named/log.c
  projects/mesh11s/contrib/bind9/bin/named/logconf.c
  projects/mesh11s/contrib/bind9/bin/named/lwaddr.c
  projects/mesh11s/contrib/bind9/bin/named/lwdclient.c
  projects/mesh11s/contrib/bind9/bin/named/lwderror.c
  projects/mesh11s/contrib/bind9/bin/named/lwdgabn.c
  projects/mesh11s/contrib/bind9/bin/named/lwdgnba.c
  projects/mesh11s/contrib/bind9/bin/named/lwdgrbn.c
  projects/mesh11s/contrib/bind9/bin/named/lwdnoop.c
  projects/mesh11s/contrib/bind9/bin/named/lwresd.8
  projects/mesh11s/contrib/bind9/bin/named/lwresd.c
  projects/mesh11s/contrib/bind9/bin/named/lwresd.docbook
  projects/mesh11s/contrib/bind9/bin/named/lwresd.html
  projects/mesh11s/contrib/bind9/bin/named/lwsearch.c
  projects/mesh11s/contrib/bind9/bin/named/main.c
  projects/mesh11s/contrib/bind9/bin/named/named.8
  projects/mesh11s/contrib/bind9/bin/named/named.conf.5
  projects/mesh11s/contrib/bind9/bin/named/named.conf.docbook
  projects/mesh11s/contrib/bind9/bin/named/named.conf.html
  projects/mesh11s/contrib/bind9/bin/named/named.docbook
  projects/mesh11s/contrib/bind9/bin/named/named.html
  projects/mesh11s/contrib/bind9/bin/named/notify.c
  projects/mesh11s/contrib/bind9/bin/named/query.c
  projects/mesh11s/contrib/bind9/bin/named/server.c
  projects/mesh11s/contrib/bind9/bin/named/sortlist.c
  projects/mesh11s/contrib/bind9/bin/named/tkeyconf.c
  projects/mesh11s/contrib/bind9/bin/named/tsigconf.c
  projects/mesh11s/contrib/bind9/bin/named/unix/Makefile.in
  projects/mesh11s/contrib/bind9/bin/named/unix/include/named/os.h
  projects/mesh11s/contrib/bind9/bin/named/unix/os.c
  projects/mesh11s/contrib/bind9/bin/named/update.c
  projects/mesh11s/contrib/bind9/bin/named/xfrout.c
  projects/mesh11s/contrib/bind9/bin/named/zoneconf.c
  projects/mesh11s/contrib/bind9/bin/nsupdate/Makefile.in
  projects/mesh11s/contrib/bind9/bin/nsupdate/nsupdate.1
  projects/mesh11s/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/mesh11s/contrib/bind9/bin/nsupdate/nsupdate.docbook
  projects/mesh11s/contrib/bind9/bin/nsupdate/nsupdate.html
  projects/mesh11s/contrib/bind9/bin/rndc/Makefile.in
  projects/mesh11s/contrib/bind9/bin/rndc/include/rndc/os.h
  projects/mesh11s/contrib/bind9/bin/rndc/rndc-confgen.8
  projects/mesh11s/contrib/bind9/bin/rndc/rndc-confgen.c
  projects/mesh11s/contrib/bind9/bin/rndc/rndc-confgen.docbook
  projects/mesh11s/contrib/bind9/bin/rndc/rndc-confgen.html
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.8
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.c
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.conf
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.conf.5
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.conf.docbook
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.conf.html
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.docbook
  projects/mesh11s/contrib/bind9/bin/rndc/rndc.html
  projects/mesh11s/contrib/bind9/bin/rndc/unix/Makefile.in
  projects/mesh11s/contrib/bind9/bin/rndc/unix/os.c
  projects/mesh11s/contrib/bind9/bin/rndc/util.c
  projects/mesh11s/contrib/bind9/bin/rndc/util.h
  projects/mesh11s/contrib/bind9/config.guess
  projects/mesh11s/contrib/bind9/config.h.in
  projects/mesh11s/contrib/bind9/configure.in
  projects/mesh11s/contrib/bind9/doc/Makefile.in
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.html
  projects/mesh11s/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/mesh11s/contrib/bind9/doc/arm/Makefile.in
  projects/mesh11s/contrib/bind9/doc/arm/man.dig.html
  projects/mesh11s/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/mesh11s/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/mesh11s/contrib/bind9/doc/arm/man.host.html
  projects/mesh11s/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/mesh11s/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/mesh11s/contrib/bind9/doc/arm/man.named.html
  projects/mesh11s/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/mesh11s/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/mesh11s/contrib/bind9/doc/arm/man.rndc.html
  projects/mesh11s/contrib/bind9/doc/misc/Makefile.in
  projects/mesh11s/contrib/bind9/doc/misc/format-options.pl
  projects/mesh11s/contrib/bind9/doc/misc/ipv6
  projects/mesh11s/contrib/bind9/doc/misc/migration
  projects/mesh11s/contrib/bind9/doc/misc/options
  projects/mesh11s/contrib/bind9/doc/misc/sort-options.pl
  projects/mesh11s/contrib/bind9/lib/Makefile.in
  projects/mesh11s/contrib/bind9/lib/bind9/Makefile.in
  projects/mesh11s/contrib/bind9/lib/bind9/api
  projects/mesh11s/contrib/bind9/lib/bind9/check.c
  projects/mesh11s/contrib/bind9/lib/bind9/getaddresses.c
  projects/mesh11s/contrib/bind9/lib/bind9/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/bind9/include/bind9/Makefile.in
  projects/mesh11s/contrib/bind9/lib/bind9/include/bind9/check.h
  projects/mesh11s/contrib/bind9/lib/bind9/include/bind9/getaddresses.h
  projects/mesh11s/contrib/bind9/lib/bind9/include/bind9/version.h
  projects/mesh11s/contrib/bind9/lib/bind9/version.c
  projects/mesh11s/contrib/bind9/lib/dns/Makefile.in
  projects/mesh11s/contrib/bind9/lib/dns/acache.c
  projects/mesh11s/contrib/bind9/lib/dns/acl.c
  projects/mesh11s/contrib/bind9/lib/dns/adb.c
  projects/mesh11s/contrib/bind9/lib/dns/api
  projects/mesh11s/contrib/bind9/lib/dns/byaddr.c
  projects/mesh11s/contrib/bind9/lib/dns/cache.c
  projects/mesh11s/contrib/bind9/lib/dns/callbacks.c
  projects/mesh11s/contrib/bind9/lib/dns/compress.c
  projects/mesh11s/contrib/bind9/lib/dns/db.c
  projects/mesh11s/contrib/bind9/lib/dns/dbiterator.c
  projects/mesh11s/contrib/bind9/lib/dns/dbtable.c
  projects/mesh11s/contrib/bind9/lib/dns/diff.c
  projects/mesh11s/contrib/bind9/lib/dns/dispatch.c
  projects/mesh11s/contrib/bind9/lib/dns/dlz.c
  projects/mesh11s/contrib/bind9/lib/dns/dnssec.c
  projects/mesh11s/contrib/bind9/lib/dns/ds.c
  projects/mesh11s/contrib/bind9/lib/dns/dst_api.c
  projects/mesh11s/contrib/bind9/lib/dns/dst_internal.h
  projects/mesh11s/contrib/bind9/lib/dns/dst_lib.c
  projects/mesh11s/contrib/bind9/lib/dns/dst_openssl.h
  projects/mesh11s/contrib/bind9/lib/dns/dst_parse.c
  projects/mesh11s/contrib/bind9/lib/dns/dst_parse.h
  projects/mesh11s/contrib/bind9/lib/dns/dst_result.c
  projects/mesh11s/contrib/bind9/lib/dns/forward.c
  projects/mesh11s/contrib/bind9/lib/dns/gen-unix.h
  projects/mesh11s/contrib/bind9/lib/dns/gen.c
  projects/mesh11s/contrib/bind9/lib/dns/gssapi_link.c
  projects/mesh11s/contrib/bind9/lib/dns/gssapictx.c
  projects/mesh11s/contrib/bind9/lib/dns/hmac_link.c
  projects/mesh11s/contrib/bind9/lib/dns/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/Makefile.in
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/acache.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/acl.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/adb.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/bit.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/byaddr.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/cache.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/callbacks.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/cert.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/compress.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/db.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/dbiterator.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/dbtable.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/diff.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/dispatch.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/dlz.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/dnssec.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/ds.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/events.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/fixedname.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/forward.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/journal.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/keyflags.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/keytable.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/keyvalues.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/lib.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/log.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/lookup.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/master.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/masterdump.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/message.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/name.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/ncache.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/opcode.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/order.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/peer.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/portlist.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rbt.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rcode.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdataclass.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdatalist.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdataset.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdatasetiter.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdataslab.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rdatatype.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/request.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/resolver.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/result.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/rootns.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/sdlz.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/secalg.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/secproto.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/soa.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/ssu.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/stats.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/tcpmsg.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/time.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/timer.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/tkey.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/tsig.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/ttl.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/types.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/validator.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/version.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/view.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/xfrin.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/zone.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/zonekey.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dns/zt.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dst/Makefile.in
  projects/mesh11s/contrib/bind9/lib/dns/include/dst/dst.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dst/gssapi.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dst/lib.h
  projects/mesh11s/contrib/bind9/lib/dns/include/dst/result.h
  projects/mesh11s/contrib/bind9/lib/dns/journal.c
  projects/mesh11s/contrib/bind9/lib/dns/key.c
  projects/mesh11s/contrib/bind9/lib/dns/keytable.c
  projects/mesh11s/contrib/bind9/lib/dns/lib.c
  projects/mesh11s/contrib/bind9/lib/dns/log.c
  projects/mesh11s/contrib/bind9/lib/dns/lookup.c
  projects/mesh11s/contrib/bind9/lib/dns/master.c
  projects/mesh11s/contrib/bind9/lib/dns/masterdump.c
  projects/mesh11s/contrib/bind9/lib/dns/message.c
  projects/mesh11s/contrib/bind9/lib/dns/name.c
  projects/mesh11s/contrib/bind9/lib/dns/ncache.c
  projects/mesh11s/contrib/bind9/lib/dns/nsec.c
  projects/mesh11s/contrib/bind9/lib/dns/openssl_link.c
  projects/mesh11s/contrib/bind9/lib/dns/openssldh_link.c
  projects/mesh11s/contrib/bind9/lib/dns/openssldsa_link.c
  projects/mesh11s/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/mesh11s/contrib/bind9/lib/dns/order.c
  projects/mesh11s/contrib/bind9/lib/dns/peer.c
  projects/mesh11s/contrib/bind9/lib/dns/portlist.c
  projects/mesh11s/contrib/bind9/lib/dns/rbt.c
  projects/mesh11s/contrib/bind9/lib/dns/rbtdb.c
  projects/mesh11s/contrib/bind9/lib/dns/rbtdb.h
  projects/mesh11s/contrib/bind9/lib/dns/rbtdb64.c
  projects/mesh11s/contrib/bind9/lib/dns/rbtdb64.h
  projects/mesh11s/contrib/bind9/lib/dns/rcode.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/ch_3/a_1.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/ch_3/a_1.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/cert_37.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/cname_5.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/cname_5.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dname_39.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dname_39.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ds_43.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/gpos_27.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/gpos_27.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/isdn_20.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/isdn_20.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/key_25.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/key_25.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/loc_29.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/loc_29.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mb_7.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mb_7.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/md_3.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/md_3.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mf_4.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mf_4.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mg_8.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mg_8.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/minfo_14.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/minfo_14.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mr_9.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mr_9.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/mx_15.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ns_2.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ns_2.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/null_10.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/null_10.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nxt_30.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/nxt_30.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/opt_41.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/proforma.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/proforma.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ptr_12.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/ptr_12.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rp_17.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rp_17.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rt_21.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/rt_21.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/sig_24.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/soa_6.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/spf_99.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/spf_99.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/tkey_249.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/txt_16.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/unspec_103.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/unspec_103.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/x25_19.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/generic/x25_19.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/hs_4/a_1.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/hs_4/a_1.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/a6_38.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/a6_38.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/a_1.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/a_1.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/apl_42.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/kx_36.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/kx_36.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/px_26.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/px_26.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/srv_33.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/srv_33.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/wks_11.c
  projects/mesh11s/contrib/bind9/lib/dns/rdata/in_1/wks_11.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/rdatastructpre.h
  projects/mesh11s/contrib/bind9/lib/dns/rdata/rdatastructsuf.h
  projects/mesh11s/contrib/bind9/lib/dns/rdatalist.c
  projects/mesh11s/contrib/bind9/lib/dns/rdatalist_p.h
  projects/mesh11s/contrib/bind9/lib/dns/rdataset.c
  projects/mesh11s/contrib/bind9/lib/dns/rdatasetiter.c
  projects/mesh11s/contrib/bind9/lib/dns/rdataslab.c
  projects/mesh11s/contrib/bind9/lib/dns/request.c
  projects/mesh11s/contrib/bind9/lib/dns/resolver.c
  projects/mesh11s/contrib/bind9/lib/dns/result.c
  projects/mesh11s/contrib/bind9/lib/dns/rootns.c
  projects/mesh11s/contrib/bind9/lib/dns/sdb.c
  projects/mesh11s/contrib/bind9/lib/dns/sdlz.c
  projects/mesh11s/contrib/bind9/lib/dns/soa.c
  projects/mesh11s/contrib/bind9/lib/dns/ssu.c
  projects/mesh11s/contrib/bind9/lib/dns/stats.c
  projects/mesh11s/contrib/bind9/lib/dns/tcpmsg.c
  projects/mesh11s/contrib/bind9/lib/dns/time.c
  projects/mesh11s/contrib/bind9/lib/dns/timer.c
  projects/mesh11s/contrib/bind9/lib/dns/tkey.c
  projects/mesh11s/contrib/bind9/lib/dns/tsig.c
  projects/mesh11s/contrib/bind9/lib/dns/ttl.c
  projects/mesh11s/contrib/bind9/lib/dns/validator.c
  projects/mesh11s/contrib/bind9/lib/dns/version.c
  projects/mesh11s/contrib/bind9/lib/dns/view.c
  projects/mesh11s/contrib/bind9/lib/dns/xfrin.c
  projects/mesh11s/contrib/bind9/lib/dns/zone.c
  projects/mesh11s/contrib/bind9/lib/dns/zonekey.c
  projects/mesh11s/contrib/bind9/lib/dns/zt.c
  projects/mesh11s/contrib/bind9/lib/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/alpha/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/alpha/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/api
  projects/mesh11s/contrib/bind9/lib/isc/assertions.c
  projects/mesh11s/contrib/bind9/lib/isc/base64.c
  projects/mesh11s/contrib/bind9/lib/isc/bitstring.c
  projects/mesh11s/contrib/bind9/lib/isc/buffer.c
  projects/mesh11s/contrib/bind9/lib/isc/bufferlist.c
  projects/mesh11s/contrib/bind9/lib/isc/commandline.c
  projects/mesh11s/contrib/bind9/lib/isc/entropy.c
  projects/mesh11s/contrib/bind9/lib/isc/error.c
  projects/mesh11s/contrib/bind9/lib/isc/event.c
  projects/mesh11s/contrib/bind9/lib/isc/fsaccess.c
  projects/mesh11s/contrib/bind9/lib/isc/hash.c
  projects/mesh11s/contrib/bind9/lib/isc/heap.c
  projects/mesh11s/contrib/bind9/lib/isc/hex.c
  projects/mesh11s/contrib/bind9/lib/isc/hmacmd5.c
  projects/mesh11s/contrib/bind9/lib/isc/hmacsha.c
  projects/mesh11s/contrib/bind9/lib/isc/ia64/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/ia64/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/app.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/assertions.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/base64.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/bitstring.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/boolean.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/buffer.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/bufferlist.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/commandline.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/entropy.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/error.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/event.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/eventclass.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/file.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/formatcheck.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/fsaccess.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/hash.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/heap.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/hex.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/hmacmd5.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/hmacsha.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/interfaceiter.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/ipv6.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/lang.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/lex.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/lfsr.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/lib.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/list.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/log.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/magic.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/md5.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/mem.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/msgcat.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/msgs.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/mutexblock.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/netaddr.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/netscope.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/ondestroy.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/os.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/parseint.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/platform.h.in
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/portset.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/print.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/quota.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/random.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/ratelimiter.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/refcount.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/region.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/resource.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/result.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/resultclass.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/rwlock.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/serial.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/sha1.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/sha2.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/sockaddr.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/socket.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/stdio.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/stdlib.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/string.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/symtab.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/task.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/taskpool.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/timer.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/types.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/util.h
  projects/mesh11s/contrib/bind9/lib/isc/include/isc/version.h
  projects/mesh11s/contrib/bind9/lib/isc/inet_aton.c
  projects/mesh11s/contrib/bind9/lib/isc/inet_ntop.c
  projects/mesh11s/contrib/bind9/lib/isc/inet_pton.c
  projects/mesh11s/contrib/bind9/lib/isc/lex.c
  projects/mesh11s/contrib/bind9/lib/isc/lfsr.c
  projects/mesh11s/contrib/bind9/lib/isc/lib.c
  projects/mesh11s/contrib/bind9/lib/isc/log.c
  projects/mesh11s/contrib/bind9/lib/isc/md5.c
  projects/mesh11s/contrib/bind9/lib/isc/mem.c
  projects/mesh11s/contrib/bind9/lib/isc/mips/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/mips/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/mips/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/mutexblock.c
  projects/mesh11s/contrib/bind9/lib/isc/netaddr.c
  projects/mesh11s/contrib/bind9/lib/isc/netscope.c
  projects/mesh11s/contrib/bind9/lib/isc/nls/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/nls/msgcat.c
  projects/mesh11s/contrib/bind9/lib/isc/noatomic/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/noatomic/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/condition.c
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/isc/condition.h
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/isc/once.h
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/include/isc/thread.h
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/mutex.c
  projects/mesh11s/contrib/bind9/lib/isc/nothreads/thread.c
  projects/mesh11s/contrib/bind9/lib/isc/ondestroy.c
  projects/mesh11s/contrib/bind9/lib/isc/parseint.c
  projects/mesh11s/contrib/bind9/lib/isc/portset.c
  projects/mesh11s/contrib/bind9/lib/isc/powerpc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/powerpc/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/print.c
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/condition.c
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/isc/condition.h
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/isc/once.h
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/include/isc/thread.h
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/mutex.c
  projects/mesh11s/contrib/bind9/lib/isc/pthreads/thread.c
  projects/mesh11s/contrib/bind9/lib/isc/quota.c
  projects/mesh11s/contrib/bind9/lib/isc/random.c
  projects/mesh11s/contrib/bind9/lib/isc/ratelimiter.c
  projects/mesh11s/contrib/bind9/lib/isc/refcount.c
  projects/mesh11s/contrib/bind9/lib/isc/region.c
  projects/mesh11s/contrib/bind9/lib/isc/result.c
  projects/mesh11s/contrib/bind9/lib/isc/rwlock.c
  projects/mesh11s/contrib/bind9/lib/isc/serial.c
  projects/mesh11s/contrib/bind9/lib/isc/sha1.c
  projects/mesh11s/contrib/bind9/lib/isc/sha2.c
  projects/mesh11s/contrib/bind9/lib/isc/sockaddr.c
  projects/mesh11s/contrib/bind9/lib/isc/sparc64/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/sparc64/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/string.c
  projects/mesh11s/contrib/bind9/lib/isc/strtoul.c
  projects/mesh11s/contrib/bind9/lib/isc/symtab.c
  projects/mesh11s/contrib/bind9/lib/isc/task.c
  projects/mesh11s/contrib/bind9/lib/isc/task_p.h
  projects/mesh11s/contrib/bind9/lib/isc/taskpool.c
  projects/mesh11s/contrib/bind9/lib/isc/timer.c
  projects/mesh11s/contrib/bind9/lib/isc/timer_p.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/unix/app.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/dir.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/entropy.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/errno2result.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/errno2result.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/file.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/fsaccess.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/ifiter_ioctl.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/ifiter_sysctl.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/dir.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/int.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/keyboard.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/net.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/netdb.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/offset.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/stat.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/stdtime.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/strerror.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/syslog.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/include/isc/time.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/interfaceiter.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/ipv6.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/keyboard.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/net.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/os.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/resource.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/socket.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/socket_p.h
  projects/mesh11s/contrib/bind9/lib/isc/unix/stdio.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/stdtime.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/strerror.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/syslog.c
  projects/mesh11s/contrib/bind9/lib/isc/unix/time.c
  projects/mesh11s/contrib/bind9/lib/isc/version.c
  projects/mesh11s/contrib/bind9/lib/isc/x86_32/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_32/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isc/x86_64/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_64/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h
  projects/mesh11s/contrib/bind9/lib/isccc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccc/alist.c
  projects/mesh11s/contrib/bind9/lib/isccc/api
  projects/mesh11s/contrib/bind9/lib/isccc/base64.c
  projects/mesh11s/contrib/bind9/lib/isccc/cc.c
  projects/mesh11s/contrib/bind9/lib/isccc/ccmsg.c
  projects/mesh11s/contrib/bind9/lib/isccc/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/alist.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/base64.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/cc.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/events.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/lib.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/result.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/sexpr.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/symtab.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/symtype.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/types.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/util.h
  projects/mesh11s/contrib/bind9/lib/isccc/include/isccc/version.h
  projects/mesh11s/contrib/bind9/lib/isccc/lib.c
  projects/mesh11s/contrib/bind9/lib/isccc/result.c
  projects/mesh11s/contrib/bind9/lib/isccc/sexpr.c
  projects/mesh11s/contrib/bind9/lib/isccc/symtab.c
  projects/mesh11s/contrib/bind9/lib/isccc/version.c
  projects/mesh11s/contrib/bind9/lib/isccfg/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccfg/aclconf.c
  projects/mesh11s/contrib/bind9/lib/isccfg/api
  projects/mesh11s/contrib/bind9/lib/isccfg/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/grammar.h
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/log.h
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  projects/mesh11s/contrib/bind9/lib/isccfg/include/isccfg/version.h
  projects/mesh11s/contrib/bind9/lib/isccfg/log.c
  projects/mesh11s/contrib/bind9/lib/isccfg/namedconf.c
  projects/mesh11s/contrib/bind9/lib/isccfg/parser.c
  projects/mesh11s/contrib/bind9/lib/isccfg/version.c
  projects/mesh11s/contrib/bind9/lib/lwres/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/api
  projects/mesh11s/contrib/bind9/lib/lwres/assert_p.h
  projects/mesh11s/contrib/bind9/lib/lwres/context.c
  projects/mesh11s/contrib/bind9/lib/lwres/context_p.h
  projects/mesh11s/contrib/bind9/lib/lwres/gai_strerror.c
  projects/mesh11s/contrib/bind9/lib/lwres/getaddrinfo.c
  projects/mesh11s/contrib/bind9/lib/lwres/gethost.c
  projects/mesh11s/contrib/bind9/lib/lwres/getipnode.c
  projects/mesh11s/contrib/bind9/lib/lwres/getnameinfo.c
  projects/mesh11s/contrib/bind9/lib/lwres/getrrset.c
  projects/mesh11s/contrib/bind9/lib/lwres/herror.c
  projects/mesh11s/contrib/bind9/lib/lwres/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/context.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/int.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/ipv6.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/lang.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/list.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/lwpacket.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/lwres.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/netdb.h.in
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/platform.h.in
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/result.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/stdlib.h
  projects/mesh11s/contrib/bind9/lib/lwres/include/lwres/version.h
  projects/mesh11s/contrib/bind9/lib/lwres/lwbuffer.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwconfig.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwinetaton.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwinetntop.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwinetpton.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwpacket.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwres_gabn.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwres_gnba.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwres_grbn.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwres_noop.c
  projects/mesh11s/contrib/bind9/lib/lwres/lwresutil.c
  projects/mesh11s/contrib/bind9/lib/lwres/man/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_buffer.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_buffer.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_buffer.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_config.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_config.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_config.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_context.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_context.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_context.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gabn.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gabn.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gnba.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_gnba.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_noop.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_noop.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_packet.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_packet.html
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_resutil.3
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  projects/mesh11s/contrib/bind9/lib/lwres/man/lwres_resutil.html
  projects/mesh11s/contrib/bind9/lib/lwres/print.c
  projects/mesh11s/contrib/bind9/lib/lwres/print_p.h
  projects/mesh11s/contrib/bind9/lib/lwres/strtoul.c
  projects/mesh11s/contrib/bind9/lib/lwres/unix/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/unix/include/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  projects/mesh11s/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  projects/mesh11s/contrib/bind9/lib/lwres/version.c
  projects/mesh11s/contrib/bind9/libtool.m4
  projects/mesh11s/contrib/bind9/ltmain.sh
  projects/mesh11s/contrib/bind9/make/Makefile.in
  projects/mesh11s/contrib/bind9/make/includes.in
  projects/mesh11s/contrib/bind9/make/mkdep.in
  projects/mesh11s/contrib/bind9/make/rules.in
  projects/mesh11s/contrib/bind9/version
  projects/mesh11s/contrib/cpio/   (props changed)
  projects/mesh11s/contrib/csup/   (props changed)
  projects/mesh11s/contrib/csup/rcstokenizer.l   (props changed)
  projects/mesh11s/contrib/csup/updater.c
  projects/mesh11s/contrib/file/   (props changed)
  projects/mesh11s/contrib/gcc/config/mips/freebsd.h   (props changed)
  projects/mesh11s/contrib/gdb/   (props changed)
  projects/mesh11s/contrib/gdtoa/   (props changed)
  projects/mesh11s/contrib/groff/font/devutf8/R.proto
  projects/mesh11s/contrib/ipfilter/lib/load_http.c
  projects/mesh11s/contrib/less/   (props changed)
  projects/mesh11s/contrib/libpcap/   (props changed)
  projects/mesh11s/contrib/libpcap/FREEBSD-Xlist   (props changed)
  projects/mesh11s/contrib/ncurses/   (props changed)
  projects/mesh11s/contrib/netcat/   (props changed)
  projects/mesh11s/contrib/netcat/nc.1
  projects/mesh11s/contrib/netcat/netcat.c
  projects/mesh11s/contrib/ntp/   (props changed)
  projects/mesh11s/contrib/openbsm/   (props changed)
  projects/mesh11s/contrib/openpam/   (props changed)
  projects/mesh11s/contrib/pf/   (props changed)
  projects/mesh11s/contrib/sendmail/   (props changed)
  projects/mesh11s/contrib/tcpdump/   (props changed)
  projects/mesh11s/contrib/tcpdump/FREEBSD-Xlist   (props changed)
  projects/mesh11s/contrib/top/   (props changed)
  projects/mesh11s/contrib/top/install-sh   (props changed)
  projects/mesh11s/contrib/wpa/   (props changed)
  projects/mesh11s/crypto/openssh/   (props changed)
  projects/mesh11s/crypto/openssh/ChangeLog
  projects/mesh11s/crypto/openssh/PROTOCOL
  projects/mesh11s/crypto/openssh/README
  projects/mesh11s/crypto/openssh/addrmatch.c
  projects/mesh11s/crypto/openssh/auth-options.c
  projects/mesh11s/crypto/openssh/auth-pam.c   (contents, props changed)
  projects/mesh11s/crypto/openssh/auth.c
  projects/mesh11s/crypto/openssh/auth.h
  projects/mesh11s/crypto/openssh/auth2-chall.c
  projects/mesh11s/crypto/openssh/auth2.c
  projects/mesh11s/crypto/openssh/canohost.c
  projects/mesh11s/crypto/openssh/canohost.h
  projects/mesh11s/crypto/openssh/channels.c
  projects/mesh11s/crypto/openssh/channels.h
  projects/mesh11s/crypto/openssh/cipher.c
  projects/mesh11s/crypto/openssh/cipher.h
  projects/mesh11s/crypto/openssh/clientloop.c
  projects/mesh11s/crypto/openssh/compat.c
  projects/mesh11s/crypto/openssh/compat.h
  projects/mesh11s/crypto/openssh/config.guess
  projects/mesh11s/crypto/openssh/config.h
  projects/mesh11s/crypto/openssh/config.h.in
  projects/mesh11s/crypto/openssh/defines.h
  projects/mesh11s/crypto/openssh/dispatch.c
  projects/mesh11s/crypto/openssh/kex.c
  projects/mesh11s/crypto/openssh/kexgexs.c
  projects/mesh11s/crypto/openssh/key.c
  projects/mesh11s/crypto/openssh/loginrec.c
  projects/mesh11s/crypto/openssh/misc.c
  projects/mesh11s/crypto/openssh/monitor.c
  projects/mesh11s/crypto/openssh/monitor.h
  projects/mesh11s/crypto/openssh/monitor_fdpass.c
  projects/mesh11s/crypto/openssh/monitor_wrap.c
  projects/mesh11s/crypto/openssh/monitor_wrap.h
  projects/mesh11s/crypto/openssh/myproposal.h
  projects/mesh11s/crypto/openssh/nchan.c
  projects/mesh11s/crypto/openssh/openbsd-compat/bsd-poll.c
  projects/mesh11s/crypto/openssh/openbsd-compat/port-uw.c
  projects/mesh11s/crypto/openssh/openbsd-compat/xcrypt.c
  projects/mesh11s/crypto/openssh/openbsd-compat/xmmap.c
  projects/mesh11s/crypto/openssh/packet.c
  projects/mesh11s/crypto/openssh/pathnames.h
  projects/mesh11s/crypto/openssh/readconf.c
  projects/mesh11s/crypto/openssh/readconf.h
  projects/mesh11s/crypto/openssh/scp.c
  projects/mesh11s/crypto/openssh/servconf.c
  projects/mesh11s/crypto/openssh/servconf.h
  projects/mesh11s/crypto/openssh/serverloop.c
  projects/mesh11s/crypto/openssh/session.c
  projects/mesh11s/crypto/openssh/sftp-server-main.c
  projects/mesh11s/crypto/openssh/sftp.1   (contents, props changed)
  projects/mesh11s/crypto/openssh/sftp.c
  projects/mesh11s/crypto/openssh/ssh-keygen.1   (contents, props changed)
  projects/mesh11s/crypto/openssh/ssh-keygen.c
  projects/mesh11s/crypto/openssh/ssh-keyscan.1   (contents, props changed)
  projects/mesh11s/crypto/openssh/ssh-keyscan.c
  projects/mesh11s/crypto/openssh/ssh.1
  projects/mesh11s/crypto/openssh/ssh.c
  projects/mesh11s/crypto/openssh/ssh2.h
  projects/mesh11s/crypto/openssh/ssh_config
  projects/mesh11s/crypto/openssh/ssh_config.5
  projects/mesh11s/crypto/openssh/ssh_namespace.h
  projects/mesh11s/crypto/openssh/sshconnect.c
  projects/mesh11s/crypto/openssh/sshconnect2.c
  projects/mesh11s/crypto/openssh/sshd.8
  projects/mesh11s/crypto/openssh/sshd.c
  projects/mesh11s/crypto/openssh/sshd_config
  projects/mesh11s/crypto/openssh/sshd_config.5
  projects/mesh11s/crypto/openssh/sshpty.c
  projects/mesh11s/crypto/openssh/ttymodes.c
  projects/mesh11s/crypto/openssh/uidswap.c
  projects/mesh11s/crypto/openssh/version.h
  projects/mesh11s/crypto/openssl/   (props changed)
  projects/mesh11s/etc/Makefile
  projects/mesh11s/etc/defaults/rc.conf
  projects/mesh11s/etc/mtree/BSD.include.dist
  projects/mesh11s/etc/network.subr
  projects/mesh11s/etc/periodic/daily/100.clean-disks
  projects/mesh11s/etc/periodic/daily/460.status-mail-rejects
  projects/mesh11s/etc/rc.d/Makefile
  projects/mesh11s/etc/rc.d/amd
  projects/mesh11s/etc/rc.d/archdep
  projects/mesh11s/etc/rc.d/ip6fw
  projects/mesh11s/etc/rc.d/ipfilter
  projects/mesh11s/etc/rc.d/ipfs
  projects/mesh11s/etc/rc.d/ipfw
  projects/mesh11s/etc/rc.d/ipnat
  projects/mesh11s/etc/rc.d/keyserv
  projects/mesh11s/etc/rc.d/mountd
  projects/mesh11s/etc/rc.d/moused
  projects/mesh11s/etc/rc.d/netif
  projects/mesh11s/etc/rc.d/network_ipv6
  projects/mesh11s/etc/rc.d/nfsd
  projects/mesh11s/etc/rc.d/nisdomain
  projects/mesh11s/etc/rc.d/nscd
  projects/mesh11s/etc/rc.d/ntpd
  projects/mesh11s/etc/rc.d/pf
  projects/mesh11s/etc/rc.d/pflog
  projects/mesh11s/etc/rc.d/pfsync
  projects/mesh11s/etc/rc.d/quota
  projects/mesh11s/etc/rc.d/yppasswdd
  projects/mesh11s/etc/rc.subr
  projects/mesh11s/games/fortune/datfiles/fortunes
  projects/mesh11s/games/fortune/datfiles/fortunes-o.real
  projects/mesh11s/include/Makefile
  projects/mesh11s/lib/bind/Makefile
  projects/mesh11s/lib/bind/config.h
  projects/mesh11s/lib/bind/config.mk
  projects/mesh11s/lib/bind/dns/Makefile
  projects/mesh11s/lib/bind/dns/code.h
  projects/mesh11s/lib/bind/dns/dns/enumclass.h
  projects/mesh11s/lib/bind/dns/dns/enumtype.h
  projects/mesh11s/lib/bind/dns/dns/rdatastruct.h
  projects/mesh11s/lib/bind/isc/Makefile
  projects/mesh11s/lib/bind/isc/isc/platform.h
  projects/mesh11s/lib/bind/lwres/Makefile
  projects/mesh11s/lib/bind/lwres/lwres/netdb.h
  projects/mesh11s/lib/bind/lwres/lwres/platform.h
  projects/mesh11s/lib/libarchive/Makefile
  projects/mesh11s/lib/libarchive/archive_read_support_compression_gzip.c
  projects/mesh11s/lib/libc/   (props changed)
  projects/mesh11s/lib/libc/arm/Makefile.inc
  projects/mesh11s/lib/libc/arm/gen/_setjmp.S
  projects/mesh11s/lib/libc/arm/gen/setjmp.S
  projects/mesh11s/lib/libc/gen/popen.c
  projects/mesh11s/lib/libc/net/nsdispatch.c
  projects/mesh11s/lib/libc/net/resolver.3
  projects/mesh11s/lib/libc/nls/be_BY.UTF-8.msg   (props changed)
  projects/mesh11s/lib/libc/nls/el_GR.ISO8859-7.msg   (props changed)
  projects/mesh11s/lib/libc/nls/mn_MN.UTF-8.msg   (props changed)
  projects/mesh11s/lib/libc/nls/ru_RU.KOI8-R.msg   (props changed)
  projects/mesh11s/lib/libc/nls/uk_UA.UTF-8.msg   (props changed)
  projects/mesh11s/lib/libc/posix1e/Makefile.inc
  projects/mesh11s/lib/libc/posix1e/Symbol.map
  projects/mesh11s/lib/libc/posix1e/acl.3
  projects/mesh11s/lib/libc/posix1e/acl_add_perm.3
  projects/mesh11s/lib/libc/posix1e/acl_delete.c
  projects/mesh11s/lib/libc/posix1e/acl_entry.c
  projects/mesh11s/lib/libc/posix1e/acl_get.3
  projects/mesh11s/lib/libc/posix1e/acl_get.c
  projects/mesh11s/lib/libc/posix1e/acl_init.c
  projects/mesh11s/lib/libc/posix1e/acl_set.3
  projects/mesh11s/lib/libc/posix1e/acl_set.c
  projects/mesh11s/lib/libc/posix1e/acl_set_tag_type.3
  projects/mesh11s/lib/libc/posix1e/acl_support.c
  projects/mesh11s/lib/libc/posix1e/acl_support.h
  projects/mesh11s/lib/libc/posix1e/acl_valid.c
  projects/mesh11s/lib/libc/resolv/res_comp.c
  projects/mesh11s/lib/libc/rpc/svc_dg.c
  projects/mesh11s/lib/libc/rpc/svc_generic.c
  projects/mesh11s/lib/libc/stdio/asprintf.c   (props changed)
  projects/mesh11s/lib/libc/stdtime/   (props changed)
  projects/mesh11s/lib/libc/stdtime/asctime.c
  projects/mesh11s/lib/libc/stdtime/difftime.c
  projects/mesh11s/lib/libc/stdtime/localtime.c
  projects/mesh11s/lib/libc/stdtime/private.h
  projects/mesh11s/lib/libc/stdtime/strftime.c
  projects/mesh11s/lib/libc/stdtime/time2posix.3
  projects/mesh11s/lib/libc/stdtime/tzfile.5
  projects/mesh11s/lib/libc/stdtime/tzfile.h
  projects/mesh11s/lib/libc/string/ffsll.c   (props changed)
  projects/mesh11s/lib/libc/string/flsll.c   (props changed)
  projects/mesh11s/lib/libc/string/wcpcpy.c   (props changed)
  projects/mesh11s/lib/libc/string/wcpncpy.c   (props changed)
  projects/mesh11s/lib/libc/sys/bind.2
  projects/mesh11s/lib/libc/sys/jail.2
  projects/mesh11s/lib/libc_r/arch/amd64/_atomic_lock.S
  projects/mesh11s/lib/libc_r/arch/i386/_atomic_lock.S
  projects/mesh11s/lib/libstand/Makefile
  projects/mesh11s/lib/libstand/bootp.c
  projects/mesh11s/lib/libstand/i386/_setjmp.S
  projects/mesh11s/lib/libstand/rpc.c
  projects/mesh11s/lib/libstand/stand.h
  projects/mesh11s/lib/libstand/tftp.c
  projects/mesh11s/lib/libusb/   (props changed)
  projects/mesh11s/lib/libusb/libusb.3   (contents, props changed)
  projects/mesh11s/lib/libusb/libusb20.c
  projects/mesh11s/lib/libusb/libusb20.h
  projects/mesh11s/lib/libusb/libusb20_int.h
  projects/mesh11s/lib/libusb/libusb20_ugen20.c
  projects/mesh11s/lib/libusb/usb.h   (props changed)
  projects/mesh11s/lib/libusbhid/descr.c
  projects/mesh11s/lib/libutil/   (props changed)
  projects/mesh11s/lib/libutil/flopen.3
  projects/mesh11s/lib/libutil/flopen.c
  projects/mesh11s/lib/libutil/pidfile.3
  projects/mesh11s/lib/msun/amd64/e_sqrt.S
  projects/mesh11s/lib/msun/amd64/e_sqrtf.S
  projects/mesh11s/lib/msun/amd64/s_lrint.S
  projects/mesh11s/lib/msun/amd64/s_lrintf.S
  projects/mesh11s/lib/msun/amd64/s_remquo.S
  projects/mesh11s/lib/msun/amd64/s_remquof.S
  projects/mesh11s/lib/msun/amd64/s_scalbn.S
  projects/mesh11s/lib/msun/amd64/s_scalbnf.S
  projects/mesh11s/lib/msun/amd64/s_scalbnl.S
  projects/mesh11s/lib/msun/i387/e_exp.S
  projects/mesh11s/lib/msun/i387/e_fmod.S
  projects/mesh11s/lib/msun/i387/e_log.S
  projects/mesh11s/lib/msun/i387/e_log10.S
  projects/mesh11s/lib/msun/i387/e_log10f.S
  projects/mesh11s/lib/msun/i387/e_remainder.S
  projects/mesh11s/lib/msun/i387/e_remainderf.S
  projects/mesh11s/lib/msun/i387/e_sqrt.S
  projects/mesh11s/lib/msun/i387/e_sqrtf.S
  projects/mesh11s/lib/msun/i387/s_ceil.S
  projects/mesh11s/lib/msun/i387/s_ceilf.S
  projects/mesh11s/lib/msun/i387/s_ceill.S
  projects/mesh11s/lib/msun/i387/s_copysign.S
  projects/mesh11s/lib/msun/i387/s_copysignf.S
  projects/mesh11s/lib/msun/i387/s_copysignl.S
  projects/mesh11s/lib/msun/i387/s_cos.S
  projects/mesh11s/lib/msun/i387/s_finite.S
  projects/mesh11s/lib/msun/i387/s_floor.S
  projects/mesh11s/lib/msun/i387/s_floorf.S
  projects/mesh11s/lib/msun/i387/s_floorl.S
  projects/mesh11s/lib/msun/i387/s_llrint.S
  projects/mesh11s/lib/msun/i387/s_llrintf.S
  projects/mesh11s/lib/msun/i387/s_logb.S
  projects/mesh11s/lib/msun/i387/s_logbf.S
  projects/mesh11s/lib/msun/i387/s_lrint.S
  projects/mesh11s/lib/msun/i387/s_lrintf.S
  projects/mesh11s/lib/msun/i387/s_remquo.S
  projects/mesh11s/lib/msun/i387/s_remquof.S
  projects/mesh11s/lib/msun/i387/s_rint.S
  projects/mesh11s/lib/msun/i387/s_rintf.S
  projects/mesh11s/lib/msun/i387/s_scalbn.S
  projects/mesh11s/lib/msun/i387/s_scalbnf.S
  projects/mesh11s/lib/msun/i387/s_scalbnl.S
  projects/mesh11s/lib/msun/i387/s_significand.S
  projects/mesh11s/lib/msun/i387/s_significandf.S
  projects/mesh11s/lib/msun/i387/s_sin.S
  projects/mesh11s/lib/msun/i387/s_tan.S
  projects/mesh11s/lib/msun/i387/s_trunc.S
  projects/mesh11s/lib/msun/i387/s_truncf.S
  projects/mesh11s/lib/msun/i387/s_truncl.S
  projects/mesh11s/lib/msun/ia64/s_fma.S
  projects/mesh11s/lib/msun/ia64/s_fmaf.S
  projects/mesh11s/lib/msun/ia64/s_fmal.S
  projects/mesh11s/lib/msun/src/e_rem_pio2.c
  projects/mesh11s/lib/msun/src/e_rem_pio2f.c
  projects/mesh11s/lib/msun/src/k_cosf.c
  projects/mesh11s/lib/msun/src/k_sinf.c
  projects/mesh11s/lib/msun/src/k_tanf.c
  projects/mesh11s/lib/msun/src/math_private.h
  projects/mesh11s/libexec/Makefile
  projects/mesh11s/libexec/rtld-elf/rtld.h
  projects/mesh11s/rescue/rescue/Makefile
  projects/mesh11s/sbin/   (props changed)
  projects/mesh11s/sbin/Makefile
  projects/mesh11s/sbin/dump/optr.c
  projects/mesh11s/sbin/fdisk/fdisk.8
  projects/mesh11s/sbin/fdisk/fdisk.c
  projects/mesh11s/sbin/fsck_ffs/fsck.h
  projects/mesh11s/sbin/fsck_ffs/gjournal.c
  projects/mesh11s/sbin/geom/class/journal/gjournal.8
  projects/mesh11s/sbin/geom/class/part/geom_part.c
  projects/mesh11s/sbin/geom/core/geom.c
  projects/mesh11s/sbin/geom/core/geom.h
  projects/mesh11s/sbin/ifconfig/Makefile
  projects/mesh11s/sbin/ifconfig/ifieee80211.c
  projects/mesh11s/sbin/ipfw/   (props changed)
  projects/mesh11s/sbin/ipfw/dummynet.c
  projects/mesh11s/sbin/ipfw/ipfw.8
  projects/mesh11s/sbin/ipfw/ipfw2.c
  projects/mesh11s/sbin/kldload/kldload.8
  projects/mesh11s/sbin/kldload/kldload.c
  projects/mesh11s/sbin/mksnap_ffs/Makefile
  projects/mesh11s/sbin/mksnap_ffs/mksnap_ffs.8
  projects/mesh11s/sbin/mksnap_ffs/mksnap_ffs.c
  projects/mesh11s/sbin/mount/mount.c
  projects/mesh11s/sbin/mount_nfs/Makefile
  projects/mesh11s/sbin/mount_nfs/mount_nfs.8
  projects/mesh11s/sbin/mount_nfs/mount_nfs.c
  projects/mesh11s/sbin/restore/Makefile
  projects/mesh11s/secure/lib/libssh/Makefile
  projects/mesh11s/secure/usr.sbin/sshd/Makefile
  projects/mesh11s/share/doc/bind9/Makefile
  projects/mesh11s/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/mesh11s/share/examples/kld/syscall/module/syscall.c
  projects/mesh11s/share/examples/ppp/ppp.linkup.sample
  projects/mesh11s/share/man/man3/Makefile
  projects/mesh11s/share/man/man3/queue.3
  projects/mesh11s/share/man/man4/Makefile
  projects/mesh11s/share/man/man4/audit.4
  projects/mesh11s/share/man/man4/ch.4
  projects/mesh11s/share/man/man4/gif.4
  projects/mesh11s/share/man/man4/if_bridge.4
  projects/mesh11s/share/man/man4/ip.4
  projects/mesh11s/share/man/man4/ipsec.4
  projects/mesh11s/share/man/man4/msk.4
  projects/mesh11s/share/man/man4/multicast.4
  projects/mesh11s/share/man/man4/pcm.4
  projects/mesh11s/share/man/man4/ral.4
  projects/mesh11s/share/man/man4/rum.4
  projects/mesh11s/share/man/man4/scsi.4
  projects/mesh11s/share/man/man4/ural.4
  projects/mesh11s/share/man/man5/fstab.5
  projects/mesh11s/share/man/man5/src.conf.5
  projects/mesh11s/share/man/man9/Makefile
  projects/mesh11s/share/man/man9/VFS_MOUNT.9
  projects/mesh11s/share/man/man9/VFS_QUOTACTL.9
  projects/mesh11s/share/man/man9/VFS_ROOT.9
  projects/mesh11s/share/man/man9/VFS_STATFS.9
  projects/mesh11s/share/man/man9/VFS_SYNC.9
  projects/mesh11s/share/man/man9/VFS_UNMOUNT.9
  projects/mesh11s/share/man/man9/VOP_ACCESS.9
  projects/mesh11s/share/man/man9/acl.9
  projects/mesh11s/share/man/man9/rmlock.9
  projects/mesh11s/share/man/man9/sx.9
  projects/mesh11s/share/misc/committers-ports.dot
  projects/mesh11s/share/misc/committers-src.dot
  projects/mesh11s/share/misc/iso639
  projects/mesh11s/share/misc/pci_vendors
  projects/mesh11s/share/mk/bsd.own.mk
  projects/mesh11s/share/syscons/keymaps/uk.iso-ctrl.kbd
  projects/mesh11s/share/timedef/de_DE.ISO8859-1.src
  projects/mesh11s/share/timedef/de_DE.UTF-8.src
  projects/mesh11s/share/timedef/pt_PT.ISO8859-1.src
  projects/mesh11s/share/timedef/pt_PT.UTF-8.src
  projects/mesh11s/share/zoneinfo/   (props changed)
  projects/mesh11s/share/zoneinfo/africa
  projects/mesh11s/share/zoneinfo/antarctica
  projects/mesh11s/share/zoneinfo/asia
  projects/mesh11s/share/zoneinfo/australasia
  projects/mesh11s/share/zoneinfo/backward
  projects/mesh11s/share/zoneinfo/etcetera
  projects/mesh11s/share/zoneinfo/europe
  projects/mesh11s/share/zoneinfo/factory
  projects/mesh11s/share/zoneinfo/leapseconds
  projects/mesh11s/share/zoneinfo/northamerica
  projects/mesh11s/share/zoneinfo/pacificnew
  projects/mesh11s/share/zoneinfo/southamerica
  projects/mesh11s/share/zoneinfo/systemv
  projects/mesh11s/share/zoneinfo/zone.tab
  projects/mesh11s/sys/   (props changed)
  projects/mesh11s/sys/Makefile
  projects/mesh11s/sys/amd64/acpica/OsdEnvironment.c
  projects/mesh11s/sys/amd64/acpica/acpi_machdep.c
  projects/mesh11s/sys/amd64/acpica/acpi_wakeup.c
  projects/mesh11s/sys/amd64/acpica/madt.c
  projects/mesh11s/sys/amd64/amd64/dump_machdep.c
  projects/mesh11s/sys/amd64/amd64/minidump_machdep.c
  projects/mesh11s/sys/amd64/amd64/support.S
  projects/mesh11s/sys/amd64/conf/GENERIC
  projects/mesh11s/sys/amd64/conf/NOTES
  projects/mesh11s/sys/amd64/include/param.h
  projects/mesh11s/sys/amd64/include/xen/   (props changed)
  projects/mesh11s/sys/amd64/linux32/linux.h
  projects/mesh11s/sys/amd64/linux32/linux32_sysent.c
  projects/mesh11s/sys/arm/arm/dump_machdep.c
  projects/mesh11s/sys/arm/arm/pmap.c
  projects/mesh11s/sys/arm/conf/AVILA
  projects/mesh11s/sys/arm/xscale/ixp425/files.ixp425
  projects/mesh11s/sys/arm/xscale/ixp425/if_npe.c
  projects/mesh11s/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/mesh11s/sys/arm/xscale/ixp425/ixp425_qmgr.h
  projects/mesh11s/sys/arm/xscale/ixp425/std.ixp435   (props changed)
  projects/mesh11s/sys/boot/common/boot.c
  projects/mesh11s/sys/boot/common/ufsread.c
  projects/mesh11s/sys/boot/i386/libi386/Makefile
  projects/mesh11s/sys/boot/i386/libi386/biosacpi.c
  projects/mesh11s/sys/boot/i386/libi386/biosdisk.c
  projects/mesh11s/sys/boot/i386/libi386/biospnp.c
  projects/mesh11s/sys/boot/ia64/ski/acpi_stub.c
  projects/mesh11s/sys/boot/pc98/boot2/sys.c
  projects/mesh11s/sys/boot/uboot/lib/disk.c
  projects/mesh11s/sys/boot/uboot/lib/net.c
  projects/mesh11s/sys/cddl/boot/zfs/zfssubr.c   (props changed)
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris.c
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
  projects/mesh11s/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/mesh11s/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/acl/acl_common.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/acl/acl_common.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c   (props changed)
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c   (props changed)
  projects/mesh11s/sys/compat/freebsd32/freebsd32_misc.c
  projects/mesh11s/sys/compat/freebsd32/freebsd32_sysent.c
  projects/mesh11s/sys/compat/linprocfs/linprocfs.c
  projects/mesh11s/sys/compat/linux/linux_file.c
  projects/mesh11s/sys/compat/linux/linux_getcwd.c
  projects/mesh11s/sys/compat/linux/linux_ioctl.c
  projects/mesh11s/sys/compat/linux/linux_mib.c
  projects/mesh11s/sys/compat/linux/linux_misc.c
  projects/mesh11s/sys/compat/linux/linux_socket.c
  projects/mesh11s/sys/compat/linux/linux_stats.c
  projects/mesh11s/sys/compat/ndis/kern_ndis.c
  projects/mesh11s/sys/compat/ndis/subr_usbd.c
  projects/mesh11s/sys/compat/svr4/svr4_fcntl.c
  projects/mesh11s/sys/compat/svr4/svr4_ioctl.c
  projects/mesh11s/sys/compat/svr4/svr4_misc.c
  projects/mesh11s/sys/compat/svr4/svr4_resource.c
  projects/mesh11s/sys/compat/svr4/svr4_signal.c
  projects/mesh11s/sys/compat/svr4/svr4_socket.c
  projects/mesh11s/sys/compat/svr4/svr4_sockio.c
  projects/mesh11s/sys/compat/svr4/svr4_stat.c
  projects/mesh11s/sys/compat/svr4/svr4_stream.c
  projects/mesh11s/sys/compat/svr4/svr4_sysconfig.h
  projects/mesh11s/sys/compat/svr4/svr4_sysent.c
  projects/mesh11s/sys/conf/NOTES
  projects/mesh11s/sys/conf/files
  projects/mesh11s/sys/conf/files.i386
  projects/mesh11s/sys/conf/files.powerpc
  projects/mesh11s/sys/conf/kern.pre.mk
  projects/mesh11s/sys/conf/options
  projects/mesh11s/sys/contrib/altq/altq/altq_subr.c
  projects/mesh11s/sys/contrib/dev/acpica/   (props changed)
  projects/mesh11s/sys/contrib/dev/acpica/acpica_prep.sh
  projects/mesh11s/sys/contrib/dev/acpica/common/adfile.c
  projects/mesh11s/sys/contrib/dev/acpica/common/adisasm.c
  projects/mesh11s/sys/contrib/dev/acpica/common/adwalk.c
  projects/mesh11s/sys/contrib/dev/acpica/common/dmrestag.c
  projects/mesh11s/sys/contrib/dev/acpica/common/dmtable.c
  projects/mesh11s/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/mesh11s/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/mesh11s/sys/contrib/dev/acpica/common/getopt.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asllength.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslload.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asltree.c
  projects/mesh11s/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/mesh11s/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/mesh11s/sys/contrib/dev/acpica/osunixxf.c
  projects/mesh11s/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  projects/mesh11s/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/mesh11s/sys/contrib/pf/   (props changed)
  projects/mesh11s/sys/contrib/pf/net/pf.c
  projects/mesh11s/sys/contrib/pf/net/pf_if.c
  projects/mesh11s/sys/contrib/pf/net/pf_ioctl.c
  projects/mesh11s/sys/crypto/via/padlock_hash.c
  projects/mesh11s/sys/ddb/db_textdump.c
  projects/mesh11s/sys/dev/acpi_support/acpi_aiboost.c
  projects/mesh11s/sys/dev/acpi_support/acpi_asus.c
  projects/mesh11s/sys/dev/acpi_support/acpi_fujitsu.c
  projects/mesh11s/sys/dev/acpi_support/acpi_ibm.c
  projects/mesh11s/sys/dev/acpi_support/acpi_panasonic.c
  projects/mesh11s/sys/dev/acpi_support/acpi_sony.c
  projects/mesh11s/sys/dev/acpi_support/acpi_toshiba.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdDebug.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdHardware.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdInterrupt.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdMemory.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdSchedule.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdStream.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdSynch.c
  projects/mesh11s/sys/dev/acpica/Osd/OsdTable.c
  projects/mesh11s/sys/dev/acpica/acpi.c
  projects/mesh11s/sys/dev/acpica/acpi_acad.c
  projects/mesh11s/sys/dev/acpica/acpi_battery.c
  projects/mesh11s/sys/dev/acpica/acpi_button.c
  projects/mesh11s/sys/dev/acpica/acpi_cmbat.c
  projects/mesh11s/sys/dev/acpica/acpi_cpu.c
  projects/mesh11s/sys/dev/acpica/acpi_dock.c
  projects/mesh11s/sys/dev/acpica/acpi_ec.c
  projects/mesh11s/sys/dev/acpica/acpi_hpet.c
  projects/mesh11s/sys/dev/acpica/acpi_if.m
  projects/mesh11s/sys/dev/acpica/acpi_isab.c
  projects/mesh11s/sys/dev/acpica/acpi_lid.c
  projects/mesh11s/sys/dev/acpica/acpi_package.c
  projects/mesh11s/sys/dev/acpica/acpi_pci.c
  projects/mesh11s/sys/dev/acpica/acpi_pci_link.c
  projects/mesh11s/sys/dev/acpica/acpi_pcib.c
  projects/mesh11s/sys/dev/acpica/acpi_pcib_acpi.c
  projects/mesh11s/sys/dev/acpica/acpi_pcib_pci.c
  projects/mesh11s/sys/dev/acpica/acpi_perf.c
  projects/mesh11s/sys/dev/acpica/acpi_powerres.c
  projects/mesh11s/sys/dev/acpica/acpi_quirk.c
  projects/mesh11s/sys/dev/acpica/acpi_resource.c
  projects/mesh11s/sys/dev/acpica/acpi_smbat.c
  projects/mesh11s/sys/dev/acpica/acpi_thermal.c
  projects/mesh11s/sys/dev/acpica/acpi_throttle.c
  projects/mesh11s/sys/dev/acpica/acpi_timer.c
  projects/mesh11s/sys/dev/acpica/acpi_video.c
  projects/mesh11s/sys/dev/aic7xxx/aicasm/Makefile
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  projects/mesh11s/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
  projects/mesh11s/sys/dev/asmc/asmc.c
  projects/mesh11s/sys/dev/ata/   (props changed)
  projects/mesh11s/sys/dev/ata/ata-all.h
  projects/mesh11s/sys/dev/ata/ata-pci.h
  projects/mesh11s/sys/dev/ata/ata-usb.c   (contents, props changed)
  projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-intel.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-nvidia.c
  projects/mesh11s/sys/dev/ath/if_ath.c
  projects/mesh11s/sys/dev/bge/if_bge.c
  projects/mesh11s/sys/dev/bktr/bktr_os.c
  projects/mesh11s/sys/dev/bwi/if_bwi.c
  projects/mesh11s/sys/dev/cfe/cfe_console.c
  projects/mesh11s/sys/dev/cxgb/   (props changed)
  projects/mesh11s/sys/dev/cxgb/cxgb_main.c
  projects/mesh11s/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/mesh11s/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/mesh11s/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/mesh11s/sys/dev/dc/if_dc.c
  projects/mesh11s/sys/dev/dcons/dcons_os.c
  projects/mesh11s/sys/dev/e1000/if_em.c
  projects/mesh11s/sys/dev/fdc/fdc_acpi.c
  projects/mesh11s/sys/dev/firewire/firewire.c
  projects/mesh11s/sys/dev/firewire/if_fwe.c
  projects/mesh11s/sys/dev/firewire/if_fwip.c
  projects/mesh11s/sys/dev/fxp/if_fxp.c
  projects/mesh11s/sys/dev/if_ndis/if_ndis.c
  projects/mesh11s/sys/dev/if_ndis/if_ndis_usb.c
  projects/mesh11s/sys/dev/if_ndis/if_ndisvar.h
  projects/mesh11s/sys/dev/iir/iir.c
  projects/mesh11s/sys/dev/iir/iir_ctrl.c
  projects/mesh11s/sys/dev/ipmi/ipmi_acpi.c
  projects/mesh11s/sys/dev/iwn/if_iwn.c
  projects/mesh11s/sys/dev/ixgb/if_ixgb.c
  projects/mesh11s/sys/dev/kbd/kbd.c
  projects/mesh11s/sys/dev/kbdmux/kbdmux.c
  projects/mesh11s/sys/dev/lmc/if_lmc.c
  projects/mesh11s/sys/dev/lmc/if_lmc.h
  projects/mesh11s/sys/dev/mge/if_mge.c
  projects/mesh11s/sys/dev/mii/e1000phy.c
  projects/mesh11s/sys/dev/mii/e1000phyreg.h
  projects/mesh11s/sys/dev/mii/miidevs
  projects/mesh11s/sys/dev/msk/if_msk.c
  projects/mesh11s/sys/dev/msk/if_mskreg.h
  projects/mesh11s/sys/dev/mxge/if_mxge.c
  projects/mesh11s/sys/dev/mxge/if_mxge_var.h
  projects/mesh11s/sys/dev/nfe/if_nfe.c
  projects/mesh11s/sys/dev/nge/if_nge.c
  projects/mesh11s/sys/dev/nmdm/nmdm.c
  projects/mesh11s/sys/dev/ofw/ofw_console.c
  projects/mesh11s/sys/dev/pci/pci.c
  projects/mesh11s/sys/dev/pci/pcivar.h
  projects/mesh11s/sys/dev/puc/pucdata.c
  projects/mesh11s/sys/dev/ral/rt2560.c
  projects/mesh11s/sys/dev/random/nehemiah.c
  projects/mesh11s/sys/dev/random/randomdev_soft.c
  projects/mesh11s/sys/dev/re/if_re.c
  projects/mesh11s/sys/dev/rp/rp.c
  projects/mesh11s/sys/dev/sf/if_sf.c
  projects/mesh11s/sys/dev/si/si.c
  projects/mesh11s/sys/dev/sis/if_sis.c
  projects/mesh11s/sys/dev/smc/if_smc.c
  projects/mesh11s/sys/dev/sound/clone.c
  projects/mesh11s/sys/dev/sound/driver.c
  projects/mesh11s/sys/dev/sound/isa/ad1816.c
  projects/mesh11s/sys/dev/sound/isa/ess.c
  projects/mesh11s/sys/dev/sound/isa/gusc.c
  projects/mesh11s/sys/dev/sound/isa/mss.c
  projects/mesh11s/sys/dev/sound/isa/sb16.c
  projects/mesh11s/sys/dev/sound/isa/sb8.c
  projects/mesh11s/sys/dev/sound/isa/sbc.c
  projects/mesh11s/sys/dev/sound/isa/sndbuf_dma.c
  projects/mesh11s/sys/dev/sound/macio/aoa.c
  projects/mesh11s/sys/dev/sound/macio/davbus.c
  projects/mesh11s/sys/dev/sound/macio/i2s.c
  projects/mesh11s/sys/dev/sound/macio/snapper.c
  projects/mesh11s/sys/dev/sound/macio/tumbler.c
  projects/mesh11s/sys/dev/sound/midi/midi.c
  projects/mesh11s/sys/dev/sound/midi/mpu401.c
  projects/mesh11s/sys/dev/sound/midi/sequencer.c
  projects/mesh11s/sys/dev/sound/midi/sequencer.h
  projects/mesh11s/sys/dev/sound/pci/als4000.c
  projects/mesh11s/sys/dev/sound/pci/atiixp.c
  projects/mesh11s/sys/dev/sound/pci/aureal.c
  projects/mesh11s/sys/dev/sound/pci/cmi.c
  projects/mesh11s/sys/dev/sound/pci/cs4281.c
  projects/mesh11s/sys/dev/sound/pci/csa.c
  projects/mesh11s/sys/dev/sound/pci/csapcm.c
  projects/mesh11s/sys/dev/sound/pci/ds1.c
  projects/mesh11s/sys/dev/sound/pci/emu10k1.c
  projects/mesh11s/sys/dev/sound/pci/emu10kx-midi.c
  projects/mesh11s/sys/dev/sound/pci/emu10kx-pcm.c
  projects/mesh11s/sys/dev/sound/pci/emu10kx.c
  projects/mesh11s/sys/dev/sound/pci/envy24.c
  projects/mesh11s/sys/dev/sound/pci/envy24ht.c
  projects/mesh11s/sys/dev/sound/pci/es137x.c
  projects/mesh11s/sys/dev/sound/pci/fm801.c
  projects/mesh11s/sys/dev/sound/pci/hda/hdac.c
  projects/mesh11s/sys/dev/sound/pci/ich.c
  projects/mesh11s/sys/dev/sound/pci/maestro.c
  projects/mesh11s/sys/dev/sound/pci/maestro3.c
  projects/mesh11s/sys/dev/sound/pci/neomagic.c
  projects/mesh11s/sys/dev/sound/pci/solo.c
  projects/mesh11s/sys/dev/sound/pci/spicds.c
  projects/mesh11s/sys/dev/sound/pci/t4dwave.c
  projects/mesh11s/sys/dev/sound/pci/via8233.c
  projects/mesh11s/sys/dev/sound/pci/via82c686.c
  projects/mesh11s/sys/dev/sound/pci/vibes.c
  projects/mesh11s/sys/dev/sound/pcm/ac97.c
  projects/mesh11s/sys/dev/sound/pcm/ac97_patch.c
  projects/mesh11s/sys/dev/sound/pcm/buffer.c
  projects/mesh11s/sys/dev/sound/pcm/buffer.h
  projects/mesh11s/sys/dev/sound/pcm/channel.c
  projects/mesh11s/sys/dev/sound/pcm/channel.h
  projects/mesh11s/sys/dev/sound/pcm/channel_if.m
  projects/mesh11s/sys/dev/sound/pcm/dsp.c
  projects/mesh11s/sys/dev/sound/pcm/dsp.h
  projects/mesh11s/sys/dev/sound/pcm/feeder.c
  projects/mesh11s/sys/dev/sound/pcm/feeder.h
  projects/mesh11s/sys/dev/sound/pcm/feeder_rate.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_volume.c
  projects/mesh11s/sys/dev/sound/pcm/mixer.c
  projects/mesh11s/sys/dev/sound/pcm/mixer.h
  projects/mesh11s/sys/dev/sound/pcm/sndstat.c
  projects/mesh11s/sys/dev/sound/pcm/sound.c
  projects/mesh11s/sys/dev/sound/pcm/sound.h
  projects/mesh11s/sys/dev/sound/pcm/vchan.c
  projects/mesh11s/sys/dev/sound/pcm/vchan.h
  projects/mesh11s/sys/dev/sound/sbus/cs4231.c
  projects/mesh11s/sys/dev/sound/unit.c
  projects/mesh11s/sys/dev/sound/usb/uaudio.c   (contents, props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudio.h   (contents, props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c   (contents, props changed)
  projects/mesh11s/sys/dev/sound/usb/uaudioreg.h   (contents, props changed)
  projects/mesh11s/sys/dev/sound/version.h
  projects/mesh11s/sys/dev/ste/if_ste.c
  projects/mesh11s/sys/dev/stge/if_stge.c
  projects/mesh11s/sys/dev/syscons/daemon/daemon_saver.c
  projects/mesh11s/sys/dev/syscons/scterm-teken.c
  projects/mesh11s/sys/dev/syscons/syscons.c
  projects/mesh11s/sys/dev/syscons/sysmouse.c
  projects/mesh11s/sys/dev/syscons/teken/sequences
  projects/mesh11s/sys/dev/syscons/teken/teken.c
  projects/mesh11s/sys/dev/syscons/teken/teken.h
  projects/mesh11s/sys/dev/syscons/teken/teken_subr_compat.h
  projects/mesh11s/sys/dev/tsec/if_tsec.c
  projects/mesh11s/sys/dev/uart/uart_tty.c
  projects/mesh11s/sys/dev/usb/controller/at91dci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/at91dci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/avr32dci.c
  projects/mesh11s/sys/dev/usb/controller/avr32dci.h
  projects/mesh11s/sys/dev/usb/controller/ehci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ehci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/ohci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/uhci_pci.c   (props changed)
  projects/mesh11s/sys/dev/usb/controller/usb_controller.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c   (props changed)
  projects/mesh11s/sys/dev/usb/input/uhid.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/input/ukbd.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/input/ums.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/input/usb_rdesc.h   (props changed)
  projects/mesh11s/sys/dev/usb/misc/udbp.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/misc/udbp.h   (props changed)
  projects/mesh11s/sys/dev/usb/misc/ufm.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_aue.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_auereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_axe.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_axereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_cdce.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_cdcereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_cue.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_cuereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_kue.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_kuefw.h   (props changed)
  projects/mesh11s/sys/dev/usb/net/if_kuereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_rue.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_ruereg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_udav.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/if_udavreg.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/usb_ethernet.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/net/usb_ethernet.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h   (props changed)
  projects/mesh11s/sys/dev/usb/serial/u3g.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uark.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/ubsa.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/ubser.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uchcom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/ucycom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/ufoma.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uftdi.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h   (props changed)
  projects/mesh11s/sys/dev/usb/serial/ugensa.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uipaq.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/ulpt.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/umct.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/umodem.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/umoscom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uplcom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/usb_serial.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/usb_serial.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uslcom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uvisor.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/serial/uvscom.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/storage/rio500_usb.h   (props changed)
  projects/mesh11s/sys/dev/usb/storage/umass.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/storage/urio.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_msc.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/ufm_ioctl.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_bus.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_busdma.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_busdma.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_cdc.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_compat_linux.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_compat_linux.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_controller.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_core.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_core.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_debug.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_debug.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_defs.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_dev.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_dev.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_device.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_device.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_dynamic.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_dynamic.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_endian.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_error.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_error.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_generic.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_generic.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_handle_request.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_handle_request.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_hid.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_hid.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_hub.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_hub.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_if.m   (props changed)
  projects/mesh11s/sys/dev/usb/usb_ioctl.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_lookup.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_lookup.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_mbuf.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_mbuf.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_mfunc.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_msctest.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_msctest.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_parse.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_parse.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_pci.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_process.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_process.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_request.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_request.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_revision.h   (props changed)
  projects/mesh11s/sys/dev/usb/usb_transfer.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_transfer.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_util.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usb_util.h   (props changed)
  projects/mesh11s/sys/dev/usb/usbdevs   (contents, props changed)
  projects/mesh11s/sys/dev/usb/usbhid.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rum.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uath.c
  projects/mesh11s/sys/dev/usb/wlan/if_uathvar.h
  projects/mesh11s/sys/dev/usb/wlan/if_upgt.c
  projects/mesh11s/sys/dev/usb/wlan/if_upgtvar.h
  projects/mesh11s/sys/dev/usb/wlan/if_ural.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zyd.c   (contents, props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h   (contents, props changed)
  projects/mesh11s/sys/dev/vge/if_vge.c
  projects/mesh11s/sys/dev/vr/if_vr.c
  projects/mesh11s/sys/dev/xen/console/console.c
  projects/mesh11s/sys/dev/xen/netfront/   (props changed)
  projects/mesh11s/sys/dev/xen/netfront/netfront.c
  projects/mesh11s/sys/dev/xen/xenpci/   (props changed)
  projects/mesh11s/sys/dev/xl/if_xl.c
  projects/mesh11s/sys/fs/cd9660/cd9660_rrip.c
  projects/mesh11s/sys/fs/devfs/devfs_devs.c
  projects/mesh11s/sys/fs/devfs/devfs_vnops.c
  projects/mesh11s/sys/fs/nfs/nfs.h
  projects/mesh11s/sys/fs/nfs/nfs_commonacl.c
  projects/mesh11s/sys/fs/nfs/nfs_commonkrpc.c
  projects/mesh11s/sys/fs/nfs/nfs_commonport.c
  projects/mesh11s/sys/fs/nfs/nfs_commonsubs.c
  projects/mesh11s/sys/fs/nfs/nfsport.h
  projects/mesh11s/sys/fs/nfsclient/nfs_clbio.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clkrpc.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clnode.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clport.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clstate.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clvfsops.c
  projects/mesh11s/sys/fs/nfsclient/nfs_clvnops.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdport.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdsocket.c
  projects/mesh11s/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/mesh11s/sys/fs/nullfs/null_subr.c
  projects/mesh11s/sys/fs/nullfs/null_vnops.c
  projects/mesh11s/sys/fs/nwfs/nwfs_io.c
  projects/mesh11s/sys/fs/procfs/procfs_status.c
  projects/mesh11s/sys/fs/pseudofs/pseudofs_vncache.c
  projects/mesh11s/sys/fs/pseudofs/pseudofs_vnops.c
  projects/mesh11s/sys/fs/smbfs/smbfs_io.c
  projects/mesh11s/sys/fs/tmpfs/tmpfs_vnops.c
  projects/mesh11s/sys/fs/udf/osta.c
  projects/mesh11s/sys/fs/unionfs/union_subr.c
  projects/mesh11s/sys/geom/geom_subr.c
  projects/mesh11s/sys/geom/label/g_label.c
  projects/mesh11s/sys/geom/vinum/geom_vinum_create.c
  projects/mesh11s/sys/geom/vinum/geom_vinum_drive.c
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_fs.h
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_lookup.c
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/mesh11s/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/mesh11s/sys/i386/acpica/OsdEnvironment.c
  projects/mesh11s/sys/i386/acpica/acpi_machdep.c
  projects/mesh11s/sys/i386/acpica/acpi_wakeup.c
  projects/mesh11s/sys/i386/acpica/madt.c
  projects/mesh11s/sys/i386/conf/GENERIC
  projects/mesh11s/sys/i386/conf/NOTES
  projects/mesh11s/sys/i386/cpufreq/est.c
  projects/mesh11s/sys/i386/cpufreq/hwpstate.c
  projects/mesh11s/sys/i386/cpufreq/p4tcc.c
  projects/mesh11s/sys/i386/i386/dump_machdep.c
  projects/mesh11s/sys/i386/i386/minidump_machdep.c
  projects/mesh11s/sys/i386/i386/sys_machdep.c
  projects/mesh11s/sys/i386/ibcs2/ibcs2_misc.c
  projects/mesh11s/sys/i386/ibcs2/ibcs2_socksys.c
  projects/mesh11s/sys/i386/ibcs2/ibcs2_sysent.c
  projects/mesh11s/sys/i386/include/apicvar.h
  projects/mesh11s/sys/i386/linux/linux.h
  projects/mesh11s/sys/i386/linux/linux_sysent.c
  projects/mesh11s/sys/i386/xen/clock.c
  projects/mesh11s/sys/i386/xen/mp_machdep.c
  projects/mesh11s/sys/ia64/acpica/OsdEnvironment.c
  projects/mesh11s/sys/ia64/acpica/acpi_machdep.c
  projects/mesh11s/sys/ia64/acpica/acpi_wakeup.c
  projects/mesh11s/sys/ia64/acpica/madt.c
  projects/mesh11s/sys/ia64/conf/GENERIC
  projects/mesh11s/sys/ia64/ia64/dump_machdep.c
  projects/mesh11s/sys/ia64/ia64/mp_machdep.c
  projects/mesh11s/sys/ia64/ia64/nexus.c
  projects/mesh11s/sys/ia64/ia64/ssc.c
  projects/mesh11s/sys/kern/init_main.c
  projects/mesh11s/sys/kern/init_sysent.c
  projects/mesh11s/sys/kern/kern_acct.c
  projects/mesh11s/sys/kern/kern_alq.c
  projects/mesh11s/sys/kern/kern_conf.c
  projects/mesh11s/sys/kern/kern_cpu.c
  projects/mesh11s/sys/kern/kern_cpuset.c
  projects/mesh11s/sys/kern/kern_descrip.c
  projects/mesh11s/sys/kern/kern_environment.c
  projects/mesh11s/sys/kern/kern_exec.c
  projects/mesh11s/sys/kern/kern_exit.c
  projects/mesh11s/sys/kern/kern_fork.c
  projects/mesh11s/sys/kern/kern_jail.c
  projects/mesh11s/sys/kern/kern_ktrace.c
  projects/mesh11s/sys/kern/kern_linker.c
  projects/mesh11s/sys/kern/kern_lock.c
  projects/mesh11s/sys/kern/kern_lockf.c
  projects/mesh11s/sys/kern/kern_malloc.c
  projects/mesh11s/sys/kern/kern_mbuf.c
  projects/mesh11s/sys/kern/kern_mib.c
  projects/mesh11s/sys/kern/kern_mutex.c
  projects/mesh11s/sys/kern/kern_osd.c
  projects/mesh11s/sys/kern/kern_poll.c
  projects/mesh11s/sys/kern/kern_priv.c
  projects/mesh11s/sys/kern/kern_proc.c
  projects/mesh11s/sys/kern/kern_prot.c
  projects/mesh11s/sys/kern/kern_rmlock.c
  projects/mesh11s/sys/kern/kern_rwlock.c
  projects/mesh11s/sys/kern/kern_shutdown.c
  projects/mesh11s/sys/kern/kern_sx.c
  projects/mesh11s/sys/kern/kern_sysctl.c
  projects/mesh11s/sys/kern/kern_uuid.c
  projects/mesh11s/sys/kern/kern_vimage.c
  projects/mesh11s/sys/kern/kern_xxx.c
  projects/mesh11s/sys/kern/link_elf.c
  projects/mesh11s/sys/kern/link_elf_obj.c
  projects/mesh11s/sys/kern/linker_if.m
  projects/mesh11s/sys/kern/makesyscalls.sh
  projects/mesh11s/sys/kern/subr_acl_posix1e.c
  projects/mesh11s/sys/kern/subr_trap.c
  projects/mesh11s/sys/kern/sys_pipe.c
  projects/mesh11s/sys/kern/sys_socket.c
  projects/mesh11s/sys/kern/sysv_msg.c
  projects/mesh11s/sys/kern/sysv_sem.c
  projects/mesh11s/sys/kern/sysv_shm.c
  projects/mesh11s/sys/kern/tty.c
  projects/mesh11s/sys/kern/tty_pts.c
  projects/mesh11s/sys/kern/uipc_debug.c
  projects/mesh11s/sys/kern/uipc_domain.c
  projects/mesh11s/sys/kern/uipc_mbuf.c
  projects/mesh11s/sys/kern/uipc_mbuf2.c
  projects/mesh11s/sys/kern/uipc_sem.c
  projects/mesh11s/sys/kern/uipc_shm.c
  projects/mesh11s/sys/kern/uipc_sockbuf.c
  projects/mesh11s/sys/kern/uipc_socket.c
  projects/mesh11s/sys/kern/uipc_syscalls.c
  projects/mesh11s/sys/kern/uipc_usrreq.c
  projects/mesh11s/sys/kern/vfs_acl.c
  projects/mesh11s/sys/kern/vfs_aio.c
  projects/mesh11s/sys/kern/vfs_bio.c
  projects/mesh11s/sys/kern/vfs_cache.c
  projects/mesh11s/sys/kern/vfs_cluster.c
  projects/mesh11s/sys/kern/vfs_default.c
  projects/mesh11s/sys/kern/vfs_extattr.c
  projects/mesh11s/sys/kern/vfs_lookup.c
  projects/mesh11s/sys/kern/vfs_mount.c
  projects/mesh11s/sys/kern/vfs_subr.c
  projects/mesh11s/sys/kern/vfs_syscalls.c
  projects/mesh11s/sys/kern/vfs_vnops.c
  projects/mesh11s/sys/kern/vnode_if.src
  projects/mesh11s/sys/kgssapi/gsstest.c
  projects/mesh11s/sys/mips/mips/pmap.c
  projects/mesh11s/sys/modules/Makefile
  projects/mesh11s/sys/modules/acpi/acpi/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_aiboost/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_asus/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_dock/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_fujitsu/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_ibm/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_panasonic/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_sony/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_toshiba/Makefile
  projects/mesh11s/sys/modules/acpi/acpi_video/Makefile
  projects/mesh11s/sys/modules/bridgestp/Makefile
  projects/mesh11s/sys/modules/cpufreq/Makefile
  projects/mesh11s/sys/modules/cxgb/iw_cxgb/Makefile
  projects/mesh11s/sys/modules/cxgb/tom/Makefile
  projects/mesh11s/sys/modules/dtrace/Makefile
  projects/mesh11s/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/mesh11s/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/mesh11s/sys/modules/dummynet/Makefile
  projects/mesh11s/sys/modules/fdc/Makefile
  projects/mesh11s/sys/modules/firewire/fwip/Makefile
  projects/mesh11s/sys/modules/geom/geom_part/geom_part_ebr/Makefile
  projects/mesh11s/sys/modules/ibcs2/Makefile
  projects/mesh11s/sys/modules/if_ef/Makefile
  projects/mesh11s/sys/modules/if_gif/Makefile
  projects/mesh11s/sys/modules/if_ppp/Makefile
  projects/mesh11s/sys/modules/if_stf/Makefile
  projects/mesh11s/sys/modules/if_tun/Makefile
  projects/mesh11s/sys/modules/if_vlan/Makefile
  projects/mesh11s/sys/modules/ip6_mroute_mod/   (props changed)
  projects/mesh11s/sys/modules/ip6_mroute_mod/Makefile
  projects/mesh11s/sys/modules/ip_mroute_mod/Makefile
  projects/mesh11s/sys/modules/ipfw/Makefile
  projects/mesh11s/sys/modules/ipfw_nat/Makefile
  projects/mesh11s/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/mesh11s/sys/modules/linprocfs/Makefile
  projects/mesh11s/sys/modules/linux/Makefile
  projects/mesh11s/sys/modules/mac_lomac/Makefile
  projects/mesh11s/sys/modules/netgraph/atm/atm/Makefile
  projects/mesh11s/sys/modules/netgraph/bluetooth/ubt/Makefile
  projects/mesh11s/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
  projects/mesh11s/sys/modules/netgraph/ether/Makefile
  projects/mesh11s/sys/modules/netgraph/gif/Makefile
  projects/mesh11s/sys/modules/nfsclient/Makefile
  projects/mesh11s/sys/modules/nfsserver/Makefile
  projects/mesh11s/sys/modules/pf/Makefile
  projects/mesh11s/sys/modules/pseudofs/Makefile
  projects/mesh11s/sys/modules/sem/Makefile
  projects/mesh11s/sys/modules/sound/sound/Makefile
  projects/mesh11s/sys/modules/svr4/Makefile
  projects/mesh11s/sys/modules/sysvipc/sysvmsg/Makefile
  projects/mesh11s/sys/modules/sysvipc/sysvsem/Makefile
  projects/mesh11s/sys/modules/sysvipc/sysvshm/Makefile
  projects/mesh11s/sys/modules/ufs/Makefile
  projects/mesh11s/sys/modules/usb/Makefile
  projects/mesh11s/sys/modules/usb/zyd/Makefile
  projects/mesh11s/sys/modules/wlan/Makefile
  projects/mesh11s/sys/modules/zfs/Makefile
  projects/mesh11s/sys/net/bpf.c
  projects/mesh11s/sys/net/bridgestp.c
  projects/mesh11s/sys/net/flowtable.h
  projects/mesh11s/sys/net/if.c
  projects/mesh11s/sys/net/if.h
  projects/mesh11s/sys/net/if_atmsubr.c
  projects/mesh11s/sys/net/if_bridge.c
  projects/mesh11s/sys/net/if_clone.c
  projects/mesh11s/sys/net/if_ef.c
  projects/mesh11s/sys/net/if_ethersubr.c
  projects/mesh11s/sys/net/if_fddisubr.c
  projects/mesh11s/sys/net/if_fwsubr.c
  projects/mesh11s/sys/net/if_gif.c
  projects/mesh11s/sys/net/if_gif.h
  projects/mesh11s/sys/net/if_iso88025subr.c
  projects/mesh11s/sys/net/if_loop.c
  projects/mesh11s/sys/net/if_mib.c
  projects/mesh11s/sys/net/if_stf.c
  projects/mesh11s/sys/net/if_tun.c
  projects/mesh11s/sys/net/if_var.h
  projects/mesh11s/sys/net/if_vlan.c
  projects/mesh11s/sys/net/netisr.c
  projects/mesh11s/sys/net/netisr.h
  projects/mesh11s/sys/net/pfil.h
  projects/mesh11s/sys/net/raw_cb.c
  projects/mesh11s/sys/net/raw_usrreq.c
  projects/mesh11s/sys/net/route.c
  projects/mesh11s/sys/net/route.h
  projects/mesh11s/sys/net/rtsock.c
  projects/mesh11s/sys/net/vnet.h
  projects/mesh11s/sys/net80211/ieee80211.c
  projects/mesh11s/sys/net80211/ieee80211.h
  projects/mesh11s/sys/net80211/ieee80211_adhoc.c
  projects/mesh11s/sys/net80211/ieee80211_crypto.c
  projects/mesh11s/sys/net80211/ieee80211_crypto.h
  projects/mesh11s/sys/net80211/ieee80211_crypto_ccmp.c
  projects/mesh11s/sys/net80211/ieee80211_crypto_tkip.c
  projects/mesh11s/sys/net80211/ieee80211_ddb.c
  projects/mesh11s/sys/net80211/ieee80211_dfs.c
  projects/mesh11s/sys/net80211/ieee80211_freebsd.c
  projects/mesh11s/sys/net80211/ieee80211_hostap.c
  projects/mesh11s/sys/net80211/ieee80211_ht.c
  projects/mesh11s/sys/net80211/ieee80211_ht.h
  projects/mesh11s/sys/net80211/ieee80211_input.c
  projects/mesh11s/sys/net80211/ieee80211_ioctl.c
  projects/mesh11s/sys/net80211/ieee80211_ioctl.h
  projects/mesh11s/sys/net80211/ieee80211_monitor.c
  projects/mesh11s/sys/net80211/ieee80211_node.c
  projects/mesh11s/sys/net80211/ieee80211_node.h
  projects/mesh11s/sys/net80211/ieee80211_output.c
  projects/mesh11s/sys/net80211/ieee80211_phy.h
  projects/mesh11s/sys/net80211/ieee80211_proto.c
  projects/mesh11s/sys/net80211/ieee80211_proto.h
  projects/mesh11s/sys/net80211/ieee80211_radiotap.c
  projects/mesh11s/sys/net80211/ieee80211_scan.c
  projects/mesh11s/sys/net80211/ieee80211_scan.h
  projects/mesh11s/sys/net80211/ieee80211_scan_sta.c
  projects/mesh11s/sys/net80211/ieee80211_sta.c
  projects/mesh11s/sys/net80211/ieee80211_superg.c
  projects/mesh11s/sys/net80211/ieee80211_tdma.c
  projects/mesh11s/sys/net80211/ieee80211_var.h
  projects/mesh11s/sys/net80211/ieee80211_wds.c
  projects/mesh11s/sys/netatalk/aarp.c
  projects/mesh11s/sys/netatalk/ddp_input.c
  projects/mesh11s/sys/netatalk/ddp_output.c
  projects/mesh11s/sys/netatalk/ddp_usrreq.c
  projects/mesh11s/sys/netgraph/atm/ng_atm.c
  projects/mesh11s/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/mesh11s/sys/netgraph/ng_base.c
  projects/mesh11s/sys/netgraph/ng_ether.c
  projects/mesh11s/sys/netgraph/ng_gif.c
  projects/mesh11s/sys/netgraph/ng_ksocket.c
  projects/mesh11s/sys/netinet/accf_data.c
  projects/mesh11s/sys/netinet/accf_dns.c
  projects/mesh11s/sys/netinet/accf_http.c
  projects/mesh11s/sys/netinet/if_ether.c
  projects/mesh11s/sys/netinet/igmp.c
  projects/mesh11s/sys/netinet/in.h
  projects/mesh11s/sys/netinet/in_gif.c
  projects/mesh11s/sys/netinet/in_mcast.c
  projects/mesh11s/sys/netinet/in_pcb.c
  projects/mesh11s/sys/netinet/in_pcb.h
  projects/mesh11s/sys/netinet/in_proto.c
  projects/mesh11s/sys/netinet/in_rmx.c
  projects/mesh11s/sys/netinet/ip_divert.c
  projects/mesh11s/sys/netinet/ip_dummynet.h
  projects/mesh11s/sys/netinet/ip_fw.h
  projects/mesh11s/sys/netinet/ip_icmp.c
  projects/mesh11s/sys/netinet/ip_input.c
  projects/mesh11s/sys/netinet/ip_ipsec.c
  projects/mesh11s/sys/netinet/ip_ipsec.h
  projects/mesh11s/sys/netinet/ip_mroute.c
  projects/mesh11s/sys/netinet/ip_options.c
  projects/mesh11s/sys/netinet/ip_output.c
  projects/mesh11s/sys/netinet/ip_var.h
  projects/mesh11s/sys/netinet/raw_ip.c
  projects/mesh11s/sys/netinet/sctp_os_bsd.h
  projects/mesh11s/sys/netinet/sctp_pcb.c
  projects/mesh11s/sys/netinet/sctp_sysctl.c
  projects/mesh11s/sys/netinet/sctp_sysctl.h
  projects/mesh11s/sys/netinet/sctp_uio.h
  projects/mesh11s/sys/netinet/sctputil.c
  projects/mesh11s/sys/netinet/tcp_hostcache.c
  projects/mesh11s/sys/netinet/tcp_input.c
  projects/mesh11s/sys/netinet/tcp_output.c
  projects/mesh11s/sys/netinet/tcp_reass.c
  projects/mesh11s/sys/netinet/tcp_subr.c
  projects/mesh11s/sys/netinet/tcp_syncache.c
  projects/mesh11s/sys/netinet/tcp_syncache.h
  projects/mesh11s/sys/netinet/tcp_timewait.c
  projects/mesh11s/sys/netinet/tcp_var.h
  projects/mesh11s/sys/netinet/udp_usrreq.c
  projects/mesh11s/sys/netinet/udp_var.h
  projects/mesh11s/sys/netinet/vinet.h
  projects/mesh11s/sys/netinet6/frag6.c
  projects/mesh11s/sys/netinet6/icmp6.c
  projects/mesh11s/sys/netinet6/in6.c
  projects/mesh11s/sys/netinet6/in6.h
  projects/mesh11s/sys/netinet6/in6_gif.c
  projects/mesh11s/sys/netinet6/in6_ifattach.c
  projects/mesh11s/sys/netinet6/in6_mcast.c
  projects/mesh11s/sys/netinet6/in6_pcb.c
  projects/mesh11s/sys/netinet6/in6_proto.c
  projects/mesh11s/sys/netinet6/in6_rmx.c
  projects/mesh11s/sys/netinet6/ip6_input.c
  projects/mesh11s/sys/netinet6/ip6_ipsec.c
  projects/mesh11s/sys/netinet6/ip6_mroute.c
  projects/mesh11s/sys/netinet6/ip6_output.c
  projects/mesh11s/sys/netinet6/ip6_var.h
  projects/mesh11s/sys/netinet6/ip6protosw.h
  projects/mesh11s/sys/netinet6/mld6.c
  projects/mesh11s/sys/netinet6/nd6.c
  projects/mesh11s/sys/netinet6/nd6.h
  projects/mesh11s/sys/netinet6/nd6_rtr.c
  projects/mesh11s/sys/netinet6/raw_ip6.c
  projects/mesh11s/sys/netinet6/scope6.c
  projects/mesh11s/sys/netinet6/udp6_usrreq.c
  projects/mesh11s/sys/netinet6/vinet6.h
  projects/mesh11s/sys/netipsec/ipsec.c
  projects/mesh11s/sys/netipsec/ipsec.h
  projects/mesh11s/sys/netipsec/ipsec6.h
  projects/mesh11s/sys/netipsec/ipsec_input.c
  projects/mesh11s/sys/netipsec/key.c
  projects/mesh11s/sys/netipsec/key.h
  projects/mesh11s/sys/netipsec/keysock.c
  projects/mesh11s/sys/netipsec/vipsec.h
  projects/mesh11s/sys/netipsec/xform_ipip.c
  projects/mesh11s/sys/netipx/ipx_input.c
  projects/mesh11s/sys/netipx/spx.h
  projects/mesh11s/sys/netipx/spx_usrreq.c
  projects/mesh11s/sys/netipx/spx_var.h
  projects/mesh11s/sys/netnatm/natm_proto.c
  projects/mesh11s/sys/netsmb/smb_trantcp.c
  projects/mesh11s/sys/nfsclient/bootp_subr.c
  projects/mesh11s/sys/nfsclient/krpc_subr.c
  projects/mesh11s/sys/nfsclient/nfs.h
  projects/mesh11s/sys/nfsclient/nfs_bio.c
  projects/mesh11s/sys/nfsclient/nfs_diskless.c
  projects/mesh11s/sys/nfsclient/nfs_krpc.c
  projects/mesh11s/sys/nfsclient/nfs_lock.c
  projects/mesh11s/sys/nfsclient/nfs_nfsiod.c
  projects/mesh11s/sys/nfsclient/nfs_node.c
  projects/mesh11s/sys/nfsclient/nfs_socket.c
  projects/mesh11s/sys/nfsclient/nfs_subs.c
  projects/mesh11s/sys/nfsclient/nfs_vfsops.c
  projects/mesh11s/sys/nfsclient/nfs_vnops.c
  projects/mesh11s/sys/nfsclient/nfsm_subs.h
  projects/mesh11s/sys/nfsclient/nfsmount.h
  projects/mesh11s/sys/nfsclient/nfsnode.h
  projects/mesh11s/sys/nfsserver/nfs.h
  projects/mesh11s/sys/nfsserver/nfs_srvkrpc.c
  projects/mesh11s/sys/nfsserver/nfs_srvsock.c
  projects/mesh11s/sys/nfsserver/nfs_syscalls.c
  projects/mesh11s/sys/nlm/nlm_advlock.c
  projects/mesh11s/sys/opencrypto/cryptodev.c
  projects/mesh11s/sys/pc98/conf/GENERIC
  projects/mesh11s/sys/pci/if_rl.c
  projects/mesh11s/sys/powerpc/aim/machdep.c
  projects/mesh11s/sys/powerpc/booke/machdep.c
  projects/mesh11s/sys/powerpc/booke/platform_bare.c
  projects/mesh11s/sys/powerpc/booke/pmap.c
  projects/mesh11s/sys/powerpc/conf/GENERIC
  projects/mesh11s/sys/powerpc/conf/MPC85XX
  projects/mesh11s/sys/powerpc/conf/NOTES
  projects/mesh11s/sys/powerpc/include/ocpbus.h
  projects/mesh11s/sys/powerpc/include/pio.h
  projects/mesh11s/sys/powerpc/mpc85xx/atpic.c
  projects/mesh11s/sys/powerpc/mpc85xx/ocpbus.c
  projects/mesh11s/sys/powerpc/mpc85xx/ocpbus.h
  projects/mesh11s/sys/powerpc/powermac/pmu.c
  projects/mesh11s/sys/powerpc/powerpc/bus_machdep.c
  projects/mesh11s/sys/powerpc/powerpc/cpu.c
  projects/mesh11s/sys/rpc/authunix_prot.c
  projects/mesh11s/sys/rpc/clnt_dg.c
  projects/mesh11s/sys/rpc/clnt_vc.c
  projects/mesh11s/sys/rpc/svc.c
  projects/mesh11s/sys/rpc/svc.h
  projects/mesh11s/sys/rpc/svc_auth.c
  projects/mesh11s/sys/rpc/svc_dg.c
  projects/mesh11s/sys/rpc/svc_vc.c
  projects/mesh11s/sys/rpc/xdr.h
  projects/mesh11s/sys/security/audit/audit_syscalls.c
  projects/mesh11s/sys/security/mac/mac_atalk.c
  projects/mesh11s/sys/security/mac/mac_framework.c
  projects/mesh11s/sys/security/mac/mac_inet.c
  projects/mesh11s/sys/security/mac/mac_inet6.c
  projects/mesh11s/sys/security/mac/mac_internal.h
  projects/mesh11s/sys/security/mac/mac_net.c
  projects/mesh11s/sys/security/mac/mac_socket.c
  projects/mesh11s/sys/security/mac_biba/mac_biba.c
  projects/mesh11s/sys/security/mac_bsdextended/mac_bsdextended.c
  projects/mesh11s/sys/security/mac_lomac/mac_lomac.c
  projects/mesh11s/sys/security/mac_mls/mac_mls.c
  projects/mesh11s/sys/security/mac_stub/mac_stub.c
  projects/mesh11s/sys/security/mac_test/mac_test.c
  projects/mesh11s/sys/sparc64/conf/GENERIC
  projects/mesh11s/sys/sparc64/sparc64/dump_machdep.c
  projects/mesh11s/sys/sun4v/conf/GENERIC
  projects/mesh11s/sys/sun4v/include/pcpu.h
  projects/mesh11s/sys/sun4v/sun4v/dump_machdep.c
  projects/mesh11s/sys/sun4v/sun4v/hvcons.c
  projects/mesh11s/sys/sys/acl.h
  projects/mesh11s/sys/sys/buf.h
  projects/mesh11s/sys/sys/conf.h
  projects/mesh11s/sys/sys/cpu.h
  projects/mesh11s/sys/sys/cpuset.h
  projects/mesh11s/sys/sys/domain.h
  projects/mesh11s/sys/sys/eventhandler.h
  projects/mesh11s/sys/sys/jail.h
  projects/mesh11s/sys/sys/kernel.h
  projects/mesh11s/sys/sys/lock.h
  projects/mesh11s/sys/sys/lockf.h
  projects/mesh11s/sys/sys/mount.h
  projects/mesh11s/sys/sys/mutex.h
  projects/mesh11s/sys/sys/namei.h
  projects/mesh11s/sys/sys/param.h
  projects/mesh11s/sys/sys/pcpu.h
  projects/mesh11s/sys/sys/pmc.h
  projects/mesh11s/sys/sys/priv.h
  projects/mesh11s/sys/sys/protosw.h
  projects/mesh11s/sys/sys/queue.h
  projects/mesh11s/sys/sys/rmlock.h
  projects/mesh11s/sys/sys/rwlock.h
  projects/mesh11s/sys/sys/sockbuf.h
  projects/mesh11s/sys/sys/socketvar.h
  projects/mesh11s/sys/sys/sockio.h
  projects/mesh11s/sys/sys/soundcard.h
  projects/mesh11s/sys/sys/sx.h
  projects/mesh11s/sys/sys/syscallsubr.h
  projects/mesh11s/sys/sys/sysent.h
  projects/mesh11s/sys/sys/systm.h
  projects/mesh11s/sys/sys/tty.h
  projects/mesh11s/sys/sys/ucred.h
  projects/mesh11s/sys/sys/user.h
  projects/mesh11s/sys/sys/vimage.h
  projects/mesh11s/sys/sys/vnode.h
  projects/mesh11s/sys/ufs/ffs/ffs_softdep.c
  projects/mesh11s/sys/ufs/ffs/ffs_vfsops.c
  projects/mesh11s/sys/ufs/ufs/dirhash.h
  projects/mesh11s/sys/ufs/ufs/ufs_acl.c
  projects/mesh11s/sys/ufs/ufs/ufs_dirhash.c
  projects/mesh11s/sys/ufs/ufs/ufs_vnops.c
  projects/mesh11s/sys/vm/swap_pager.c
  projects/mesh11s/sys/vm/vm_contig.c
  projects/mesh11s/sys/vm/vm_fault.c
  projects/mesh11s/sys/vm/vm_glue.c
  projects/mesh11s/sys/vm/vm_map.c
  projects/mesh11s/sys/vm/vm_mmap.c
  projects/mesh11s/sys/vm/vm_object.c
  projects/mesh11s/sys/vm/vm_page.c
  projects/mesh11s/sys/vm/vm_page.h
  projects/mesh11s/sys/vm/vm_pageout.c
  projects/mesh11s/sys/vm/vm_pager.h
  projects/mesh11s/sys/vm/vnode_pager.c
  projects/mesh11s/sys/xdr/xdr_mem.c
  projects/mesh11s/sys/xen/evtchn.h   (props changed)
  projects/mesh11s/sys/xen/evtchn/evtchn.c
  projects/mesh11s/sys/xen/hypervisor.h   (props changed)
  projects/mesh11s/sys/xen/xen_intr.h   (props changed)
  projects/mesh11s/sys/xen/xenbus/init.txt   (props changed)
  projects/mesh11s/sys/xen/xenbus/xenbus_xs.c
  projects/mesh11s/tools/KSE/ksetest/kse_asm.S
  projects/mesh11s/tools/KSE/rr/kse_asm.S
  projects/mesh11s/tools/regression/README
  projects/mesh11s/tools/regression/bin/sh/set-e/not2.0
  projects/mesh11s/tools/regression/file/flock/Makefile
  projects/mesh11s/tools/regression/file/flock/flock.c
  projects/mesh11s/tools/regression/fstest/fstest.c
  projects/mesh11s/tools/regression/lib/libutil/test-flopen.c
  projects/mesh11s/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.t   (props changed)
  projects/mesh11s/tools/regression/usr.bin/sed/multitest.t
  projects/mesh11s/tools/tools/README
  projects/mesh11s/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/mesh11s/tools/tools/nanobsd/gateworks/common
  projects/mesh11s/tools/tools/pciid/mk_pci_vendors.pl
  projects/mesh11s/usr.bin/Makefile
  projects/mesh11s/usr.bin/calendar/calendars/calendar.music
  projects/mesh11s/usr.bin/csup/   (props changed)
  projects/mesh11s/usr.bin/dig/Makefile
  projects/mesh11s/usr.bin/ee/Makefile
  projects/mesh11s/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
  projects/mesh11s/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
  projects/mesh11s/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
  projects/mesh11s/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg   (contents, props changed)
  projects/mesh11s/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg   (contents, props changed)
  projects/mesh11s/usr.bin/find/function.c
  projects/mesh11s/usr.bin/kdump/mkioctls
  projects/mesh11s/usr.bin/killall/killall.1
  projects/mesh11s/usr.bin/killall/killall.c
  projects/mesh11s/usr.bin/netstat/route.c
  projects/mesh11s/usr.bin/nfsstat/nfsstat.1
  projects/mesh11s/usr.bin/nfsstat/nfsstat.c
  projects/mesh11s/usr.bin/perror/perror.c
  projects/mesh11s/usr.bin/procstat/   (props changed)
  projects/mesh11s/usr.bin/sed/compile.c
  projects/mesh11s/usr.bin/sed/defs.h
  projects/mesh11s/usr.bin/sed/process.c
  projects/mesh11s/usr.bin/sed/sed.1
  projects/mesh11s/usr.bin/tail/extern.h
  projects/mesh11s/usr.bin/tail/forward.c
  projects/mesh11s/usr.bin/tail/misc.c
  projects/mesh11s/usr.bin/tail/read.c
  projects/mesh11s/usr.bin/tail/reverse.c
  projects/mesh11s/usr.bin/tail/tail.1
  projects/mesh11s/usr.bin/tail/tail.c
  projects/mesh11s/usr.bin/truss/amd64-fbsd.c
  projects/mesh11s/usr.bin/truss/amd64-fbsd32.c
  projects/mesh11s/usr.bin/truss/amd64-linux32.c
  projects/mesh11s/usr.bin/truss/i386-fbsd.c
  projects/mesh11s/usr.bin/truss/i386-linux.c
  projects/mesh11s/usr.bin/truss/ia64-fbsd.c
  projects/mesh11s/usr.bin/truss/mips-fbsd.c
  projects/mesh11s/usr.bin/truss/powerpc-fbsd.c
  projects/mesh11s/usr.bin/truss/sparc64-fbsd.c
  projects/mesh11s/usr.sbin/Makefile
  projects/mesh11s/usr.sbin/acpi/Makefile.inc
  projects/mesh11s/usr.sbin/acpi/acpiconf/acpiconf.c
  projects/mesh11s/usr.sbin/acpi/acpidb/Makefile
  projects/mesh11s/usr.sbin/acpi/acpidb/acpidb.c
  projects/mesh11s/usr.sbin/acpi/acpidump/acpi.c
  projects/mesh11s/usr.sbin/acpi/iasl/Makefile
  projects/mesh11s/usr.sbin/dumpcis/cardinfo.h   (props changed)
  projects/mesh11s/usr.sbin/dumpcis/cis.h   (props changed)
  projects/mesh11s/usr.sbin/ifmcstat/ifmcstat.8
  projects/mesh11s/usr.sbin/ifmcstat/ifmcstat.c
  projects/mesh11s/usr.sbin/iostat/iostat.c
  projects/mesh11s/usr.sbin/ipfwpcap/Makefile
  projects/mesh11s/usr.sbin/ipfwpcap/ipfwpcap.c
  projects/mesh11s/usr.sbin/jail/jail.8
  projects/mesh11s/usr.sbin/jail/jail.c
  projects/mesh11s/usr.sbin/jexec/Makefile
  projects/mesh11s/usr.sbin/jexec/jexec.8
  projects/mesh11s/usr.sbin/jexec/jexec.c
  projects/mesh11s/usr.sbin/jls/Makefile
  projects/mesh11s/usr.sbin/jls/jls.8
  projects/mesh11s/usr.sbin/jls/jls.c
  projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/mesh11s/usr.sbin/makefs/getid.c   (props changed)
  projects/mesh11s/usr.sbin/mountd/exports.5
  projects/mesh11s/usr.sbin/mountd/mountd.8
  projects/mesh11s/usr.sbin/mountd/mountd.c
  projects/mesh11s/usr.sbin/named/Makefile
  projects/mesh11s/usr.sbin/nfsd/Makefile
  projects/mesh11s/usr.sbin/nfsd/nfsd.8
  projects/mesh11s/usr.sbin/nfsd/nfsd.c
  projects/mesh11s/usr.sbin/pkg_install/info/main.c
  projects/mesh11s/usr.sbin/pmcstat/pmcstat.8
  projects/mesh11s/usr.sbin/powerd/powerd.c
  projects/mesh11s/usr.sbin/ppp/timer.c
  projects/mesh11s/usr.sbin/tcpdrop/tcpdrop.8
  projects/mesh11s/usr.sbin/tcpdrop/tcpdrop.c
  projects/mesh11s/usr.sbin/usbconfig/usbconfig.8
  projects/mesh11s/usr.sbin/wpa/hostapd/driver_freebsd.c
  projects/mesh11s/usr.sbin/zic/   (props changed)
  projects/mesh11s/usr.sbin/zic/README
  projects/mesh11s/usr.sbin/zic/Theory
  projects/mesh11s/usr.sbin/zic/ialloc.c
  projects/mesh11s/usr.sbin/zic/private.h
  projects/mesh11s/usr.sbin/zic/scheck.c
  projects/mesh11s/usr.sbin/zic/zdump.8
  projects/mesh11s/usr.sbin/zic/zdump.c
  projects/mesh11s/usr.sbin/zic/zic.8
  projects/mesh11s/usr.sbin/zic/zic.c

Modified: projects/mesh11s/ObsoleteFiles.inc
==============================================================================
--- projects/mesh11s/ObsoleteFiles.inc	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/ObsoleteFiles.inc	Mon Jun  8 21:58:34 2009	(r193772)
@@ -14,6 +14,61 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090605: removal of clists
+OLD_FILES+=usr/include/sys/clist.h
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
+# 20090530: removal of early.sh
+OLD_FILES+=etc/rc.d/early.sh
+# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
+OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
+OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
+# 20090527: removal of legacy USB stack
+OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/hid.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
+OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
+OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
+OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
+OLD_DIRS+=usr/include/legacy/dev/usb
+OLD_DIRS+=usr/include/legacy/dev
+OLD_DIRS+=usr/include/legacy
+# 20090526: removal of makekey(8)
+OLD_FILES+=libexec/makekey
+OLD_FILES+=usr/share/man/man8/makekey.8.gz
+# 20090522: removal of University of Michigan NFSv4 client
+OLD_FILES+=etc/rc.d/idmapd
+OLD_FILES+=sbin/idmapd
+OLD_FILES+=sbin/mount_nfs4
+OLD_FILES+=usr/share/man/man8/idmapd.8.gz
+OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
+# 20090513: removal of legacy versions of USB network interface drivers
+OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h

Modified: projects/mesh11s/UPDATING
==============================================================================
--- projects/mesh11s/UPDATING	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/UPDATING	Mon Jun  8 21:58:34 2009	(r193772)
@@ -22,6 +22,67 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090608:
+	The layout of structs ifnet, domain, protosw and vnet_net has
+	changed.  Kernel modules need to be rebuilt.
+	Bump __FreeBSD_version to 800097.
+
+20090602:
+	window(1) has been removed from the base system. It can now be
+	installed from ports. The port is called misc/window.
+
+20090601:
+	The way we are storing and accessing `routing table' entries
+	has changed. Programs reading the FIB, like netstat, need to
+	be re-compiled.
+
+20090601:
+	A new netisr implementation has been added for FreeBSD 8.  Network
+	file system modules, such as igmp, ipdivert, and others, should be
+	rebuilt.
+	Bump __FreeBSD_version to 800096.
+
+20090531:
+	For those who use ipfw and especially pf, those two firewalls
+	are now started BEFORE the network is initialized (i.e., before
+	rc.d/netif). Please review your rules to make sure that your
+	interfaces will be properly described.
+
+20090530:
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
+	is no more valid.
+
+20090530:
+	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
+	Bump __FreeBSD_version to 800094.
+
+20090529:
+	Add mnt_xflag field to 'struct mount'.  File system modules
+	need to be rebuilt.
+	Bump __FreeBSD_version to 800093.
+
+20090528:
+	The compiling option ADAPTIVE_SX has been retired while it has been
+	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+	The KPI for sx_init_flags() changes as accepting flags:
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+	has been introduced in order to handle the reversed logic.
+	Bump __FreeBSD_version to 800092.
+
+20090527:
+	Add support for hierarchical jails.  Remove global securelevel.
+	Bump __FreeBSD_version to 800091.
+
+20090523:
+	The layout of struct vnet_net has changed, therefore modules
+	need to be rebuilt.
+	Bump __FreeBSD_version to 800090.
+
+20090523:
+	The newly imported zic(8) produces a new format in the
+	output. Please run tzsetup(8) to install the newly created
+	data to /etc/localtime.
+
 20090520:
 	The sysctl tree for the usb stack has renamed from hw.usb2.* to
 	hw.usb.* and is now consistent again with previous releases.
@@ -274,7 +335,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	memory segment of size > 2 GB on the 64-bit architectures.
 	Due to a limitation of the existing ABI, the shm_segsz member
 	of the struct shmid_ds, returned by shmctl(IPC_STAT) call is
-	wrong for large segments. Note that limits must be explicitely
+	wrong for large segments. Note that limits must be explicitly
 	raised to allow such segments to be created.
 
 20090301:

Modified: projects/mesh11s/bin/chflags/chflags.c
==============================================================================
--- projects/mesh11s/bin/chflags/chflags.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/chflags/chflags.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
 			fts_options |= FTS_LOGICAL;
 		}
 	} else
-		fts_options = FTS_LOGICAL;
+		fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
 
 	/* XXX: Why don't chflags and lchflags have compatible prototypes? */
 	if (hflag)

Modified: projects/mesh11s/bin/cp/Makefile
==============================================================================
--- projects/mesh11s/bin/cp/Makefile	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/cp/Makefile	Mon Jun  8 21:58:34 2009	(r193772)
@@ -3,6 +3,6 @@
 
 PROG=	cp
 SRCS=	cp.c utils.c
-CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED
+CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED -D_ACL_PRIVATE
 
 .include <bsd.prog.mk>

Modified: projects/mesh11s/bin/cp/utils.c
==============================================================================
--- projects/mesh11s/bin/cp/utils.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/cp/utils.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -365,7 +365,7 @@ setfile(struct stat *fs, int fd)
 	if (!gotstat || fs->st_flags != ts.st_flags)
 		if (fdval ?
 		    fchflags(fd, fs->st_flags) :
-		    (islink ? (errno = ENOSYS) :
+		    (islink ? lchflags(to.p_path, fs->st_flags) :
 		    chflags(to.p_path, fs->st_flags))) {
 			warn("chflags: %s", to.p_path);
 			rval = 1;

Modified: projects/mesh11s/bin/df/df.1
==============================================================================
--- projects/mesh11s/bin/df/df.1	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/df/df.1	Mon Jun  8 21:58:34 2009	(r193772)
@@ -78,15 +78,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 10 for sizes.
 .It Fl h
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 2 for sizes.
+Inodes statistics, if enabled with
+.Fl i ,
+are always printed in base 10.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

Modified: projects/mesh11s/bin/df/df.c
==============================================================================
--- projects/mesh11s/bin/df/df.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/df/df.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -369,6 +369,23 @@ prthumanval(int64_t bytes)
 }
 
 /*
+ * Print an inode count in "human-readable" format.
+ */
+static void
+prthumanvalinode(int64_t bytes)
+{
+	char buf[6];
+	int flags;
+
+	flags = HN_NOSPACE | HN_DECIMAL | HN_DIVISOR_1000;
+
+	humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
+	    bytes, "", HN_AUTOSCALE, flags);
+
+	(void)printf(" %5s", buf);
+}
+
+/*
  * Convert statfs returned file system size into BLOCKSIZE units.
  * Attempts to avoid overflow for large file systems.
  */
@@ -413,8 +430,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
-			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
-			mwp->ifree = imax(mwp->ifree, (int)strlen("ifree"));
+			mwp->iused = imax(hflag ? 0 : mwp->iused,
+			    (int)strlen("  iused"));
+			mwp->ifree = imax(hflag ? 0 : mwp->ifree,
+			    (int)strlen("ifree"));
 			(void)printf(" %*s %*s %%iused",
 			    mwp->iused - 2, "iused", mwp->ifree, "ifree");
 		}
@@ -440,8 +459,15 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used,
-		    mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 :
+		if (hflag) {
+			(void)printf("  ");
+			prthumanvalinode(used);
+			prthumanvalinode(sfsp->f_ffree);
+		} else {
+			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			    mwp->ifree, (intmax_t)sfsp->f_ffree);
+		}
+		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
 		    (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");

Modified: projects/mesh11s/bin/ps/print.c
==============================================================================
--- projects/mesh11s/bin/ps/print.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/ps/print.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -596,6 +596,10 @@ elapsed(KINFO *k, VARENT *ve)
 	char obuff[128];
 
 	v = ve->var;
+	if (!k->ki_valid) {
+		(void)printf("%-*s", v->width, "-");
+		return;
+	}
 	val = now - k->ki_p->ki_start.tv_sec;
 	days = val / (24 * 60 * 60);
 	val %= 24 * 60 * 60;

Modified: projects/mesh11s/bin/rm/rm.c
==============================================================================
--- projects/mesh11s/bin/rm/rm.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/rm/rm.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -234,7 +234,7 @@ rm_tree(char **argv)
 			else if (!uid &&
 				 (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 				 !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
-				 chflags(p->fts_accpath,
+				 lchflags(p->fts_accpath,
 					 p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0)
 				goto err;
 			continue;
@@ -253,7 +253,7 @@ rm_tree(char **argv)
 		if (!uid &&
 		    (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(p->fts_accpath,
+			rval = lchflags(p->fts_accpath,
 				       p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			/*
@@ -368,7 +368,7 @@ rm_file(char **argv)
 		if (!uid && !S_ISWHT(sb.st_mode) &&
 		    (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
+			rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			if (S_ISWHT(sb.st_mode))
 				rval = undelete(f);

Modified: projects/mesh11s/bin/sh/alias.c
==============================================================================
--- projects/mesh11s/bin/sh/alias.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/alias.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -97,7 +97,7 @@ setalias(char *name, char *val)
 	ap->val = savestr(val);
 #else /* hack */
 	{
-	int len = strlen(val);
+	size_t len = strlen(val);
 	ap->val = ckmalloc(len + 2);
 	memcpy(ap->val, val, len);
 	ap->val[len] = ' ';	/* fluff */

Modified: projects/mesh11s/bin/sh/eval.c
==============================================================================
--- projects/mesh11s/bin/sh/eval.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/eval.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -83,6 +83,7 @@ MKINIT int evalskip;		/* set if we are s
 STATIC int skipcount;		/* number of levels to skip */
 MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
+STATIC int builtin_flags;	/* evalcommand flags for builtins */
 
 
 char *commandname;
@@ -147,7 +148,7 @@ evalcmd(int argc, char **argv)
                         STPUTC('\0', concat);
                         p = grabstackstr(concat);
                 }
-                evalstring(p);
+                evalstring(p, builtin_flags & EV_TESTED);
         }
         return exitstatus;
 }
@@ -158,7 +159,7 @@ evalcmd(int argc, char **argv)
  */
 
 void
-evalstring(char *s)
+evalstring(char *s, int flags)
 {
 	union node *n;
 	struct stackmark smark;
@@ -167,7 +168,7 @@ evalstring(char *s)
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
 		if (n != NULL)
-			evaltree(n, 0);
+			evaltree(n, flags);
 		popstackmark(&smark);
 	}
 	popfile();
@@ -593,7 +594,7 @@ evalcommand(union node *cmd, int flags, 
 	char *lastarg;
 	int realstatus;
 	int do_clearcmdentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &argv;
 	(void) &argc;
@@ -839,6 +840,7 @@ evalcommand(union node *cmd, int flags, 
 		commandname = argv[0];
 		argptr = argv + 1;
 		optptr = NULL;			/* initialize nextopt */
+		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();
 cmddone:

Modified: projects/mesh11s/bin/sh/eval.h
==============================================================================
--- projects/mesh11s/bin/sh/eval.h	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/eval.h	Mon Jun  8 21:58:34 2009	(r193772)
@@ -46,7 +46,7 @@ struct backcmd {		/* result of evalbackc
 };
 
 int evalcmd(int, char **);
-void evalstring(char *);
+void evalstring(char *, int);
 union node;	/* BLETCH for ansi C */
 void evaltree(union node *, int);
 void evalbackcmd(union node *, struct backcmd *);

Modified: projects/mesh11s/bin/sh/exec.c
==============================================================================
--- projects/mesh11s/bin/sh/exec.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/exec.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -187,7 +187,8 @@ padvance(char **path, char *name)
 	if (*path == NULL)
 		return NULL;
 	start = *path;
-	for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+	for (p = start; *p && *p != ':' && *p != '%'; p++)
+		; /* nothing */
 	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
 	while (stackblocksize() < len)
 		growstackblock();

Modified: projects/mesh11s/bin/sh/histedit.c
==============================================================================
--- projects/mesh11s/bin/sh/histedit.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/histedit.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -350,7 +350,7 @@ histcmd(int argc, char **argv)
 				if (displayhist) {
 					out2str(s);
 				}
-				evalstring(s);
+				evalstring(s, 0);
 				if (displayhist && hist) {
 					/*
 					 *  XXX what about recursive and
@@ -382,7 +382,7 @@ histcmd(int argc, char **argv)
 		fclose(efp);
 		editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
 		sprintf(editcmd, "%s %s", editor, editfile);
-		evalstring(editcmd);	/* XXX - should use no JC command */
+		evalstring(editcmd, 0);	/* XXX - should use no JC command */
 		INTON;
 		readcmdfile(editfile);	/* XXX - should read back - quick tst */
 		unlink(editfile);

Modified: projects/mesh11s/bin/sh/main.c
==============================================================================
--- projects/mesh11s/bin/sh/main.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/main.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -178,7 +178,7 @@ state2:
 state3:
 	state = 4;
 	if (minusc) {
-		evalstring(minusc);
+		evalstring(minusc, 0);
 	}
 	if (sflag || minusc == NULL) {
 state4:	/* XXX ??? - why isn't this before the "if" statement */

Modified: projects/mesh11s/bin/sh/memalloc.c
==============================================================================
--- projects/mesh11s/bin/sh/memalloc.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/memalloc.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  */
 
 pointer
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	pointer p;
 

Modified: projects/mesh11s/bin/sh/memalloc.h
==============================================================================
--- projects/mesh11s/bin/sh/memalloc.h	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/memalloc.h	Mon Jun  8 21:58:34 2009	(r193772)
@@ -33,6 +33,8 @@
  * $FreeBSD$
  */
 
+#include <string.h>
+
 struct stackmark {
 	struct stack_block *stackp;
 	char *stacknxt;
@@ -46,7 +48,7 @@ extern int stacknleft;
 extern int sstrnleft;
 extern int herefd;
 
-pointer ckmalloc(int);
+pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
 char *savestr(char *);

Modified: projects/mesh11s/bin/sh/miscbltin.c
==============================================================================
--- projects/mesh11s/bin/sh/miscbltin.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/miscbltin.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -103,8 +103,6 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
-	struct termios told, tnew;
-	int tsaved;
 
 	rflag = 0;
 	prompt = NULL;
@@ -151,26 +149,11 @@ readcmd(int argc __unused, char **argv _
 
 	if (tv.tv_sec >= 0) {
 		/*
-		 * See if we can disable input processing; this will
-		 * not give the desired result if we are in a pipeline
-		 * and someone upstream is still in line-by-line mode.
-		 */
-		tsaved = 0;
-		if (tcgetattr(0, &told) == 0) {
-			memcpy(&tnew, &told, sizeof(told));
-			cfmakeraw(&tnew);
-			tnew.c_iflag |= told.c_iflag & ICRNL;
-			tcsetattr(0, TCSANOW, &tnew);
-			tsaved = 1;
-		}
-		/*
 		 * Wait for something to become available.
 		 */
 		FD_ZERO(&ifds);
 		FD_SET(0, &ifds);
 		status = select(1, &ifds, NULL, NULL, &tv);
-		if (tsaved)
-			tcsetattr(0, TCSANOW, &told);
 		/*
 		 * If there's nothing ready, return an error.
 		 */

Modified: projects/mesh11s/bin/sh/mkinit.c
==============================================================================
--- projects/mesh11s/bin/sh/mkinit.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/mkinit.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -159,7 +159,7 @@ void addstr(char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
 FILE *ckfopen(char *, char *);
-void *ckmalloc(int);
+void *ckmalloc(size_t);
 char *savestr(char *);
 void error(char *);
 
@@ -464,7 +464,7 @@ ckfopen(char *file, char *mode)
 }
 
 void *
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	char *p;
 

Modified: projects/mesh11s/bin/sh/mksyntax.c
==============================================================================
--- projects/mesh11s/bin/sh/mksyntax.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/mksyntax.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -354,7 +354,7 @@ output_type_macros(void)
 	char **pp;
 
 	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
+		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
 	if (digit_contig)

Modified: projects/mesh11s/bin/sh/parser.c
==============================================================================
--- projects/mesh11s/bin/sh/parser.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/parser.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -898,7 +898,7 @@ readtoken1(int firstc, char const *synta
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &out;
 	(void) &quotef;
@@ -1323,7 +1323,7 @@ parsebackq: {
 	struct jmploc *volatile savehandler;
 	int savelen;
 	int saveprompt;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &saveprompt;
 #endif

Modified: projects/mesh11s/bin/sh/sh.1
==============================================================================
--- projects/mesh11s/bin/sh/sh.1	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/sh.1	Mon Jun  8 21:58:34 2009	(r193772)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd May 31, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1682,6 +1682,7 @@ If
 is given
 it is used as the exit status of the shell;
 otherwise the exit status of the preceding command is used.
+The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p
 The specified names are exported so that they will
@@ -1949,7 +1950,7 @@ If the
 .Fl t
 option is specified and the
 .Ar timeout
-elapses before any input is supplied,
+elapses before a complete line of input is supplied,
 the
 .Ic read
 command will return an exit status of 1 without assigning any values.

Modified: projects/mesh11s/bin/sh/trap.c
==============================================================================
--- projects/mesh11s/bin/sh/trap.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/trap.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -416,7 +416,7 @@ dotrap(void)
 					if (i == SIGCHLD)
 						ignore_sigchld++;
 					savestatus = exitstatus;
-					evalstring(trap[i]);
+					evalstring(trap[i], 0);
 					exitstatus = savestatus;
 					if (i == SIGCHLD)
 						ignore_sigchld--;
@@ -471,7 +471,7 @@ exitshell(int status)
 	handler = &loc1;
 	if ((p = trap[0]) != NULL && *p != '\0') {
 		trap[0] = NULL;
-		evalstring(p);
+		evalstring(p, 0);
 	}
 l1:   handler = &loc2;			/* probably unnecessary */
 	flushall();

Modified: projects/mesh11s/bin/sh/var.c
==============================================================================
--- projects/mesh11s/bin/sh/var.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/sh/var.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -195,7 +195,7 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
 	int err = 0;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &err;
 #endif

Modified: projects/mesh11s/bin/test/TEST.sh
==============================================================================
--- projects/mesh11s/bin/test/TEST.sh	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/test/TEST.sh	Mon Jun  8 21:58:34 2009	(r193772)
@@ -133,5 +133,45 @@ t 0 '"a" -a ! ""'
 t 1 '""'
 t 0 '! ""'
 
+t 0 '!'
+t 0 '\('
+t 0 '\)'
+
+t 1 '\( = \)'
+t 0 '\( != \)'
+t 0 '\( ! \)'
+t 0 '\( \( \)'
+t 0 '\( \) \)'
+t 0 '! = !'
+t 1 '! != !'
+t 1 '-n = \)'
+t 0 '! != \)'
+t 1 '! = a'
+t 0 '! != -n'
+t 0 '! -c /etc/passwd'
+
+t 0 '! \( = \)'
+t 1 '! \( != \)'
+t 1 '! = = ='
+t 0 '! = = \)'
+t 0 '! "" -o ""'
+t 1 '! "x" -o ""'
+t 1 '! "" -o "x"'
+t 1 '! "x" -o "x"'
+t 0 '\( -f /etc/passwd \)'
+t 1 '\( ! = \)'
+t 0 '\( ! "" \)'
+t 1 '\( ! -e \)'
+
+t 0 '0 -eq 0 -a -d /'
+t 0 '-s = "" -o "" = ""'
+t 0 '"" = "" -o -s = ""'
+t 1 '-s = "" -o -s = ""'
+t 0 '-z x -o x = "#" -o x = x'
+t 1 '-z y -o y = "#" -o y = x'
+t 0 '0 -ne 0 -o ! -f /'
+t 0 '1 -ne 0 -o ! -f /etc/passwd'
+t 1 '0 -ne 0 -o ! -f /etc/passwd'
+
 echo ""
 echo "Syntax errors: $ERROR Failed: $FAILED"

Modified: projects/mesh11s/bin/test/test.c
==============================================================================
--- projects/mesh11s/bin/test/test.c	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/bin/test/test.c	Mon Jun  8 21:58:34 2009	(r193772)
@@ -163,6 +163,7 @@ struct t_op {
 struct t_op const *t_wp_op;
 int nargc;
 char **t_wp;
+int parenlevel;
 
 static int	aexpr(enum token);
 static int	binop(void);
@@ -171,7 +172,9 @@ static int	filstat(char *, enum token);
 static int	getn(const char *);
 static intmax_t	getq(const char *);
 static int	intcmp(const char *, const char *);
-static int	isoperand(void);
+static int	isunopoperand(void);
+static int	islparenoperand(void);
+static int	isrparenoperand(void);
 static int	newerf(const char *, const char *);
 static int	nexpr(enum token);
 static int	oexpr(enum token);
@@ -205,7 +208,14 @@ main(int argc, char **argv)
 #endif
 	nargc = argc;
 	t_wp = &argv[1];
-	res = !oexpr(t_lex(*t_wp));
+	parenlevel = 0;
+	if (nargc == 4 && strcmp(*t_wp, "!") == 0) {
+		/* Things like ! "" -o x do not fit in the normal grammar. */
+		--nargc;
+		++t_wp;
+		res = oexpr(t_lex(*t_wp));
+	} else
+		res = !oexpr(t_lex(*t_wp));
 
 	if (--nargc > 0)
 		syntax(*t_wp, "unexpected operator");
@@ -268,12 +278,16 @@ primary(enum token n)
 	if (n == EOI)
 		return 0;		/* missing expression */
 	if (n == LPAREN) {
+		parenlevel++;
 		if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) ==
-		    RPAREN)
+		    RPAREN) {
+			parenlevel--;
 			return 0;	/* missing expression */
+		}
 		res = oexpr(nn);
 		if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN)
 			syntax(NULL, "closing paren expected");
+		parenlevel--;
 		return res;
 	}
 	if (t_wp_op && t_wp_op->op_type == UNOP) {
@@ -410,8 +424,10 @@ t_lex(char *s)
 	}
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
-			if ((op->op_type == UNOP && isoperand()) ||
-			    (op->op_num == LPAREN && nargc == 1))
+			if (((op->op_type == UNOP || op->op_type == BUNOP)
+						&& isunopoperand()) ||
+			    (op->op_num == LPAREN && islparenoperand()) ||
+			    (op->op_num == RPAREN && isrparenoperand()))
 				break;
 			t_wp_op = op;
 			return op->op_num;
@@ -423,7 +439,7 @@ t_lex(char *s)
 }
 
 static int
-isoperand(void)
+isunopoperand(void)
 {
 	struct t_op const *op = ops;
 	char *s;
@@ -431,19 +447,53 @@ isoperand(void)
 
 	if (nargc == 1)
 		return 1;
-	if (nargc == 2)
-		return 0;
 	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP &&
-			    (t[0] != ')' || t[1] != '\0');
+			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
+		op++;
+	}
+	return 0;
+}
+
+static int
+islparenoperand(void)
+{
+	struct t_op const *op = ops;
+	char *s;
+
+	if (nargc == 1)
+		return 1;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	if (nargc != 3)
+		return 0;
+	while (op->op_text) {
+		if (strcmp(s, op->op_text) == 0)
+			return op->op_type == BINOP;
 		op++;
 	}
 	return 0;
 }
 
+static int
+isrparenoperand(void)
+{
+	char *s;
+
+	if (nargc == 1)
+		return 0;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	return 0;
+}
+
 /* atoi with error detection */
 static int
 getn(const char *s)

Modified: projects/mesh11s/cddl/usr.sbin/Makefile
==============================================================================
--- projects/mesh11s/cddl/usr.sbin/Makefile	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/cddl/usr.sbin/Makefile	Mon Jun  8 21:58:34 2009	(r193772)
@@ -3,6 +3,7 @@
 .include <bsd.own.mk>
 
 SUBDIR=	dtrace \
+	lockstat \
 	${_zdb}
 
 .if ${MK_ZFS} != "no"

Modified: projects/mesh11s/contrib/bind9/CHANGES
==============================================================================
--- projects/mesh11s/contrib/bind9/CHANGES	Mon Jun  8 21:55:18 2009	(r193771)
+++ projects/mesh11s/contrib/bind9/CHANGES	Mon Jun  8 21:58:34 2009	(r193772)
@@ -1,18 +1,258 @@
-	--- 9.4.3-P2 released ---
+
+	--- 9.6.1rc1 released ---
+
+2599.	[bug]		Address rapid memory growth when validation fails.
+			[RT #19654]
+
+2597.	[bug]		Handle a validation failure with a insecure delegation
+			from a NSEC3 signed master/slave zone.  [RT #19464]
+
+2596.	[bug]		Stale tree nodes of cache/dynamic rbtdb could stay
+			long, leading to inefficient memory usage or rejecting
+			newer cache entries in the worst case. [RT #19563]
+
+2595.	[bug]		Fix unknown extended rcodes in dig. [RT #19625]
+
+2592.	[bug]		Treat "any" as a type in nsupdate. [RT #19455]
+
+2591.	[bug]		named could die when processing a update in
+			removed_orphaned_ds(). [RT #19507]
+
+2588.	[bug]		SO_REUSEADDR could be set unconditionally after failure
+			of bind(2) call.  This should be rare and mostly
+			harmless, but may cause interference with other
+			processes that happen to use the same port. [RT #19642]
+
+2586.	[bug]		Missing cleanup of SIG rdataset in searching a DLZ DB
+			or SDB. [RT #19577]
+
+2585.	[bug]		Uninitialized socket name could be referenced via a
+			statistics channel, triggering an assertion failure in
+			XML rendering. [RT #19427]
+
+2584.	[bug]		alpha: gcc optimization could break atomic operations.
+			[RT #19227]
+
+2583.	[port]		netbsd: provide a control to not add the compile
+			date to the version string, -DNO_VERSION_DATE.
+
+2582.	[bug]		Don't emit warning log message when we attempt to
+			remove non-existant journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
 
-	--- 9.4.3-P1 released ---
+2578.	[bug]		Changed default sig-signing-type to 65534, because
+			65535 turns out to be reserved.  [RT #19477]
+
+2499.	[port]		solaris: lib/lwres/getaddrinfo.c namespace clash.
+			[RT #18837]
+
+	--- 9.6.1b1 released ---
+
+2577.	[doc]		Clarified some statistics counters. [RT #19454]
+
+2576.	[bug]		NSEC record were not being correctly signed when
+			a zone transitions from insecure to secure.
+			Handle such incorrectly signed zones. [RT #19114]
+
+2574.	[doc]		Document nsupdate -g and -o. [RT #19351]
+
+2573.	[bug]		Replacing a non-CNAME record with a CNAME record in a
+			single transaction in a signed zone failed. [RT #19397]
+
+2568.	[bug]		Report when the write to indicate a otherwise
+			successful start fails. [RT #19360]
+
+2567.	[bug]		dst__privstruct_writefile() could miss write errors.
+			write_public_key() could miss write errors.
+			dnssec-dsfromkey could miss write errors.
+			[RT #19360]
+
+2564.	[bug]		Only take EDNS fallback steps when processing timeouts.
+			[RT #19405]
+
+2563.	[bug]		Dig could leak a socket causing it to wait forever
+			to exit. [RT #19359]
+
+2562.	[doc]		ARM: miscellaneous improvements, reorganization,
+			and some new content.
+
+2561.	[doc]		Add isc-config.sh(1) man page. [RT #16378]
+
+2560.	[bug]		Add #include <config.h> to iptable.c. [RT #18258]
+
+2559.	[bug]		dnssec-dsfromkey could compute bad DS records when
+			reading from a K* files.  [RT #19357]
+
+2557.	[cleanup]	PCI compliance:
+			* new libisc log module file
+			* isc_dir_chroot() now also changes the working
+			  directory to "/".
+			* additional INSISTs
+			* additional logging when files can't be removed.
+
+2556.	[port]		Solaris: mkdir(2) on tmpfs filesystems does not do the
+			error checks in the correct order resulting in the
+			wrong error code sometimes being returned. [RT #19249]
+			
+2554.	[bug]		Validation of uppercase queries from NSEC3 zones could
+			fail. [RT #19297]
+
+2553.	[bug]		Reference leak on DNSSEC validation errors. [RT #19291]
+
+2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+			[RT #19340]
+
+2551.	[bug]		Potential Reference leak on return. [RT #19341]
+
+2550.	[bug]		Check --with-openssl=<path> finds <openssl/opensslv.h>.
+			[RT #19343]
+
+2549.	[port]		linux: define NR_OPEN if not currently defined.
+			[RT #19344]
+
+2548.	[bug]		Install iterated_hash.h. [RT #19335]
+
+2547.	[bug]		openssl_link.c:mem_realloc() could reference an
+			out-of-range area of the source buffer.  New public
+			function isc_mem_reallocate() was introduced to address
+			this bug. [RT #19313]
+
+2545.	[doc]		ARM: Legal hostname checking (check-names) is
+			for SRV RDATA too. [RT #19304]
+
+2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
+
+2543.	[contrib]	Update contrib/zkt to version 0.98. [RT #19113]
+
+2542.	[doc]		Update the description of dig +adflag. [RT #19290]
+
+2541.	[bug]		Conditionally update dispatch manager statistics.
+			[RT #19247]
+
+2539.	[security]	Update the interaction between recursion, allow-query,
+			allow-query-cache and allow-recursion.  [RT #19198]
+
+2538.	[bug]		cache/ADB memory could grow over max-cache-size,
+			especially with threads and smaller max-cache-size
+			values. [RT #19240]
+
+2537.	[experimental]	Added more statistics counters including those on socket
+			I/O events and query RTT histograms. [RT #18802]
+
+2536.	[cleanup]	Silence some warnings when -Werror=format-security is
+			specified. [RT #19083]
+
+2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+
+2532.	[bug]		dig: check the question section of the response to
+			see if it matches the asked question. [RT #18495]
+
+2531.	[bug]		Change #2207 was incomplete. [RT #19098]
+
+2530.	[bug]		named failed to reject insecure to secure transitions
+			via UPDATE. [RT #19101]
+
+2529.	[cleanup]	Upgrade libtool to silence complaints from recent
+			version of autoconf. [RT #18657]
+
+2528.   [cleanup]       Silence spurious configure warning about
+                        --datarootdir [RT #19096]
+
+2527.	[bug]		named could reuse cache on reload with
+			enabling/disabling validation. [RT #19119]
+
+2525.	[experimental]	New logging category "query-errors" to provide detailed
+			internal information about query failures, especially
+			about server failures. [RT #19027]
+
+2524.	[port]		sunos: dnssec-signzone needs strtoul(). [RT #19129]
+
+2523.	[bug]		Random type rdata freed by dns_nsec_typepresent().
+			[RT #19112]
+
+2522.	[security]	Handle -1 from DSA_do_verify() and EVP_VerifyFinal().
+
+2521.	[bug]		Improve epoll cross compilation support. [RT #19047]
+
+2519.	[bug]		dig/host with -4 or -6 didn't work if more than two
+			nameserver addresses of the excluded address family
+			preceded in resolv.conf. [RT #19081]
+
+2517.	[bug]		dig +trace with -4 or -6 failed when it chose a
+			nameserver address of the excluded address.
+			[RT #18843]
+
+2516.	[bug]		glue sort for responses was performed even when not
+			needed. [RT #19039]
+
+2514.	[bug]		dig/host failed with -4 or -6 when resolv.conf contains
+			a nameserver of the excluded address family.
+			[RT #18848]
+
+2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
+			[RT #18885]
+
+2506.	[port]		solaris: Check at configure time if 
+			hack_shutup_pthreadonceinit is needed. [RT #19037]
+
+2505.	[port]		Treat amd64 similarly to x86_64 when determining
+			atomic operation support. [RT #19031]
+
+2503.	[port]		linux: improve compatibility with Linux Standard
+			Base. [RT #18793]
+
+2502.	[cleanup]	isc_radix: Improve compliance with coding style,

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 04:58:16 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AF1E106567E;
	Tue,  9 Jun 2009 04:58:16 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F65C8FC15;
	Tue,  9 Jun 2009 04:58:16 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n594wGYn056206;
	Tue, 9 Jun 2009 04:58:16 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n594wGZk056204;
	Tue, 9 Jun 2009 04:58:16 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906090458.n594wGZk056204@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 9 Jun 2009 04:58:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193806 - projects/ngroups/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 04:58:16 -0000

Author: brooks
Date: Tue Jun  9 04:58:15 2009
New Revision: 193806
URL: http://svn.freebsd.org/changeset/base/193806

Log:
  Set NGROUPS_MAX to be 1023 since it should be the number of
  _supplemental_ groups and thus getgroups() should return up to
  NGROUPS_MAX+1 results on FreeBSD (ignoring for the moment the fact
  that NGROUPS_MAX isn't actually a maximum value under POSIX).  This
  limits waste in naive applications to a single page.
  
  Set NGROUPS to NGROUPS_MAX+1 to properly reflect the in-kernel space
  requirements.

Modified:
  projects/ngroups/sys/sys/param.h
  projects/ngroups/sys/sys/syslimits.h

Modified: projects/ngroups/sys/sys/param.h
==============================================================================
--- projects/ngroups/sys/sys/param.h	Tue Jun  9 04:39:47 2009	(r193805)
+++ projects/ngroups/sys/sys/param.h	Tue Jun  9 04:58:15 2009	(r193806)
@@ -77,7 +77,7 @@
 #define	MAXLOGNAME	17		/* max login name length (incl. NUL) */
 #define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
 #define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
+#define	NGROUPS		NGROUPS_MAX+1	/* max number groups */
 #define	NOFILE		OPEN_MAX	/* max open files per process */
 #define	NOGROUP		65535		/* marker for empty group set member */
 #define MAXHOSTNAMELEN	256		/* max hostname size */

Modified: projects/ngroups/sys/sys/syslimits.h
==============================================================================
--- projects/ngroups/sys/sys/syslimits.h	Tue Jun  9 04:39:47 2009	(r193805)
+++ projects/ngroups/sys/sys/syslimits.h	Tue Jun  9 04:58:15 2009	(r193806)
@@ -54,7 +54,9 @@
 #define	MAX_CANON		  255	/* max bytes in term canon input line */
 #define	MAX_INPUT		  255	/* max bytes in terminal input */
 #define	NAME_MAX		  255	/* max bytes in a file name */
-#define	NGROUPS_MAX	 	32767	/* max supplemental group id's */
+#ifndef NGROUPS_MAX
+#define	NGROUPS_MAX	 	 1023	/* max supplemental group id's */
+#endif
 #ifndef OPEN_MAX
 #define	OPEN_MAX		   64	/* max open files per process */
 #endif

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 10:56:41 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC7C4106566C;
	Tue,  9 Jun 2009 10:56:41 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBBB58FC18;
	Tue,  9 Jun 2009 10:56:41 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59AufR0068380;
	Tue, 9 Jun 2009 10:56:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59Auffv068379;
	Tue, 9 Jun 2009 10:56:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091056.n59Auffv068379@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 10:56:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193822 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 10:56:42 -0000

Author: rpaulo
Date: Tue Jun  9 10:56:41 2009
New Revision: 193822
URL: http://svn.freebsd.org/changeset/base/193822

Log:
  HWMP seq numbers are 32 bit.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:17:22 2009	(r193821)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:56:41 2009	(r193822)
@@ -31,26 +31,29 @@
 #ifndef _NET80211_IEEE80211_HWMP_H_
 #define _NET80211_IEEE80211_HWMP_H_
 
+/* HWMP sequence numbers are 32 bit, so we can't use ieee80211_seq */
+typedef ieee80211_hwmp_seq uint32_t;
+
 /*
  * HWMP Forwarding Information table, part of each VAP.
  */
 struct ieee80211_hwmp_fi {
 	TAILQ_ENTRY(ieee80211_hwmp_fi) fi_next;
-	uint8_t		fi_dest[IEEE80211_ADDR_LEN];
-	ieee80211_seq	fi_seq;			/* HWMP sequence number */
-	ieee80211_seq	fi_preqid;		/* Last PREQ ID seen */
-	uint8_t		fi_nexthop[IEEE80211_ADDR_LEN];
-	uint32_t	fi_metric;		/* Path Metric */
-	uint32_t	fi_nhops;		/* Number of Hops */
-	uint8_t		fi_prevhop[IEEE80211_ADDR_LEN];
-	uint32_t	fi_lifetime;
+	uint8_t			fi_dest[IEEE80211_ADDR_LEN];
+	ieee80211_hwmp_seq	fi_seq;		/* HWMP sequence number */
+	ieee80211_hwmp_seq	fi_preqid;	/* Last PREQ ID seen */
+	uint8_t			fi_nexthop[IEEE80211_ADDR_LEN];
+	uint32_t		fi_metric;	/* Path Metric */
+	uint32_t		fi_nhops;	/* Number of Hops */
+	uint8_t			fi_prevhop[IEEE80211_ADDR_LEN];
+	uint32_t		fi_lifetime;
 };
 
 #ifdef _KERNEL
 struct ieee80211_hwmp_state {
 	TAILQ_HEAD(, ieee80211_hwmp_fi)	hs_head;
-	ieee80211_seq			hs_seq;	   /* next seq to be used */
-	ieee80211_seq			hs_preqid; /* next PREQ ID to be used */
+	ieee80211_hwmp_seq		hs_seq;	   /* next seq to be used */
+	ieee80211_hwmp_seq		hs_preqid; /* next PREQ ID to be used */
 	struct mtx			hs_lock;   /* lock for the fi table */
 };
 

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 11:21:36 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB9A51065672;
	Tue,  9 Jun 2009 11:21:36 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA80C8FC24;
	Tue,  9 Jun 2009 11:21:36 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59BLaUC068917;
	Tue, 9 Jun 2009 11:21:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59BLauA068912;
	Tue, 9 Jun 2009 11:21:36 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091121.n59BLauA068912@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 11:21:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193823 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 11:21:37 -0000

Author: rpaulo
Date: Tue Jun  9 11:21:36 2009
New Revision: 193823
URL: http://svn.freebsd.org/changeset/base/193823

Log:
  Properly implement mesh sequence numbers.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h
  projects/mesh11s/sys/net80211/ieee80211_output.c
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -32,7 +32,7 @@
 #define _NET80211_IEEE80211_HWMP_H_
 
 /* HWMP sequence numbers are 32 bit, so we can't use ieee80211_seq */
-typedef ieee80211_hwmp_seq uint32_t;
+typedef uint32_t ieee80211_hwmp_seq;
 
 /*
  * HWMP Forwarding Information table, part of each VAP.

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 11:21:36 2009	(r193823)
@@ -120,6 +120,7 @@ static void
 mesh_vdetach(struct ieee80211vap *vap)
 {
 	ieee80211_hwmp_vdetach(vap);
+	vap->iv_meshseq = 0;
 }
 
 static void
@@ -1274,14 +1275,6 @@ ieee80211_create_mbss(struct ieee80211va
 	ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
 }
 
-uint32_t
-ieee80211_mesh_getseq(void)
-{
-	static uint32_t seq = 0;
-	
-	return seq++;
-}
-
 static int
 mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -387,6 +387,5 @@ uint32_t	ieee80211_airtime_calc(struct i
 uint8_t *	ieee80211_add_meshlmetric(uint8_t *, uint32_t);
 void		ieee80211_create_mbss(struct ieee80211vap *, struct
 		    ieee80211_channel *);
-uint32_t	ieee80211_mesh_getseq(void);
 #endif /* _KERNEL */
 #endif /* !_NET80211_IEEE80211_MESH_H_ */

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 11:21:36 2009	(r193823)
@@ -1250,6 +1250,7 @@ ieee80211_encap(struct ieee80211vap *vap
 	struct ieee80211_meshcntl_ae11 *mc;
 	uint32_t seq;
 	uint8_t *qos;
+	extern uint32_t ieee80211_mesh_ttl;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The
@@ -1473,8 +1474,8 @@ ieee80211_encap(struct ieee80211vap *vap
 			KASSERT(0, ("meshae %d", meshae));
 			break;
 		}
-		mc->mc_ttl = 160;
-		seq = ieee80211_mesh_getseq();
+		mc->mc_ttl = ieee80211_mesh_ttl;
+		seq = vap->iv_meshseq++;
 		mc->mc_seq[0] = seq & 0xff;
 		mc->mc_seq[1] = (seq >> 8) & 0xff;
 		mc->mc_seq[2] = (seq >> 16) & 0xff;

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 10:56:41 2009	(r193822)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 11:21:36 2009	(r193823)
@@ -395,6 +395,7 @@ struct ieee80211vap {
 	int			iv_csa_count;	/* count for doing CSA */
 	int			iv_meshidlen;
 	uint8_t			iv_meshid[IEEE80211_MESHID_LEN];
+	uint32_t		iv_meshseq;
 
 	struct ieee80211_node	*iv_bss;	/* information for this node */
 	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 11:39:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAB791065674;
	Tue,  9 Jun 2009 11:39:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9999B8FC16;
	Tue,  9 Jun 2009 11:39:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59BdNMR069657;
	Tue, 9 Jun 2009 11:39:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59BdNqP069656;
	Tue, 9 Jun 2009 11:39:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091139.n59BdNqP069656@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 11:39:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193825 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 11:39:24 -0000

Author: rpaulo
Date: Tue Jun  9 11:39:23 2009
New Revision: 193825
URL: http://svn.freebsd.org/changeset/base/193825

Log:
  Move the extern from previous commit to a proper place.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 11:31:47 2009	(r193824)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Tue Jun  9 11:39:23 2009	(r193825)
@@ -73,6 +73,8 @@ __FBSDID("$FreeBSD$");
 #define	ETHER_HEADER_COPY(dst, src) \
 	memcpy(dst, src, sizeof(struct ether_header))
 
+extern uint32_t ieee80211_mesh_ttl;
+
 static int ieee80211_fragment(struct ieee80211vap *, struct mbuf *,
 	u_int hdrsize, u_int ciphdrsize, u_int mtu);
 static	void ieee80211_tx_mgt_cb(struct ieee80211_node *, void *, int);
@@ -1250,7 +1252,6 @@ ieee80211_encap(struct ieee80211vap *vap
 	struct ieee80211_meshcntl_ae11 *mc;
 	uint32_t seq;
 	uint8_t *qos;
-	extern uint32_t ieee80211_mesh_ttl;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 13:50:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B15A3106567E;
	Tue,  9 Jun 2009 13:50:17 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C1078FC24;
	Tue,  9 Jun 2009 13:50:17 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59DoH64072982;
	Tue, 9 Jun 2009 13:50:17 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59DoGA5072964;
	Tue, 9 Jun 2009 13:50:16 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906091350.n59DoGA5072964@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 9 Jun 2009 13:50:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193830 - in projects/ngroups/sys: contrib/pf/net
	fs/nfs gnu/fs/xfs gnu/fs/xfs/FreeBSD kern netncp netsmb
	nfsclient nfsserver rpc security/audit ufs/ufs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 13:50:18 -0000

Author: brooks
Date: Tue Jun  9 13:50:16 2009
New Revision: 193830
URL: http://svn.freebsd.org/changeset/base/193830

Log:
  Back out the new uses of the cr_gid macro introduced in r193537.  We're
  certaintly not going to split cr_gid out from cr_groups for 8.0.
  
  Also reintroduce a few related comments.

Modified:
  projects/ngroups/sys/contrib/pf/net/pf.c
  projects/ngroups/sys/fs/nfs/nfs_commonport.c
  projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h
  projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c
  projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c
  projects/ngroups/sys/kern/kern_prot.c
  projects/ngroups/sys/kern/vfs_syscalls.c
  projects/ngroups/sys/netncp/ncp_conn.c
  projects/ngroups/sys/netsmb/smb_conn.c
  projects/ngroups/sys/nfsclient/nfs_subs.c
  projects/ngroups/sys/nfsserver/nfs_srvsock.c
  projects/ngroups/sys/rpc/svc_auth.c
  projects/ngroups/sys/rpc/svc_auth_unix.c
  projects/ngroups/sys/security/audit/audit.c
  projects/ngroups/sys/security/audit/audit_arg.c
  projects/ngroups/sys/ufs/ufs/ufs_vnops.c

Modified: projects/ngroups/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/ngroups/sys/contrib/pf/net/pf.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/contrib/pf/net/pf.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -2945,7 +2945,7 @@ pf_socket_lookup(int direction, struct p
 	if (inp_arg != NULL) {
 		INP_LOCK_ASSERT(inp_arg);
 		pd->lookup.uid = inp_arg->inp_cred->cr_uid;
-		pd->lookup.gid = inp_arg->inp_cred->cr_gid;
+		pd->lookup.gid = inp_arg->inp_cred->cr_groups[0];
 		return (1);
 	}
 #endif
@@ -3043,7 +3043,7 @@ pf_socket_lookup(int direction, struct p
 	}
 #ifdef __FreeBSD__
 	pd->lookup.uid = inp->inp_cred->cr_uid;
-	pd->lookup.gid = inp->inp_cred->cr_gid;
+	pd->lookup.gid = inp->inp_cred->cr_groups[0];
 	INP_INFO_RUNLOCK(pi);
 #else
 	pd->lookup.uid = inp->inp_socket->so_euid;

Modified: projects/ngroups/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/ngroups/sys/fs/nfs/nfs_commonport.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/fs/nfs/nfs_commonport.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -290,13 +290,15 @@ nfsrv_atroot(struct vnode *vp, long *ret
 
 /*
  * Set the credentials to refer to root.
+ * If only the various BSDen could agree on whether cr_gid is a separate
+ * field or cr_groups[0]...
  */
 void
 newnfs_setroot(struct ucred *cred)
 {
 
 	cred->cr_uid = 0;
-	cred->cr_gid = 0;
+	cred->cr_groups[0] = 0;
 	cred->cr_ngroups = 1;
 }
 

Modified: projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h	Tue Jun  9 13:50:16 2009	(r193830)
@@ -163,7 +163,7 @@ typedef struct mtx xfs_mutex_t;
  * Cedentials manipulation.
  */
 #define current_fsuid(credp)	(credp)->cr_uid
-#define current_fsgid(credp)	(credp)->cr_gid
+#define current_fsgid(credp)	(credp)->cr_groups[0]
 
 #define PAGE_CACHE_SIZE PAGE_SIZE
 

Modified: projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/gnu/fs/xfs/xfs_inode.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -1124,7 +1124,7 @@ xfs_ialloc(
 	ip->i_d.di_nlink = nlink;
 	ASSERT(ip->i_d.di_nlink == nlink);
 	ip->i_d.di_uid = curthread->td_ucred->cr_uid;
-	ip->i_d.di_gid = curthread->td_ucred->cr_gid;
+	ip->i_d.di_gid = curthread->td_ucred->cr_groups[0];
 	ip->i_d.di_projid = prid;
 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
 

Modified: projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c
==============================================================================
--- projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/gnu/fs/xfs/xfs_vnodeops.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -3379,7 +3379,7 @@ xfs_symlink(
 	 */
 	error = XFS_QM_DQVOPALLOC(mp, dp,
 				  current->td_ucred->cr_uid,
-				  current->td_ucred->cr_gid,
+				  current->td_ucred->cr_groups[0],
 				  prid,
 				  XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
 	if (error)

Modified: projects/ngroups/sys/kern/kern_prot.c
==============================================================================
--- projects/ngroups/sys/kern/kern_prot.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/kern/kern_prot.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -246,11 +246,16 @@ getgid(struct thread *td, struct getgid_
 
 	td->td_retval[0] = td->td_ucred->cr_rgid;
 #if defined(COMPAT_43)
-	td->td_retval[1] = td->td_ucred->cr_gid;
+	td->td_retval[1] = td->td_ucred->cr_groups[0];
 #endif
 	return (0);
 }
 
+/*
+ * Get effective group ID.  The "egid" is groups[0], and could be obtained
+ * via getgroups.  This syscall exists because it is somewhat painful to do
+ * correctly in a library function.
+ */
 #ifndef _SYS_SYSPROTO_H_
 struct getegid_args {
         int     dummy;
@@ -261,7 +266,7 @@ int
 getegid(struct thread *td, struct getegid_args *uap)
 {
 
-	td->td_retval[0] = td->td_ucred->cr_gid;
+	td->td_retval[0] = td->td_ucred->cr_groups[0];
 	return (0);
 }
 
@@ -677,7 +682,7 @@ setgid(struct thread *td, struct setgid_
 	    gid != oldcred->cr_svgid &&		/* allow setgid(saved gid) */
 #endif
 #ifdef POSIX_APPENDIX_B_4_2_2	/* Use BSD-compat clause from B.4.2.2 */
-	    gid != oldcred->cr_gid && /* allow setgid(getegid()) */
+	    gid != oldcred->cr_groups[0] && /* allow setgid(getegid()) */
 #endif
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETGID, 0)) != 0)
 		goto fail;
@@ -689,7 +694,7 @@ setgid(struct thread *td, struct setgid_
 	 */
 	if (
 #ifdef POSIX_APPENDIX_B_4_2_2	/* use the clause from B.4.2.2 */
-	    gid == oldcred->cr_gid ||
+	    gid == oldcred->cr_groups[0] ||
 #endif
 	    /* We are using privs. */
 	    priv_check_cred(oldcred, PRIV_CRED_SETGID, 0) == 0)
@@ -718,7 +723,7 @@ setgid(struct thread *td, struct setgid_
 	 * In all cases permitted cases, we are changing the egid.
 	 * Copy credentials so other references do not see our changes.
 	 */
-	if (oldcred->cr_gid != gid) {
+	if (oldcred->cr_groups[0] != gid) {
 		change_egid(newcred, gid);
 		setsugid(p);
 	}
@@ -764,7 +769,7 @@ setegid(struct thread *td, struct setegi
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETEGID, 0)) != 0)
 		goto fail;
 
-	if (oldcred->cr_gid != egid) {
+	if (oldcred->cr_groups[0] != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -950,12 +955,12 @@ setregid(register struct thread *td, str
 
 	if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid &&
 	    rgid != oldcred->cr_svgid) ||
-	     (egid != (gid_t)-1 && egid != oldcred->cr_gid &&
+	     (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] &&
 	     egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) &&
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETREGID, 0)) != 0)
 		goto fail;
 
-	if (egid != (gid_t)-1 && oldcred->cr_gid != egid) {
+	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -963,9 +968,9 @@ setregid(register struct thread *td, str
 		change_rgid(newcred, rgid);
 		setsugid(p);
 	}
-	if ((rgid != (gid_t)-1 || newcred->cr_gid != newcred->cr_rgid) &&
-	    newcred->cr_svgid != newcred->cr_gid) {
-		change_svgid(newcred, newcred->cr_gid);
+	if ((rgid != (gid_t)-1 || newcred->cr_groups[0] != newcred->cr_rgid) &&
+	    newcred->cr_svgid != newcred->cr_groups[0]) {
+		change_svgid(newcred, newcred->cr_groups[0]);
 		setsugid(p);
 	}
 	p->p_ucred = newcred;
@@ -1096,17 +1101,17 @@ setresgid(register struct thread *td, st
 
 	if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid &&
 	      rgid != oldcred->cr_svgid &&
-	      rgid != oldcred->cr_gid) ||
+	      rgid != oldcred->cr_groups[0]) ||
 	     (egid != (gid_t)-1 && egid != oldcred->cr_rgid &&
 	      egid != oldcred->cr_svgid &&
-	      egid != oldcred->cr_gid) ||
+	      egid != oldcred->cr_groups[0]) ||
 	     (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid &&
 	      sgid != oldcred->cr_svgid &&
-	      sgid != oldcred->cr_gid)) &&
+	      sgid != oldcred->cr_groups[0])) &&
 	    (error = priv_check_cred(oldcred, PRIV_CRED_SETRESGID, 0)) != 0)
 		goto fail;
 
-	if (egid != (gid_t)-1 && oldcred->cr_gid != egid) {
+	if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) {
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
@@ -1175,8 +1180,8 @@ getresgid(register struct thread *td, st
 		error1 = copyout(&cred->cr_rgid,
 		    uap->rgid, sizeof(cred->cr_rgid));
 	if (uap->egid)
-		error2 = copyout(&cred->cr_gid,
-		    uap->egid, sizeof(cred->cr_gid));
+		error2 = copyout(&cred->cr_groups[0],
+		    uap->egid, sizeof(cred->cr_groups[0]));
 	if (uap->sgid)
 		error3 = copyout(&cred->cr_svgid,
 		    uap->sgid, sizeof(cred->cr_svgid));
@@ -2101,7 +2106,7 @@ void
 change_egid(struct ucred *newcred, gid_t egid)
 {
 
-	newcred->cr_gid = egid;
+	newcred->cr_groups[0] = egid;
 }
 
 /*-

Modified: projects/ngroups/sys/kern/vfs_syscalls.c
==============================================================================
--- projects/ngroups/sys/kern/vfs_syscalls.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/kern/vfs_syscalls.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -2128,7 +2128,7 @@ kern_accessat(struct thread *td, int fd,
 		cred = td->td_ucred;
 		tmpcred = crdup(cred);
 		tmpcred->cr_uid = cred->cr_ruid;
-		tmpcred->cr_gid = cred->cr_rgid;
+		tmpcred->cr_groups[0] = cred->cr_rgid;
 		td->td_ucred = tmpcred;
 	} else
 		cred = tmpcred = td->td_ucred;

Modified: projects/ngroups/sys/netncp/ncp_conn.c
==============================================================================
--- projects/ngroups/sys/netncp/ncp_conn.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/netncp/ncp_conn.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -249,7 +249,7 @@ ncp_conn_alloc(struct ncp_conn_args *cap
 	ncp->connid = 0xFFFF;
 	ncp->li = *cap;
 	ncp->nc_group = (cap->group != NCP_DEFAULT_GROUP) ?
-		cap->group : cred->cr_gid;
+		cap->group : cred->cr_groups[0];
 
 	if (cap->retry_count == 0)
 		ncp->li.retry_count = NCP_RETRY_COUNT;

Modified: projects/ngroups/sys/netsmb/smb_conn.c
==============================================================================
--- projects/ngroups/sys/netsmb/smb_conn.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/netsmb/smb_conn.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -416,7 +416,7 @@ smb_vc_create(struct smb_vcspec *vcspec,
 	if (uid == SMBM_ANY_OWNER)
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
-		gid = cred->cr_gid;
+		gid = cred->cr_groups[0];
 	vcp->vc_uid = uid;
 	vcp->vc_grp = gid;
 
@@ -714,7 +714,7 @@ smb_share_create(struct smb_vc *vcp, str
 	if (uid == SMBM_ANY_OWNER)
 		uid = realuid;
 	if (gid == SMBM_ANY_GROUP)
-		gid = cred->cr_gid;
+		gid = cred->cr_groups[0];
 	ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK);
 	smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss ilock", "smbss");
 	ssp->obj.co_free = smb_share_free;

Modified: projects/ngroups/sys/nfsclient/nfs_subs.c
==============================================================================
--- projects/ngroups/sys/nfsclient/nfs_subs.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/nfsclient/nfs_subs.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -253,7 +253,7 @@ nfsm_rpchead(struct ucred *cr, int nmfla
 		*tl++ = 0;		/* stamp ?? */
 		*tl++ = 0;		/* NULL hostname */
 		*tl++ = txdr_unsigned(cr->cr_uid);
-		*tl++ = txdr_unsigned(cr->cr_gid);
+		*tl++ = txdr_unsigned(cr->cr_groups[0]);
 		grpsiz = (auth_len >> 2) - 5;
 		*tl++ = txdr_unsigned(grpsiz);
 		for (i = 1; i <= grpsiz; i++)

Modified: projects/ngroups/sys/nfsserver/nfs_srvsock.c
==============================================================================
--- projects/ngroups/sys/nfsserver/nfs_srvsock.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/nfsserver/nfs_srvsock.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -358,7 +358,7 @@ nfs_getreq(struct nfsrv_descript *nd, st
 		tl = nfsm_dissect_nonblock(u_int32_t *, 3 * NFSX_UNSIGNED);
 		nd->nd_cr->cr_uid = nd->nd_cr->cr_ruid =
 		    nd->nd_cr->cr_svuid = fxdr_unsigned(uid_t, *tl++);
-		nd->nd_cr->cr_gid = nd->nd_cr->cr_rgid =
+		nd->nd_cr->cr_groups[0] = nd->nd_cr->cr_rgid =
 		    nd->nd_cr->cr_svgid = fxdr_unsigned(gid_t, *tl++);
 #ifdef MAC
 		mac_cred_associate_nfsd(nd->nd_cr);

Modified: projects/ngroups/sys/rpc/svc_auth.c
==============================================================================
--- projects/ngroups/sys/rpc/svc_auth.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/rpc/svc_auth.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -178,7 +178,7 @@ svc_getcred(struct svc_req *rqst, struct
 		cr = crget();
 		cr->cr_uid = cr->cr_ruid = cr->cr_svuid = xcr->cr_uid;
 		crsetgroups(cr, xcr->cr_ngroups, xcr->cr_groups);
-		cr->cr_rgid = cr->cr_svgid = cr->cr_gid;
+		cr->cr_rgid = cr->cr_svgid = cr->cr_groups[0];
 		*crp = cr;
 		return (TRUE);
 

Modified: projects/ngroups/sys/rpc/svc_auth_unix.c
==============================================================================
--- projects/ngroups/sys/rpc/svc_auth_unix.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/rpc/svc_auth_unix.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -88,7 +88,7 @@ _svcauth_unix(struct svc_req *rqst, stru
 		str_len = RNDUP(str_len);
 		buf += str_len / sizeof (int32_t);
 		xcr->cr_uid = IXDR_GET_UINT32(buf);
-		xcr->cr_gid = IXDR_GET_UINT32(buf);
+		xcr->cr_groups[0] = IXDR_GET_UINT32(buf);
 		gid_len = (size_t)IXDR_GET_UINT32(buf);
 		if (gid_len > NGRPS) {
 			stat = AUTH_BADCRED;

Modified: projects/ngroups/sys/security/audit/audit.c
==============================================================================
--- projects/ngroups/sys/security/audit/audit.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/security/audit/audit.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -224,7 +224,7 @@ audit_record_ctor(void *mem, int size, v
 	cru2x(cred, &ar->k_ar.ar_subj_cred);
 	ar->k_ar.ar_subj_ruid = cred->cr_ruid;
 	ar->k_ar.ar_subj_rgid = cred->cr_rgid;
-	ar->k_ar.ar_subj_egid = cred->cr_gid;
+	ar->k_ar.ar_subj_egid = cred->cr_groups[0];
 	ar->k_ar.ar_subj_auid = cred->cr_audit.ai_auid;
 	ar->k_ar.ar_subj_asid = cred->cr_audit.ai_asid;
 	ar->k_ar.ar_subj_pid = td->td_proc->p_pid;

Modified: projects/ngroups/sys/security/audit/audit_arg.c
==============================================================================
--- projects/ngroups/sys/security/audit/audit_arg.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/security/audit/audit_arg.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -369,7 +369,7 @@ audit_arg_process(struct proc *p)
 	cred = p->p_ucred;
 	ar->k_ar.ar_arg_auid = cred->cr_audit.ai_auid;
 	ar->k_ar.ar_arg_euid = cred->cr_uid;
-	ar->k_ar.ar_arg_egid = cred->cr_gid;
+	ar->k_ar.ar_arg_egid = cred->cr_groups[0];
 	ar->k_ar.ar_arg_ruid = cred->cr_ruid;
 	ar->k_ar.ar_arg_rgid = cred->cr_rgid;
 	ar->k_ar.ar_arg_asid = cred->cr_audit.ai_asid;

Modified: projects/ngroups/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- projects/ngroups/sys/ufs/ufs/ufs_vnops.c	Tue Jun  9 13:44:17 2009	(r193829)
+++ projects/ngroups/sys/ufs/ufs/ufs_vnops.c	Tue Jun  9 13:50:16 2009	(r193830)
@@ -1475,7 +1475,7 @@ ufs_mkdir(ap)
 				refcount_init(&ucred.cr_ref, 1);
 				ucred.cr_uid = ip->i_uid;
 				ucred.cr_ngroups = 1;
-				ucred.cr_gid = dp->i_gid;
+				ucred.cr_groups[0] = dp->i_gid;
 				ucp = &ucred;
 			}
 #endif
@@ -2294,7 +2294,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 			ucred.cr_uid = ip->i_uid;
 			ucred.cr_ngroups = 1;
 			ucred.cr_groups = &ucred_group;
-			ucred.cr_gid = pdir->i_gid;
+			ucred.cr_groups[0] = pdir->i_gid;
 			ucp = &ucred;
 #endif
 		} else {

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 14:18:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32400106564A;
	Tue,  9 Jun 2009 14:18:17 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 200838FC19;
	Tue,  9 Jun 2009 14:18:17 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59EIHfs073719;
	Tue, 9 Jun 2009 14:18:17 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59EIGGD073717;
	Tue, 9 Jun 2009 14:18:16 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906091418.n59EIGGD073717@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 9 Jun 2009 14:18:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193832 - projects/ngroups/lib/libc/gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 14:18:17 -0000

Author: brooks
Date: Tue Jun  9 14:18:16 2009
New Revision: 193832
URL: http://svn.freebsd.org/changeset/base/193832

Log:
  Fix some style bugs and return the right error.  Also, document the new
  out of memory error condition.

Modified:
  projects/ngroups/lib/libc/gen/initgroups.3
  projects/ngroups/lib/libc/gen/initgroups.c

Modified: projects/ngroups/lib/libc/gen/initgroups.3
==============================================================================
--- projects/ngroups/lib/libc/gen/initgroups.3	Tue Jun  9 14:07:29 2009	(r193831)
+++ projects/ngroups/lib/libc/gen/initgroups.3	Tue Jun  9 14:18:16 2009	(r193832)
@@ -65,6 +65,13 @@ function may fail and set
 .Va errno
 for any of the errors specified for the library function
 .Xr setgroups 2 .
+It may also return:
+.Bl -tag -width Er
+.It Bq Er ENOMEM
+The
+.Fn initgroups
+function was unable to allocate temporary storage.
+.El
 .Sh SEE ALSO
 .Xr setgroups 2 ,
 .Xr getgrouplist 3

Modified: projects/ngroups/lib/libc/gen/initgroups.c
==============================================================================
--- projects/ngroups/lib/libc/gen/initgroups.c	Tue Jun  9 14:07:29 2009	(r193831)
+++ projects/ngroups/lib/libc/gen/initgroups.c	Tue Jun  9 14:18:16 2009	(r193832)
@@ -35,12 +35,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include "namespace.h"
 #include <err.h>
 #include "un-namespace.h"
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int
@@ -56,12 +56,11 @@ initgroups(uname, agroup)
 	 * setgroups to fail and set errno.
 	 */
 	ngroups = sysconf(_SC_NGROUPS_MAX) + 1;
-	groups = malloc(sizeof(gid_t)*ngroups);
-	if (groups == NULL)
-		return (ENOSPC);
+	if ((groups = malloc(sizeof(*groups) * ngroups)) == NULL)
+		return (ENOMEM);
 
 	getgrouplist(uname, agroup, groups, &ngroups);
 	ret = setgroups(ngroups, groups);
 	free(groups);
-	return(ret);
+	return (ret);
 }

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 15:03:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E2751065689;
	Tue,  9 Jun 2009 15:03:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A4608FC21;
	Tue,  9 Jun 2009 15:03:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59F3Mx8075185;
	Tue, 9 Jun 2009 15:03:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59F3Mjs075180;
	Tue, 9 Jun 2009 15:03:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091503.n59F3Mjs075180@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 15:03:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193834 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 15:03:23 -0000

Author: rpaulo
Date: Tue Jun  9 15:03:22 2009
New Revision: 193834
URL: http://svn.freebsd.org/changeset/base/193834

Log:
  * properly setup and send the mesh conf IE; this breaks linux
  compatibility
  * verify mesh conf IE on peer link establishment
  * move forwarding sysctl to a per vap ioctl
  * implement accept peerings flag that will enable disable peering
  * add ioctls for peering and fowarding bits
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c
  projects/mesh11s/sys/net80211/ieee80211_ioctl.h
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Tue Jun  9 14:26:23 2009	(r193833)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Tue Jun  9 15:03:22 2009	(r193834)
@@ -144,7 +144,6 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo
 #endif
 
 extern int	ieee80211_mesh_ttl;
-extern int	ieee80211_mesh_forwarding;
 
 void
 ieee80211_hwmp_vattach(struct ieee80211vap *vap)
@@ -486,7 +485,7 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 	 * forwarding is disabled, discard this PREQ.
 	 */
 	if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0)) &&
-	    !ieee80211_mesh_forwarding) {
+	    !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 		    preq->preq_origaddr, NULL, "%s", "not accepting PREQ");
 		return;
@@ -675,7 +674,7 @@ hwmp_recv_prep(struct ieee80211vap *vap,
 	 * forwarding is disabled, discard this PREP.
 	 */
 	if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, prep->prep_origaddr) &&
-	    !ieee80211_mesh_forwarding)
+	    !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD))
 		return;
 
 	/*
@@ -753,7 +752,7 @@ hwmp_recv_perr(struct ieee80211vap *vap,
 	 */
 	if (ni == vap->iv_bss ||
 	    ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED ||
-	    !ieee80211_mesh_forwarding)
+	    !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD))
 		return;
 
 	mtx_lock(&hs->hs_lock);
@@ -833,7 +832,8 @@ hwmp_recv_rann(struct ieee80211vap *vap,
 	 * We have a path for this Root Mesh station, so
 	 * propagate the RANN if forwarding is enabled.
 	 */
-	} else if (rann->rann_ttl > 1 && ieee80211_mesh_forwarding) {
+	} else if (rann->rann_ttl > 1 &&
+	    (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) {
 		struct ieee80211_meshrann_ie prann;
 
 		memcpy(&prann, rann, sizeof(prann));
@@ -956,11 +956,11 @@ hwmp_ioctl_get80211(struct ieee80211vap 
 	struct ieee80211_hwmp_fi *fi;
 	uint8_t *p;
 
+	if (vap->iv_opmode != IEEE80211_M_MBSS)
+		return EINVAL;
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_HWMP_TABLE:
-		if (vap->iv_opmode != IEEE80211_M_MBSS)
-			return EINVAL;
 		hs = vap->iv_hwmp;
 		len = 0;
 		mtx_lock(&hs->hs_lock);
@@ -999,11 +999,12 @@ hwmp_ioctl_set80211(struct ieee80211vap 
 {
 	int error;
 
+	if (vap->iv_opmode != IEEE80211_M_MBSS)
+		return EINVAL;
+
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_HWMP_TABLE:
-		if (vap->iv_opmode != IEEE80211_M_MBSS)
-			return EINVAL;
 	default:
 		return ENOSYS;
 	}

Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ioctl.h	Tue Jun  9 14:26:23 2009	(r193833)
+++ projects/mesh11s/sys/net80211/ieee80211_ioctl.h	Tue Jun  9 15:03:22 2009	(r193834)
@@ -641,6 +641,8 @@ struct ieee80211req {
 #define	IEEE80211_IOC_STBC		113	/* STBC Tx/RX (on, off) */
 
 #define	IEEE80211_IOC_MESH_ID		190	/* Mesh identifier */
+#define	IEEE80211_IOC_MESH_AP		191	/* Accepting Peerings */
+#define	IEEE80211_IOC_MESH_FWRD		192	/* Forward frames */
 #define	IEEE80211_IOC_HWMP_TABLE	195	/* HWMP Forwarding Table */
 
 #define	IEEE80211_IOC_TDMA_SLOT		201	/* TDMA: assigned slot */

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 14:26:23 2009	(r193833)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 15:03:22 2009	(r193834)
@@ -87,14 +87,11 @@ static const int ieee80211_mesh_confirmt
 #define	CONFIRM_TIMEOUT	msecs_to_ticks(ieee80211_mesh_confirmtimeout)
 static const int ieee80211_mesh_maxretries = 2;
 int		ieee80211_mesh_ttl = 31;
-int		ieee80211_mesh_forwarding = 1;
 
 SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
     "IEEE 802.11s parameters");
 SYSCTL_INT(_net_wlan_mesh, OID_AUTO, ttl, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_ttl, 0, "TTL for mesh packets");
-SYSCTL_INT(_net_wlan_mesh, OID_AUTO, forwarding, CTLTYPE_INT | CTLFLAG_RW,
-    &ieee80211_mesh_forwarding, 0, "Forward mesh packets");
 
 static const char *nodemeshstates[] = {
 	"IDLE",
@@ -121,6 +118,7 @@ mesh_vdetach(struct ieee80211vap *vap)
 {
 	ieee80211_hwmp_vdetach(vap);
 	vap->iv_meshseq = 0;
+	vap->iv_meshflags = (IEEE80211_MFLAGS_AP | IEEE80211_MFLAGS_FWRD);
 }
 
 static void
@@ -1039,19 +1037,19 @@ mesh_verify_meshid(struct ieee80211vap *
 	return memcmp(vap->iv_meshid, (uint8_t *)&meshid[1], vap->iv_meshidlen);
 }
 
+/*
+ * Check if we are using the same algorithms for this mesh.
+ */
 static int
 mesh_verify_meshconf(struct ieee80211vap *vap,
     struct ieee80211_meshconf_ie *meshconf)
 {
-#ifdef notyet
 	static const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
 	static const uint8_t hwmp[4] = IEEE80211_MESHCONF_HWMP;
 	static const uint8_t airtime[4] = IEEE80211_MESHCONF_AIRTIME;
-#endif
+
 	if (meshconf == NULL)
 		return 1;
-
-#ifdef notyet
 	if (meshconf->conf_ver != IEEE80211_MESHCONF_VERSION)
 		return 1;
 	if (memcmp(meshconf->conf_pselid, hwmp, 4) != 0)
@@ -1064,7 +1062,9 @@ mesh_verify_meshconf(struct ieee80211vap
 		return 1;
 	if (memcmp(meshconf->conf_authid, null, 4) != 0)
 		return 1;
-#endif
+	/* Not accepting peers */
+	if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP))
+		return 1;
 	return 0;
 }
 
@@ -1097,6 +1097,19 @@ ieee80211_add_meshid(uint8_t *frm, struc
 }
 
 /*
+ * Helper function to find the number of mesh neighbors.
+ */
+static void
+meshconf_neighbors(void *arg, struct ieee80211_node *ni)
+{
+	uint8_t *neighbors = arg;
+
+	/* NB: avoid overflow */
+	if (*neighbors < 15 &&
+	    ni->ni_mlstate == IEEE80211_NODE_MESH_ESTABLISHED)
+		(*neighbors)++;
+}
+/*
  * Add a Mesh Configuration IE to a frame.
  * For now just use HWMP routing, Airtime link metric, Null Congestion
  * Signaling, Null Sync Protocol and Null Authentication.
@@ -1104,20 +1117,34 @@ ieee80211_add_meshid(uint8_t *frm, struc
 uint8_t *
 ieee80211_add_meshconf(uint8_t *frm, struct ieee80211vap *vap)
 {
-	static const struct ieee80211_meshconf_ie ie = {
+	uint8_t neighs = 0;
+	struct ieee80211_meshconf_ie ie = {
 		.conf_ie	= IEEE80211_ELEMID_MESHCONF,
 		.conf_len	= sizeof(struct ieee80211_meshconf_ie) - 2,
 		.conf_ver 	= IEEE80211_MESHCONF_VERSION,
 		.conf_pselid	= IEEE80211_MESHCONF_HWMP,
 		.conf_pmetid	= IEEE80211_MESHCONF_AIRTIME,
 		.conf_ccid	= IEEE80211_MESHCONF_CCSIG,
-		.conf_syncid	= { 0, 0, 0, 0 },	/* XXX */
-		.conf_authid	= { 0x80, 0, 0, 0 },	/* XXX */
-		.conf_form	= 0,	/* XXX */
-		.conf_cap	= 1,	/* XXX */
+		.conf_syncid	= IEEE80211_MESHCONF_NULL,
+		.conf_authid	= IEEE80211_MESHCONF_NULL,
+		/* NB: set below */
+		.conf_form	= 0,
+		.conf_cap	= 0,
 	};
 
 	KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a MBSS vap"));
+
+	/* NB: set the number of neighbors before anything else */
+	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, meshconf_neighbors,
+	    &neighs);
+	ie.conf_form = neighs << 1;
+	if (vap->iv_meshflags & IEEE80211_MFLAGS_MP)
+		ie.conf_form |= IEEE80211_MESHCONF_FORM_MP;
+	if (vap->iv_meshflags & IEEE80211_MFLAGS_AP)
+		ie.conf_cap |= IEEE80211_MESHCONF_CAP_AP;
+	if (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)
+		ie.conf_cap |= IEEE80211_MESHCONF_CAP_FWRD;
+
 	memcpy(frm, &ie, sizeof(ie));
 
 	return frm + sizeof(ie);
@@ -1281,15 +1308,28 @@ mesh_ioctl_get80211(struct ieee80211vap 
 	int error;
 	uint8_t tmpmeshid[IEEE80211_NWID_LEN];
 
+	if (vap->iv_opmode != IEEE80211_M_MBSS)
+		return EINVAL;
+
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_MESH_ID:
-		if (vap->iv_opmode != IEEE80211_M_MBSS)
-			return EINVAL;
 		ireq->i_len = vap->iv_meshidlen;
 		memcpy(tmpmeshid, vap->iv_meshid, ireq->i_len);
 		error = copyout(tmpmeshid, ireq->i_data, ireq->i_len);
 		break;
+	case IEEE80211_IOC_MESH_AP:
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_AP;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_AP;
+		break;
+	case IEEE80211_IOC_MESH_FWRD:
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_FWRD;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_FWRD;
+		break;
 	default:
 		return ENOSYS;
 	}
@@ -1304,6 +1344,9 @@ mesh_ioctl_set80211(struct ieee80211vap 
 	int error;
 	uint8_t tmpmeshid[IEEE80211_NWID_LEN];
 
+	if (vap->iv_opmode != IEEE80211_M_MBSS)
+		return EINVAL;
+
 	error = 0;
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_MESH_ID:
@@ -1316,6 +1359,12 @@ mesh_ioctl_set80211(struct ieee80211vap 
 		vap->iv_meshidlen = ireq->i_len;
 		memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len);
 		break;
+	case IEEE80211_IOC_MESH_AP:
+		ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_AP;
+		break;
+	case IEEE80211_IOC_MESH_FWRD:
+		ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_FWRD;
+		break;
 	default:
 		return ENOSYS;
 	}

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 14:26:23 2009	(r193833)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue Jun  9 15:03:22 2009	(r193834)
@@ -56,17 +56,17 @@ struct ieee80211_meshconf_ie {
 					  IEEE80211_MESHCONF_NULL_VALUE }
 /* Hybrid Wireless Mesh Protocol */
 #define	IEEE80211_MESHCONF_HWMP_OUI		0x00, 0x0f, 0xac
-#define	IEEE80211_MESHCONF_HWMP_VALUE		0xff		/* XXX Linux */
+#define	IEEE80211_MESHCONF_HWMP_VALUE		0x00
 #define	IEEE80211_MESHCONF_HWMP		{ IEEE80211_MESHCONF_HWMP_OUI, \
 					  IEEE80211_MESHCONF_HWMP_VALUE }
 /* Airtime Link Metric */
 #define	IEEE80211_MESHCONF_AIRTIME_OUI		0x00, 0x0f, 0xac
-#define	IEEE80211_MESHCONF_AIRTIME_VALUE	0xff		/* XXX Linux */
+#define	IEEE80211_MESHCONF_AIRTIME_VALUE	0x00
 #define	IEEE80211_MESHCONF_AIRTIME	{ IEEE80211_MESHCONF_AIRTIME_OUI, \
 					  IEEE80211_MESHCONF_AIRTIME_VALUE }
 /* Congestion Control Signaling */
 #define	IEEE80211_MESHCONF_CCSIG_OUI		0x00, 0x0f, 0xac
-#define	IEEE80211_MESHCONF_CCSIG_VALUE		0xff		/* XXX Linux */
+#define	IEEE80211_MESHCONF_CCSIG_VALUE		0x00
 #define	IEEE80211_MESHCONF_CCSIG	{ IEEE80211_MESHCONF_CCSIG_OUI,\
 					  IEEE80211_MESHCONF_CCSIG_VALUE }
 /* Neighbour Offset */
@@ -84,7 +84,7 @@ struct ieee80211_meshconf_ie {
 #define	IEEE80211_MESHCONF_CAP_AP	0x01	/* Accepting Peers */
 #define	IEEE80211_MESHCONF_CAP_MCCAS	0x02	/* MCCA supported */
 #define	IEEE80211_MESHCONF_CAP_MCCAE	0x04	/* MCCA enabled */
-#define	IEEE80211_MESHCONF_CAP_FRWD 	0x08	/* forwarding enabled */
+#define	IEEE80211_MESHCONF_CAP_FWRD 	0x08	/* forwarding enabled */
 #define	IEEE80211_MESHCONF_CAP_BTR	0x10	/* Beacon Timing Report Enab */
 #define	IEEE80211_MESHCONF_CAP_TBTTA	0x20	/* TBTT Adj. Enabled */
 #define	IEEE80211_MESHCONF_CAP_PSL	0x40	/* Power Save Level */

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 14:26:23 2009	(r193833)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Tue Jun  9 15:03:22 2009	(r193834)
@@ -393,9 +393,14 @@ struct ieee80211vap {
 	uint8_t			iv_dtim_count;	/* DTIM count from last bcn */
 						/* set/unset aid pwrsav state */
 	int			iv_csa_count;	/* count for doing CSA */
+
 	int			iv_meshidlen;
 	uint8_t			iv_meshid[IEEE80211_MESHID_LEN];
-	uint32_t		iv_meshseq;
+	uint32_t		iv_meshseq;	/* seq no for meshcntl */
+#define	IEEE80211_MFLAGS_AP	0x01	/* accept peers */
+#define	IEEE80211_MFLAGS_MP	0x02	/* mesh portal role */
+#define	IEEE80211_MFLAGS_FWRD	0x04	/* forward packets */
+	uint8_t			iv_meshflags;
 
 	struct ieee80211_node	*iv_bss;	/* information for this node */
 	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 16:32:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A92E1065674;
	Tue,  9 Jun 2009 16:32:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38E298FC0C;
	Tue,  9 Jun 2009 16:32:30 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59GWUDj077374;
	Tue, 9 Jun 2009 16:32:30 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59GWUoZ077373;
	Tue, 9 Jun 2009 16:32:30 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906091632.n59GWUoZ077373@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 9 Jun 2009 16:32:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193841 - projects/clangbsd/sys/dev/sound/pcm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 16:32:30 -0000

Author: ed
Date: Tue Jun  9 16:32:29 2009
New Revision: 193841
URL: http://svn.freebsd.org/changeset/base/193841

Log:
  Make the new sound code build with Clang.
  
  I'll discuss this patch with ariff.

Modified:
  projects/clangbsd/sys/dev/sound/pcm/sound.h

Modified: projects/clangbsd/sys/dev/sound/pcm/sound.h
==============================================================================
--- projects/clangbsd/sys/dev/sound/pcm/sound.h	Tue Jun  9 16:32:07 2009	(r193840)
+++ projects/clangbsd/sys/dev/sound/pcm/sound.h	Tue Jun  9 16:32:29 2009	(r193841)
@@ -68,11 +68,7 @@
 #include <sys/kobj.h>
 #ifdef SND_DEBUG
 #undef KOBJMETHOD
-#define KOBJMETHOD(NAME, FUNC)						\
-	{								\
-		&NAME##_desc,						\
-		(kobjop_t) ((FUNC != (NAME##_t *)NULL) ? FUNC : NULL)	\
-	}
+#define KOBJMETHOD(NAME, FUNC) { &NAME##_desc, FUNC }
 #endif
 #ifndef KOBJMETHOD_END
 #define KOBJMETHOD_END	{ NULL, NULL }

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 19:47:37 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F34B10656A5;
	Tue,  9 Jun 2009 19:47:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 63C3E8FC26;
	Tue,  9 Jun 2009 19:47:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59JlbhC081699;
	Tue, 9 Jun 2009 19:47:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59Jlb8A081698;
	Tue, 9 Jun 2009 19:47:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091947.n59Jlb8A081698@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 19:47:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193849 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 19:47:37 -0000

Author: rpaulo
Date: Tue Jun  9 19:47:37 2009
New Revision: 193849
URL: http://svn.freebsd.org/changeset/base/193849

Log:
  Add meshpeering and meshforward commands to enable disable respective
  mesh bits.
  Rename list routes to list hwmp.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Jun  9 19:19:16 2009	(r193848)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Jun  9 19:47:37 2009	(r193849)
@@ -1783,6 +1783,18 @@ DECL_CMD_FUNC(set80211tdmabintval, val, 
 	set80211(s, IEEE80211_IOC_TDMA_BINTERVAL, atoi(val), 0, NULL);
 }
 
+static
+DECL_CMD_FUNC(set80211meshforward, val, d)
+{
+	set80211(s, IEEE80211_IOC_MESH_FWRD, atoi(val), 0, NULL);
+}
+
+static
+DECL_CMD_FUNC(set80211meshpeering, val, d)
+{
+	set80211(s, IEEE80211_IOC_MESH_AP, atoi(val), 0, NULL);
+}
+
 static int
 regdomain_sort(const void *a, const void *b)
 {
@@ -3880,7 +3892,7 @@ list_regdomain(int s, int channelsalso)
 }
 
 static void
-list_routes(int s)
+list_hwmp(int s)
 {
 	int i;
 	struct ieee80211req ireq;
@@ -3950,8 +3962,8 @@ DECL_CMD_FUNC(set80211list, arg, d)
 		list_countries();
 	else if (iseq(arg, "mesh"))
 		list_mesh(s);
-	else if (iseq(arg, "routes"))
-		list_routes(s);
+	else if (iseq(arg, "hwmp"))
+		list_hwmp(s);
 	else
 		errx(1, "Don't know how to list %s for %s", arg, name);
 	LINE_BREAK();
@@ -4717,6 +4729,22 @@ end:
 		LINE_BREAK();
 		list_wme(s);
 	}
+
+	if (opmode == IEEE80211_M_MBSS) {
+		if (get80211val(s, IEEE80211_IOC_MESH_AP, &val) != -1) {
+			if (val)
+				LINE_CHECK("meshpeering");
+			else
+				LINE_CHECK("-meshpeering");
+		}
+		if (get80211val(s, IEEE80211_IOC_MESH_FWRD, &val) != -1) {
+			if (val)
+				LINE_CHECK("meshforward");
+			else
+				LINE_CHECK("-meshforward");
+		}
+	}
+
 	LINE_BREAK();
 }
 
@@ -5113,6 +5141,9 @@ static struct cmd ieee80211_cmds[] = {
 	DEF_CMD_ARG("tdmaslotlen",	set80211tdmaslotlen),
 	DEF_CMD_ARG("tdmabintval",	set80211tdmabintval),
 
+	DEF_CMD_ARG("meshforward",	set80211meshforward),
+	DEF_CMD_ARG("meshpeering",	set80211meshpeering),
+
 	/* vap cloning support */
 	DEF_CLONE_CMD_ARG("wlanaddr",	set80211clone_wlanaddr),
 	DEF_CLONE_CMD_ARG("wlanbssid",	set80211clone_wlanbssid),

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 19:51:34 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3DA61065670;
	Tue,  9 Jun 2009 19:51:34 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B2E938FC1C;
	Tue,  9 Jun 2009 19:51:34 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59JpYEU081838;
	Tue, 9 Jun 2009 19:51:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59JpYxs081837;
	Tue, 9 Jun 2009 19:51:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906091951.n59JpYxs081837@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 19:51:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193851 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 19:51:35 -0000

Author: rpaulo
Date: Tue Jun  9 19:51:34 2009
New Revision: 193851
URL: http://svn.freebsd.org/changeset/base/193851

Log:
  Remove dead code.
  Follow ioctl.c style.
  We don't use any congestion signalling, so mark it as null.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 19:51:22 2009	(r193850)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 19:51:34 2009	(r193851)
@@ -717,13 +717,6 @@ mesh_recv_action(struct ieee80211_node *
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-#ifdef notyet
-		if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP)) {
-			IEEE80211_DISCARD(vap,
-			    IEEE80211_MSG_MESH,
-			    wh, NULL, "%s", "neighbor not accepting peers");
-		}
-#endif
 		switch (ia->ia_action) {
 		case IEEE80211_ACTION_MESHPEERING_OPEN:
 			IEEE80211_NOTE(vap,
@@ -1124,7 +1117,7 @@ ieee80211_add_meshconf(uint8_t *frm, str
 		.conf_ver 	= IEEE80211_MESHCONF_VERSION,
 		.conf_pselid	= IEEE80211_MESHCONF_HWMP,
 		.conf_pmetid	= IEEE80211_MESHCONF_AIRTIME,
-		.conf_ccid	= IEEE80211_MESHCONF_CCSIG,
+		.conf_ccid	= IEEE80211_MESHCONF_NULL,
 		.conf_syncid	= IEEE80211_MESHCONF_NULL,
 		.conf_authid	= IEEE80211_MESHCONF_NULL,
 		/* NB: set below */
@@ -1360,10 +1353,10 @@ mesh_ioctl_set80211(struct ieee80211vap 
 		memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
-		ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_AP;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
-		ireq->i_val = vap->iv_meshflags & IEEE80211_MFLAGS_FWRD;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
 		break;
 	default:
 		return ENOSYS;

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 20:16:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 644D7106567B;
	Tue,  9 Jun 2009 20:16:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5313E8FC19;
	Tue,  9 Jun 2009 20:16:23 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59KGMpt082416;
	Tue, 9 Jun 2009 20:16:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59KGMOd082415;
	Tue, 9 Jun 2009 20:16:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092016.n59KGMOd082415@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 20:16:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193852 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 20:16:23 -0000

Author: rpaulo
Date: Tue Jun  9 20:16:22 2009
New Revision: 193852
URL: http://svn.freebsd.org/changeset/base/193852

Log:
  Move code previously added to vdetach to vattach.
  Add debugging to verify_meshconf()
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 19:51:34 2009	(r193851)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 20:16:22 2009	(r193852)
@@ -117,8 +117,6 @@ static void
 mesh_vdetach(struct ieee80211vap *vap)
 {
 	ieee80211_hwmp_vdetach(vap);
-	vap->iv_meshseq = 0;
-	vap->iv_meshflags = (IEEE80211_MFLAGS_AP | IEEE80211_MFLAGS_FWRD);
 }
 
 static void
@@ -128,6 +126,8 @@ mesh_vattach(struct ieee80211vap *vap)
 	vap->iv_input = mesh_input;
 	vap->iv_opdetach = mesh_vdetach;
 	vap->iv_recv_mgmt = mesh_recv_mgmt;
+	vap->iv_meshseq = 0;
+	vap->iv_meshflags = (IEEE80211_MFLAGS_AP | IEEE80211_MFLAGS_FWRD);
 	ieee80211_hwmp_vattach(vap);
 }
 
@@ -1043,21 +1043,53 @@ mesh_verify_meshconf(struct ieee80211vap
 
 	if (meshconf == NULL)
 		return 1;
-	if (meshconf->conf_ver != IEEE80211_MESHCONF_VERSION)
+	if (meshconf->conf_ver != IEEE80211_MESHCONF_VERSION) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "wrong mesh conf version: %d\n", meshconf->conf_ver);
 		return 1;
-	if (memcmp(meshconf->conf_pselid, hwmp, 4) != 0)
+	}
+	if (memcmp(meshconf->conf_pselid, hwmp, 4) != 0) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "unknown path selection algorithm: 0x%x%x%x%x\n",
+		    meshconf->conf_pselid[0], meshconf->conf_pselid[1],
+		    meshconf->conf_pselid[2], meshconf->conf_pselid[3]);
 		return 1;
-	if (memcmp(meshconf->conf_pmetid, airtime, 4) != 0)
+	}
+	if (memcmp(meshconf->conf_pmetid, airtime, 4) != 0) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "unknown path metric algorithm: 0x%x%x%x%x\n",
+		    meshconf->conf_pmetid[0], meshconf->conf_pmetid[1],
+		    meshconf->conf_pmetid[2], meshconf->conf_pmetid[3]);
 		return 1;
-	if (memcmp(meshconf->conf_ccid, null, 4) != 0)
+	}
+	if (memcmp(meshconf->conf_ccid, null, 4) != 0) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "unknown congestion sig algorithm: 0x%x%x%x%x\n",
+		    meshconf->conf_ccid[0], meshconf->conf_ccid[1],
+		    meshconf->conf_ccid[2], meshconf->conf_ccid[3]);
 		return 1;
-	if (memcmp(meshconf->conf_syncid, null, 4) != 0)
+	}
+	if (memcmp(meshconf->conf_syncid, null, 4) != 0) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "unknown sync algorithm: 0x%x%x%x%x\n",
+		    meshconf->conf_syncid[0], meshconf->conf_syncid[1],
+		    meshconf->conf_syncid[2], meshconf->conf_syncid[3]);
 		return 1;
-	if (memcmp(meshconf->conf_authid, null, 4) != 0)
+	}
+	if (memcmp(meshconf->conf_authid, null, 4) != 0) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "unknown auth auth algorithm: 0x%x%x%x%x\n",
+		    meshconf->conf_pselid[0], meshconf->conf_pselid[1],
+		    meshconf->conf_pselid[2], meshconf->conf_pselid[3]);
 		return 1;
+	}
 	/* Not accepting peers */
-	if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP))
+	if (!(meshconf->conf_cap & IEEE80211_MESHCONF_CAP_AP)) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_MESH,
+		    "not accepting peers: 0x%x\n", meshconf->conf_cap);
 		return 1;
+	}
+
 	return 0;
 }
 

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 20:29:47 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C057106564A;
	Tue,  9 Jun 2009 20:29:47 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B4298FC17;
	Tue,  9 Jun 2009 20:29:47 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59KTlBb082940;
	Tue, 9 Jun 2009 20:29:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59KTlTV082939;
	Tue, 9 Jun 2009 20:29:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092029.n59KTlTV082939@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 20:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193857 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 20:29:47 -0000

Author: rpaulo
Date: Tue Jun  9 20:29:47 2009
New Revision: 193857
URL: http://svn.freebsd.org/changeset/base/193857

Log:
  Don't transition to run state if a meshid is not set.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 20:27:30 2009	(r193856)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 20:29:47 2009	(r193857)
@@ -164,9 +164,10 @@ mesh_newstate(struct ieee80211vap *vap, 
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
-			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
+			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan &&
+			    vap->iv_meshidlen != 0)) {
 			    /*
-			     * Already have a channel; bypass the
+			     * Already have a channel and a mesh ID; bypass the
 			     * scan and startup immediately.
 			     */
 			     ieee80211_create_mbss(vap, vap->iv_des_chan);

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 22:12:13 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9001E106567A;
	Tue,  9 Jun 2009 22:12:13 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 702A88FC3A;
	Tue,  9 Jun 2009 22:12:13 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59MCDVg085531;
	Tue, 9 Jun 2009 22:12:13 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59MCD3E085530;
	Tue, 9 Jun 2009 22:12:13 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092212.n59MCD3E085530@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 22:12:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193866 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 22:12:18 -0000

Author: rpaulo
Date: Tue Jun  9 22:12:13 2009
New Revision: 193866
URL: http://svn.freebsd.org/changeset/base/193866

Log:
  * fix a typo in previous commit
  * add remaining bits of mesh peering
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:09:29 2009	(r193865)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:12:13 2009	(r193866)
@@ -164,8 +164,8 @@ mesh_newstate(struct ieee80211vap *vap, 
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
-			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan &&
-			    vap->iv_meshidlen != 0)) {
+			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan) &&
+			    vap->iv_meshidlen != 0) {
 			    /*
 			     * Already have a channel and a mesh ID; bypass the
 			     * scan and startup immediately.
@@ -439,7 +439,6 @@ static void
 mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
     int rssi, int noise)
 {
-	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_frame *wh;
@@ -504,10 +503,9 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		/*
 		 * More validation: make sure we are talking to a Mesh node.
 		 */
-		if ((scan.capinfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) == 0 &&
-		    !IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr) &&
-		    IEEE80211_ADDR_EQ(wh->i_addr3, zerobssid)) {
-			union ieee80211_send_action_args vargs;
+		if ((scan.capinfo &
+		    (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) == 0 &&
+		    !IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
 			/*
 			 * Create a new entry in the neighbor table.
 			 */
@@ -516,9 +514,14 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 			 * Mesh nodes must be QoS capable.
 			 */
 			ni->ni_flags |= IEEE80211_NODE_QOS;
-			/*
-			 * Try to peer with this node.
-			 */
+		}
+		/*
+		 * Try to peer with this node if possible.
+		 */
+		if (ni != vap->iv_bss &&
+		    vap->iv_meshflags & IEEE80211_MFLAGS_AP &&
+		    ni->ni_mlstate == IEEE80211_NODE_MESH_IDLE) {
+			union ieee80211_send_action_args vargs;
 			get_random_bytes(&ni->ni_mlpid, 2);
 			ni->ni_mlstate = IEEE80211_NODE_MESH_OPENSNT;
 			IEEE80211_NOTE(vap,
@@ -532,11 +535,8 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 			ni->ni_mlrcnt = 0;
 			mesh_peer_timeout_setup(ni);
 		}
-		if (ni != NULL) {
-			IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
-			ni->ni_noise = noise;
-		}
-
+		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
+		ni->ni_noise = noise;
 		break;
 	}
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
@@ -716,6 +716,28 @@ mesh_recv_action(struct ieee80211_node *
 			    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
 			    wh, NULL, "%s", "action frame not for our mesh");
 			vap->iv_stats.is_rx_mgtdiscard++;
+			switch (ni->ni_mlstate) {
+			case IEEE80211_NODE_MESH_IDLE:
+				break;
+			case IEEE80211_NODE_MESH_OPENSNT:
+			case IEEE80211_NODE_MESH_OPENRCV:
+			case IEEE80211_NODE_MESH_CONFIRMRCV:
+				vargs.fixedarg[0] = ni->ni_mlid;
+				vargs.fixedarg[1] = ni->ni_plid;
+				vargs.fixedarg[2] =
+				    IEEE80211_REASON_PEER_LINK_CANCELED;
+				ieee80211_send_action(ni,
+				    IEEE80211_ACTION_CAT_MESHPEERING,
+				    IEEE80211_ACTION_MESHPEERING_CLOSE,
+				    vargs);
+				ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
+				IEEE80211_NOTE(vap,
+				    IEEE80211_MSG_MESH,
+				    ni, "peer link: switching to state %s",
+				    nodemeshstates[ni->ni_mlstate]);
+				mesh_peer_timeout_setup(ni);
+				break;
+			}
 			return;
 		}
 		switch (ia->ia_action) {
@@ -833,7 +855,8 @@ mesh_recv_action(struct ieee80211_node *
 			case IEEE80211_NODE_MESH_HOLDING:
 				vargs.fixedarg[0] = ni->ni_mllid;
 				vargs.fixedarg[1] = ni->ni_mlpid;
-				vargs.fixedarg[2] = IEEE80211_REASON_MESH_MAX_RETRIES;
+				vargs.fixedarg[2] =
+				    IEEE80211_REASON_MESH_MAX_RETRIES;
 				ieee80211_send_action(ni,
 				    IEEE80211_ACTION_CAT_MESHPEERING,
 				    IEEE80211_ACTION_MESHPEERING_CLOSE,
@@ -853,16 +876,34 @@ mesh_recv_action(struct ieee80211_node *
 			    "%s", "recv PEER CLOSE");
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_IDLE:
-			case IEEE80211_NODE_MESH_CONFIRMRECV:
-			case IEEE80211_NODE_MESH_ESTABLISHED:
+				/* ignore */
 				break;
 			case IEEE80211_NODE_MESH_OPENRCV:
+			case IEEE80211_NODE_MESH_OPENSNT:
+			case IEEE80211_NODE_MESH_CONFIRMRECV:
+			case IEEE80211_NODE_MESH_ESTABLISHED:
+				vargs.fixedarg[0] = ni->ni_mlid;
+				vargs.fixedarg[1] = 0;
+				vargs.fixedarg[2] =
+				    IEEE80211_REASON_MESH_CLOSE_RCVD;
+				ieee80211_send_action(ni,
+				    IEEE80211_ACTION_CAT_MESHPEERING,
+				    IEEE80211_ACTION_MESHPEERING_CLOSE,
+				    vargs);
 				ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
+				IEEE80211_NOTE(vap,
+				    IEEE80211_MSG_MESH,
+				    ni, "peer link: switching to state %s",
+				    nodemeshstates[ni->ni_mlstate]);
 				mesh_peer_timeout_setup(ni);
 				break;
-			case IEEE80211_NODE_MESH_OPENSNT:
-				break;
 			case IEEE80211_NODE_MESH_HOLDING:
+				ni->ni_mlstate = IEEE80211_NODE_MESH_IDLE;
+				IEEE80211_NOTE(vap,
+				    IEEE80211_MSG_MESH,
+				    ni, "peer link: switching to state %s",
+				    nodemeshstates[ni->ni_mlstate]);
+				mesh_peer_timeout_setup(ni);
 				break;
 			}
 			break;
@@ -921,11 +962,15 @@ mesh_peer_timeout_setup(struct ieee80211
 	case IEEE80211_NODE_MESH_CONFIRMRECV:
 		ni->ni_mltval = CONFIRM_TIMEOUT;
 		break;
+	case IEEE80211_NODE_MESH_IDLE:
+		ni->ni_mltval = 0;
+		break;
 	default:
 		ni->ni_mltval = RETRY_TIMEOUT;
 	}
-	callout_reset(&ni->ni_mltimer, ni->ni_mltval, mesh_peer_timeout_cb,
-	    ni);
+	if (ni->ni_mltval)
+		callout_reset(&ni->ni_mltimer, ni->ni_mltval,
+		    mesh_peer_timeout_cb, ni);
 }
 
 /*

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 22:27:21 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54302106566C;
	Tue,  9 Jun 2009 22:27:21 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 433968FC12;
	Tue,  9 Jun 2009 22:27:21 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59MRKfO085934;
	Tue, 9 Jun 2009 22:27:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59MRKSi085933;
	Tue, 9 Jun 2009 22:27:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092227.n59MRKSi085933@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 22:27:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193868 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 22:27:21 -0000

Author: rpaulo
Date: Tue Jun  9 22:27:20 2009
New Revision: 193868
URL: http://svn.freebsd.org/changeset/base/193868

Log:
  fix build errors in previous commit

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:22:04 2009	(r193867)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:27:20 2009	(r193868)
@@ -718,12 +718,15 @@ mesh_recv_action(struct ieee80211_node *
 			vap->iv_stats.is_rx_mgtdiscard++;
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_IDLE:
+			case IEEE80211_NODE_MESH_ESTABLISHED:
+			case IEEE80211_NODE_MESH_HOLDING:
+				/* ignore */
 				break;
 			case IEEE80211_NODE_MESH_OPENSNT:
 			case IEEE80211_NODE_MESH_OPENRCV:
-			case IEEE80211_NODE_MESH_CONFIRMRCV:
-				vargs.fixedarg[0] = ni->ni_mlid;
-				vargs.fixedarg[1] = ni->ni_plid;
+			case IEEE80211_NODE_MESH_CONFIRMRECV:
+				vargs.fixedarg[0] = ni->ni_mllid;
+				vargs.fixedarg[1] = ni->ni_mlpid;
 				vargs.fixedarg[2] =
 				    IEEE80211_REASON_PEER_LINK_CANCELED;
 				ieee80211_send_action(ni,
@@ -882,8 +885,8 @@ mesh_recv_action(struct ieee80211_node *
 			case IEEE80211_NODE_MESH_OPENSNT:
 			case IEEE80211_NODE_MESH_CONFIRMRECV:
 			case IEEE80211_NODE_MESH_ESTABLISHED:
-				vargs.fixedarg[0] = ni->ni_mlid;
-				vargs.fixedarg[1] = 0;
+				vargs.fixedarg[0] = ni->ni_mllid;
+				vargs.fixedarg[1] = ni->ni_mlpid;
 				vargs.fixedarg[2] =
 				    IEEE80211_REASON_MESH_CLOSE_RCVD;
 				ieee80211_send_action(ni,

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 23:04:44 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E3D81065673;
	Tue,  9 Jun 2009 23:04:44 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B1998FC27;
	Tue,  9 Jun 2009 23:04:44 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59N4hm3086757;
	Tue, 9 Jun 2009 23:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59N4hah086756;
	Tue, 9 Jun 2009 23:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092304.n59N4hah086756@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 23:04:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193870 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 23:04:44 -0000

Author: rpaulo
Date: Tue Jun  9 23:04:43 2009
New Revision: 193870
URL: http://svn.freebsd.org/changeset/base/193870

Log:
  Exchange ioctl setter/getter for recently added ioctls.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:33:34 2009	(r193869)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 23:04:43 2009	(r193870)
@@ -1393,16 +1393,10 @@ mesh_ioctl_get80211(struct ieee80211vap 
 		error = copyout(tmpmeshid, ireq->i_data, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
-		if (ireq->i_val)
-			vap->iv_meshflags |= IEEE80211_MFLAGS_AP;
-		else
-			vap->iv_meshflags &= ~IEEE80211_MFLAGS_AP;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
-		if (ireq->i_val)
-			vap->iv_meshflags |= IEEE80211_MFLAGS_FWRD;
-		else
-			vap->iv_meshflags &= ~IEEE80211_MFLAGS_FWRD;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
 		break;
 	default:
 		return ENOSYS;
@@ -1434,10 +1428,16 @@ mesh_ioctl_set80211(struct ieee80211vap 
 		memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
-		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_AP;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_AP;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
-		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_FWRD;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_FWRD;
 		break;
 	default:
 		return ENOSYS;

From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 23:30:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32197106566B;
	Tue,  9 Jun 2009 23:30:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2070D8FC08;
	Tue,  9 Jun 2009 23:30:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59NUJxU087313;
	Tue, 9 Jun 2009 23:30:19 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59NUIGo087312;
	Tue, 9 Jun 2009 23:30:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092330.n59NUIGo087312@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 23:30:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193872 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 23:30:19 -0000

Author: rpaulo
Date: Tue Jun  9 23:30:18 2009
New Revision: 193872
URL: http://svn.freebsd.org/changeset/base/193872

Log:
  Factorize common link change code into a common function
  mesh_linkchange(). Should remove some KB from debug kernels and makes
  the code cleaner.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 23:24:04 2009	(r193871)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 23:30:18 2009	(r193872)
@@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
 
 static void	mesh_vattach(struct ieee80211vap *);
 static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
+static inline void	mesh_linkchange(struct ieee80211_node *,
+    enum ieee80211_mesh_mlstate);
 static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int);
 static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
 		    int, int);
@@ -93,15 +95,6 @@ SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, C
 SYSCTL_INT(_net_wlan_mesh, OID_AUTO, ttl, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_mesh_ttl, 0, "TTL for mesh packets");
 
-static const char *nodemeshstates[] = {
-	"IDLE",
-	"OPEN SENT",
-	"OPEN RECEIVED",
-	"CONFIRM RECEIVED",
-	"ESTABLISHED",
-	"HOLDING"
-};
-
 void
 ieee80211_mesh_attach(struct ieee80211com *ic)
 {
@@ -225,6 +218,30 @@ doprint(struct ieee80211vap *vap, int su
 	return 1;
 }
 
+/*
+ * Helper function to nore the Mesh Peer Link FSM change.
+ */
+static inline void
+mesh_linkchange(struct ieee80211_node *ni, enum ieee80211_mesh_mlstate state)
+{
+	struct ieee80211vap *vap = ni->ni_vap;
+#ifdef IEEE80211_DEBUG
+	static const char *meshlinkstates[] = {
+		[IEEE80211_NODE_MESH_IDLE]		= "IDLE",
+		[IEEE80211_NODE_MESH_OPENSNT]		= "OPEN SENT",
+		[IEEE80211_NODE_MESH_OPENRCV]		= "OPEN RECEIVED",
+		[IEEE80211_NODE_MESH_CONFIRMRECV]	= "CONFIRM RECEIVED",
+		[IEEE80211_NODE_MESH_ESTABLISHED]	= "ESTABLISHED",
+		[IEEE80211_NODE_MESH_HOLDING]		= "HOLDING"
+	};
+#endif
+	ni->ni_mlstate = state;
+	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH,
+	    ni, "peer link: switching to state %s",
+	    meshlinkstates[ni->ni_mlstate]);
+
+}
+
 static int
 mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise)
 {
@@ -280,8 +297,8 @@ mesh_input(struct ieee80211_node *ni, st
 		if (ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
 			    ni->ni_macaddr, NULL,
-			    "peer link not yet established (%s)",
-			    nodemeshstates[ni->ni_mlstate]);
+			    "peer link not yet established (%d)",
+			    ni->ni_mlstate);
 		}	
 		if (dir != IEEE80211_FC1_DIR_FROMDS &&
 		    dir != IEEE80211_FC1_DIR_DSTODS) {
@@ -523,11 +540,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		    ni->ni_mlstate == IEEE80211_NODE_MESH_IDLE) {
 			union ieee80211_send_action_args vargs;
 			get_random_bytes(&ni->ni_mlpid, 2);
-			ni->ni_mlstate = IEEE80211_NODE_MESH_OPENSNT;
-			IEEE80211_NOTE(vap,
-			    IEEE80211_MSG_MESH,
-			    ni, "peer link: switching to state %s",
-			    nodemeshstates[ni->ni_mlstate]);
+			mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENSNT);
 			vargs.fixedarg[0] = ni->ni_mlpid;
 			ieee80211_send_action(ni,
 			    IEEE80211_ACTION_CAT_MESHPEERING,
@@ -733,11 +746,8 @@ mesh_recv_action(struct ieee80211_node *
 				    IEEE80211_ACTION_CAT_MESHPEERING,
 				    IEEE80211_ACTION_MESHPEERING_CLOSE,
 				    vargs);
-				ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_HOLDING);
 				mesh_peer_timeout_setup(ni);
 				break;
 			}
@@ -750,11 +760,8 @@ mesh_recv_action(struct ieee80211_node *
 			    "recv PEER OPEN, lid 0x%x", meshpeer->peer_llinkid);
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_IDLE:
-				ni->ni_mlstate = IEEE80211_NODE_MESH_OPENRCV;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_OPENRCV);
 				ni->ni_mllid = meshpeer->peer_llinkid;
 				get_random_bytes(&ni->ni_mlpid, 2);
 				vargs.fixedarg[0] = ni->ni_mlpid;
@@ -782,12 +789,9 @@ mesh_recv_action(struct ieee80211_node *
 				    vargs);
 				break;
 			case IEEE80211_NODE_MESH_OPENSNT:
-				ni->ni_mlstate = IEEE80211_NODE_MESH_OPENRCV;
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_OPENRCV);
 				ni->ni_mllid = meshpeer->peer_llinkid;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				vargs.fixedarg[1] = ni->ni_mllid;
 				ieee80211_send_action(ni,
@@ -797,12 +801,8 @@ mesh_recv_action(struct ieee80211_node *
 				/* NB: don't setup/clear any timeout */
 				break;
 			case IEEE80211_NODE_MESH_CONFIRMRECV:
-				ni->ni_mlstate =
-				    IEEE80211_NODE_MESH_ESTABLISHED;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_ESTABLISHED);
 				ni->ni_mllid = meshpeer->peer_llinkid;
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				vargs.fixedarg[1] = ni->ni_mllid;
@@ -839,21 +839,13 @@ mesh_recv_action(struct ieee80211_node *
 			    meshpeer->peer_llinkid, meshpeer->peer_linkid);
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_OPENRCV:
-				ni->ni_mlstate =
-				    IEEE80211_NODE_MESH_ESTABLISHED;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni, 
+				    IEEE80211_NODE_MESH_ESTABLISHED);
 				mesh_peer_timeout_stop(ni);
 				break;
 			case IEEE80211_NODE_MESH_OPENSNT:
-				ni->ni_mlstate =
-				    IEEE80211_NODE_MESH_CONFIRMRECV;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_CONFIRMRECV);
 				break;
 			case IEEE80211_NODE_MESH_HOLDING:
 				vargs.fixedarg[0] = ni->ni_mllid;
@@ -893,19 +885,12 @@ mesh_recv_action(struct ieee80211_node *
 				    IEEE80211_ACTION_CAT_MESHPEERING,
 				    IEEE80211_ACTION_MESHPEERING_CLOSE,
 				    vargs);
-				ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni,
+				    IEEE80211_NODE_MESH_HOLDING);
 				mesh_peer_timeout_setup(ni);
 				break;
 			case IEEE80211_NODE_MESH_HOLDING:
-				ni->ni_mlstate = IEEE80211_NODE_MESH_IDLE;
-				IEEE80211_NOTE(vap,
-				    IEEE80211_MSG_MESH,
-				    ni, "peer link: switching to state %s",
-				    nodemeshstates[ni->ni_mlstate]);
+				mesh_linkchange(ni, IEEE80211_NODE_MESH_IDLE);
 				mesh_peer_timeout_setup(ni);
 				break;
 			}
@@ -1008,8 +993,8 @@ mesh_peer_timeout_cb(void *arg)
 
 	IEEE80211_NOTE(vap,
 	    IEEE80211_MSG_MESH,
-	    ni, "mesh link timeout, state %s, retry counter %d",
-	    nodemeshstates[ni->ni_mlstate], ni->ni_mlrcnt);
+	    ni, "mesh link timeout, state %d, retry counter %d",
+	    ni->ni_mlstate, ni->ni_mlrcnt);
 	
 	switch (ni->ni_mlstate) {
 	case IEEE80211_NODE_MESH_IDLE:
@@ -1024,11 +1009,7 @@ mesh_peer_timeout_cb(void *arg)
 			    IEEE80211_ACTION_CAT_MESHPEERING,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE, vargs);
 			ni->ni_mlrcnt = 0;
-			ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
-			IEEE80211_NOTE(vap,
-			    IEEE80211_MSG_MESH,
-			    ni, "peer link: switching to state %s",
-			    nodemeshstates[ni->ni_mlstate]);
+			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 		} else {
 			vargs.fixedarg[0] = ni->ni_mlpid;
@@ -1048,11 +1029,7 @@ mesh_peer_timeout_cb(void *arg)
 			    IEEE80211_ACTION_CAT_MESHPEERING,
 			    IEEE80211_ACTION_MESHPEERING_CLOSE, vargs);
 			ni->ni_mlrcnt = 0;
-			ni->ni_mlstate = IEEE80211_NODE_MESH_HOLDING;
-			IEEE80211_NOTE(vap,
-			    IEEE80211_MSG_MESH,
-			    ni, "peer link: switching to state %s",
-			    nodemeshstates[ni->ni_mlstate]);
+			mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING);
 			mesh_peer_timeout_setup(ni);
 		} else {
 			ni->ni_mlrcnt++;
@@ -1060,11 +1037,7 @@ mesh_peer_timeout_cb(void *arg)
 		}
 		break;
 	case IEEE80211_NODE_MESH_HOLDING:
-		ni->ni_mlstate = IEEE80211_NODE_MESH_IDLE;
-		IEEE80211_NOTE(vap,
-		    IEEE80211_MSG_MESH,
-		    ni, "peer link: switching to state %s",
-		    nodemeshstates[ni->ni_mlstate]);
+		mesh_linkchange(ni, IEEE80211_NODE_MESH_IDLE);
 		break;
 	}
 }

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 09:30:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08BA8106564A;
	Wed, 10 Jun 2009 09:30:56 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au
	[211.29.132.183])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E1AA8FC14;
	Wed, 10 Jun 2009 09:30:55 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from c122-106-159-184.carlnfd1.nsw.optusnet.com.au
	(c122-106-159-184.carlnfd1.nsw.optusnet.com.au [122.106.159.184])
	by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id
	n5A9UnA5026894
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 10 Jun 2009 19:30:52 +1000
Date: Wed, 10 Jun 2009 19:30:50 +1000 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@delplex.bde.org
To: Brooks Davis <brooks@FreeBSD.org>
In-Reply-To: <200906091418.n59EIGGD073717@svn.freebsd.org>
Message-ID: <20090610191250.A20260@delplex.bde.org>
References: <200906091418.n59EIGGD073717@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193832 - projects/ngroups/lib/libc/gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 09:30:56 -0000

On Tue, 9 Jun 2009, Brooks Davis wrote:

> Log:
>  Fix some style bugs and return the right error.  Also, document the new
>  out of memory error condition.

> Modified: projects/ngroups/lib/libc/gen/initgroups.c
> ==============================================================================
> --- projects/ngroups/lib/libc/gen/initgroups.c	Tue Jun  9 14:07:29 2009	(r193831)
> +++ projects/ngroups/lib/libc/gen/initgroups.c	Tue Jun  9 14:18:16 2009	(r193832)
> int
> @@ -56,12 +56,11 @@ initgroups(uname, agroup)
> 	 * setgroups to fail and set errno.
> 	 */
> 	ngroups = sysconf(_SC_NGROUPS_MAX) + 1;
> -	groups = malloc(sizeof(gid_t)*ngroups);
> -	if (groups == NULL)
> -		return (ENOSPC);
> +	if ((groups = malloc(sizeof(*groups) * ngroups)) == NULL)
> +		return (ENOMEM);
>
> 	getgrouplist(uname, agroup, groups, &ngroups);
> 	ret = setgroups(ngroups, groups);
> 	free(groups);
> -	return(ret);
> +	return (ret);
> }

BTW, another idea for the allocator function is to use C99 variable length
arrays (VLAs).  In its most hackish form:

#undef NGROUPS
#define	NGROUPS	sysconf(__SC_NGROUPS_MAX)
/* Better use ngroups_max() = above sysconf() with error checking. */

 	gid_t ngroups[NGROUPS + 1];	/* ... No changes to old code .*.

This removes the burden of memory management, including any possibility
of checking for allocation failure and returning ENOMEM.  Running out
of memory would cause bad things but no more than almost any other use
of VLAs, not to mention almost any other use of auto variables and function
calls.

Bruce

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:41:41 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7FF4D106564A;
	Wed, 10 Jun 2009 10:41:41 +0000 (UTC)
	(envelope-from rdivacky@vlk.vlakno.cz)
Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190])
	by mx1.freebsd.org (Postfix) with ESMTP id 377588FC19;
	Wed, 10 Jun 2009 10:41:40 +0000 (UTC)
	(envelope-from rdivacky@vlk.vlakno.cz)
Received: from localhost (localhost [127.0.0.1])
	by vlakno.cz (Postfix) with ESMTP id D72DF9CB0EA;
	Wed, 10 Jun 2009 12:40:31 +0200 (CEST)
X-Virus-Scanned: amavisd-new at vlakno.cz
Received: from vlakno.cz ([127.0.0.1])
	by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id qj2iZ1vhnC+C; Wed, 10 Jun 2009 12:40:29 +0200 (CEST)
Received: from vlk.vlakno.cz (localhost [127.0.0.1])
	by vlakno.cz (Postfix) with ESMTP id A03269CB10F;
	Wed, 10 Jun 2009 12:40:29 +0200 (CEST)
Received: (from rdivacky@localhost)
	by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id n5AAeTlP023265;
	Wed, 10 Jun 2009 12:40:29 +0200 (CEST) (envelope-from rdivacky)
Date: Wed, 10 Jun 2009 12:40:29 +0200
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Ed Schouten <ed@FreeBSD.org>
Message-ID: <20090610104029.GA18940@freebsd.org>
References: <200906082105.n58L5TsI043469@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200906082105.n58L5TsI043469@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
	cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
	contrib/llvm/autoconf contrib/llvm/cmake
	contrib/llvm/cmake/modules contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 10:41:41 -0000

On Mon, Jun 08, 2009 at 09:05:29PM +0000, Ed Schouten wrote:
> Author: ed
> Date: Mon Jun  8 21:05:27 2009
> New Revision: 193755
> URL: http://svn.freebsd.org/changeset/base/193755
> 
> Log:
>   Update sources again.
>   
>   We're now using LLVM and Clang r73070.
>   
>   It took me a couple of days to get this working again, because an
>   additional optimizer pass got enabled, which causes miscompilations.
>   I've disabled the pass again, but I should really figure out a way to
>   submit a reduced testcase.
>   
>   Also change cdefs.h to use __printf__ instead of __printf0__ to keep the
>   compiler happy.

you know that it changes the semantic of the check, right? we should implement
the checks instead...

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:48:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 725CE1065678;
	Wed, 10 Jun 2009 10:48:56 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211])
	by mx1.freebsd.org (Postfix) with ESMTP id BA1248FC25;
	Wed, 10 Jun 2009 10:48:55 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id CFBD41CC8D; Wed, 10 Jun 2009 12:48:54 +0200 (CEST)
Date: Wed, 10 Jun 2009 12:48:54 +0200
From: Ed Schouten <ed@80386.nl>
To: Roman Divacky <rdivacky@FreeBSD.org>
Message-ID: <20090610104854.GN48776@hoeg.nl>
References: <200906082105.n58L5TsI043469@svn.freebsd.org>
	<20090610104029.GA18940@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="z/AAsH1r4ZXu3bz7"
Content-Disposition: inline
In-Reply-To: <20090610104029.GA18940@freebsd.org>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
	cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
	contrib/llvm/autoconf contrib/llvm/cmake contrib/llvm/cmake/modules
	contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 10:48:57 -0000


--z/AAsH1r4ZXu3bz7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Roman Divacky <rdivacky@FreeBSD.org> wrote:
> you know that it changes the semantic of the check, right? we should
> implement the checks instead...

No, it doesn't. printf0 is just printf, but it allows fmt to be NULL.
Clang always allows this, even with printf.

--=20
 Ed Schouten <ed@80386.nl>
 WWW: http://80386.nl/

--z/AAsH1r4ZXu3bz7
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEARECAAYFAkovj5YACgkQ52SDGA2eCwVU8gCeLPrS3tSJ7rWWE2od3MQbXh3o
qOYAniTX7f3/OydT0he7hemuCghW1NFm
=+iIC
-----END PGP SIGNATURE-----

--z/AAsH1r4ZXu3bz7--

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:51:38 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67D8310656E5;
	Wed, 10 Jun 2009 10:51:38 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 564B68FC23;
	Wed, 10 Jun 2009 10:51:38 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AApcAI010702;
	Wed, 10 Jun 2009 10:51:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AApckR010701;
	Wed, 10 Jun 2009 10:51:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906101051.n5AApckR010701@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 10 Jun 2009 10:51:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193897 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 10:51:39 -0000

Author: rpaulo
Date: Wed Jun 10 10:51:38 2009
New Revision: 193897
URL: http://svn.freebsd.org/changeset/base/193897

Log:
  Work around the fact that ether_ntoa() uses a static buffer.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Wed Jun 10 10:47:31 2009	(r193896)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Wed Jun 10 10:51:38 2009	(r193897)
@@ -3916,9 +3916,9 @@ list_hwmp(int s)
 		, "PREQID");
 
 	for (i = 0; i < ireq.i_len / sizeof(*routes); i++) {
-		printf("%s %s %4u   %4d   %6d %4d %6d\n",
-			ether_ntoa((const struct ether_addr *)
-			    routes[i].fi_dest),
+		printf("%s ", ether_ntoa((const struct ether_addr *)
+		    routes[i].fi_dest));
+		printf("%s %4u   %4d   %6d %4d %6d\n",
 			ether_ntoa((const struct ether_addr *)
 			    routes[i].fi_nexthop),
 			routes[i].fi_nhops, routes[i].fi_metric,

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:53:14 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA8211065764;
	Wed, 10 Jun 2009 10:53:14 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E8D88FC27;
	Wed, 10 Jun 2009 10:53:14 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AArEAi010767;
	Wed, 10 Jun 2009 10:53:14 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AArEo7010766;
	Wed, 10 Jun 2009 10:53:14 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906101053.n5AArEo7010766@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 10 Jun 2009 10:53:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193898 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 10:53:15 -0000

Author: rpaulo
Date: Wed Jun 10 10:53:14 2009
New Revision: 193898
URL: http://svn.freebsd.org/changeset/base/193898

Log:
  Simplify code. No functional change.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Wed Jun 10 10:51:38 2009	(r193897)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Wed Jun 10 10:53:14 2009	(r193898)
@@ -872,7 +872,6 @@ ieee80211_hwmp_discover(struct ieee80211
 {
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
 	struct ieee80211_hwmp_fi *fi = NULL;
-	static const uint8_t invalidaddr[] = { 0, 0, 0, 0, 0, 0 };
 	struct ieee80211_meshpreq_ie preq;
 	int sendpreq = 0, unknowndst = 0;
 
@@ -887,12 +886,11 @@ ieee80211_hwmp_discover(struct ieee80211
 
 	mtx_lock(&hs->hs_lock);
 	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
-		if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) {
-			if (IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) {
-				/* XXX check preq retries */
-				sendpreq = 1;
-				unknowndst = 1;
-			}
+		if (IEEE80211_ADDR_EQ(fi->fi_dest, dest) &&
+		    IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) {
+			/* XXX check preq retries */
+			sendpreq = 1;
+			unknowndst = 1;
 			break;
 		}
 	}
@@ -901,7 +899,7 @@ ieee80211_hwmp_discover(struct ieee80211
 	if (fi == NULL) {
 		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP,
 		    M_NOWAIT | M_ZERO);
-		memcpy(fi->fi_dest, dest, IEEE80211_ADDR_LEN);
+		IEEE80211_ADDR_COPY(fi->fi_dest, dest);
 		fi->fi_seq = ++hs->hs_seq;
 		fi->fi_metric = IEEE80211_MESHLMETRIC_INITIALVAL;
 		fi->fi_lifetime = ieee80211_hwmp_pathtimeout;
@@ -946,7 +944,6 @@ ieee80211_hwmp_discover(struct ieee80211
 #undef	PREQ_TADDR
 #undef	PREQ_TSEQ
 
-
 static int
 hwmp_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
 {
@@ -955,7 +952,7 @@ hwmp_ioctl_get80211(struct ieee80211vap 
 	struct ieee80211_hwmp_state *hs;
 	struct ieee80211_hwmp_fi *fi;
 	uint8_t *p;
-
+ 
 	if (vap->iv_opmode != IEEE80211_M_MBSS)
 		return EINVAL;
 	error = 0;

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 10:59:25 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8182610656AC;
	Wed, 10 Jun 2009 10:59:25 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F7338FC14;
	Wed, 10 Jun 2009 10:59:25 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AAxPfL010909;
	Wed, 10 Jun 2009 10:59:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AAxPJ2010908;
	Wed, 10 Jun 2009 10:59:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906101059.n5AAxPJ2010908@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 10 Jun 2009 10:59:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193899 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 10:59:26 -0000

Author: rpaulo
Date: Wed Jun 10 10:59:25 2009
New Revision: 193899
URL: http://svn.freebsd.org/changeset/base/193899

Log:
  Set the AID field correctly.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Wed Jun 10 10:53:14 2009	(r193898)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Wed Jun 10 10:59:25 2009	(r193899)
@@ -721,7 +721,7 @@ ieee80211_send_action(struct ieee80211_n
 		 *   [1] category
 		 *   [2] capabilities
 		 *   [2] status code
-		 *   [2] association id (0)
+		 *   [2] association id (peer ID)
 		 *   [tlv] rates
 		 *   [tlv] xrates
 		 *   [tlv] mesh id
@@ -735,8 +735,8 @@ ieee80211_send_action(struct ieee80211_n
 			    "peerid 0x%x", vargs.fixedarg[0],
 			    vargs.fixedarg[1]);
 			ADDSHORT(frm, getcapinfo(vap, ni->ni_chan));
-			ADDSHORT(frm, 0);	/* status code */
-			ADDSHORT(frm, 0);	/* AID */
+			ADDSHORT(frm, 0);		  /* status code */
+			ADDSHORT(frm, vargs.fixedarg[1]); /* AID */
 			frm = ieee80211_add_rates(frm, rs);
 			frm = ieee80211_add_xrates(frm, rs);
 			frm = ieee80211_add_meshid(frm, vap);

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 11:33:01 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9285F106568B;
	Wed, 10 Jun 2009 11:33:01 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 77CE78FC1B;
	Wed, 10 Jun 2009 11:33:01 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ABX1dl011681;
	Wed, 10 Jun 2009 11:33:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ABX17C011680;
	Wed, 10 Jun 2009 11:33:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906101133.n5ABX17C011680@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 10 Jun 2009 11:33:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193901 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 11:33:02 -0000

Author: rpaulo
Date: Wed Jun 10 11:33:01 2009
New Revision: 193901
URL: http://svn.freebsd.org/changeset/base/193901

Log:
  Add mesh local/peer ID validation.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 10 11:19:34 2009	(r193900)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 10 11:33:01 2009	(r193901)
@@ -779,8 +779,22 @@ mesh_recv_action(struct ieee80211_node *
 				mesh_peer_timeout_setup(ni);
 				break;
 			case IEEE80211_NODE_MESH_OPENRCV:
+				/* Wrong Link ID */
+				if (ni->ni_mllid != meshpeer->peer_llinkid) {
+					vargs.fixedarg[0] = ni->ni_mllid;
+					vargs.fixedarg[1] = ni->ni_mlpid;
+					vargs.fixedarg[2] =
+					    IEEE80211_REASON_PEER_LINK_CANCELED;
+					ieee80211_send_action(ni,
+					    IEEE80211_ACTION_CAT_MESHPEERING,
+					    IEEE80211_ACTION_MESHPEERING_CLOSE,
+					    vargs);
+					mesh_linkchange(ni,
+					    IEEE80211_NODE_MESH_HOLDING);
+					mesh_peer_timeout_setup(ni);
+					break;
+				}
 				/* Duplicate open, confirm again. */
-				ni->ni_mllid = meshpeer->peer_llinkid;
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				vargs.fixedarg[1] = ni->ni_mllid;
 				ieee80211_send_action(ni,
@@ -789,9 +803,9 @@ mesh_recv_action(struct ieee80211_node *
 				    vargs);
 				break;
 			case IEEE80211_NODE_MESH_OPENSNT:
+				ni->ni_mllid = meshpeer->peer_llinkid;
 				mesh_linkchange(ni,
 				    IEEE80211_NODE_MESH_OPENRCV);
-				ni->ni_mllid = meshpeer->peer_llinkid;
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				vargs.fixedarg[1] = ni->ni_mllid;
 				ieee80211_send_action(ni,
@@ -801,6 +815,20 @@ mesh_recv_action(struct ieee80211_node *
 				/* NB: don't setup/clear any timeout */
 				break;
 			case IEEE80211_NODE_MESH_CONFIRMRECV:
+				if (ni->ni_mllid != meshpeer->peer_llinkid) {
+					vargs.fixedarg[0] = ni->ni_mllid;
+					vargs.fixedarg[1] = ni->ni_mlpid;
+					vargs.fixedarg[2] =
+					    IEEE80211_REASON_PEER_LINK_CANCELED;
+					ieee80211_send_action(ni,
+					    IEEE80211_ACTION_CAT_MESHPEERING,
+					    IEEE80211_ACTION_MESHPEERING_CLOSE,
+					    vargs);
+					mesh_linkchange(ni,
+					    IEEE80211_NODE_MESH_HOLDING);
+					mesh_peer_timeout_setup(ni);
+					break;
+				}
 				mesh_linkchange(ni,
 				    IEEE80211_NODE_MESH_ESTABLISHED);
 				ni->ni_mllid = meshpeer->peer_llinkid;
@@ -813,6 +841,20 @@ mesh_recv_action(struct ieee80211_node *
 				mesh_peer_timeout_stop(ni);
 				break;
 			case IEEE80211_NODE_MESH_ESTABLISHED:
+				if (ni->ni_mllid != meshpeer->peer_llinkid) {
+					vargs.fixedarg[0] = ni->ni_mllid;
+					vargs.fixedarg[1] = ni->ni_mlpid;
+					vargs.fixedarg[2] =
+					    IEEE80211_REASON_PEER_LINK_CANCELED;
+					ieee80211_send_action(ni,
+					    IEEE80211_ACTION_CAT_MESHPEERING,
+					    IEEE80211_ACTION_MESHPEERING_CLOSE,
+					    vargs);
+					mesh_linkchange(ni,
+					    IEEE80211_NODE_MESH_HOLDING);
+					mesh_peer_timeout_setup(ni);
+					break;
+				}
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				vargs.fixedarg[1] = ni->ni_mllid;
 				ieee80211_send_action(ni,
@@ -857,6 +899,21 @@ mesh_recv_action(struct ieee80211_node *
 				    IEEE80211_ACTION_MESHPEERING_CLOSE,
 				    vargs);
 				break;
+			case IEEE80211_NODE_MESH_CONFIRMRECV:
+				if (ni->ni_mllid != meshpeer->peer_llinkid) {
+					vargs.fixedarg[0] = ni->ni_mllid;
+					vargs.fixedarg[1] = ni->ni_mlpid;
+					vargs.fixedarg[2] =
+					    IEEE80211_REASON_PEER_LINK_CANCELED;
+					ieee80211_send_action(ni,
+					    IEEE80211_ACTION_CAT_MESHPEERING,
+					    IEEE80211_ACTION_MESHPEERING_CLOSE,
+					    vargs);
+					mesh_linkchange(ni,
+					    IEEE80211_NODE_MESH_HOLDING);
+					mesh_peer_timeout_setup(ni);
+				}
+				break;
 			default:
 				IEEE80211_DISCARD(vap,
 				    IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 11:53:02 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C51AE106564A;
	Wed, 10 Jun 2009 11:53:02 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B33CF8FC17;
	Wed, 10 Jun 2009 11:53:02 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ABr2ao012115;
	Wed, 10 Jun 2009 11:53:02 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ABr28n012112;
	Wed, 10 Jun 2009 11:53:02 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200906101153.n5ABr28n012112@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 10 Jun 2009 11:53:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193903 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 11:53:03 -0000

Author: pho
Date: Wed Jun 10 11:53:02 2009
New Revision: 193903
URL: http://svn.freebsd.org/changeset/base/193903

Log:
  Added three new jail() regression tests for problems found by the syscall
  stress test program.

Added:
  projects/stress2/misc/jail2.sh   (contents, props changed)
  projects/stress2/misc/jail3.sh   (contents, props changed)
  projects/stress2/misc/jail4.sh   (contents, props changed)

Added: projects/stress2/misc/jail2.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/jail2.sh	Wed Jun 10 11:53:02 2009	(r193903)
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Regression test for problem found with the syscall.sh test
+
+. ../default.cfg
+
+odir=`pwd`
+
+cd /tmp
+sed '1,/^EOF/d' < $odir/$0 > jail2.c
+cc -o jail2 -Wall jail2.c
+rm -f jail2.c
+cd $odir
+/tmp/jail2
+rm -f /tmp/jail2
+exit
+EOF
+#include <sys/param.h>
+#include <sys/jail.h>
+#include <err.h>
+
+int
+main()
+{
+	struct jail j;
+
+	/*
+	version = 0x2,
+	path = 0x0,
+	hostname = 0x0,
+	jailname = 0x50000000 <Address 0x50000000 out of bounds>,
+	ip4s = 0xf7000004,
+	ip6s = 0x1,
+	ip4 = 0x0,
+	ip6 = 0x0
+	 */
+	j.version = 2;
+	j.path = 0;
+	j.hostname = 0;
+	j.jailname = (char *)0x50000000;
+	j.ip4s = 0xf7000004;
+	j.ip6s = 1;
+	j.ip4 = 0;
+	j.ip6 = 0;
+
+        if (jail(&j) == -1)
+		err(1, "jail()");
+
+	  return (0);
+}

Added: projects/stress2/misc/jail3.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/jail3.sh	Wed Jun 10 11:53:02 2009	(r193903)
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Regression test for problem found with the syscall.sh test
+
+. ../default.cfg
+
+odir=`pwd`
+
+cd /tmp
+sed '1,/^EOF/d' < $odir/$0 > jail3.c
+cc -o jail3 -Wall jail3.c
+rm -f jail3.c
+cd $odir
+/tmp/jail3
+rm -f /tmp/jail3
+exit
+EOF
+#include <sys/param.h>
+#include <sys/jail.h>
+#include <err.h>
+
+int
+main()
+{
+	struct jail j;
+
+	/*
+	version = 0x0,
+	path = 0x2809cd61 <Address 0x2809cd61 out of bounds>,
+	hostname = 0x2809b650 <Address 0x2809b650 out of bounds>,
+	jailname = 0x0, 
+	ip4s = 0x1,
+	ip6s = 0x0,
+	ip4 = 0x0,
+	ip6 = 0x0
+	 */
+	j.version = 0;
+	j.path = (char *)0x2809cd61;
+	j.hostname = (char *)0x2809b650;
+	j.jailname = 0;
+	j.ip4s = 1;
+	j.ip6s = 0;
+	j.ip4 = 0;
+	j.ip6 = 0;
+
+        if (jail(&j) == -1)
+		err(1, "jail()");
+
+	  return (0);
+}

Added: projects/stress2/misc/jail4.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/jail4.sh	Wed Jun 10 11:53:02 2009	(r193903)
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Regression test for problem found with the syscall.sh test
+
+# "panic: kern_jail: too many iovecs (28)" seen.
+
+. ../default.cfg
+
+odir=`pwd`
+
+cd /tmp
+sed '1,/^EOF/d' < $odir/$0 > jail4.c
+cc -o jail4 -Wall jail4.c
+rm -f jail4.c
+cd $odir
+/tmp/jail4
+rm -f /tmp/jail4
+exit
+EOF
+#include <sys/param.h>
+#include <sys/jail.h>
+#include <err.h>
+
+int
+main()
+{
+	struct jail j;
+
+	/*
+	version = 0x2,
+	path = 0x28190cb1 <Address 0x28190cb1 out of bounds>,
+	hostname = 0x28167b90 <Address 0x28167b90 out of bounds>, 
+	jailname = 0x28198700 <Address 0x28198700 out of bounds>,
+	ip4s = 0x0,
+	ip6s = 0x0,
+	ip4 = 0x0,
+	ip6 = 0x0}
+	 */
+	j.version = 2;
+	j.path = (char *)0x28190cb1;
+	j.hostname = (char *)0x28167b90;
+	j.jailname = (char *)0x28198700;
+	j.ip4s = 0;
+	j.ip6s = 0;
+	j.ip4 = 0;
+	j.ip6 = 0;
+
+        if (jail(&j) == -1)
+		err(1, "jail()");
+
+	  return (0);
+}

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 11:58:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A1BA106568B;
	Wed, 10 Jun 2009 11:58:39 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F8218FC16;
	Wed, 10 Jun 2009 11:58:39 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ABwdHs012252;
	Wed, 10 Jun 2009 11:58:39 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ABwdOh012251;
	Wed, 10 Jun 2009 11:58:39 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200906101158.n5ABwdOh012251@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 10 Jun 2009 11:58:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193904 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 11:58:40 -0000

Author: pho
Date: Wed Jun 10 11:58:38 2009
New Revision: 193904
URL: http://svn.freebsd.org/changeset/base/193904

Log:
  Ignore umount busy warning

Modified:
  projects/stress2/misc/nullfs2.sh

Modified: projects/stress2/misc/nullfs2.sh
==============================================================================
--- projects/stress2/misc/nullfs2.sh	Wed Jun 10 11:53:02 2009	(r193903)
+++ projects/stress2/misc/nullfs2.sh	Wed Jun 10 11:58:38 2009	(r193904)
@@ -45,7 +45,7 @@ export RUNDIR=`pwd`/mp1/stressX
 export runRUNTIME=10m
 (cd ..; ./run.sh marcus.cfg) 
 
-umount $mp
+umount $mp 2>&1 | grep -v busy
 
 mount | grep -q $mp && umount -f $mp
 

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 12:03:55 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B1881065698;
	Wed, 10 Jun 2009 12:03:55 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FC5B8FC16;
	Wed, 10 Jun 2009 12:03:55 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AC3tRV012437;
	Wed, 10 Jun 2009 12:03:55 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AC3tna012435;
	Wed, 10 Jun 2009 12:03:55 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200906101203.n5AC3tna012435@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 10 Jun 2009 12:03:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193905 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 12:04:04 -0000

Author: pho
Date: Wed Jun 10 12:03:55 2009
New Revision: 193905
URL: http://svn.freebsd.org/changeset/base/193905

Log:
  Added two nullfs regression tests

Added:
  projects/stress2/misc/nullfs4.sh   (contents, props changed)
  projects/stress2/misc/nullfs5.sh   (contents, props changed)

Added: projects/stress2/misc/nullfs4.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/nullfs4.sh	Wed Jun 10 12:03:55 2009	(r193905)
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Test scenario by Anatoli Klassen <dev 26th net>
+
+# kern/94269: [nullfs] procfs shows wrong data if executable is running from
+# nullfs
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+mount | grep -q /proc || mount -t procfs procfs /proc
+mount -t nullfs /bin $mntpoint
+
+r1=`/bin/ls -l /proc/curproc/file`
+r2=`$mntpoint/ls -l /proc/curproc/file | sed "s#$mntpoint#/bin#"`
+if [ "$r1" != "$r2" ]; then
+	echo "/bin/ls -l /proc/curproc/file"
+	echo $r1
+	echo "$mntpoint/ls -l /proc/curproc/file"
+	echo $r2
+fi
+
+umount $mntpoint

Added: projects/stress2/misc/nullfs5.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/nullfs5.sh	Wed Jun 10 12:03:55 2009	(r193905)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Composit test: nullfs2.sh + kinfo.sh
+
+# Kernel page fault with the following non-sleepable locks held from
+# nullfs/null_vnops.c:531
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+odir=`pwd`
+cd /tmp
+sed '1,/^EOF/d;s/60/600/' < $odir/kinfo.sh > kinfo.c
+cc -o kinfo -Wall -g kinfo.c -lutil
+rm -f kinfo.c
+cd $odir
+
+mount | grep -q procfs || mount -t procfs procfs /procfs
+
+for j in `jot 5`; do
+	/tmp/kinfo &
+done
+
+[ -d mp1 ] || mkdir mp1
+
+mp=`pwd`/mp1
+mount | grep -q $mp && umount -f $mp
+
+mount -t nullfs `dirname $RUNDIR` $mp
+
+export RUNDIR=`pwd`/mp1/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh marcus.cfg) 
+
+umount $mp 2>&1 | grep -v busy
+
+mount | grep -q $mp && umount -f $mp
+
+rm -rf mp1
+
+for j in `jot 5`; do
+	wait
+done
+rm -f /tmp/kinfo

From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 10 12:07:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5AA0C1065707;
	Wed, 10 Jun 2009 12:07:56 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 464598FC17;
	Wed, 10 Jun 2009 12:07:56 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AC7uAV012598;
	Wed, 10 Jun 2009 12:07:56 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AC7urU012593;
	Wed, 10 Jun 2009 12:07:56 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200906101207.n5AC7urU012593@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 10 Jun 2009 12:07:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193907 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 12:07:59 -0000

Author: pho
Date: Wed Jun 10 12:07:55 2009
New Revision: 193907
URL: http://svn.freebsd.org/changeset/base/193907

Log:
  Added some simple zfs test scenarios

Added:
  projects/stress2/misc/zfs.sh   (contents, props changed)
  projects/stress2/misc/zfs2.sh   (contents, props changed)
  projects/stress2/misc/zfs3.sh   (contents, props changed)
  projects/stress2/misc/zfs4.sh   (contents, props changed)
  projects/stress2/misc/zfs5.sh   (contents, props changed)

Added: projects/stress2/misc/zfs.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/zfs.sh	Wed Jun 10 12:07:55 2009	(r193907)
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Simple zfs raidz test scenario
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q zfs.ko  || kldload zfs.ko
+
+u1=$mdstart
+u2=$((u1 + 1))
+u3=$((u2 + 1))
+
+mdconfig -l | grep -q md${u1} && mdconfig -d -u $u1
+mdconfig -l | grep -q md${u2} && mdconfig -d -u $u2
+mdconfig -l | grep -q md${u3} && mdconfig -d -u $u3
+
+mdconfig -s 512m -u $u1
+mdconfig -s 512m -u $u2
+mdconfig -s 512m -u $u3
+
+zpool create tank raidz md$u1 md$u2 md$u3
+zfs create tank/test
+
+export RUNDIR=/tank/test/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh marcus.cfg) 
+
+zfs destroy -r tank
+zpool destroy tank
+
+mdconfig -d -u $u1
+mdconfig -d -u $u2
+mdconfig -d -u $u3

Added: projects/stress2/misc/zfs2.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/zfs2.sh	Wed Jun 10 12:07:55 2009	(r193907)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Simple zfs mirror test scenario
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q zfs.ko  || kldload zfs.ko
+
+d1=${diskimage}.1
+d2=${diskimage}.2
+
+dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+
+u1=$mdstart
+u2=$((u1 + 1))
+
+mdconfig -l | grep -q md${u1} && mdconfig -d -u $u1
+mdconfig -l | grep -q md${u2} && mdconfig -d -u $u2
+
+mdconfig -a -t vnode -f $d1 -u $u1
+mdconfig -a -t vnode -f $d2 -u $u2
+
+zpool create tank mirror md$u1 md$u2
+
+export RUNDIR=/tank/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh marcus.cfg) 
+
+zfs destroy -r tank
+zpool destroy tank
+
+mdconfig -d -u $u1
+mdconfig -d -u $u2
+
+rm -rf $d1 $d2

Added: projects/stress2/misc/zfs3.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/zfs3.sh	Wed Jun 10 12:07:55 2009	(r193907)
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Simple zfs snapshot test scenario
+
+# page fault from fs/zfs/dbuf.c:1807
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q zfs.ko  || kldload zfs.ko
+
+d1=${diskimage}.1
+d2=${diskimage}.2
+
+dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+
+u1=$mdstart
+u2=$((u1 + 1))
+
+mdconfig -l | grep -q md${u1} && mdconfig -d -u $u1
+mdconfig -l | grep -q md${u2} && mdconfig -d -u $u2
+
+mdconfig -a -t vnode -f $d1 -u $u1
+mdconfig -a -t vnode -f $d2 -u $u2
+
+zpool create tank md$u1 md$u2
+zfs create tank/test
+zfs set quota=800m tank/test
+zfs snapshot tank/test@snap1
+
+export RUNDIR=/tank/test/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh marcus.cfg) 
+
+zfs rollback tank/test@snap1
+zfs destroy  tank/test@snap1
+
+zfs destroy -r tank
+zpool destroy tank
+
+mdconfig -d -u $u1
+mdconfig -d -u $u2
+
+rm -rf $d1 $d2

Added: projects/stress2/misc/zfs4.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/zfs4.sh	Wed Jun 10 12:07:55 2009	(r193907)
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Simple zfs snapshot test scenario
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q zfs.ko  || kldload zfs.ko
+
+d1=${diskimage}.1
+d2=${diskimage}.2
+
+dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+
+u1=$mdstart
+u2=$((u1 + 1))
+
+mdconfig -l | grep -q md${u1} && mdconfig -d -u $u1
+mdconfig -l | grep -q md${u2} && mdconfig -d -u $u2
+
+mdconfig -a -t vnode -f $d1 -u $u1
+mdconfig -a -t vnode -f $d2 -u $u2
+
+zpool create tank md$u1 md$u2
+zfs create tank/test
+zfs set quota=100m tank/test
+zfs set snapdir=visible tank/test
+
+export RUNDIR=/tank/test/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh marcus.cfg) &
+
+for i in `jot 20`; do
+	zfs snapshot tank/test@snap$i
+done
+for i in `jot 20`; do
+	zfs destroy  tank/test@snap$i
+done
+wait
+
+zfs destroy -r tank
+zpool destroy tank
+
+mdconfig -d -u $u1
+mdconfig -d -u $u2
+
+rm -rf $d1 $d2

Added: projects/stress2/misc/zfs5.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/stress2/misc/zfs5.sh	Wed Jun 10 12:07:55 2009	(r193907)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009 Peter Holm <pho@FreeBSD.org>
+# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
+#
+
+# Simple zfs test of vdev as a file and snapshot clones
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q zfs.ko  || kldload zfs.ko
+
+d1=${diskimage}.1
+d2=${diskimage}.2
+
+dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
+
+zpool create tank $d1 $d2
+zfs create tank/test
+zfs set quota=100m tank/test
+
+export RUNDIR=/tank/test/stressX
+export runRUNTIME=10m
+(cd ..; ./run.sh vfs.cfg) &
+
+for i in `jot 20`; do
+	zfs snapshot tank/test@snap$i
+	zfs clone    tank/test@snap$i tank/snap$i
+done
+for i in `jot 20`; do
+	zfs destroy tank/snap$i
+	zfs destroy tank/test@snap$i
+done
+wait
+
+zfs destroy -r tank
+zpool destroy tank
+
+rm -rf $d1 $d2

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 01:39:48 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B7F4106564A;
	Thu, 11 Jun 2009 01:39:48 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from mail08.syd.optusnet.com.au (mail08.syd.optusnet.com.au
	[211.29.132.189])
	by mx1.freebsd.org (Postfix) with ESMTP id 7916D8FC12;
	Thu, 11 Jun 2009 01:39:42 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from c122-106-159-184.carlnfd1.nsw.optusnet.com.au
	(c122-106-159-184.carlnfd1.nsw.optusnet.com.au [122.106.159.184])
	by mail08.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id
	n5B1dAqu012983
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 11 Jun 2009 11:39:13 +1000
Date: Thu, 11 Jun 2009 11:39:10 +1000 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@delplex.bde.org
To: Ed Schouten <ed@80386.nl>
In-Reply-To: <20090610104854.GN48776@hoeg.nl>
Message-ID: <20090611113543.E21054@delplex.bde.org>
References: <200906082105.n58L5TsI043469@svn.freebsd.org>
	<20090610104029.GA18940@freebsd.org> <20090610104854.GN48776@hoeg.nl>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-projects@FreeBSD.org, Roman Divacky <rdivacky@FreeBSD.org>,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
 cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
 contrib/llvm/autoconf
 contrib/llvm/cmake contrib/llvm/cmake/modules contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 01:39:48 -0000

On Wed, 10 Jun 2009, Ed Schouten wrote:

> * Roman Divacky <rdivacky@FreeBSD.org> wrote:
>> you know that it changes the semantic of the check, right? we should
>> implement the checks instead...
>
> No, it doesn't. printf0 is just printf, but it allows fmt to be NULL.

No it isn't.  printf is just printf0, except it doesn't allow fmt to
be NULL.  FreeBSD extended printf to printf0, to support functions like
err() where a NULL format is valid.

> Clang always allows this, even with printf.

If so, this is a bug in Clang.

Bruce

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 02:24:47 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0F621065673;
	Thu, 11 Jun 2009 02:24:47 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from mail09.syd.optusnet.com.au (mail09.syd.optusnet.com.au
	[211.29.132.190])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D63A8FC14;
	Thu, 11 Jun 2009 02:24:46 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from c122-106-159-184.carlnfd1.nsw.optusnet.com.au
	(c122-106-159-184.carlnfd1.nsw.optusnet.com.au [122.106.159.184])
	by mail09.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id
	n5B2Og7e013618
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 11 Jun 2009 12:24:44 +1000
Date: Thu, 11 Jun 2009 12:24:42 +1000 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@delplex.bde.org
To: Rui Paulo <rpaulo@FreeBSD.org>
In-Reply-To: <200906101051.n5AApckR010701@svn.freebsd.org>
Message-ID: <20090611120541.V21075@delplex.bde.org>
References: <200906101051.n5AApckR010701@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
Subject: Re: svn commit: r193897 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 02:24:48 -0000

On Wed, 10 Jun 2009, Rui Paulo wrote:

> Log:
>  Work around the fact that ether_ntoa() uses a static buffer.

ether_ntoa() and inet_ntoa() use static buffers, so they are hard to
use in non-preemptive UP kernels and almost impossible to use in
preemtive UP and SMP kernels.  I don't see how the problem can be
worked around.  They shouldn't exist.  inet_ntoa_r() has existed for
a long time and ether_ntoa_r() has existed for a not so long time.

> Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
> ==============================================================================
> --- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Wed Jun 10 10:47:31 2009	(r193896)
> +++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Wed Jun 10 10:51:38 2009	(r193897)
> @@ -3916,9 +3916,9 @@ list_hwmp(int s)
> 		, "PREQID");
>
> 	for (i = 0; i < ireq.i_len / sizeof(*routes); i++) {
> -		printf("%s %s %4u   %4d   %6d %4d %6d\n",
> -			ether_ntoa((const struct ether_addr *)
> -			    routes[i].fi_dest),
> +		printf("%s ", ether_ntoa((const struct ether_addr *)
> +		    routes[i].fi_dest));
> +		printf("%s %4u   %4d   %6d %4d %6d\n",
> 			ether_ntoa((const struct ether_addr *)
> 			    routes[i].fi_nexthop),
> 			routes[i].fi_nhops, routes[i].fi_metric,

This still has nice races (unlikely to be hit, but confusing if they happen)
except for non-preemptive UP kernels.

Until all callers are fixed, ether_ntoa() and inet_ntoa() should use the
hack of an array of static buffers.  An array of size 2 permits 2 calls
per printf under UP, etc.  A larger array with atomic accesses for the
index should work well enough even for the SMP case in practice.

/sys sources on Mar 30 has the following lines matching ntoa:

% ./kern/kern_jail.c:			db_printf("%6s  %s\n", "", inet_ntoa(ia));
% ./boot/common/dev_net.c:	printf("net_open: client addr: %s\n", inet_ntoa(myip));
% ./boot/common/dev_net.c:		printf("net_open: subnet mask: %s\n", intoa(netmask));
% ./boot/common/dev_net.c:		printf("net_open: net gateway: %s\n", inet_ntoa(gateip));
% ./boot/common/dev_net.c:		printf("net_open: server addr: %s\n", inet_ntoa(rootip));
% ./boot/common/dev_net.c:	setenv("boot.netif.ip", inet_ntoa(myip), 1);
% ./boot/common/dev_net.c:	setenv("boot.netif.netmask", intoa(netmask), 1);
% ./boot/common/dev_net.c:	setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
% ./boot/common/dev_net.c:	setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
% ./boot/i386/libi386/pxe.c:		printf("pxe_open: server addr: %s\n", inet_ntoa(rootip));
% ./boot/i386/libi386/pxe.c:		printf("pxe_open: gateway ip:  %s\n", inet_ntoa(gateip));
% ./boot/i386/libi386/pxe.c:		setenv("boot.netif.ip", inet_ntoa(myip), 1);
% ./boot/i386/libi386/pxe.c:		setenv("boot.netif.netmask", intoa(netmask), 1);
% ./boot/i386/libi386/pxe.c:		setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
% ./boot/i386/libi386/pxe.c:		setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
% ./netinet/libalias/alias_proxy.c:	    inet_ntoa(GetProxyAddress(lnk)), (u_int) ntohs(GetProxyPort(lnk)));
% ./netinet/libalias/alias_nbt.c:	printf("%s:%d-->", inet_ntoa(ndh->source_ip), ntohs(ndh->source_port));
% ./netinet/libalias/alias_nbt.c:	printf("%s:%d\n", inet_ntoa(ndh->source_ip), ntohs(ndh->source_port));
% ./netinet/libalias/alias_nbt.c:	printf("NB rec[%s", inet_ntoa(nbtarg->oldaddr));
% ./netinet/libalias/alias_nbt.c:	printf("->%s, %dbytes] ", inet_ntoa(nbtarg->newaddr), bcount);
% ./netinet/libalias/alias_nbt.c:		printf("<%s>", inet_ntoa(nb->addr));
% ./netinet/libalias/alias_nbt.c:	printf("Arec [%s", inet_ntoa(nbtarg->oldaddr));
% ./netinet/libalias/alias_nbt.c:	printf("->%s]", inet_ntoa(nbtarg->newaddr));
% ./netinet/libalias/alias_nbt.c:		printf("..%s", inet_ntoa(a->addr));
% ./netinet/libalias/alias_sctp.c:		inet_ntoa(ip->ip_dst),ntohs(sctp_hdr->dest_port), 
% ./netinet/libalias/alias_sctp.c:	    s, sp, assoc->exp, inet_ntoa(assoc->l_addr), ntohl(assoc->l_vtag),
% ./netinet/libalias/alias_sctp.c:		SctpAliasLog("\t\tga=%s\n",inet_ntoa(G_Addr->g_addr));
% ./netinet/ip_gre.c:void gre_inet_ntoa(struct in_addr in);	/* XXX */
% ./netinet/in.c:		    inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr));
% ./netinet/in.h:char	*inet_ntoa(struct in_addr); /* in libkern */
% ./netinet/in.h:char	*inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */
% ./netinet/tcp_subr.c:		    (ip->ip_v == IPVERSION) ? inet_ntoa(dst.sin.sin_addr) :
% ./netinet/tcp_subr.c:		inet_ntoa_r(inc->inc_faddr, sp);
% ./netinet/tcp_subr.c:		inet_ntoa_r(inc->inc_laddr, sp);
% ./netinet/tcp_subr.c:		inet_ntoa_r(ip->ip_src, sp);
% ./netinet/tcp_subr.c:		inet_ntoa_r(ip->ip_dst, sp);
% ./netinet/in_pcb.c:		inet_ntoa_r(inc->inc_laddr, laddr_str);
% ./netinet/in_pcb.c:		inet_ntoa_r(inc->inc_faddr, faddr_str);
% ./netinet/in_mcast.c:			    __func__, ifma, inm, inet_ntoa(*group));
% ./netinet/in_mcast.c:		    inet_ntoa(ia), ims);
% ./netinet/in_mcast.c:		    __func__, n, inet_ntoa(ia));
% ./netinet/in_mcast.c:		    __func__, n, inet_ntoa(ia));
% ./netinet/in_mcast.c:		    __func__, n, inet_ntoa(ia));
% ./netinet/in_mcast.c:		    __func__, n, inet_ntoa(ia));
% ./netinet/in_mcast.c:	    inet_ntoa(*gina), ifp, ifp->if_xname);
% ./netinet/in_mcast.c:	    inm, inet_ntoa(inm->inm_addr),
% ./netinet/in_mcast.c:	    ("%s: %s not in 224.0.0.0/24", __func__, inet_ntoa(*ap)));
% ./netinet/in_mcast.c:		    __func__, inet_ntoa(mreqs.imr_interface), ifp);
% ./netinet/in_mcast.c:		    inet_ntoa(ssa->sin.sin_addr), doblock ? "" : "not ");
% ./netinet/in_mcast.c:		    __func__, inet_ntoa(mreqs.imr_interface), ifp);
% ./netinet/in_mcast.c:		    __func__, inet_ntoa(mreqs.imr_interface), ifp);
% ./netinet/in_mcast.c:			    inet_ntoa(ssa->sin.sin_addr), "not ");
% ./netinet/in_mcast.c:		    inet_ntoa(addr));
% ./netinet/in_mcast.c:		    __func__, inet_ntoa(group));
% ./netinet/in_mcast.c:			    inet_ntoa(ina));
% ./netinet/in_mcast.c:	    inet_ntoa(inm->inm_addr),
% ./netinet/tcp_hostcache.c:			    hc_entry->ip4.s_addr ? inet_ntoa(hc_entry->ip4) :
% ./netinet/ip_mroute.c:	(int)vifcp->vifc_vifi, inet_ntoa(vifcp->vifc_lcl_addr),
% ./netinet/ip_mroute.c:	    __func__, inet_ntoa(mfccp->mfcc_origin),
% ./netinet/ip_mroute.c:		    __func__, inet_ntoa(mfccp->mfcc_origin),
% ./netinet/ip_mroute.c:	inet_ntoa(origin), (u_long)ntohl(mcastgrp.s_addr));
% ./netinet/ip_mroute.c:	inet_ntoa(ip->ip_src), (u_long)ntohl(ip->ip_dst.s_addr), ifp);
% ./netinet/ip_mroute.c:	    inet_ntoa(ip->ip_src), (u_long)ntohl(ip->ip_dst.s_addr));
% ./netinet/ip_mroute.c:	    __func__, datalen, inet_ntoa(ip->ip_src));
% ./netinet/ip_mroute.c:	    __func__, inet_ntoa(encap_ip->ip_src), ntohs(encap_ip->ip_len));
% ./netinet/ip_mroute.c:		inet_ntoa(encap_ip->ip_dst));
% ./netinet/ip_icmp.c:		strcpy(buf, inet_ntoa(ip->ip_src));
% ./netinet/ip_icmp.c:		       buf, inet_ntoa(ip->ip_dst), icmplen);
% ./netinet/ip_icmp.c:			strcpy(buf, inet_ntoa(icp->icmp_ip.ip_dst));
% ./netinet/ip_icmp.c:			       buf, inet_ntoa(icp->icmp_gwaddr));
% ./netinet/ip_icmp.c:		strcpy(buf, inet_ntoa(ip->ip_dst));
% ./netinet/ip_icmp.c:		       buf, inet_ntoa(ip->ip_src));
% ./netinet/ip_options.c:					strcpy(buf, inet_ntoa(ip->ip_dst));
% ./netinet/ip_options.c:					    inet_ntoa(ip->ip_src), buf);
% ./netinet/if_ether.c:			    inet_ntoa(SIN(dst)->sin_addr));
% ./netinet/if_ether.c:		    inet_ntoa(SIN(dst)->sin_addr));
% ./netinet/if_ether.c:		    inet_ntoa(isaddr));
% ./netinet/if_ether.c:		   inet_ntoa(isaddr), ifp->if_xname);
% ./netinet/if_ether.c:				    inet_ntoa(isaddr),
% ./netinet/if_ether.c:				    inet_ntoa(isaddr), ifp->if_xname);
% ./netinet/if_ether.c:				    inet_ntoa(isaddr),
% ./netinet/if_ether.c:			    inet_ntoa(isaddr), ifp->if_xname,
% ./netinet/if_ether.c:		       inet_ntoa(itaddr));
% ./netinet/if_ether.c:		    inet_ntoa(itaddr));
% ./netinet/ip_fw2.c:				inet_ntoa(dummyaddr));
% ./netinet/ip_fw2.c:			inet_ntoa_r(ip->ip_src, src);
% ./netinet/ip_fw2.c:			inet_ntoa_r(ip->ip_dst, dst);
% ./netinet/ip_fw2.c:						inet_ntoa_r(da, src);
% ./netinet/ip_fw2.c:						inet_ntoa_r(da, dst);
% ./netinet/udp_usrreq.c:			strcpy(buf, inet_ntoa(ip->ip_dst));
% ./netinet/udp_usrreq.c:			    buf, ntohs(uh->uh_dport), inet_ntoa(ip->ip_src),
% ./netinet/igmp.c:inet_ntoa_haddr(in_addr_t haddr)
% ./netinet/igmp.c:	return (inet_ntoa(ia));
% ./netinet/igmp.c:			    inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:	    inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname, timer);
% ./netinet/igmp.c:		     inet_ntoa(igmpv3->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:	     inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:			    inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:			    inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:	     inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:			    inet_ntoa(igmp->igmp_group), ifp, ifp->if_xname);
% ./netinet/igmp.c:			    inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname);
% ./netinet/igmp.c:	    __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp,
% ./netinet/igmp.c:		    inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname);
% ./netinet/igmp.c:	    __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp,
% ./netinet/igmp.c:		    inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname);
% ./netinet/igmp.c:	    __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp,
% ./netinet/igmp.c:			    inet_ntoa(inm->inm_addr),
% ./netinet/igmp.c:		    inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname);
% ./netinet/igmp.c:		    __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname);
% ./netinet/igmp.c:		    __func__, inet_ntoa(inm->inm_addr),
% ./netinet/igmp.c:	    igmp_rec_type_to_str(type), inet_ntoa(inm->inm_addr),
% ./netinet/igmp.c:			    inet_ntoa_haddr(ims->ims_haddr));
% ./netinet/igmp.c:			    inet_ntoa_haddr(ims->ims_haddr));
% ./netinet/igmp.c:				    __func__, inet_ntoa_haddr(ims->ims_haddr));
% ./netipx/ipx.h:char		*ipx_ntoa(struct ipx_addr);
% ./nfs4client/nfs4_vfsops.c:	ipsrc = inet_ntoa(IA_SIN(ifatoia(ro.ro_rt->rt_ifa))->sin_addr);
% ./nfsserver/nfs_syscalls.c:				    inet_ntoa(sin->sin_addr), port);
% ./nfsserver/nfs_srvkrpc.c:			    inet_ntoa(sin->sin_addr), port);
% ./dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c:			inet_ntoa(local->sin_addr),
% ./dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c:			inet_ntoa(remote->sin_addr));
% ./dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c:		inet_ntoa(remote->sin_addr), ntohs(remote->sin_port));
% ./dev/isp/ispvar.h:	uint64_t		isp_intoasync;		/* other async */
% ./dev/isp/isp_freebsd.c:		sp->isp_stats[ISP_INGOASYNC] = isp->isp_intoasync;
% ./dev/isp/isp_freebsd.c:		isp->isp_intoasync = 0;
% ./dev/isp/isp.c:		isp->isp_intoasync++;
% ./net/ethernet.h:char 	*ether_ntoa(const struct ether_addr *);
% ./net/ethernet.h:char 	*ether_ntoa_r(const struct ether_addr *, char *);
% ./net/if_dl.h:char	*link_ntoa(const struct sockaddr_dl *);
% ./net/if_gre.c:	    inet_ntoa(((struct sockaddr_in *)&ro->ro_dst)->sin_addr));
% ./net/if_gre.c:	    inet_ntoa(((struct sockaddr_in *)(ro->ro_rt->rt_gateway))->sin_addr));
% ./libkern/inet_ntoa.c:__FBSDID("$FreeBSD: head/sys/libkern/inet_ntoa.c 139815 2005-01-07 00:24:33Z imp $");
% ./libkern/inet_ntoa.c:inet_ntoa(struct in_addr ina)
% ./libkern/inet_ntoa.c:inet_ntoa_r(struct in_addr ina, char *buf)
% ./contrib/pf/net/pf_osfp.c:		strlcpy(srcname, inet_ntoa(ip->ip_src), sizeof(srcname));
% ./cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c:			 * just the IPv4 string is returned for inet_ntoa6.
% ./netipsec/ipsec.c:inet_ntoa4(struct in_addr ina)
% ./netipsec/ipsec.c:		return (inet_ntoa4(sa->sin.sin_addr));
% ./netipsec/ipsec_input.c:			    inet_ntoa4(ipn.ip_src),
% ./netipsec/ipsec_input.c:			    inet_ntoa4(ipn.ip_src),
% ./sys/eui64.h:int	eui64_ntoa(const struct eui64 *, char *, size_t);

In 141 lines, the _r variants are only used 10 times.  Neither of the
ether_ntoa*() variants were used, so ether_ntoa() should be easy to remove.

Bruce

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 06:54:55 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4251B106567F;
	Thu, 11 Jun 2009 06:54:55 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211])
	by mx1.freebsd.org (Postfix) with ESMTP id D077A8FC24;
	Thu, 11 Jun 2009 06:54:54 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id 55C981CD8A; Thu, 11 Jun 2009 08:54:52 +0200 (CEST)
Date: Thu, 11 Jun 2009 08:54:52 +0200
From: Ed Schouten <ed@80386.nl>
To: Bruce Evans <brde@optusnet.com.au>
Message-ID: <20090611065451.GR48776@hoeg.nl>
References: <200906082105.n58L5TsI043469@svn.freebsd.org>
	<20090610104029.GA18940@freebsd.org>
	<20090610104854.GN48776@hoeg.nl>
	<20090611113543.E21054@delplex.bde.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="SHs8gxXfwr6H9vII"
Content-Disposition: inline
In-Reply-To: <20090611113543.E21054@delplex.bde.org>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: svn-src-projects@FreeBSD.org, Roman Divacky <rdivacky@FreeBSD.org>,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
	cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
	contrib/llvm/autoconf contrib/llvm/cmake contrib/llvm/cmake/modules
	contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 06:54:55 -0000


--SHs8gxXfwr6H9vII
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Bruce,

* Bruce Evans <brde@optusnet.com.au> wrote:
> On Wed, 10 Jun 2009, Ed Schouten wrote:
>> No, it doesn't. printf0 is just printf, but it allows fmt to be NULL.
>
> No it isn't.  printf is just printf0, except it doesn't allow fmt to
> be NULL.  FreeBSD extended printf to printf0, to support functions like
> err() where a NULL format is valid.

Aren't you saying exactly the same thing as what I did?

>> Clang always allows this, even with printf.
>
> If so, this is a bug in Clang.

I'm not calling it a bug. I'm calling it a missing feature of a GNU
extension. For the time being, this solution is sufficient. The clangbsd
branch isn't yet supposed to be pretty...

--=20
 Ed Schouten <ed@80386.nl>
 WWW: http://80386.nl/

--SHs8gxXfwr6H9vII
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEARECAAYFAkowqjsACgkQ52SDGA2eCwUgFQCcCkd26t2gzQuQQ7uBUqccrsVs
KuwAniEIjThSNIJpUiUJ6koEdpNElBJ2
=uiBd
-----END PGP SIGNATURE-----

--SHs8gxXfwr6H9vII--

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 08:26:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA083106564A;
	Thu, 11 Jun 2009 08:26:19 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au
	[211.29.132.183])
	by mx1.freebsd.org (Postfix) with ESMTP id 564CF8FC1D;
	Thu, 11 Jun 2009 08:26:19 +0000 (UTC)
	(envelope-from brde@optusnet.com.au)
Received: from besplex.bde.org (c122-106-159-184.carlnfd1.nsw.optusnet.com.au
	[122.106.159.184])
	by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id
	n5B8PoLP028191
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 11 Jun 2009 18:25:52 +1000
Date: Thu, 11 Jun 2009 18:25:50 +1000 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Ed Schouten <ed@80386.nl>
In-Reply-To: <20090611065451.GR48776@hoeg.nl>
Message-ID: <20090611182005.T786@besplex.bde.org>
References: <200906082105.n58L5TsI043469@svn.freebsd.org>
	<20090610104029.GA18940@freebsd.org> <20090610104854.GN48776@hoeg.nl>
	<20090611113543.E21054@delplex.bde.org>
	<20090611065451.GR48776@hoeg.nl>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-projects@FreeBSD.org, Roman Divacky <rdivacky@FreeBSD.org>,
	src-committers@FreeBSD.org, Bruce Evans <brde@optusnet.com.au>
Subject: Re: svn commit: r193755 - in projects/clangbsd: . bin/df bin/sh
 cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm
 contrib/llvm/autoconf
 contrib/llvm/cmake contrib/llvm/cmake/modules contrib/llvm/...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 08:26:20 -0000

On Thu, 11 Jun 2009, Ed Schouten wrote:

> * Bruce Evans <brde@optusnet.com.au> wrote:
>> On Wed, 10 Jun 2009, Ed Schouten wrote:
>>> No, it doesn't. printf0 is just printf, but it allows fmt to be NULL.
>>
>> No it isn't.  printf is just printf0, except it doesn't allow fmt to
>> be NULL.  FreeBSD extended printf to printf0, to support functions like
>> err() where a NULL format is valid.
>
> Aren't you saying exactly the same thing as what I did?

I don't think so.  You said that printf0 is just printf.

>>> Clang always allows this, even with printf.
>>
>> If so, this is a bug in Clang.
>
> I'm not calling it a bug. I'm calling it a missing feature of a GNU
> extension. For the time being, this solution is sufficient. The clangbsd
> branch isn't yet supposed to be pretty...

I would call printf0 a non-GNU extension.  AFAIK Gnu doesn't have it.

There seem to be 2 bugs here in Clang:
- Clang printf != Gnu printf, since Gnu printf doesn't allow null fmt.
   Maybe that is a FreeBSD extension too.
- Clang printf0 doesn't exist yet, or is too simple.  It is less surprising
   for Clang not to have FreeBSD extensions yet.

Bruce

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 11:59:53 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5ADCA106564A;
	Thu, 11 Jun 2009 11:59:53 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4817C8FC0C;
	Thu, 11 Jun 2009 11:59:53 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BBxr0j046391;
	Thu, 11 Jun 2009 11:59:53 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BBxrCQ046390;
	Thu, 11 Jun 2009 11:59:53 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906111159.n5BBxrCQ046390@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 11 Jun 2009 11:59:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193989 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 11:59:53 -0000

Author: rpaulo
Date: Thu Jun 11 11:59:53 2009
New Revision: 193989
URL: http://svn.freebsd.org/changeset/base/193989

Log:
  Fix some code that was introduced in previous revisions.
  Add a bit more of PREP processing, still unfinished.
  This makes HWMP usable for local neighbors.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 11:17:16 2009	(r193988)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 11:59:53 2009	(r193989)
@@ -75,22 +75,22 @@ static uint8_t *hwmp_add_meshperr(uint8_
 static uint8_t *hwmp_add_meshrann(uint8_t *,
     const struct ieee80211_meshrann_ie *);
 static void	hwmp_recv_preq(struct ieee80211vap *, struct ieee80211_node *,
-    const struct ieee80211_meshpreq_ie *);
+    const struct ieee80211_frame *, const struct ieee80211_meshpreq_ie *);
 static inline int hwmp_send_preq(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshpreq_ie *);
 static void	hwmp_recv_prep(struct ieee80211vap *, struct ieee80211_node *,
-    const struct ieee80211_meshprep_ie *);
+    const struct ieee80211_frame *, const struct ieee80211_meshprep_ie *);
 static inline int hwmp_send_prep(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshprep_ie *);
 static void	hwmp_recv_perr(struct ieee80211vap *, struct ieee80211_node *,
-    const struct ieee80211_meshperr_ie *);
+    const struct ieee80211_frame *, const struct ieee80211_meshperr_ie *);
 static inline int hwmp_send_perr(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshperr_ie *);
 static void	hwmp_recv_rann(struct ieee80211vap *, struct ieee80211_node *,
-   const  struct ieee80211_meshrann_ie *);
+   const struct ieee80211_frame *, const  struct ieee80211_meshrann_ie *);
 static inline int hwmp_send_rann(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshrann_ie *);
@@ -240,7 +240,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-		hwmp_recv_preq(vap, ni, meshpreq);
+		hwmp_recv_preq(vap, ni, wh, meshpreq);
 		break;
 	case IEEE80211_ACTION_MESHPATH_REP:
 		if (meshprep == NULL) {
@@ -250,7 +250,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-		hwmp_recv_prep(vap, ni, meshprep);
+		hwmp_recv_prep(vap, ni, wh, meshprep);
 		break;
 	case IEEE80211_ACTION_MESHPATH_ERR:
 		if (meshperr == NULL) {
@@ -260,7 +260,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-		hwmp_recv_perr(vap, ni, meshperr);
+		hwmp_recv_perr(vap, ni, wh, meshperr);
 		break;
 	case IEEE80211_ACTION_MESHPATH_RANN:
 		if (meshrann == NULL) {
@@ -270,7 +270,7 @@ ieee80211_hwmp_recv_action(struct ieee80
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-		hwmp_recv_rann(vap, ni, meshrann);
+		hwmp_recv_rann(vap, ni, wh, meshrann);
 		break;
 	default:
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
@@ -472,7 +472,7 @@ hwmp_add_meshrann(uint8_t *frm, const st
 #define	PREQ_TSEQ(n)	preq->preq_targets[n].target_seq
 static void
 hwmp_recv_preq(struct ieee80211vap *vap, struct ieee80211_node *ni,
-    const struct ieee80211_meshpreq_ie *preq)
+    const struct ieee80211_frame *wh, const struct ieee80211_meshpreq_ie *preq)
 {
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
 	struct ieee80211_hwmp_fi *fi = NULL;
@@ -493,7 +493,7 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 
 	mtx_lock(&hs->hs_lock);
 	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
-		if (IEEE80211_ADDR_EQ(PREQ_TADDR(0), fi->fi_dest))
+		if (IEEE80211_ADDR_EQ(preq->preq_origaddr, fi->fi_dest))
 			break;
 	}
 	mtx_unlock(&hs->hs_lock);
@@ -539,13 +539,15 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 		prep.prep_origseq = hs->hs_seq++;
 		/* XXX addr1 = next hop */
 		hwmp_send_prep(ni, vap->iv_myaddr, preq->preq_origaddr, &prep);
+#if 0
 		/*
 		 * Build the reverse path, if we don't have it already.
 		 */
 		if (fi == NULL ||
-		    memcmp(fi->fi_nexthop, invalidaddr, IEEE80211_ADDR_LEN)) {
+		    IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) {
 			ieee80211_hwmp_discover(vap, fi->fi_dest);
 		}
+#endif
 
 		return;
 	}
@@ -666,8 +668,10 @@ hwmp_send_preq(struct ieee80211_node *ni
 
 static void
 hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni,
-    const struct ieee80211_meshprep_ie *prep)
+    const struct ieee80211_frame *wh, const struct ieee80211_meshprep_ie *prep)
 {
+	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
+	struct ieee80211_hwmp_fi *fi = NULL;
 
 	/*
 	 * Acceptance criteria: if the PREP was not generated by us and
@@ -677,10 +681,28 @@ hwmp_recv_prep(struct ieee80211vap *vap,
 	    !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD))
 		return;
 
+	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni,
+	    "received PREP from %s", ether_sprintf(prep->prep_origaddr));
+
 	/*
-	 * Update the Forwarding Information.
+	 * Find out if this path reply is useful to us.
 	 */
+	mtx_lock(&hs->hs_lock);
+	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
+		if (IEEE80211_ADDR_EQ(prep->prep_targetaddr, fi->fi_dest))
+			break;
+	}
+	mtx_unlock(&hs->hs_lock);
 
+	/* XXX */
+	if (fi == NULL)
+		return;
+
+	/*
+	 * Record the next hop.
+	 * XXX check for SEQ and PREQ ID.
+	 */
+	IEEE80211_ADDR_COPY(fi->fi_nexthop, wh->i_addr2);
 
 	/*
 	 * If it's NOT for us, propagate the PREP if TTL is
@@ -740,7 +762,7 @@ hwmp_send_prep(struct ieee80211_node *ni
 #define	PREQ_DSEQ(n)	perr->perr_dests[n].dest_seq
 static void
 hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni,
-    const struct ieee80211_meshperr_ie *perr)
+    const struct ieee80211_frame *wh, const struct ieee80211_meshperr_ie *perr)
 {
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
 	struct ieee80211_hwmp_fi *fi = NULL;
@@ -792,7 +814,7 @@ hwmp_send_perr(struct ieee80211_node *ni
 
 static void
 hwmp_recv_rann(struct ieee80211vap *vap, struct ieee80211_node *ni,
-    const struct ieee80211_meshrann_ie *rann)
+    const struct ieee80211_frame *wh, const struct ieee80211_meshrann_ie *rann)
 {
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
 	struct ieee80211_hwmp_fi *fi = NULL;
@@ -881,16 +903,14 @@ ieee80211_hwmp_discover(struct ieee80211
 	if (IEEE80211_IS_MULTICAST(dest))
 		return ieee80211_find_txnode(vap, dest);
 
-	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
-	    "%s", "initiating path discovery");
-
 	mtx_lock(&hs->hs_lock);
 	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
-		if (IEEE80211_ADDR_EQ(fi->fi_dest, dest) &&
-		    IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) {
-			/* XXX check preq retries */
-			sendpreq = 1;
-			unknowndst = 1;
+		if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) {
+			if (IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) {
+				/* XXX check preq retries */
+				sendpreq = 1;
+				unknowndst = 1;
+			}
 			break;
 		}
 	}
@@ -901,6 +921,7 @@ ieee80211_hwmp_discover(struct ieee80211
 		    M_NOWAIT | M_ZERO);
 		IEEE80211_ADDR_COPY(fi->fi_dest, dest);
 		fi->fi_seq = ++hs->hs_seq;
+		fi->fi_preqid = ++hs->hs_preqid;
 		fi->fi_metric = IEEE80211_MESHLMETRIC_INITIALVAL;
 		fi->fi_lifetime = ieee80211_hwmp_pathtimeout;
 		mtx_lock(&hs->hs_lock);
@@ -911,13 +932,15 @@ ieee80211_hwmp_discover(struct ieee80211
 	}
 
 	if (sendpreq) {
+		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
+		    "%s", "initiating path discovery");
 		/*
 		 * Try to discover the path for this node.
 		 */
 		preq.preq_flags = 0;
 		preq.preq_hopcount = 0;
 		preq.preq_ttl = ieee80211_mesh_ttl;
-		preq.preq_id = ++hs->hs_preqid;
+		preq.preq_id = fi->fi_preqid;
 		IEEE80211_ADDR_COPY(preq.preq_origaddr, vap->iv_myaddr);
 		preq.preq_origseq = fi->fi_seq;
 		preq.preq_lifetime = fi->fi_lifetime;

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 12:09:13 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B09321065670;
	Thu, 11 Jun 2009 12:09:13 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DBEE8FC1A;
	Thu, 11 Jun 2009 12:09:13 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BC9D1s046744;
	Thu, 11 Jun 2009 12:09:13 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BC9DAF046743;
	Thu, 11 Jun 2009 12:09:13 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906111209.n5BC9DAF046743@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 11 Jun 2009 12:09:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193992 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 12:09:15 -0000

Author: rpaulo
Date: Thu Jun 11 12:09:13 2009
New Revision: 193992
URL: http://svn.freebsd.org/changeset/base/193992

Log:
  Update IEEE80211_C_BITS from ieee80211_var.h
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Jun 11 12:06:37 2009	(r193991)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu Jun 11 12:09:13 2009	(r193992)
@@ -3571,9 +3571,9 @@ list_keys(int s)
 }
 
 #define	IEEE80211_C_BITS \
-	"\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \
+	"\20\1STA\002803ENCAP\7FF\10TURBOP\11IBSS\12PMGT" \
 	"\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \
-	"\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
+	"\21MONITOR\22DFS\23MBSS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
 	"\37TXFRAG\40TDMA"
 
 static void

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 13:02:14 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C04510656B5;
	Thu, 11 Jun 2009 13:02:14 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A53E8FC15;
	Thu, 11 Jun 2009 13:02:14 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BD2EU5048153;
	Thu, 11 Jun 2009 13:02:14 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BD2Ejp048151;
	Thu, 11 Jun 2009 13:02:14 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906111302.n5BD2Ejp048151@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 11 Jun 2009 13:02:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193998 - in projects/clangbsd/lib: libc msun
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 13:02:14 -0000

Author: ed
Date: Thu Jun 11 13:02:13 2009
New Revision: 193998
URL: http://svn.freebsd.org/changeset/base/193998

Log:
  Build both libc and msun with GCC on i386.
  
  It turns out there are still issues with inline assembly with FPU
  instructions.
  
  Reported by:	Dominique Goncalves <dominique goncalves gmail com>

Modified:
  projects/clangbsd/lib/libc/Makefile
  projects/clangbsd/lib/msun/Makefile

Modified: projects/clangbsd/lib/libc/Makefile
==============================================================================
--- projects/clangbsd/lib/libc/Makefile	Thu Jun 11 12:56:14 2009	(r193997)
+++ projects/clangbsd/lib/libc/Makefile	Thu Jun 11 13:02:13 2009	(r193998)
@@ -5,6 +5,11 @@ SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
+# XXX: LLVM PR879 in ldexp.c
+.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" && ${MACHINE_ARCH} == "i386"
+CC=	gcc
+.endif
+
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS

Modified: projects/clangbsd/lib/msun/Makefile
==============================================================================
--- projects/clangbsd/lib/msun/Makefile	Thu Jun 11 12:56:14 2009	(r193997)
+++ projects/clangbsd/lib/msun/Makefile	Thu Jun 11 13:02:13 2009	(r193998)
@@ -12,6 +12,13 @@
 #
 #
 
+.include <bsd.own.mk>
+
+# XXX: LLVM PR879 in e_rem_pio2.c
+.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" && ${MACHINE_ARCH} == "i386"
+CC=	gcc
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 ARCH_SUBDIR= i387
 .else

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 14:44:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21595106566B;
	Thu, 11 Jun 2009 14:44:11 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9A5A8FC14;
	Thu, 11 Jun 2009 14:44:10 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BEiATY050493;
	Thu, 11 Jun 2009 14:44:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BEiAPR050491;
	Thu, 11 Jun 2009 14:44:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906111444.n5BEiAPR050491@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 11 Jun 2009 14:44:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194004 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 14:44:11 -0000

Author: rpaulo
Date: Thu Jun 11 14:44:10 2009
New Revision: 194004
URL: http://svn.freebsd.org/changeset/base/194004

Log:
  Create M_80211_HWMP and use it.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 14:37:18 2009	(r194003)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 14:44:10 2009	(r194004)
@@ -143,6 +143,8 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, roo
     "3 = Root with RANNs");
 #endif
 
+MALLOC_DEFINE(M_80211_HWMP, "80211hwmp", "802.11 HWMP routing table");
+
 extern int	ieee80211_mesh_ttl;
 
 void
@@ -153,7 +155,7 @@ ieee80211_hwmp_vattach(struct ieee80211v
 	KASSERT(vap->iv_opmode == IEEE80211_M_MBSS,
 	    ("not a mesh vap, opmode %d", vap->iv_opmode));
 
-	hs = malloc(sizeof(struct ieee80211_hwmp_state), M_80211_VAP,
+	hs = malloc(sizeof(struct ieee80211_hwmp_state), M_80211_HWMP,
 	    M_NOWAIT | M_ZERO);
 	if (hs == NULL) {
 		printf("%s: couldn't alloc HWMP state\n", __func__);
@@ -502,7 +504,7 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 	 * Record the PREQ ID and the originator MAC address.
 	 */
 	if (fi == NULL) {
-		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP,
+		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_HWMP,
 		    M_NOWAIT | M_ZERO);
 		memset(fi, 0, sizeof(*fi));
 		IEEE80211_ADDR_COPY(fi->fi_dest, preq->preq_origaddr);
@@ -917,7 +919,7 @@ ieee80211_hwmp_discover(struct ieee80211
 	mtx_unlock(&hs->hs_lock);
 
 	if (fi == NULL) {
-		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP,
+		fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_HWMP,
 		    M_NOWAIT | M_ZERO);
 		IEEE80211_ADDR_COPY(fi->fi_dest, dest);
 		fi->fi_seq = ++hs->hs_seq;

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun 11 14:37:18 2009	(r194003)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun 11 14:44:10 2009	(r194004)
@@ -50,6 +50,9 @@ struct ieee80211_hwmp_fi {
 };
 
 #ifdef _KERNEL
+
+MALLOC_DECLARE(M_80211_HWMP);
+
 struct ieee80211_hwmp_state {
 	TAILQ_HEAD(, ieee80211_hwmp_fi)	hs_head;
 	ieee80211_hwmp_seq		hs_seq;	   /* next seq to be used */

From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 21:41:52 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04FB81065670;
	Thu, 11 Jun 2009 21:41:52 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6EAD8FC15;
	Thu, 11 Jun 2009 21:41:51 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BLfpwg060910;
	Thu, 11 Jun 2009 21:41:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BLfp2W060908;
	Thu, 11 Jun 2009 21:41:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906112141.n5BLfp2W060908@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 11 Jun 2009 21:41:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194041 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 21:41:52 -0000

Author: rpaulo
Date: Thu Jun 11 21:41:51 2009
New Revision: 194041
URL: http://svn.freebsd.org/changeset/base/194041

Log:
  Enforce PREQ/PREP/PERR time intervals between packets.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c
  projects/mesh11s/sys/net80211/ieee80211_hwmp.h

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 21:37:23 2009	(r194040)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Thu Jun 11 21:41:51 2009	(r194041)
@@ -76,17 +76,17 @@ static uint8_t *hwmp_add_meshrann(uint8_
     const struct ieee80211_meshrann_ie *);
 static void	hwmp_recv_preq(struct ieee80211vap *, struct ieee80211_node *,
     const struct ieee80211_frame *, const struct ieee80211_meshpreq_ie *);
-static inline int hwmp_send_preq(struct ieee80211_node *,
+static int	hwmp_send_preq(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshpreq_ie *);
 static void	hwmp_recv_prep(struct ieee80211vap *, struct ieee80211_node *,
     const struct ieee80211_frame *, const struct ieee80211_meshprep_ie *);
-static inline int hwmp_send_prep(struct ieee80211_node *,
+static int	hwmp_send_prep(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshprep_ie *);
 static void	hwmp_recv_perr(struct ieee80211vap *, struct ieee80211_node *,
     const struct ieee80211_frame *, const struct ieee80211_meshperr_ie *);
-static inline int hwmp_send_perr(struct ieee80211_node *,
+static int	hwmp_send_perr(struct ieee80211_node *,
     const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
     struct ieee80211_meshperr_ie *);
 static void	hwmp_recv_rann(struct ieee80211vap *, struct ieee80211_node *,
@@ -96,26 +96,23 @@ static inline int hwmp_send_rann(struct 
     struct ieee80211_meshrann_ie *);
 
 static int	ieee80211_hwmp_maxhops = 31;	
-#ifdef notyet
-static int	ieee80211_hwmp_maxhopstime = 500;
-static int	ieee80211_hwmp_maxprepretries = 3;
-static int	ieee80211_hwmp_prepminint = 100;
-static int	ieee80211_hwmp_perrminint = 100;
-#endif
-static int	ieee80211_hwmp_roottimeout = 5000;
-static int	ieee80211_hwmp_pathtimeout = 5000;
-#ifdef notyet
 static int	ieee80211_hwmp_rootmode = 0;	/* XXX move to vap */
-static int	ieee80211_hwmp_pathtoroottimeout = 5000;
-static int	ieee80211_hmwp_rootint = 2000;
-static int	ieee80211_hwmp_rannint = 1000;
-#endif
 static int	ieee80211_hwmp_targetonly = 0;
 static int	ieee80211_hwmp_replyforward = 1;
-#ifdef notyet
-static int	ieee80211_hwmp_pathmaintenance = 2000;
-static int	ieee80211_hwmp_confirmint = 2000;
-#endif
+static const int ieee80211_hwmp_maxprepretries = 3;
+static const struct timeval ieee80211_hwmp_maxhopstime = { 0, 500000 };
+static const struct timeval ieee80211_hwmp_preqminint = { 0, 100000 };
+static const struct timeval ieee80211_hwmp_prepminint = { 0, 100000 };
+static const struct timeval ieee80211_hwmp_perrminint = { 0, 100000 };
+static const struct timeval ieee80211_hwmp_roottimeout = { 5, 0 };
+static const struct timeval ieee80211_hwmp_pathtimeout = { 5, 0 };
+static const struct timeval ieee80211_hwmp_pathtoroottimeout = { 5, 0 };
+static const struct timeval ieee80211_hmwp_rootint = { 2, 0 };
+static const struct timeval ieee80211_hwmp_rannint = { 1, 0 };
+static const struct timeval ieee80211_hwmp_pathmaintenanceint = { 2, 0 };
+static const struct timeval ieee80211_hwmp_confirmint = { 2, 0 };
+
+#define	timeval2msecs(tv)	(tv.tv_sec * 1000 + tv.tv_usec / 1000)
 
 /*
  * Target Address set in a Proactive PREQ.
@@ -136,12 +133,10 @@ SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, tar
     &ieee80211_hwmp_targetonly, 0, "Set TO bit on generated PREQs");
 SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, replyforward, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_hwmp_replyforward, 0, "Set RF bit on generated PREQs");
-#ifdef notyet
 SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, rootmode, CTLTYPE_INT | CTLFLAG_RW,
     &ieee80211_hwmp_rootmode, 0, "0 = Not a Root, "
     "2 = Root with normal PREPs, 3 = Root with proactive PREPs, "
     "3 = Root with RANNs");
-#endif
 
 MALLOC_DEFINE(M_80211_HWMP, "80211hwmp", "802.11 HWMP routing table");
 
@@ -647,12 +642,21 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 #undef	PREQ_TADDR
 #undef	PREQ_TSEQ
 
-static inline int
+static int
 hwmp_send_preq(struct ieee80211_node *ni,
     const uint8_t sa[IEEE80211_ADDR_LEN],
     const uint8_t da[IEEE80211_ADDR_LEN],
     struct ieee80211_meshpreq_ie *preq)
 {
+	struct ieee80211_hwmp_state *hs = ni->ni_vap->iv_hwmp;
+
+	/*
+	 * Enforce PREQ interval.
+	 */
+	if (ratecheck(&hs->hs_lastpreq, &ieee80211_hwmp_preqminint) == 0)
+		return EALREADY;
+	getmicrouptime(&hs->hs_lastpreq);
+
 	/*
 	 * mesh preq action frame format
 	 *     [6] da
@@ -745,6 +749,15 @@ hwmp_send_prep(struct ieee80211_node *ni
     const uint8_t da[IEEE80211_ADDR_LEN],
     struct ieee80211_meshprep_ie *prep)
 {
+	struct ieee80211_hwmp_state *hs = ni->ni_vap->iv_hwmp;
+
+	/*
+	 * Enforce PREP interval.
+	 */
+	if (ratecheck(&hs->hs_lastprep, &ieee80211_hwmp_prepminint) == 0)
+		return EALREADY;
+	getmicrouptime(&hs->hs_lastprep);
+
 	/*
 	 * mesh prep action frame format
 	 *     [6] da
@@ -801,6 +814,15 @@ hwmp_send_perr(struct ieee80211_node *ni
     const uint8_t da[IEEE80211_ADDR_LEN],
     struct ieee80211_meshperr_ie *perr)
 {
+	struct ieee80211_hwmp_state *hs = ni->ni_vap->iv_hwmp;
+
+	/*
+	 * Enforce PERR interval.
+	 */
+	if (ratecheck(&hs->hs_lastperr, &ieee80211_hwmp_perrminint) == 0)
+		return EALREADY;
+	getmicrouptime(&hs->hs_lastperr);
+
 	/*
 	 * mesh perr action frame format
 	 *     [6] da
@@ -849,7 +871,7 @@ hwmp_recv_rann(struct ieee80211vap *vap,
 		IEEE80211_ADDR_COPY(preq.preq_targets[0].target_addr,
 		    rann->rann_addr);
 		preq.preq_targets[0].target_seq = rann->rann_seq;
-		preq.preq_lifetime = ieee80211_hwmp_roottimeout;
+		preq.preq_lifetime = timeval2msecs(ieee80211_hwmp_roottimeout);
 		preq.preq_metric = IEEE80211_MESHLMETRIC_INITIALVAL; 
 		hwmp_send_preq(ni, vap->iv_myaddr, broadcastaddr, &preq);
 	/*
@@ -905,6 +927,7 @@ ieee80211_hwmp_discover(struct ieee80211
 	if (IEEE80211_IS_MULTICAST(dest))
 		return ieee80211_find_txnode(vap, dest);
 
+
 	mtx_lock(&hs->hs_lock);
 	TAILQ_FOREACH(fi, &hs->hs_head, fi_next) {
 		if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) {
@@ -925,7 +948,7 @@ ieee80211_hwmp_discover(struct ieee80211
 		fi->fi_seq = ++hs->hs_seq;
 		fi->fi_preqid = ++hs->hs_preqid;
 		fi->fi_metric = IEEE80211_MESHLMETRIC_INITIALVAL;
-		fi->fi_lifetime = ieee80211_hwmp_pathtimeout;
+		fi->fi_lifetime = timeval2msecs(ieee80211_hwmp_pathtimeout);
 		mtx_lock(&hs->hs_lock);
 		TAILQ_INSERT_TAIL(&hs->hs_head, fi, fi_next);
 		mtx_unlock(&hs->hs_lock);
@@ -933,6 +956,7 @@ ieee80211_hwmp_discover(struct ieee80211
 		unknowndst = 1;
 	}
 
+
 	if (sendpreq) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest,
 		    "%s", "initiating path discovery");

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun 11 21:37:23 2009	(r194040)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.h	Thu Jun 11 21:41:51 2009	(r194041)
@@ -47,6 +47,7 @@ struct ieee80211_hwmp_fi {
 	uint32_t		fi_nhops;	/* Number of Hops */
 	uint8_t			fi_prevhop[IEEE80211_ADDR_LEN];
 	uint32_t		fi_lifetime;
+	int			fi_preqretries;
 };
 
 #ifdef _KERNEL
@@ -55,9 +56,12 @@ MALLOC_DECLARE(M_80211_HWMP);
 
 struct ieee80211_hwmp_state {
 	TAILQ_HEAD(, ieee80211_hwmp_fi)	hs_head;
-	ieee80211_hwmp_seq		hs_seq;	   /* next seq to be used */
-	ieee80211_hwmp_seq		hs_preqid; /* next PREQ ID to be used */
-	struct mtx			hs_lock;   /* lock for the fi table */
+	ieee80211_hwmp_seq	hs_seq;		/* next seq to be used */
+	ieee80211_hwmp_seq	hs_preqid;	/* next PREQ ID to be used */
+	struct timeval		hs_lastpreq;	/* last time we sent a PREQ */
+	struct timeval		hs_lastprep;	/* last time we sent a PREP */
+	struct timeval		hs_lastperr;	/* last time we sent a PERR */
+	struct mtx		hs_lock;	/* lock for the fi table */
 };
 
 void		ieee80211_hwmp_vattach(struct ieee80211vap *);

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 06:13:57 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A0F1C106564A;
	Fri, 12 Jun 2009 06:13:57 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AA048FC13;
	Fri, 12 Jun 2009 06:13:57 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5C6Duq7072375;
	Fri, 12 Jun 2009 06:13:56 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5C6DtAG072345;
	Fri, 12 Jun 2009 06:13:55 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906120613.n5C6DtAG072345@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 12 Jun 2009 06:13:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194045 - in projects/ngroups: . bin/df bin/sh
	contrib/ee contrib/less contrib/ntp/ntpd etc etc/defaults
	etc/mtree etc/rc.d lib/libc/rpc lib/libc/stdtime lib/libpmc
	lib/libthread_db lib...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 06:13:57 -0000

Author: brooks
Date: Fri Jun 12 06:13:53 2009
New Revision: 194045
URL: http://svn.freebsd.org/changeset/base/194045

Log:
  MFH @ r194044

Added:
  projects/ngroups/etc/ntp.conf
     - copied unchanged from r194044, head/etc/ntp.conf
  projects/ngroups/sbin/ifconfig/ifgif.c
     - copied unchanged from r194044, head/sbin/ifconfig/ifgif.c
  projects/ngroups/share/colldef/hr_HR.ISO8859-2.src
     - copied unchanged from r194044, head/share/colldef/hr_HR.ISO8859-2.src
  projects/ngroups/share/man/man4/alc.4
     - copied unchanged from r194044, head/share/man/man4/alc.4
  projects/ngroups/share/man/man4/mwl.4
     - copied unchanged from r194044, head/share/man/man4/mwl.4
  projects/ngroups/share/man/man4/mwlfw.4
     - copied unchanged from r194044, head/share/man/man4/mwlfw.4
  projects/ngroups/share/man/man9/BUS_NEW_PASS.9
     - copied unchanged from r194044, head/share/man/man9/BUS_NEW_PASS.9
  projects/ngroups/share/man/man9/bus_generic_new_pass.9
     - copied unchanged from r194044, head/share/man/man9/bus_generic_new_pass.9
  projects/ngroups/share/man/man9/bus_set_pass.9
     - copied unchanged from r194044, head/share/man/man9/bus_set_pass.9
  projects/ngroups/share/man/man9/netisr.9
     - copied unchanged from r194044, head/share/man/man9/netisr.9
  projects/ngroups/share/monetdef/pt_PT.ISO8859-15.src
     - copied unchanged from r194044, head/share/monetdef/pt_PT.ISO8859-15.src
  projects/ngroups/share/monetdef/pt_PT.UTF-8.src
     - copied unchanged from r194044, head/share/monetdef/pt_PT.UTF-8.src
  projects/ngroups/share/numericdef/de_CH.ISO8859-1.src
     - copied unchanged from r194044, head/share/numericdef/de_CH.ISO8859-1.src
  projects/ngroups/sys/dev/alc/
     - copied from r194044, head/sys/dev/alc/
  projects/ngroups/sys/dev/sec/
     - copied from r194044, head/sys/dev/sec/
  projects/ngroups/sys/dev/sound/pcm/feeder_chain.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_chain.c
  projects/ngroups/sys/dev/sound/pcm/feeder_eq.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_eq.c
  projects/ngroups/sys/dev/sound/pcm/feeder_format.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_format.c
  projects/ngroups/sys/dev/sound/pcm/feeder_matrix.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_matrix.c
  projects/ngroups/sys/dev/sound/pcm/feeder_mixer.c
     - copied unchanged from r194044, head/sys/dev/sound/pcm/feeder_mixer.c
  projects/ngroups/sys/dev/sound/pcm/g711.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/g711.h
  projects/ngroups/sys/dev/sound/pcm/intpcm.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/intpcm.h
  projects/ngroups/sys/dev/sound/pcm/matrix.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/matrix.h
  projects/ngroups/sys/dev/sound/pcm/matrix_map.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/matrix_map.h
  projects/ngroups/sys/dev/sound/pcm/pcm.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/pcm.h
  projects/ngroups/sys/dev/sound/pcm/sndstat.h
     - copied unchanged from r194044, head/sys/dev/sound/pcm/sndstat.h
  projects/ngroups/sys/kern/subr_acl_nfs4.c
     - copied unchanged from r194044, head/sys/kern/subr_acl_nfs4.c
  projects/ngroups/sys/libkern/jenkins.h
     - copied unchanged from r194044, head/sys/libkern/jenkins.h
  projects/ngroups/sys/modules/alc/
     - copied from r194044, head/sys/modules/alc/
  projects/ngroups/sys/tools/sound/
     - copied from r194044, head/sys/tools/sound/
  projects/ngroups/tools/tools/vimage/
     - copied from r194044, head/tools/tools/vimage/
Deleted:
  projects/ngroups/share/man/man9/devclass_add_driver.9
  projects/ngroups/sys/dev/sound/pcm/fake.c
  projects/ngroups/sys/dev/sound/pcm/feeder_fmt.c
  projects/ngroups/sys/tools/emu10k1-mkalsa.sh
Modified:
  projects/ngroups/   (props changed)
  projects/ngroups/UPDATING
  projects/ngroups/bin/df/df.1
  projects/ngroups/bin/df/df.c
  projects/ngroups/bin/sh/sh.1
  projects/ngroups/contrib/ee/   (props changed)
  projects/ngroups/contrib/less/   (props changed)
  projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c
  projects/ngroups/etc/Makefile
  projects/ngroups/etc/defaults/rc.conf
  projects/ngroups/etc/mtree/BSD.local.dist
  projects/ngroups/etc/mtree/BSD.usr.dist
  projects/ngroups/etc/rc.d/fsck
  projects/ngroups/etc/rc.d/jail
  projects/ngroups/etc/syslog.conf
  projects/ngroups/lib/libc/rpc/svc_dg.c
  projects/ngroups/lib/libc/stdtime/strftime.c
  projects/ngroups/lib/libpmc/libpmc.c
  projects/ngroups/lib/libpmc/pmc.core2.3
  projects/ngroups/lib/libthread_db/libthr_db.c
  projects/ngroups/lib/libthread_db/thread_db.h
  projects/ngroups/lib/libufs/type.c
  projects/ngroups/lib/libufs/ufs_disk_close.3
  projects/ngroups/lib/libusb/   (props changed)
  projects/ngroups/lib/libutil/flopen.3
  projects/ngroups/lib/libutil/flopen.c
  projects/ngroups/lib/libutil/pidfile.3
  projects/ngroups/lib/msun/src/math_private.h
  projects/ngroups/sbin/dhclient/dhclient.c
  projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8
  projects/ngroups/sbin/fsck_msdosfs/main.c
  projects/ngroups/sbin/geom/class/part/geom_part.c
  projects/ngroups/sbin/geom/core/geom.c
  projects/ngroups/sbin/geom/core/geom.h
  projects/ngroups/sbin/ifconfig/Makefile
  projects/ngroups/sbin/ipfw/dummynet.c
  projects/ngroups/sbin/ipfw/ipfw.8
  projects/ngroups/sbin/ipfw/ipfw2.c
  projects/ngroups/share/colldef/Makefile
  projects/ngroups/share/man/man4/Makefile
  projects/ngroups/share/man/man4/acpi.4
  projects/ngroups/share/man/man4/altq.4
  projects/ngroups/share/man/man4/gif.4
  projects/ngroups/share/man/man4/if_bridge.4
  projects/ngroups/share/man/man4/iwn.4
  projects/ngroups/share/man/man4/miibus.4
  projects/ngroups/share/man/man4/ng_ipfw.4
  projects/ngroups/share/man/man4/vlan.4
  projects/ngroups/share/man/man5/fstab.5
  projects/ngroups/share/man/man9/Makefile
  projects/ngroups/share/misc/committers-src.dot
  projects/ngroups/share/misc/pci_vendors
  projects/ngroups/share/mklocale/Makefile
  projects/ngroups/share/monetdef/Makefile
  projects/ngroups/share/monetdef/de_CH.ISO8859-1.src
  projects/ngroups/share/msgdef/Makefile
  projects/ngroups/share/numericdef/Makefile
  projects/ngroups/share/timedef/Makefile
  projects/ngroups/share/timedef/de_DE.ISO8859-1.src
  projects/ngroups/share/timedef/de_DE.UTF-8.src
  projects/ngroups/share/timedef/ja_JP.SJIS.src
  projects/ngroups/share/timedef/ja_JP.eucJP.src
  projects/ngroups/share/timedef/ko_KR.UTF-8.src
  projects/ngroups/share/timedef/ko_KR.eucKR.src
  projects/ngroups/share/timedef/pl_PL.ISO8859-2.src
  projects/ngroups/share/timedef/pl_PL.UTF-8.src
  projects/ngroups/share/zoneinfo/   (props changed)
  projects/ngroups/share/zoneinfo/asia
  projects/ngroups/sys/amd64/amd64/local_apic.c
  projects/ngroups/sys/amd64/amd64/machdep.c
  projects/ngroups/sys/amd64/conf/DEFAULTS
  projects/ngroups/sys/amd64/conf/GENERIC
  projects/ngroups/sys/amd64/conf/NOTES
  projects/ngroups/sys/amd64/include/param.h
  projects/ngroups/sys/amd64/isa/clock.c
  projects/ngroups/sys/arm/arm/intr.c
  projects/ngroups/sys/arm/arm/locore.S
  projects/ngroups/sys/arm/arm/pmap.c
  projects/ngroups/sys/arm/at91/at91.c
  projects/ngroups/sys/arm/at91/at91_cfata.c
  projects/ngroups/sys/arm/at91/at91_mci.c
  projects/ngroups/sys/arm/at91/at91_twi.c
  projects/ngroups/sys/arm/at91/if_ate.c
  projects/ngroups/sys/arm/include/intr.h
  projects/ngroups/sys/arm/mv/ic.c
  projects/ngroups/sys/arm/mv/twsi.c
  projects/ngroups/sys/arm/sa11x0/sa11x0_irqhandler.c
  projects/ngroups/sys/arm/xscale/i80321/i80321.c
  projects/ngroups/sys/arm/xscale/i80321/i80321_pci.c
  projects/ngroups/sys/arm/xscale/i8134x/i81342.c
  projects/ngroups/sys/arm/xscale/ixp425/avila_ata.c
  projects/ngroups/sys/arm/xscale/ixp425/avila_led.c
  projects/ngroups/sys/arm/xscale/ixp425/cambria_led.c
  projects/ngroups/sys/arm/xscale/ixp425/if_npe.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425.c
  projects/ngroups/sys/arm/xscale/ixp425/ixp425_iic.c
  projects/ngroups/sys/arm/xscale/pxa/pxa_icu.c
  projects/ngroups/sys/boot/forth/loader.conf
  projects/ngroups/sys/boot/i386/libi386/biosdisk.c
  projects/ngroups/sys/boot/i386/libi386/biospnp.c
  projects/ngroups/sys/cam/scsi/scsi_target.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/ngroups/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/ngroups/sys/compat/freebsd32/freebsd32_proto.h
  projects/ngroups/sys/compat/freebsd32/freebsd32_syscall.h
  projects/ngroups/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/ngroups/sys/compat/freebsd32/freebsd32_sysent.c
  projects/ngroups/sys/compat/freebsd32/syscalls.master
  projects/ngroups/sys/compat/linprocfs/linprocfs.c
  projects/ngroups/sys/compat/linux/linux_ioctl.c
  projects/ngroups/sys/compat/ndis/subr_usbd.c
  projects/ngroups/sys/compat/svr4/svr4_sockio.c
  projects/ngroups/sys/conf/NOTES
  projects/ngroups/sys/conf/files
  projects/ngroups/sys/conf/files.powerpc
  projects/ngroups/sys/conf/options
  projects/ngroups/sys/contrib/altq/altq/altq_subr.c
  projects/ngroups/sys/contrib/dev/acpica/   (props changed)
  projects/ngroups/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/ngroups/sys/contrib/pf/net/if_pflog.c
  projects/ngroups/sys/contrib/pf/net/pf_if.c
  projects/ngroups/sys/contrib/pf/net/pf_ioctl.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSchedule.c
  projects/ngroups/sys/dev/acpica/Osd/OsdSynch.c
  projects/ngroups/sys/dev/acpica/acpi_pcib_acpi.c
  projects/ngroups/sys/dev/acpica/acpivar.h
  projects/ngroups/sys/dev/agp/agp_ali.c
  projects/ngroups/sys/dev/agp/agp_amd.c
  projects/ngroups/sys/dev/agp/agp_ati.c
  projects/ngroups/sys/dev/agp/agp_nvidia.c
  projects/ngroups/sys/dev/agp/agp_sis.c
  projects/ngroups/sys/dev/ata/   (props changed)
  projects/ngroups/sys/dev/ata/ata-pci.h
  projects/ngroups/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/ngroups/sys/dev/ata/chipsets/ata-nvidia.c
  projects/ngroups/sys/dev/ce/if_ce.c
  projects/ngroups/sys/dev/cfi/cfi_core.c
  projects/ngroups/sys/dev/cp/if_cp.c
  projects/ngroups/sys/dev/ctau/if_ct.c
  projects/ngroups/sys/dev/cx/if_cx.c
  projects/ngroups/sys/dev/cxgb/cxgb_main.c
  projects/ngroups/sys/dev/cxgb/cxgb_multiq.c
  projects/ngroups/sys/dev/cxgb/cxgb_sge.c
  projects/ngroups/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/ngroups/sys/dev/e1000/if_igb.c
  projects/ngroups/sys/dev/eisa/eisaconf.c
  projects/ngroups/sys/dev/fxp/if_fxp.c
  projects/ngroups/sys/dev/if_ndis/if_ndis.c
  projects/ngroups/sys/dev/if_ndis/if_ndis_usb.c
  projects/ngroups/sys/dev/kbdmux/kbdmux.c
  projects/ngroups/sys/dev/ksyms/ksyms.c
  projects/ngroups/sys/dev/mca/mca_bus.c
  projects/ngroups/sys/dev/mge/if_mge.c
  projects/ngroups/sys/dev/mwl/if_mwl.c
  projects/ngroups/sys/dev/ncv/ncr53c500_pccard.c
  projects/ngroups/sys/dev/nmdm/nmdm.c
  projects/ngroups/sys/dev/nsp/nsp_pccard.c
  projects/ngroups/sys/dev/ofw/ofw_standard.c
  projects/ngroups/sys/dev/pcf/pcf.c
  projects/ngroups/sys/dev/pcf/pcfvar.h
  projects/ngroups/sys/dev/pdq/if_fpa.c
  projects/ngroups/sys/dev/smc/if_smc.c
  projects/ngroups/sys/dev/smc/if_smcvar.h
  projects/ngroups/sys/dev/snc/if_snc.c
  projects/ngroups/sys/dev/snc/if_sncvar.h
  projects/ngroups/sys/dev/sound/clone.c
  projects/ngroups/sys/dev/sound/driver.c
  projects/ngroups/sys/dev/sound/isa/ad1816.c
  projects/ngroups/sys/dev/sound/isa/ess.c
  projects/ngroups/sys/dev/sound/isa/gusc.c
  projects/ngroups/sys/dev/sound/isa/mss.c
  projects/ngroups/sys/dev/sound/isa/sb16.c
  projects/ngroups/sys/dev/sound/isa/sb8.c
  projects/ngroups/sys/dev/sound/isa/sbc.c
  projects/ngroups/sys/dev/sound/isa/sndbuf_dma.c
  projects/ngroups/sys/dev/sound/macio/aoa.c
  projects/ngroups/sys/dev/sound/macio/davbus.c
  projects/ngroups/sys/dev/sound/macio/i2s.c
  projects/ngroups/sys/dev/sound/macio/snapper.c
  projects/ngroups/sys/dev/sound/macio/tumbler.c
  projects/ngroups/sys/dev/sound/midi/midi.c
  projects/ngroups/sys/dev/sound/midi/mpu401.c
  projects/ngroups/sys/dev/sound/midi/sequencer.c
  projects/ngroups/sys/dev/sound/midi/sequencer.h
  projects/ngroups/sys/dev/sound/pci/als4000.c
  projects/ngroups/sys/dev/sound/pci/atiixp.c
  projects/ngroups/sys/dev/sound/pci/aureal.c
  projects/ngroups/sys/dev/sound/pci/cmi.c
  projects/ngroups/sys/dev/sound/pci/cs4281.c
  projects/ngroups/sys/dev/sound/pci/csa.c
  projects/ngroups/sys/dev/sound/pci/csapcm.c
  projects/ngroups/sys/dev/sound/pci/ds1.c
  projects/ngroups/sys/dev/sound/pci/emu10k1.c
  projects/ngroups/sys/dev/sound/pci/emu10kx-midi.c
  projects/ngroups/sys/dev/sound/pci/emu10kx-pcm.c
  projects/ngroups/sys/dev/sound/pci/emu10kx.c
  projects/ngroups/sys/dev/sound/pci/envy24.c
  projects/ngroups/sys/dev/sound/pci/envy24ht.c
  projects/ngroups/sys/dev/sound/pci/es137x.c
  projects/ngroups/sys/dev/sound/pci/fm801.c
  projects/ngroups/sys/dev/sound/pci/hda/hdac.c
  projects/ngroups/sys/dev/sound/pci/ich.c
  projects/ngroups/sys/dev/sound/pci/maestro.c
  projects/ngroups/sys/dev/sound/pci/maestro3.c
  projects/ngroups/sys/dev/sound/pci/neomagic.c
  projects/ngroups/sys/dev/sound/pci/solo.c
  projects/ngroups/sys/dev/sound/pci/spicds.c
  projects/ngroups/sys/dev/sound/pci/t4dwave.c
  projects/ngroups/sys/dev/sound/pci/via8233.c
  projects/ngroups/sys/dev/sound/pci/via82c686.c
  projects/ngroups/sys/dev/sound/pci/vibes.c
  projects/ngroups/sys/dev/sound/pcm/ac97.c
  projects/ngroups/sys/dev/sound/pcm/ac97_patch.c
  projects/ngroups/sys/dev/sound/pcm/buffer.c
  projects/ngroups/sys/dev/sound/pcm/buffer.h
  projects/ngroups/sys/dev/sound/pcm/channel.c
  projects/ngroups/sys/dev/sound/pcm/channel.h
  projects/ngroups/sys/dev/sound/pcm/channel_if.m
  projects/ngroups/sys/dev/sound/pcm/dsp.c
  projects/ngroups/sys/dev/sound/pcm/dsp.h
  projects/ngroups/sys/dev/sound/pcm/feeder.c
  projects/ngroups/sys/dev/sound/pcm/feeder.h
  projects/ngroups/sys/dev/sound/pcm/feeder_rate.c
  projects/ngroups/sys/dev/sound/pcm/feeder_volume.c
  projects/ngroups/sys/dev/sound/pcm/mixer.c
  projects/ngroups/sys/dev/sound/pcm/mixer.h
  projects/ngroups/sys/dev/sound/pcm/sndstat.c
  projects/ngroups/sys/dev/sound/pcm/sound.c
  projects/ngroups/sys/dev/sound/pcm/sound.h
  projects/ngroups/sys/dev/sound/pcm/vchan.c
  projects/ngroups/sys/dev/sound/pcm/vchan.h
  projects/ngroups/sys/dev/sound/sbus/cs4231.c
  projects/ngroups/sys/dev/sound/unit.c
  projects/ngroups/sys/dev/sound/usb/uaudio.c
  projects/ngroups/sys/dev/sound/usb/uaudio.h
  projects/ngroups/sys/dev/sound/usb/uaudio_pcm.c
  projects/ngroups/sys/dev/sound/version.h
  projects/ngroups/sys/dev/spibus/spibus.c
  projects/ngroups/sys/dev/stg/tmc18c30.h
  projects/ngroups/sys/dev/stg/tmc18c30_subr.c
  projects/ngroups/sys/dev/syscons/teken/teken_demo.c
  projects/ngroups/sys/dev/syscons/teken/teken_stress.c
  projects/ngroups/sys/dev/ubsec/ubsec.c
  projects/ngroups/sys/dev/usb/controller/at91dci.c
  projects/ngroups/sys/dev/usb/controller/atmegadci.c
  projects/ngroups/sys/dev/usb/controller/avr32dci.c
  projects/ngroups/sys/dev/usb/controller/ehci.c
  projects/ngroups/sys/dev/usb/controller/musb_otg.c
  projects/ngroups/sys/dev/usb/controller/ohci.c
  projects/ngroups/sys/dev/usb/controller/uhci.c
  projects/ngroups/sys/dev/usb/controller/uss820dci.c
  projects/ngroups/sys/dev/usb/serial/ugensa.c
  projects/ngroups/sys/dev/usb/serial/umct.c
  projects/ngroups/sys/dev/usb/storage/ustorage_fs.c
  projects/ngroups/sys/dev/usb/usb.h
  projects/ngroups/sys/dev/usb/usb_compat_linux.c
  projects/ngroups/sys/dev/usb/usb_compat_linux.h
  projects/ngroups/sys/dev/usb/usb_controller.h
  projects/ngroups/sys/dev/usb/usb_core.h
  projects/ngroups/sys/dev/usb/usb_debug.c
  projects/ngroups/sys/dev/usb/usb_debug.h
  projects/ngroups/sys/dev/usb/usb_dev.c
  projects/ngroups/sys/dev/usb/usb_device.c
  projects/ngroups/sys/dev/usb/usb_device.h
  projects/ngroups/sys/dev/usb/usb_generic.c
  projects/ngroups/sys/dev/usb/usb_handle_request.c
  projects/ngroups/sys/dev/usb/usb_hub.c
  projects/ngroups/sys/dev/usb/usb_lookup.h
  projects/ngroups/sys/dev/usb/usb_request.c
  projects/ngroups/sys/dev/usb/usb_transfer.c
  projects/ngroups/sys/dev/usb/usb_transfer.h
  projects/ngroups/sys/dev/usb/wlan/if_zyd.c
  projects/ngroups/sys/dev/usb/wlan/if_zydreg.h
  projects/ngroups/sys/dev/wb/if_wb.c
  projects/ngroups/sys/dev/wi/if_wi.c
  projects/ngroups/sys/dev/wi/if_wivar.h
  projects/ngroups/sys/dev/xen/netfront/   (props changed)
  projects/ngroups/sys/dev/xen/netfront/netfront.c
  projects/ngroups/sys/dev/xen/xenpci/   (props changed)
  projects/ngroups/sys/fs/cd9660/cd9660_vnops.c
  projects/ngroups/sys/fs/devfs/devfs_vnops.c
  projects/ngroups/sys/fs/fifofs/fifo_vnops.c
  projects/ngroups/sys/fs/msdosfs/msdosfs_vnops.c
  projects/ngroups/sys/fs/nfsclient/nfs_clbio.c
  projects/ngroups/sys/fs/nfsclient/nfs_clstate.c
  projects/ngroups/sys/fs/nfsclient/nfs_clvnops.c
  projects/ngroups/sys/fs/pseudofs/pseudofs_vncache.c
  projects/ngroups/sys/fs/pseudofs/pseudofs_vnops.c
  projects/ngroups/sys/fs/udf/osta.c
  projects/ngroups/sys/geom/geom.h
  projects/ngroups/sys/geom/geom_io.c
  projects/ngroups/sys/geom/geom_subr.c
  projects/ngroups/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/ngroups/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/ngroups/sys/i386/acpica/acpi_machdep.c
  projects/ngroups/sys/i386/conf/DEFAULTS
  projects/ngroups/sys/i386/conf/GENERIC
  projects/ngroups/sys/i386/conf/NOTES
  projects/ngroups/sys/i386/i386/local_apic.c
  projects/ngroups/sys/i386/i386/machdep.c
  projects/ngroups/sys/i386/include/apicvar.h
  projects/ngroups/sys/i386/include/legacyvar.h
  projects/ngroups/sys/i386/isa/clock.c
  projects/ngroups/sys/i386/isa/vesa.c
  projects/ngroups/sys/i386/pci/pci_bus.c
  projects/ngroups/sys/kern/bus_if.m
  projects/ngroups/sys/kern/init_main.c
  projects/ngroups/sys/kern/kern_event.c
  projects/ngroups/sys/kern/kern_exec.c
  projects/ngroups/sys/kern/kern_exit.c
  projects/ngroups/sys/kern/kern_fork.c
  projects/ngroups/sys/kern/kern_jail.c
  projects/ngroups/sys/kern/kern_lockf.c
  projects/ngroups/sys/kern/kern_poll.c
  projects/ngroups/sys/kern/kern_uuid.c
  projects/ngroups/sys/kern/kern_vimage.c
  projects/ngroups/sys/kern/link_elf_obj.c
  projects/ngroups/sys/kern/linker_if.m
  projects/ngroups/sys/kern/subr_bus.c
  projects/ngroups/sys/kern/sys_pipe.c
  projects/ngroups/sys/kern/sysv_shm.c
  projects/ngroups/sys/kern/tty.c
  projects/ngroups/sys/kern/tty_pts.c
  projects/ngroups/sys/kern/uipc_domain.c
  projects/ngroups/sys/kern/uipc_mqueue.c
  projects/ngroups/sys/kern/uipc_socket.c
  projects/ngroups/sys/kern/uipc_syscalls.c
  projects/ngroups/sys/kern/vfs_aio.c
  projects/ngroups/sys/kern/vfs_bio.c
  projects/ngroups/sys/kern/vfs_cluster.c
  projects/ngroups/sys/kern/vfs_lookup.c
  projects/ngroups/sys/kern/vfs_subr.c
  projects/ngroups/sys/kern/vfs_syscalls.c
  projects/ngroups/sys/kern/vfs_vnops.c
  projects/ngroups/sys/kern/vnode_if.src
  projects/ngroups/sys/modules/Makefile
  projects/ngroups/sys/modules/bridgestp/Makefile
  projects/ngroups/sys/modules/cxgb/iw_cxgb/Makefile
  projects/ngroups/sys/modules/cxgb/tom/Makefile
  projects/ngroups/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/ngroups/sys/modules/firewire/fwip/Makefile
  projects/ngroups/sys/modules/ibcs2/Makefile
  projects/ngroups/sys/modules/if_ef/Makefile
  projects/ngroups/sys/modules/if_gif/Makefile
  projects/ngroups/sys/modules/if_ppp/Makefile
  projects/ngroups/sys/modules/if_stf/Makefile
  projects/ngroups/sys/modules/if_tun/Makefile
  projects/ngroups/sys/modules/if_vlan/Makefile
  projects/ngroups/sys/modules/ip6_mroute_mod/   (props changed)
  projects/ngroups/sys/modules/ip6_mroute_mod/Makefile
  projects/ngroups/sys/modules/ip_mroute_mod/Makefile
  projects/ngroups/sys/modules/ipfw/Makefile
  projects/ngroups/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/ngroups/sys/modules/linprocfs/Makefile
  projects/ngroups/sys/modules/linux/Makefile
  projects/ngroups/sys/modules/mac_lomac/Makefile
  projects/ngroups/sys/modules/netgraph/atm/atm/Makefile
  projects/ngroups/sys/modules/netgraph/ether/Makefile
  projects/ngroups/sys/modules/netgraph/gif/Makefile
  projects/ngroups/sys/modules/nfsclient/Makefile
  projects/ngroups/sys/modules/nfsserver/Makefile
  projects/ngroups/sys/modules/pf/Makefile
  projects/ngroups/sys/modules/pseudofs/Makefile
  projects/ngroups/sys/modules/sem/Makefile
  projects/ngroups/sys/modules/sound/sound/Makefile
  projects/ngroups/sys/modules/svr4/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvmsg/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvsem/Makefile
  projects/ngroups/sys/modules/sysvipc/sysvshm/Makefile
  projects/ngroups/sys/modules/ufs/Makefile
  projects/ngroups/sys/modules/wlan/Makefile
  projects/ngroups/sys/net/bpf.c
  projects/ngroups/sys/net/bridgestp.c
  projects/ngroups/sys/net/flowtable.c
  projects/ngroups/sys/net/flowtable.h
  projects/ngroups/sys/net/if.c
  projects/ngroups/sys/net/if_arcsubr.c
  projects/ngroups/sys/net/if_bridge.c
  projects/ngroups/sys/net/if_ef.c
  projects/ngroups/sys/net/if_ethersubr.c
  projects/ngroups/sys/net/if_fddisubr.c
  projects/ngroups/sys/net/if_fwsubr.c
  projects/ngroups/sys/net/if_gif.c
  projects/ngroups/sys/net/if_gif.h
  projects/ngroups/sys/net/if_iso88025subr.c
  projects/ngroups/sys/net/if_loop.c
  projects/ngroups/sys/net/if_mib.c
  projects/ngroups/sys/net/if_tap.c
  projects/ngroups/sys/net/if_tun.c
  projects/ngroups/sys/net/if_var.h
  projects/ngroups/sys/net/if_vlan.c
  projects/ngroups/sys/net/raw_cb.c
  projects/ngroups/sys/net/raw_usrreq.c
  projects/ngroups/sys/net/route.c
  projects/ngroups/sys/net/rtsock.c
  projects/ngroups/sys/net/vnet.h
  projects/ngroups/sys/net80211/_ieee80211.h
  projects/ngroups/sys/net80211/ieee80211.c
  projects/ngroups/sys/net80211/ieee80211.h
  projects/ngroups/sys/net80211/ieee80211_crypto.c
  projects/ngroups/sys/net80211/ieee80211_crypto.h
  projects/ngroups/sys/net80211/ieee80211_crypto_ccmp.c
  projects/ngroups/sys/net80211/ieee80211_crypto_tkip.c
  projects/ngroups/sys/net80211/ieee80211_ddb.c
  projects/ngroups/sys/net80211/ieee80211_dfs.c
  projects/ngroups/sys/net80211/ieee80211_freebsd.c
  projects/ngroups/sys/net80211/ieee80211_hostap.c
  projects/ngroups/sys/net80211/ieee80211_ht.c
  projects/ngroups/sys/net80211/ieee80211_input.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.c
  projects/ngroups/sys/net80211/ieee80211_ioctl.h
  projects/ngroups/sys/net80211/ieee80211_node.c
  projects/ngroups/sys/net80211/ieee80211_node.h
  projects/ngroups/sys/net80211/ieee80211_output.c
  projects/ngroups/sys/net80211/ieee80211_proto.h
  projects/ngroups/sys/net80211/ieee80211_radiotap.c
  projects/ngroups/sys/net80211/ieee80211_scan_sta.c
  projects/ngroups/sys/net80211/ieee80211_sta.c
  projects/ngroups/sys/net80211/ieee80211_var.h
  projects/ngroups/sys/netgraph/atm/ng_atm.c
  projects/ngroups/sys/netgraph/netgraph.h
  projects/ngroups/sys/netgraph/ng_base.c
  projects/ngroups/sys/netgraph/ng_eiface.c
  projects/ngroups/sys/netgraph/ng_ether.c
  projects/ngroups/sys/netgraph/ng_gif.c
  projects/ngroups/sys/netgraph/ng_iface.c
  projects/ngroups/sys/netgraph/ng_ip_input.c
  projects/ngroups/sys/netgraph/ng_ipfw.c
  projects/ngroups/sys/netgraph/ng_ipfw.h
  projects/ngroups/sys/netgraph/ng_message.h
  projects/ngroups/sys/netinet/if_ether.c
  projects/ngroups/sys/netinet/igmp.c
  projects/ngroups/sys/netinet/igmp.h
  projects/ngroups/sys/netinet/in.c
  projects/ngroups/sys/netinet/in_gif.c
  projects/ngroups/sys/netinet/in_mcast.c
  projects/ngroups/sys/netinet/in_proto.c
  projects/ngroups/sys/netinet/in_rmx.c
  projects/ngroups/sys/netinet/ip_dummynet.h
  projects/ngroups/sys/netinet/ip_fw.h
  projects/ngroups/sys/netinet/ip_ipsec.c
  projects/ngroups/sys/netinet/ip_ipsec.h
  projects/ngroups/sys/netinet/ip_output.c
  projects/ngroups/sys/netinet/ip_var.h
  projects/ngroups/sys/netinet/ipfw/ip_dummynet.c   (contents, props changed)
  projects/ngroups/sys/netinet/ipfw/ip_fw2.c   (contents, props changed)
  projects/ngroups/sys/netinet/ipfw/ip_fw_pfil.c   (contents, props changed)
  projects/ngroups/sys/netinet/raw_ip.c
  projects/ngroups/sys/netinet/sctp_os_bsd.h
  projects/ngroups/sys/netinet/tcp_debug.c
  projects/ngroups/sys/netinet/tcp_hostcache.c
  projects/ngroups/sys/netinet/tcp_input.c
  projects/ngroups/sys/netinet/tcp_subr.c
  projects/ngroups/sys/netinet/tcp_syncache.c
  projects/ngroups/sys/netinet/tcp_syncache.h
  projects/ngroups/sys/netinet/tcp_timewait.c
  projects/ngroups/sys/netinet/tcp_usrreq.c
  projects/ngroups/sys/netinet/tcp_var.h
  projects/ngroups/sys/netinet/udp_usrreq.c
  projects/ngroups/sys/netinet/udp_var.h
  projects/ngroups/sys/netinet6/icmp6.c
  projects/ngroups/sys/netinet6/in6.c
  projects/ngroups/sys/netinet6/in6_gif.c
  projects/ngroups/sys/netinet6/in6_ifattach.c
  projects/ngroups/sys/netinet6/in6_mcast.c
  projects/ngroups/sys/netinet6/in6_proto.c
  projects/ngroups/sys/netinet6/in6_rmx.c
  projects/ngroups/sys/netinet6/ip6_input.c
  projects/ngroups/sys/netinet6/ip6_mroute.c
  projects/ngroups/sys/netinet6/ip6_output.c
  projects/ngroups/sys/netinet6/ip6_var.h
  projects/ngroups/sys/netinet6/ip6protosw.h
  projects/ngroups/sys/netinet6/nd6.c
  projects/ngroups/sys/netinet6/nd6.h
  projects/ngroups/sys/netinet6/nd6_rtr.c
  projects/ngroups/sys/netinet6/raw_ip6.c
  projects/ngroups/sys/netinet6/scope6.c
  projects/ngroups/sys/netipsec/ipsec.c
  projects/ngroups/sys/netipsec/ipsec_input.c
  projects/ngroups/sys/netipsec/key.c
  projects/ngroups/sys/netipsec/key.h
  projects/ngroups/sys/netipsec/keysock.c
  projects/ngroups/sys/netipsec/xform_ipip.c
  projects/ngroups/sys/netipx/spx_debug.c
  projects/ngroups/sys/nfsclient/bootp_subr.c
  projects/ngroups/sys/nfsclient/nfs_bio.c
  projects/ngroups/sys/nfsclient/nfs_diskless.c
  projects/ngroups/sys/powerpc/aim/machdep.c
  projects/ngroups/sys/powerpc/aim/platform_chrp.c
  projects/ngroups/sys/powerpc/conf/MPC85XX
  projects/ngroups/sys/powerpc/include/ocpbus.h
  projects/ngroups/sys/powerpc/include/pio.h
  projects/ngroups/sys/powerpc/mpc85xx/ocpbus.c
  projects/ngroups/sys/powerpc/mpc85xx/ocpbus.h
  projects/ngroups/sys/powerpc/ofw/ofw_real.c
  projects/ngroups/sys/powerpc/powermac/cuda.c
  projects/ngroups/sys/powerpc/powermac/pmu.c
  projects/ngroups/sys/powerpc/powerpc/bus_machdep.c
  projects/ngroups/sys/powerpc/powerpc/openpic.c
  projects/ngroups/sys/powerpc/psim/ata_iobus.c
  projects/ngroups/sys/rpc/clnt_rc.c
  projects/ngroups/sys/rpc/svc.c
  projects/ngroups/sys/rpc/svc_auth.c
  projects/ngroups/sys/security/audit/audit_pipe.c
  projects/ngroups/sys/sys/bio.h
  projects/ngroups/sys/sys/buf_ring.h
  projects/ngroups/sys/sys/bus.h
  projects/ngroups/sys/sys/domain.h
  projects/ngroups/sys/sys/event.h
  projects/ngroups/sys/sys/kobj.h
  projects/ngroups/sys/sys/mount.h
  projects/ngroups/sys/sys/param.h
  projects/ngroups/sys/sys/priv.h
  projects/ngroups/sys/sys/proc.h
  projects/ngroups/sys/sys/protosw.h
  projects/ngroups/sys/sys/soundcard.h
  projects/ngroups/sys/sys/vimage.h
  projects/ngroups/sys/vm/vm_fault.c
  projects/ngroups/sys/vm/vm_glue.c
  projects/ngroups/sys/vm/vm_map.c
  projects/ngroups/sys/vm/vm_pager.h
  projects/ngroups/tools/regression/lib/libutil/test-flopen.c
  projects/ngroups/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/ngroups/tools/tools/README
  projects/ngroups/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/ngroups/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/ngroups/tools/tools/pciid/mk_pci_vendors.pl
  projects/ngroups/usr.bin/fstat/zfs.c
  projects/ngroups/usr.sbin/arp/Makefile
  projects/ngroups/usr.sbin/arp/arp.c
  projects/ngroups/usr.sbin/flowctl/flowctl.c
  projects/ngroups/usr.sbin/jail/jail.8
  projects/ngroups/usr.sbin/jail/jail.c
  projects/ngroups/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/ngroups/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/ngroups/usr.sbin/makefs/getid.c   (props changed)
  projects/ngroups/usr.sbin/mergemaster/mergemaster.sh
  projects/ngroups/usr.sbin/mountd/mountd.c
  projects/ngroups/usr.sbin/pstat/Makefile
  projects/ngroups/usr.sbin/pstat/pstat.c
  projects/ngroups/usr.sbin/sysinstall/devices.c
  projects/ngroups/usr.sbin/syslogd/syslog.conf.5

Modified: projects/ngroups/UPDATING
==============================================================================
--- projects/ngroups/UPDATING	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/UPDATING	Fri Jun 12 06:13:53 2009	(r194045)
@@ -22,6 +22,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090611:
+	The layout of struct thread has changed.  Kernel and modules
+	need to be rebuilt.
+
+20090608:
+	The layout of structs ifnet, domain, protosw and vnet_net has
+	changed.  Kernel modules need to be rebuilt.
+	Bump __FreeBSD_version to 800097.
+
 20090602:
 	window(1) has been removed from the base system. It can now be
 	installed from ports. The port is called misc/window.

Modified: projects/ngroups/bin/df/df.1
==============================================================================
--- projects/ngroups/bin/df/df.1	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/df/df.1	Fri Jun 12 06:13:53 2009	(r194045)
@@ -78,15 +78,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 10 for sizes.
 .It Fl h
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 2 for sizes.
+Inodes statistics, if enabled with
+.Fl i ,
+are always printed in base 10.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

Modified: projects/ngroups/bin/df/df.c
==============================================================================
--- projects/ngroups/bin/df/df.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/df/df.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -369,6 +369,23 @@ prthumanval(int64_t bytes)
 }
 
 /*
+ * Print an inode count in "human-readable" format.
+ */
+static void
+prthumanvalinode(int64_t bytes)
+{
+	char buf[6];
+	int flags;
+
+	flags = HN_NOSPACE | HN_DECIMAL | HN_DIVISOR_1000;
+
+	humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
+	    bytes, "", HN_AUTOSCALE, flags);
+
+	(void)printf(" %5s", buf);
+}
+
+/*
  * Convert statfs returned file system size into BLOCKSIZE units.
  * Attempts to avoid overflow for large file systems.
  */
@@ -413,8 +430,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
-			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
-			mwp->ifree = imax(mwp->ifree, (int)strlen("ifree"));
+			mwp->iused = imax(hflag ? 0 : mwp->iused,
+			    (int)strlen("  iused"));
+			mwp->ifree = imax(hflag ? 0 : mwp->ifree,
+			    (int)strlen("ifree"));
 			(void)printf(" %*s %*s %%iused",
 			    mwp->iused - 2, "iused", mwp->ifree, "ifree");
 		}
@@ -440,8 +459,15 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used,
-		    mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 :
+		if (hflag) {
+			(void)printf("  ");
+			prthumanvalinode(used);
+			prthumanvalinode(sfsp->f_ffree);
+		} else {
+			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			    mwp->ifree, (intmax_t)sfsp->f_ffree);
+		}
+		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
 		    (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");

Modified: projects/ngroups/bin/sh/sh.1
==============================================================================
--- projects/ngroups/bin/sh/sh.1	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/bin/sh/sh.1	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1682,6 +1682,7 @@ If
 is given
 it is used as the exit status of the shell;
 otherwise the exit status of the preceding command is used.
+The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p
 The specified names are exported so that they will

Modified: projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c
==============================================================================
--- projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/contrib/ntp/ntpd/ntp_crypto.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -570,7 +570,7 @@ crypto_recv(
 			peer->issuer = emalloc(vallen + 1);
 			strcpy(peer->issuer, peer->subject);
 			temp32 = (fstamp >> 16) & 0xffff;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "flags 0x%x host %s signature %s", fstamp,
 			    peer->subject, OBJ_nid2ln(temp32));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -636,7 +636,8 @@ crypto_recv(
 			}
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "cert %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "cert %s 0x%x %s (%u) fs %u",
 			    cinfo->subject, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -685,7 +686,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "iff fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "iff fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -733,7 +734,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "gq fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "gq fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -774,7 +775,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "mv fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "mv fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -828,7 +829,7 @@ crypto_recv(
 			peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -893,7 +894,7 @@ crypto_recv(
 				peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -944,7 +945,7 @@ crypto_recv(
 			peer->pkeyid = bp->key;
 			peer->crypto |= CRYPTO_FLAG_AUTO;
 			peer->flash &= ~TEST8;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "auto seq %d key %x ts %u fs %u", bp->seq,
 			    bp->key, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
@@ -987,7 +988,8 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_SIGN;
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "sign %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "sign %s 0x%x %s (%u) fs %u",
 			    cinfo->issuer, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -1071,7 +1073,8 @@ crypto_recv(
 			crypto_flags |= CRYPTO_FLAG_TAI;
 			peer->crypto |= CRYPTO_FLAG_LEAP;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "leap %u ts %u fs %u", vallen,
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "leap %u ts %u fs %u", vallen,
 			    ntohl(ep->tstamp), ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -1127,7 +1130,7 @@ crypto_recv(
 		 * cheerfully ignored, as the message is not sent.
 		 */
 		if (rval > XEVNT_TSP) {
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "error %x opcode %x ts %u fs %u", rval,
 			    code, tstamp, fstamp);
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -1453,7 +1456,8 @@ crypto_xmit(
 	 */
 	if (rval != XEVNT_OK) {
 		opcode |= CRYPTO_ERROR;
-		sprintf(statstr, "error %x opcode %x", rval, opcode);
+		snprintf(statstr, NTP_MAXSTRLEN,
+		    "error %x opcode %x", rval, opcode);
 		record_crypto_stats(srcadr_sin, statstr);
 		report_event(rval, NULL);
 #ifdef DEBUG
@@ -1952,7 +1956,8 @@ crypto_update(void)
 		if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey))
 			tai_leap.siglen = htonl(len);
 	}
-	sprintf(statstr, "update ts %u", ntohl(hostval.tstamp)); 
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "update ts %u", ntohl(hostval.tstamp)); 
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3606,7 +3611,7 @@ crypto_key(
 	 */
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s mod %d", &linkname[2],
+	snprintf(statstr, NTP_MAXSTRLEN, "%s mod %d", &linkname[2],
 	    EVP_PKEY_size(pkey) * 8);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
@@ -3715,8 +3720,8 @@ crypto_cert(
 
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s 0x%x len %lu", &linkname[2], ret->flags,
-	    len);
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "%s 0x%x len %lu", &linkname[2], ret->flags, len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3832,7 +3837,7 @@ crypto_tai(
 	for (j = 0; j < i; j++)
 		*ptr++ = htonl(leapsec[j]);
 	crypto_flags |= CRYPTO_FLAG_TAI;
-	sprintf(statstr, "%s fs %u leap %u len %u", cp, fstamp,
+	snprintf(statstr, NTP_MAXSTRLEN, "%s fs %u leap %u len %u", cp, fstamp,
 	   leapsec[--j], len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG

Modified: projects/ngroups/etc/Makefile
==============================================================================
--- projects/ngroups/etc/Makefile	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/Makefile	Fri Jun 12 06:13:53 2009	(r194045)
@@ -63,6 +63,10 @@ BIN1+=	${.CURDIR}/../usr.bin/mail/misc/m
 BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
+.if ${MK_NTP} != "no"
+BIN1+=	ntp.conf
+.endif
+
 .if ${MK_OPENSSH} != "no"
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \

Modified: projects/ngroups/etc/defaults/rc.conf
==============================================================================
--- projects/ngroups/etc/defaults/rc.conf	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/defaults/rc.conf	Fri Jun 12 06:13:53 2009	(r194045)
@@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 -
 
 root_rw_mount="YES"	# Set to NO to inhibit remounting root read-write.
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
+fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
 netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.

Modified: projects/ngroups/etc/mtree/BSD.local.dist
==============================================================================
--- projects/ngroups/etc/mtree/BSD.local.dist	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/mtree/BSD.local.dist	Fri Jun 12 06:13:53 2009	(r194045)
@@ -541,12 +541,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Modified: projects/ngroups/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/ngroups/etc/mtree/BSD.usr.dist	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/mtree/BSD.usr.dist	Fri Jun 12 06:13:53 2009	(r194045)
@@ -357,12 +357,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Copied: projects/ngroups/etc/ntp.conf (from r194044, head/etc/ntp.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ngroups/etc/ntp.conf	Fri Jun 12 06:13:53 2009	(r194045, copy of r194044, head/etc/ntp.conf)
@@ -0,0 +1,59 @@
+#
+# $FreeBSD$
+#
+# Default NTP servers for the FreeBSD operating system.
+#
+# Don't forget to enable ntpd in /etc/rc.conf with:
+# ntpd_enable="YES"
+#
+# The driftfile is by default /var/db/ntpd.drift, check
+# /etc/defaults/rc.conf on how to change the location.
+#
+
+#
+# The following three servers will give you a random set of three
+# NTP servers geographically close to you.
+# See http://en.wikipedia.org/wiki/NTP_pool for details.
+#
+# The option `iburst' is used for faster initial synchronisation.
+# The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD.
+#
+server 0.pool.ntp.org iburst maxpoll 9
+server 1.pool.ntp.org iburst maxpoll 9
+server 2.pool.ntp.org iburst maxpoll 9
+
+#
+# If you want to pick yourself which country's public NTP server
+# you want sync against, comment out the above servers, uncomment
+# the next ones and replace CC with the country's abbrevation.
+# Make sure that the hostnames resolve to a proper IP address!
+#
+# server 0.CC.pool.ntp.org iburst maxpoll 9
+# server 1.CC.pool.ntp.org iburst maxpoll 9
+# server 2.CC.pool.ntp.org iburst maxpoll 9
+
+#
+# Security: Only accept NTP traffic from the following hosts.
+# The following configuration example only accepts traffic from the
+# above defined servers.
+#
+# Please note that this example doesn't work for the servers in
+# the pool.ntp.org domain since they return multiple A records.
+# (This is the reason that by default they are commented out)
+#
+#restrict default ignore
+#restrict 0.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 1.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 2.pool.ntp.org nomodify nopeer noquery notrap
+#restrict 127.0.0.1
+#restrict -6 ::1
+#restrict 127.127.1.0
+
+#
+# If we lose sync against all configured servers, the NTP clients
+# syncing against this server will lose sync too. To overcome this,
+# we will act as a stratum 10 server with our own internal clock
+# so that everybody at least will have the same time as we have.
+#
+server 127.127.1.0
+fudge 127.127.1.0 stratum 10

Modified: projects/ngroups/etc/rc.d/fsck
==============================================================================
--- projects/ngroups/etc/rc.d/fsck	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/rc.d/fsck	Fri Jun 12 06:13:53 2009	(r194045)
@@ -44,8 +44,8 @@ fsck_start()
 			;;
 		8)
 			if checkyesno fsck_y_enable; then
-				echo "File system preen failed, trying fsck -y."
-				fsck -y
+				echo "File system preen failed, trying fsck -y ${fsck_y_flags}"
+				fsck -y ${fsck_y_flags}
 				case $? in
 				0)
 					;;

Modified: projects/ngroups/etc/rc.d/jail
==============================================================================
--- projects/ngroups/etc/rc.d/jail	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/rc.d/jail	Fri Jun 12 06:13:53 2009	(r194045)
@@ -52,7 +52,7 @@ init_variables()
 	eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\"
 		[ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] &&  break
 		i=$((i + 1))
@@ -132,7 +132,6 @@ init_variables()
 	debug "$_j procdir: $_procdir"
 	debug "$_j ruleset: $_ruleset"
 	debug "$_j fstab: $_fstab"
-	debug "$_j consolelog: $_consolelog"
 
 	i=0
 	while : ; do
@@ -147,7 +146,7 @@ init_variables()
 	debug "$_j exec start: $_exec_start"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval out=\"\${_exec_afterstart${i}:-''}\"
 
 		if [ -z "$out" ]; then
@@ -642,7 +641,7 @@ jail_start()
 		if [ "$?" -eq 0 ] ; then
 			_jail_id=$(head -1 ${_tmp_jail})
 			i=1
-			while [ true ]; do
+			while : ; do
 				eval out=\"\${_exec_afterstart${i}:-''}\"
 
 				if [ -z "$out" ]; then

Modified: projects/ngroups/etc/syslog.conf
==============================================================================
--- projects/ngroups/etc/syslog.conf	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/etc/syslog.conf	Fri Jun 12 06:13:53 2009	(r194045)
@@ -28,3 +28,4 @@ cron.*						/var/log/cron
 # news.notice					/var/log/news/news.notice
 !ppp
 *.*						/var/log/ppp.log
+!*

Modified: projects/ngroups/lib/libc/rpc/svc_dg.c
==============================================================================
--- projects/ngroups/lib/libc/rpc/svc_dg.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libc/rpc/svc_dg.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -209,7 +209,7 @@ svc_dg_recvfrom(int fd, char *buf, int b
 		return rlen;
 
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
-	     cmsg = CMSG_NXTHDR(&msg, cmsg)){
+	     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
 		if (cmsg->cmsg_level == IPPROTO_IP &&
 		    cmsg->cmsg_type == IP_RECVDSTADDR) {
 			have_lin = TRUE;
@@ -300,7 +300,7 @@ svc_dg_sendto(int fd, char *buf, int buf
 	msg.msg_namelen = raddrlen;
 	msg.msg_name = (char *)raddr;
 
-	if (laddr->sa_family == AF_INET) {
+	if (laddr->sa_family == AF_INET && lin->s_addr != INADDR_ANY) {
 		msg.msg_control = (caddr_t)tmp;
 		msg.msg_controllen = CMSG_LEN(sizeof(*lin));
 		cmsg = CMSG_FIRSTHDR(&msg);

Modified: projects/ngroups/lib/libc/stdtime/strftime.c
==============================================================================
--- projects/ngroups/lib/libc/stdtime/strftime.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libc/stdtime/strftime.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -57,7 +57,7 @@ extern char *	tzname[];
 #define IN_THIS	2
 #define IN_ALL	3
 
-#define PAD_DEFAULT 0
+#define PAD_DEFAULT	0
 #define PAD_LESS	1
 #define PAD_SPACE	2
 #define PAD_ZERO	3
@@ -65,7 +65,7 @@ extern char *	tzname[];
 static const char* fmt_padding[][4] = {
 	/* DEFAULT,	LESS,	SPACE,	ZERO */
 #define PAD_FMT_MONTHDAY	0
-#define PAD_FMT_HMS			0
+#define PAD_FMT_HMS		0
 #define PAD_FMT_CENTURY		0
 #define PAD_FMT_SHORTYEAR	0
 #define PAD_FMT_MONTH		0

Modified: projects/ngroups/lib/libpmc/libpmc.c
==============================================================================
--- projects/ngroups/lib/libpmc/libpmc.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libpmc/libpmc.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -591,22 +591,22 @@ iap_allocate_pmc(enum pmc_event pe, char
 			pmc_config->pm_caps |= PMC_CAP_USER;
 		} else if (KWMATCH(p, IAP_KW_ANYTHREAD)) {
 			pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY;
-		} else if (KWMATCH(p, IAP_KW_CORE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) {
 			n = pmc_parse_mask(iap_core_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_AGENT)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) {
 			n = pmc_parse_mask(iap_agent_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_PREFETCH)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) {
 			n = pmc_parse_mask(iap_prefetch_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_CACHESTATE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) {
 			n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate);
 		} else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE &&
-		    KWMATCH(p, IAP_KW_TRANSITION)) {
+		    KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) {
 			n = pmc_parse_mask(iap_transition_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
@@ -614,10 +614,10 @@ iap_allocate_pmc(enum pmc_event pe, char
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) {
-			if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) {
+			if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) {
 				n = pmc_parse_mask(iap_snoopresponse_mask, p,
 				    &evmask);
-			} else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) {
+			} else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) {
 				n = pmc_parse_mask(iap_snooptype_mask, p,
 				    &evmask);
 			} else

Modified: projects/ngroups/lib/libpmc/pmc.core2.3
==============================================================================
--- projects/ngroups/lib/libpmc/pmc.core2.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libpmc/pmc.core2.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2008,2009 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 12, 2008
+.Dd June 8, 2009
 .Os
 .Dt PMC.CORE2 3
 .Sh NAME
@@ -42,7 +42,7 @@ family CPUs
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
-These CPUs contains two classes of PMCs:
+These CPUs may contain upto two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
@@ -66,6 +66,7 @@ Intel Core2 PMCs are documented in
 .Ss CORE2 FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
+Not all CPUs in this family implement fixed-function counters.
 .Ss CORE2 PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"

Modified: projects/ngroups/lib/libthread_db/libthr_db.c
==============================================================================
--- projects/ngroups/lib/libthread_db/libthr_db.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libthread_db/libthr_db.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -457,6 +457,7 @@ pt_thr_get_info(const td_thrhandle_t *th
 {
 	const td_thragent_t *ta = th->th_ta;
 	struct ptrace_lwpinfo linfo;
+	int traceme;
 	int state;
 	int ret;
 
@@ -470,7 +471,8 @@ pt_thr_get_info(const td_thrhandle_t *th
 	if (ret != 0)
 		return (TD_ERR);
 	ret = thr_pread_int(ta, th->th_thread + ta->thread_off_report_events,
-	    &info->ti_traceme);
+	    &traceme);
+	info->ti_traceme = traceme;
 	if (ret != 0)
 		return (TD_ERR);
 	ret = ps_pread(ta->ph, th->th_thread + ta->thread_off_event_mask,

Modified: projects/ngroups/lib/libthread_db/thread_db.h
==============================================================================
--- projects/ngroups/lib/libthread_db/thread_db.h	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libthread_db/thread_db.h	Fri Jun 12 06:13:53 2009	(r194045)
@@ -184,7 +184,7 @@ typedef struct {
 	int		ti_pri;
 	lwpid_t		ti_lid;
 	char		ti_db_suspended;
-	int		ti_traceme;
+	char		ti_traceme;
 	sigset_t	ti_sigmask;
 	sigset_t	ti_pending;
 	psaddr_t	ti_tls;

Modified: projects/ngroups/lib/libufs/type.c
==============================================================================
--- projects/ngroups/lib/libufs/type.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libufs/type.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -108,7 +108,10 @@ again:	if ((ret = stat(name, &st)) < 0) 
 		 */
 		name = oname;
 	}
-	if (ret >= 0 && S_ISCHR(st.st_mode)) {
+	if (ret >= 0 && S_ISREG(st.st_mode)) {
+		/* Possibly a disk image, give it a try.  */
+		;
+	} else if (ret >= 0 && S_ISCHR(st.st_mode)) {
 		/* This is what we need, do nothing. */
 		;
 	} else if ((fs = getfsfile(name)) != NULL) {

Modified: projects/ngroups/lib/libufs/ufs_disk_close.3
==============================================================================
--- projects/ngroups/lib/libufs/ufs_disk_close.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libufs/ufs_disk_close.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -53,7 +53,7 @@ and populate the structure pointed to by
 The disk is opened read-only.
 The specified
 .Fa name
-may be either a mountpoint, or a device name.
+may be either a mountpoint, a device name or a filesystem image.
 The
 .Fn ufs_disk_fillout
 function assumes there is a valid superblock and will fail if not,

Modified: projects/ngroups/lib/libutil/flopen.3
==============================================================================
--- projects/ngroups/lib/libutil/flopen.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/flopen.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 10, 2007
+.Dd June 6, 2009
 .Dt FLOPEN 3
 .Os
 .Sh NAME
@@ -46,13 +46,12 @@ The
 function opens or creates a file and acquires an exclusive lock on it.
 It is essentially equivalent with calling
 .Fn open
-with the same parameters followed by an
-.Fn fcntl
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-operation with lock type
-.Dv F_WRLCK ,
+with the same parameters followed by
+.Fn flock
+with an
+.Va operation
+argument of
+.Dv LOCK_EX ,
 except that
 .Fn flopen
 will attempt to detect and handle races that may occur between opening
@@ -87,18 +86,13 @@ returns a valid file descriptor.
 Otherwise, it returns -1, and sets
 .Va errno
 as described in
-.Xr fcntl 2
+.Xr flock 2
 and
 .Xr open 2 .
 .Sh SEE ALSO
 .Xr errno 2 ,
-.Xr fcntl 2 ,
+.Xr flock 2 ,
 .Xr open 2
-.Sh HISTORY
-The
-.Fn flopen
-function first appeared in
-.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

Modified: projects/ngroups/lib/libutil/flopen.c
==============================================================================
--- projects/ngroups/lib/libutil/flopen.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/flopen.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -28,12 +28,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/file.h>
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <fcntl.h>
 #include <stdarg.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <libutil.h>
@@ -42,7 +41,6 @@ int
 flopen(const char *path, int flags, ...)
 {
 	int fd, operation, serrno, trunc;
-	struct flock lock;
 	struct stat sb, fsb;
 	mode_t mode;
 
@@ -59,10 +57,9 @@ flopen(const char *path, int flags, ...)
 		va_end(ap);
 	}
 
-	memset(&lock, 0, sizeof lock);
-	lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW;
+        operation = LOCK_EX;
+        if (flags & O_NONBLOCK)
+                operation |= LOCK_NB;
 
 	trunc = (flags & O_TRUNC);
 	flags &= ~O_TRUNC;
@@ -71,7 +68,7 @@ flopen(const char *path, int flags, ...)
 		if ((fd = open(path, flags, mode)) == -1)
 			/* non-existent or no access */
 			return (-1);
-		if (fcntl(fd, operation, &lock) == -1) {
+		if (flock(fd, operation) == -1) {
 			/* unsupported or interrupted */
 			serrno = errno;
 			(void)close(fd);

Modified: projects/ngroups/lib/libutil/pidfile.3
==============================================================================
--- projects/ngroups/lib/libutil/pidfile.3	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/libutil/pidfile.3	Fri Jun 12 06:13:53 2009	(r194045)
@@ -100,6 +100,7 @@ if an error occurs.
 If an error occurs,
 .Va errno
 will be set.
+.Pp
 .Rv -std pidfile_write pidfile_close pidfile_remove
 .Sh EXAMPLES
 The following example shows in which order these functions should be used.

Modified: projects/ngroups/lib/msun/src/math_private.h
==============================================================================
--- projects/ngroups/lib/msun/src/math_private.h	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/lib/msun/src/math_private.h	Fri Jun 12 06:13:53 2009	(r194045)
@@ -262,7 +262,7 @@ irint(double x)
 {
 	int n;
 
-	asm("cvtsd2si %1,%0" : "=r" (n) : "Y" (x));
+	asm("cvtsd2si %1,%0" : "=r" (n) : "x" (x));
 	return (n);
 }
 #define	HAVE_EFFICIENT_IRINT

Modified: projects/ngroups/sbin/dhclient/dhclient.c
==============================================================================
--- projects/ngroups/sbin/dhclient/dhclient.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/dhclient/dhclient.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -1977,7 +1977,7 @@ supersede:
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "prepend option",
 						    dhcp_options[i].name);
@@ -1996,24 +1996,34 @@ supersede:
 					dp[len] = '\0';
 					break;
 				case ACTION_APPEND:
+					/*
+					 * When we append, we assume that we're
+					 * appending to text.  Some MS servers
+					 * include a NUL byte at the end of
+					 * the search string provided.
+					 */
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "append option",
 						    dhcp_options[i].name);
 						goto supersede;
 					}
-					dp = dbuf;
-					memcpy(dp,
+					memcpy(dbuf,
 						lease->options[i].data,
 						lease->options[i].len);
-					memcpy(dp + lease->options[i].len,
+					for (dp = dbuf + lease->options[i].len;
+					    dp > dbuf; dp--, len--)
+						if (dp[-1] != '\0')
+							break;
+					memcpy(dp,
 						ip->client->
 						config->defaults[i].data,
 						ip->client->
 						config->defaults[i].len);
+					dp = dbuf;
 					dp[len] = '\0';
 				}
 			} else {

Modified: projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8
==============================================================================
--- projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/fsck_msdosfs/fsck_msdosfs.8	Fri Jun 12 06:13:53 2009	(r194045)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 1995
+.Dd June 4, 2009
 .Dt FSCK_MSDOSFS 8
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@
 .Sh SYNOPSIS
 .Nm
 .Fl p
-.Op Fl f
+.Op Fl Cf
 .Ar filesystem ...
 .Nm
-.Op Fl ny
+.Op Fl Cny
 .Ar filesystem ...
 .Sh DESCRIPTION
 The
@@ -80,6 +80,10 @@ making any changes.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl C
+Compatibility with the corresponding
+.Xr fsck 8
+option (skip check if clean), defined to no-op.
 .It Fl F
 Compatibility with the wrapper
 .Xr fsck 8

Modified: projects/ngroups/sbin/fsck_msdosfs/main.c
==============================================================================
--- projects/ngroups/sbin/fsck_msdosfs/main.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/fsck_msdosfs/main.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -74,8 +74,10 @@ main(int argc, char **argv)
 	int ch;
 
 	skipclean = 1;
-	while ((ch = getopt(argc, argv, "fFnpy")) != -1) {
+	while ((ch = getopt(argc, argv, "CfFnpy")) != -1) {
 		switch (ch) {
+		case 'C': /* for fsck_ffs compatibility */
+			break;
 		case 'f':
 			skipclean = 0;
 			break;

Modified: projects/ngroups/sbin/geom/class/part/geom_part.c
==============================================================================
--- projects/ngroups/sbin/geom/class/part/geom_part.c	Fri Jun 12 00:07:09 2009	(r194044)
+++ projects/ngroups/sbin/geom/class/part/geom_part.c	Fri Jun 12 06:13:53 2009	(r194045)
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 uint32_t PUBSYM(lib_version) = G_LIB_VERSION;
 uint32_t PUBSYM(version) = 0;
 
+static char autofill[] = "*";
 static char optional[] = "";
 static char flags[] = "C";
 
@@ -68,10 +69,10 @@ static void gpart_show(struct gctl_req *
 
 struct g_command PUBSYM(class_commands)[] = {
 	{ "add", 0, gpart_issue, {
-		{ 'b', "start", NULL, G_TYPE_STRING },
-		{ 's', "size", NULL, G_TYPE_STRING },
+		{ 'b', "start", autofill, G_TYPE_ASCLBA },
+		{ 's', "size", autofill, G_TYPE_ASCLBA },
 		{ 't', "type", NULL, G_TYPE_STRING },
-		{ 'i', index_param, optional, G_TYPE_STRING },
+		{ 'i', index_param, optional, G_TYPE_ASCNUM },
 		{ 'l', "label", optional, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
@@ -80,7 +81,7 @@ struct g_command PUBSYM(class_commands)[
 	{ "bootcode", 0, gpart_bootcode, {
 		{ 'b', bootcode_param, optional, G_TYPE_STRING },
 		{ 'p', partcode_param, optional, G_TYPE_STRING },
-		{ 'i', index_param, optional, G_TYPE_STRING },
+		{ 'i', index_param, optional, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -88,13 +89,13 @@ struct g_command PUBSYM(class_commands)[
 	{ "commit", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
 	{ "create", 0, gpart_issue, {
 		{ 's', "scheme", NULL, G_TYPE_STRING },
-		{ 'n', "entries", optional, G_TYPE_STRING },
+		{ 'n', "entries", optional, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "provider", NULL
 	},
 	{ "delete", 0, gpart_issue, {
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -104,7 +105,7 @@ struct g_command PUBSYM(class_commands)[
 		G_OPT_SENTINEL },
 	  "geom", NULL },
 	{ "modify", 0, gpart_issue, {
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'l', "label", optional, G_TYPE_STRING },
 		{ 't', "type", optional, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
@@ -113,7 +114,7 @@ struct g_command PUBSYM(class_commands)[
 	},
 	{ "set", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -127,7 +128,7 @@ struct g_command PUBSYM(class_commands)[
 	{ "undo", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
 	{ "unset", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
-		{ 'i', index_param, NULL, G_TYPE_STRING },
+		{ 'i', index_param, NULL, G_TYPE_ASCNUM },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
@@ -240,6 +241,121 @@ fmtattrib(struct gprovider *pp)
 	return (buf);
 }
 
+static int
+gpart_autofill(struct gctl_req *req)
+{
+	struct gmesh mesh;
+	struct gclass *cp;
+	struct ggeom *gp;
+	struct gprovider *pp;
+	unsigned long long first, last;
+	unsigned long long size, start;
+	unsigned long long lba, len, grade;
+	const char *s;
+	char *val;
+	int error, has_size, has_start;
+
+	s = gctl_get_ascii(req, "verb");
+	if (strcmp(s, "add") != 0)
+		return (0);
+
+	s = gctl_get_ascii(req, "size");
+	has_size = (*s == '*') ? 0 : 1;
+	size = (has_size) ? (unsigned long long)atoll(s) : 0ULL;
+
+	s = gctl_get_ascii(req, "start");
+	has_start = (*s == '*') ? 0 : 1;
+	start = (has_start) ? (unsigned long long)atoll(s) : ~0ULL;
+
+	/* No autofill necessary. */
+	if (has_size && has_start)
+		return (0);
+
+	error = geom_gettree(&mesh);
+	if (error)
+		return (error);
+	cp = find_class(&mesh, gctl_get_ascii(req, "class"));
+	gp = find_geom(cp, gctl_get_ascii(req, "geom"));
+	first = atoll(find_geomcfg(gp, "first"));
+	last = atoll(find_geomcfg(gp, "last"));
+	grade = ~0ULL;
+	while ((pp = find_provider(gp, first)) != NULL) {
+		s = find_provcfg(pp, "start");
+		if (s == NULL) {
+			s = find_provcfg(pp, "offset");
+			lba = atoll(s) / pp->lg_sectorsize;
+		} else
+			lba = atoll(s);
+
+		if (first < lba) {
+			/* Free space [first, lba> */
+			len = lba - first;
+			if (has_size) {
+				if (len >= size && len - size < grade) {
+					start = first;
+					grade = len - size;
+				}
+			} else if (has_start) {
+				if (start >= first && start < lba) {
+					size = lba - start;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 10:41:00 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBF201065674;
	Fri, 12 Jun 2009 10:41:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA3AB8FC19;
	Fri, 12 Jun 2009 10:41:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CAf0QB077891;
	Fri, 12 Jun 2009 10:41:00 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CAf06g077890;
	Fri, 12 Jun 2009 10:41:00 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906121041.n5CAf06g077890@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 12 Jun 2009 10:41:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194053 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 10:41:01 -0000

Author: rpaulo
Date: Fri Jun 12 10:41:00 2009
New Revision: 194053
URL: http://svn.freebsd.org/changeset/base/194053

Log:
  fix style

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 12 09:31:14 2009	(r194052)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 12 10:41:00 2009	(r194053)
@@ -69,7 +69,7 @@ static inline void	mesh_linkchange(struc
     enum ieee80211_mesh_mlstate);
 static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int);
 static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
-		    int, int);
+    int, int);
 static void	mesh_recv_action(struct ieee80211_node *, struct mbuf *);
 static inline void	mesh_peer_timeout_setup(struct ieee80211_node *);
 static void		mesh_peer_timeout_backoff(struct ieee80211_node *);

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 10:56:10 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78C0A106566B;
	Fri, 12 Jun 2009 10:56:10 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 673618FC14;
	Fri, 12 Jun 2009 10:56:10 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CAuAPQ080104;
	Fri, 12 Jun 2009 10:56:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CAuANc080103;
	Fri, 12 Jun 2009 10:56:10 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906121056.n5CAuANc080103@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 12 Jun 2009 10:56:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194054 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 10:56:10 -0000

Author: rpaulo
Date: Fri Jun 12 10:56:09 2009
New Revision: 194054
URL: http://svn.freebsd.org/changeset/base/194054

Log:
  Make sure the generated mesh IDs are unique.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 12 10:41:00 2009	(r194053)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 12 10:56:09 2009	(r194054)
@@ -67,6 +67,7 @@ static void	mesh_vattach(struct ieee8021
 static int	mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static inline void	mesh_linkchange(struct ieee80211_node *,
     enum ieee80211_mesh_mlstate);
+static uint32_t	mesh_generateid(struct ieee80211vap *);
 static int	mesh_input(struct ieee80211_node *, struct mbuf *, int, int);
 static void	mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
     int, int);
@@ -219,7 +220,7 @@ doprint(struct ieee80211vap *vap, int su
 }
 
 /*
- * Helper function to nore the Mesh Peer Link FSM change.
+ * Helper function to note the Mesh Peer Link FSM change.
  */
 static inline void
 mesh_linkchange(struct ieee80211_node *ni, enum ieee80211_mesh_mlstate state)
@@ -242,6 +243,33 @@ mesh_linkchange(struct ieee80211_node *n
 
 }
 
+/*
+ * Helper function to generate a unique local ID required for mesh
+ * peer establishment.
+ */
+static void
+_mesh_checkid(void *arg, struct ieee80211_node *ni)
+{
+	uint16_t *r = arg;
+	
+	if (*r == ni->ni_mllid)
+		*(uint16_t *)arg = 0;
+}
+
+static uint32_t
+mesh_generateid(struct ieee80211vap *vap)
+{
+	uint16_t r;
+
+restart:
+	get_random_bytes(&r, 2);
+	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, _mesh_checkid, &r);
+	if (r == 0)
+		goto restart;
+
+	return r;
+}
+
 static int
 mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise)
 {
@@ -539,7 +567,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		    vap->iv_meshflags & IEEE80211_MFLAGS_AP &&
 		    ni->ni_mlstate == IEEE80211_NODE_MESH_IDLE) {
 			union ieee80211_send_action_args vargs;
-			get_random_bytes(&ni->ni_mlpid, 2);
+			ni->ni_mlpid = mesh_generateid(vap);
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENSNT);
 			vargs.fixedarg[0] = ni->ni_mlpid;
 			ieee80211_send_action(ni,
@@ -763,7 +791,7 @@ mesh_recv_action(struct ieee80211_node *
 				mesh_linkchange(ni,
 				    IEEE80211_NODE_MESH_OPENRCV);
 				ni->ni_mllid = meshpeer->peer_llinkid;
-				get_random_bytes(&ni->ni_mlpid, 2);
+				ni->ni_mlpid = mesh_generateid(vap);
 				vargs.fixedarg[0] = ni->ni_mlpid;
 				/* Announce we're open too... */
 				ieee80211_send_action(ni,

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 11:50:48 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51696106566B;
	Fri, 12 Jun 2009 11:50:48 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 397D38FC1B;
	Fri, 12 Jun 2009 11:50:48 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CBomLt081164;
	Fri, 12 Jun 2009 11:50:48 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CBolOm081136;
	Fri, 12 Jun 2009 11:50:47 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200906121150.n5CBolOm081136@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 12 Jun 2009 11:50:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194056 - in projects/mips: . bin/cp bin/df bin/rm
	bin/sh bin/test cddl/contrib/opensolaris/cmd/lockstat
	cddl/usr.sbin cddl/usr.sbin/lockstat contrib/bind9
	contrib/bind9/bin contrib/bin...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 11:50:48 -0000

Author: gonzo
Date: Fri Jun 12 11:50:44 2009
New Revision: 194056
URL: http://svn.freebsd.org/changeset/base/194056

Log:
  - Merge from HEAD

Added:
  projects/mips/cddl/contrib/opensolaris/cmd/lockstat/
     - copied from r194052, head/cddl/contrib/opensolaris/cmd/lockstat/
  projects/mips/cddl/usr.sbin/lockstat/
     - copied from r194052, head/cddl/usr.sbin/lockstat/
  projects/mips/contrib/bind9/NSEC3-NOTES
     - copied unchanged from r194052, head/contrib/bind9/NSEC3-NOTES
  projects/mips/contrib/bind9/README.pkcs11
     - copied unchanged from r194052, head/contrib/bind9/README.pkcs11
  projects/mips/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
  projects/mips/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
  projects/mips/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
  projects/mips/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
     - copied unchanged from r194052, head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
  projects/mips/contrib/bind9/bin/named/bind9.xsl
     - copied unchanged from r194052, head/contrib/bind9/bin/named/bind9.xsl
  projects/mips/contrib/bind9/bin/named/bind9.xsl.h
     - copied unchanged from r194052, head/contrib/bind9/bin/named/bind9.xsl.h
  projects/mips/contrib/bind9/bin/named/convertxsl.pl
     - copied unchanged from r194052, head/contrib/bind9/bin/named/convertxsl.pl
  projects/mips/contrib/bind9/bin/named/include/named/statschannel.h
     - copied unchanged from r194052, head/contrib/bind9/bin/named/include/named/statschannel.h
  projects/mips/contrib/bind9/bin/named/statschannel.c
     - copied unchanged from r194052, head/contrib/bind9/bin/named/statschannel.c
  projects/mips/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
     - copied unchanged from r194052, head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/mips/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
     - copied unchanged from r194052, head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/mips/contrib/bind9/doc/arm/man.nsupdate.html
     - copied unchanged from r194052, head/contrib/bind9/doc/arm/man.nsupdate.html
  projects/mips/contrib/bind9/lib/dns/include/dns/iptable.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/include/dns/iptable.h
  projects/mips/contrib/bind9/lib/dns/include/dns/nsec3.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/mips/contrib/bind9/lib/dns/iptable.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/iptable.c
  projects/mips/contrib/bind9/lib/dns/nsec3.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/nsec3.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h
  projects/mips/contrib/bind9/lib/dns/spnego.asn1
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/spnego.asn1
  projects/mips/contrib/bind9/lib/dns/spnego.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/spnego.c
  projects/mips/contrib/bind9/lib/dns/spnego.h
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/spnego.h
  projects/mips/contrib/bind9/lib/dns/spnego_asn1.c
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/spnego_asn1.c
  projects/mips/contrib/bind9/lib/dns/spnego_asn1.pl
     - copied unchanged from r194052, head/contrib/bind9/lib/dns/spnego_asn1.pl
  projects/mips/contrib/bind9/lib/isc/base32.c
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/base32.c
  projects/mips/contrib/bind9/lib/isc/httpd.c
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/httpd.c
  projects/mips/contrib/bind9/lib/isc/include/isc/base32.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/base32.h
  projects/mips/contrib/bind9/lib/isc/include/isc/httpd.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/httpd.h
  projects/mips/contrib/bind9/lib/isc/include/isc/iterated_hash.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/iterated_hash.h
  projects/mips/contrib/bind9/lib/isc/include/isc/radix.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/radix.h
  projects/mips/contrib/bind9/lib/isc/include/isc/stats.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/stats.h
  projects/mips/contrib/bind9/lib/isc/include/isc/xml.h
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/include/isc/xml.h
  projects/mips/contrib/bind9/lib/isc/iterated_hash.c
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/iterated_hash.c
  projects/mips/contrib/bind9/lib/isc/radix.c
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/radix.c
  projects/mips/contrib/bind9/lib/isc/stats.c
     - copied unchanged from r194052, head/contrib/bind9/lib/isc/stats.c
  projects/mips/contrib/ee/   (props changed)
     - copied from r194052, head/contrib/ee/
  projects/mips/etc/ntp.conf
     - copied unchanged from r194052, head/etc/ntp.conf
  projects/mips/etc/rc.d/nfscbd
     - copied unchanged from r194052, head/etc/rc.d/nfscbd
  projects/mips/etc/rc.d/nfsuserd
     - copied unchanged from r194052, head/etc/rc.d/nfsuserd
  projects/mips/sbin/ifconfig/ifgif.c
     - copied unchanged from r194052, head/sbin/ifconfig/ifgif.c
  projects/mips/share/colldef/hr_HR.ISO8859-2.src
     - copied unchanged from r194052, head/share/colldef/hr_HR.ISO8859-2.src
  projects/mips/share/man/man4/alc.4
     - copied unchanged from r194052, head/share/man/man4/alc.4
  projects/mips/share/man/man4/ksyms.4
     - copied unchanged from r194052, head/share/man/man4/ksyms.4
  projects/mips/share/man/man4/mld.4
     - copied unchanged from r194052, head/share/man/man4/mld.4
  projects/mips/share/man/man4/mwl.4
     - copied unchanged from r194052, head/share/man/man4/mwl.4
  projects/mips/share/man/man4/mwlfw.4
     - copied unchanged from r194052, head/share/man/man4/mwlfw.4
  projects/mips/share/man/man9/BUS_NEW_PASS.9
     - copied unchanged from r194052, head/share/man/man9/BUS_NEW_PASS.9
  projects/mips/share/man/man9/bus_generic_new_pass.9
     - copied unchanged from r194052, head/share/man/man9/bus_generic_new_pass.9
  projects/mips/share/man/man9/bus_set_pass.9
     - copied unchanged from r194052, head/share/man/man9/bus_set_pass.9
  projects/mips/share/man/man9/fail.9
     - copied unchanged from r194052, head/share/man/man9/fail.9
  projects/mips/share/man/man9/netisr.9
     - copied unchanged from r194052, head/share/man/man9/netisr.9
  projects/mips/share/man/man9/sglist.9
     - copied unchanged from r194052, head/share/man/man9/sglist.9
  projects/mips/share/monetdef/pt_PT.ISO8859-15.src
     - copied unchanged from r194052, head/share/monetdef/pt_PT.ISO8859-15.src
  projects/mips/share/monetdef/pt_PT.UTF-8.src
     - copied unchanged from r194052, head/share/monetdef/pt_PT.UTF-8.src
  projects/mips/share/numericdef/de_CH.ISO8859-1.src
     - copied unchanged from r194052, head/share/numericdef/de_CH.ISO8859-1.src
  projects/mips/sys/cddl/dev/lockstat/
     - copied from r194052, head/sys/cddl/dev/lockstat/
  projects/mips/sys/contrib/dev/acpica/changes.txt
     - copied unchanged from r194052, head/sys/contrib/dev/acpica/changes.txt
  projects/mips/sys/contrib/dev/acpica/compiler/aslstartup.c
     - copied unchanged from r194052, head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/mips/sys/contrib/dev/acpica/debugger/
     - copied from r194052, head/sys/contrib/dev/acpica/debugger/
  projects/mips/sys/contrib/dev/acpica/disassembler/
     - copied from r194052, head/sys/contrib/dev/acpica/disassembler/
  projects/mips/sys/contrib/dev/acpica/dispatcher/
     - copied from r194052, head/sys/contrib/dev/acpica/dispatcher/
  projects/mips/sys/contrib/dev/acpica/events/
     - copied from r194052, head/sys/contrib/dev/acpica/events/
  projects/mips/sys/contrib/dev/acpica/executer/
     - copied from r194052, head/sys/contrib/dev/acpica/executer/
  projects/mips/sys/contrib/dev/acpica/hardware/
     - copied from r194052, head/sys/contrib/dev/acpica/hardware/
  projects/mips/sys/contrib/dev/acpica/include/
     - copied from r194052, head/sys/contrib/dev/acpica/include/
  projects/mips/sys/contrib/dev/acpica/namespace/
     - copied from r194052, head/sys/contrib/dev/acpica/namespace/
  projects/mips/sys/contrib/dev/acpica/parser/
     - copied from r194052, head/sys/contrib/dev/acpica/parser/
  projects/mips/sys/contrib/dev/acpica/resources/
     - copied from r194052, head/sys/contrib/dev/acpica/resources/
  projects/mips/sys/contrib/dev/acpica/tables/
     - copied from r194052, head/sys/contrib/dev/acpica/tables/
  projects/mips/sys/contrib/dev/acpica/tools/
     - copied from r194052, head/sys/contrib/dev/acpica/tools/
  projects/mips/sys/contrib/dev/acpica/utilities/
     - copied from r194052, head/sys/contrib/dev/acpica/utilities/
  projects/mips/sys/contrib/dev/mwl/
     - copied from r194052, head/sys/contrib/dev/mwl/
  projects/mips/sys/dev/alc/
     - copied from r194052, head/sys/dev/alc/
  projects/mips/sys/dev/ksyms/
     - copied from r194052, head/sys/dev/ksyms/
  projects/mips/sys/dev/mwl/
     - copied from r194052, head/sys/dev/mwl/
  projects/mips/sys/dev/sec/
     - copied from r194052, head/sys/dev/sec/
  projects/mips/sys/dev/sound/pcm/feeder_chain.c
     - copied unchanged from r194052, head/sys/dev/sound/pcm/feeder_chain.c
  projects/mips/sys/dev/sound/pcm/feeder_eq.c
     - copied unchanged from r194052, head/sys/dev/sound/pcm/feeder_eq.c
  projects/mips/sys/dev/sound/pcm/feeder_format.c
     - copied unchanged from r194052, head/sys/dev/sound/pcm/feeder_format.c
  projects/mips/sys/dev/sound/pcm/feeder_matrix.c
     - copied unchanged from r194052, head/sys/dev/sound/pcm/feeder_matrix.c
  projects/mips/sys/dev/sound/pcm/feeder_mixer.c
     - copied unchanged from r194052, head/sys/dev/sound/pcm/feeder_mixer.c
  projects/mips/sys/dev/sound/pcm/g711.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/g711.h
  projects/mips/sys/dev/sound/pcm/intpcm.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/intpcm.h
  projects/mips/sys/dev/sound/pcm/matrix.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/matrix.h
  projects/mips/sys/dev/sound/pcm/matrix_map.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/matrix_map.h
  projects/mips/sys/dev/sound/pcm/pcm.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/pcm.h
  projects/mips/sys/dev/sound/pcm/sndstat.h
     - copied unchanged from r194052, head/sys/dev/sound/pcm/sndstat.h
  projects/mips/sys/dev/usb/wlan/if_urtw.c
     - copied unchanged from r194052, head/sys/dev/usb/wlan/if_urtw.c
  projects/mips/sys/dev/usb/wlan/if_urtwreg.h
     - copied unchanged from r194052, head/sys/dev/usb/wlan/if_urtwreg.h
  projects/mips/sys/dev/usb/wlan/if_urtwvar.h
     - copied unchanged from r194052, head/sys/dev/usb/wlan/if_urtwvar.h
  projects/mips/sys/i386/include/xen/xen_clock_util.h
     - copied unchanged from r194052, head/sys/i386/include/xen/xen_clock_util.h
  projects/mips/sys/i386/xen/xen_clock_util.c
     - copied unchanged from r194052, head/sys/i386/xen/xen_clock_util.c
  projects/mips/sys/i386/xen/xen_rtc.c
     - copied unchanged from r194052, head/sys/i386/xen/xen_rtc.c
  projects/mips/sys/kern/kern_fail.c
     - copied unchanged from r194052, head/sys/kern/kern_fail.c
  projects/mips/sys/kern/kern_lockstat.c
     - copied unchanged from r194052, head/sys/kern/kern_lockstat.c
  projects/mips/sys/kern/subr_acl_nfs4.c
     - copied unchanged from r194052, head/sys/kern/subr_acl_nfs4.c
  projects/mips/sys/kern/subr_sglist.c
     - copied unchanged from r194052, head/sys/kern/subr_sglist.c
  projects/mips/sys/libkern/jenkins.h
     - copied unchanged from r194052, head/sys/libkern/jenkins.h
  projects/mips/sys/modules/alc/
     - copied from r194052, head/sys/modules/alc/
  projects/mips/sys/modules/ksyms/
     - copied from r194052, head/sys/modules/ksyms/
  projects/mips/sys/modules/mwl/
     - copied from r194052, head/sys/modules/mwl/
  projects/mips/sys/modules/mwlfw/
     - copied from r194052, head/sys/modules/mwlfw/
  projects/mips/sys/modules/nfscl/
     - copied from r194052, head/sys/modules/nfscl/
  projects/mips/sys/modules/nfscommon/
     - copied from r194052, head/sys/modules/nfscommon/
  projects/mips/sys/modules/nfsd/
     - copied from r194052, head/sys/modules/nfsd/
  projects/mips/sys/modules/usb/urtw/
     - copied from r194052, head/sys/modules/usb/urtw/
  projects/mips/sys/netinet/ipfw/
     - copied from r194052, head/sys/netinet/ipfw/
  projects/mips/sys/powerpc/cpufreq/
     - copied from r194052, head/sys/powerpc/cpufreq/
  projects/mips/sys/powerpc/ofw/ofw_cpu.c
     - copied unchanged from r194052, head/sys/powerpc/ofw/ofw_cpu.c
  projects/mips/sys/powerpc/powermac/vcoregpio.c
     - copied unchanged from r194052, head/sys/powerpc/powermac/vcoregpio.c
  projects/mips/sys/sys/fail.h
     - copied unchanged from r194052, head/sys/sys/fail.h
  projects/mips/sys/sys/ksyms.h
     - copied unchanged from r194052, head/sys/sys/ksyms.h
  projects/mips/sys/sys/lockstat.h
     - copied unchanged from r194052, head/sys/sys/lockstat.h
  projects/mips/sys/sys/sglist.h
     - copied unchanged from r194052, head/sys/sys/sglist.h
  projects/mips/sys/tools/sound/
     - copied from r194052, head/sys/tools/sound/
  projects/mips/tools/build/options/WITH_BIND_IDN
     - copied unchanged from r194052, head/tools/build/options/WITH_BIND_IDN
  projects/mips/tools/build/options/WITH_BIND_LARGE_FILE
     - copied unchanged from r194052, head/tools/build/options/WITH_BIND_LARGE_FILE
  projects/mips/tools/build/options/WITH_BIND_SIGCHASE
     - copied unchanged from r194052, head/tools/build/options/WITH_BIND_SIGCHASE
  projects/mips/tools/build/options/WITH_BIND_XML
     - copied unchanged from r194052, head/tools/build/options/WITH_BIND_XML
  projects/mips/tools/regression/bin/sh/builtins/eval1.0
     - copied unchanged from r194052, head/tools/regression/bin/sh/builtins/eval1.0
  projects/mips/tools/regression/bin/sh/set-e/eval1.0
     - copied unchanged from r194052, head/tools/regression/bin/sh/set-e/eval1.0
  projects/mips/tools/regression/bin/sh/set-e/eval2.1
     - copied unchanged from r194052, head/tools/regression/bin/sh/set-e/eval2.1
  projects/mips/tools/regression/vfs/
     - copied from r194052, head/tools/regression/vfs/
  projects/mips/tools/tools/mwl/
     - copied from r194052, head/tools/tools/mwl/
  projects/mips/tools/tools/vimage/
     - copied from r194052, head/tools/tools/vimage/
  projects/mips/usr.bin/ee/nls/hu_HU.ISO8859-2/
     - copied from r194052, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
  projects/mips/usr.sbin/dnssec-dsfromkey/
     - copied from r194052, head/usr.sbin/dnssec-dsfromkey/
  projects/mips/usr.sbin/dnssec-keyfromlabel/
     - copied from r194052, head/usr.sbin/dnssec-keyfromlabel/
Replaced:
  projects/mips/contrib/bind9/isc-config.sh.in
     - copied unchanged from r194052, head/contrib/bind9/isc-config.sh.in
  projects/mips/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
     - copied unchanged from r194052, head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/mips/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
     - copied unchanged from r194052, head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
  projects/mips/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
     - copied unchanged from r194052, head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/mips/tools/build/options/WITH_BIND_LIBS
     - copied unchanged from r194052, head/tools/build/options/WITH_BIND_LIBS
Deleted:
  projects/mips/contrib/bind9/doc/draft/
  projects/mips/contrib/bind9/doc/rfc/
  projects/mips/contrib/bind9/lib/bind/
  projects/mips/etc/rc.d/early.sh
  projects/mips/lib/bind/bind/
  projects/mips/share/man/man9/devclass_add_driver.9
  projects/mips/sys/amd64/conf/MAC
  projects/mips/sys/arm/at91/ohci_atmelarm.c
  projects/mips/sys/contrib/dev/acpica/CHANGES.txt
  projects/mips/sys/contrib/dev/acpica/acapps.h
  projects/mips/sys/contrib/dev/acpica/acconfig.h
  projects/mips/sys/contrib/dev/acpica/acdebug.h
  projects/mips/sys/contrib/dev/acpica/acdisasm.h
  projects/mips/sys/contrib/dev/acpica/acdispat.h
  projects/mips/sys/contrib/dev/acpica/acefi.h
  projects/mips/sys/contrib/dev/acpica/acenv.h
  projects/mips/sys/contrib/dev/acpica/acevents.h
  projects/mips/sys/contrib/dev/acpica/acexcep.h
  projects/mips/sys/contrib/dev/acpica/acfreebsd.h
  projects/mips/sys/contrib/dev/acpica/acgcc.h
  projects/mips/sys/contrib/dev/acpica/acglobal.h
  projects/mips/sys/contrib/dev/acpica/achware.h
  projects/mips/sys/contrib/dev/acpica/acinterp.h
  projects/mips/sys/contrib/dev/acpica/aclocal.h
  projects/mips/sys/contrib/dev/acpica/acmacros.h
  projects/mips/sys/contrib/dev/acpica/acnames.h
  projects/mips/sys/contrib/dev/acpica/acnamesp.h
  projects/mips/sys/contrib/dev/acpica/acobject.h
  projects/mips/sys/contrib/dev/acpica/acopcode.h
  projects/mips/sys/contrib/dev/acpica/acoutput.h
  projects/mips/sys/contrib/dev/acpica/acparser.h
  projects/mips/sys/contrib/dev/acpica/acpi.h
  projects/mips/sys/contrib/dev/acpica/acpiosxf.h
  projects/mips/sys/contrib/dev/acpica/acpixf.h
  projects/mips/sys/contrib/dev/acpica/acresrc.h
  projects/mips/sys/contrib/dev/acpica/acstruct.h
  projects/mips/sys/contrib/dev/acpica/actables.h
  projects/mips/sys/contrib/dev/acpica/actbl.h
  projects/mips/sys/contrib/dev/acpica/actbl1.h
  projects/mips/sys/contrib/dev/acpica/actbl2.h
  projects/mips/sys/contrib/dev/acpica/actypes.h
  projects/mips/sys/contrib/dev/acpica/acutils.h
  projects/mips/sys/contrib/dev/acpica/aecommon.h
  projects/mips/sys/contrib/dev/acpica/amlcode.h
  projects/mips/sys/contrib/dev/acpica/amlresrc.h
  projects/mips/sys/contrib/dev/acpica/dbcmds.c
  projects/mips/sys/contrib/dev/acpica/dbdisply.c
  projects/mips/sys/contrib/dev/acpica/dbexec.c
  projects/mips/sys/contrib/dev/acpica/dbfileio.c
  projects/mips/sys/contrib/dev/acpica/dbhistry.c
  projects/mips/sys/contrib/dev/acpica/dbinput.c
  projects/mips/sys/contrib/dev/acpica/dbstats.c
  projects/mips/sys/contrib/dev/acpica/dbutils.c
  projects/mips/sys/contrib/dev/acpica/dbxface.c
  projects/mips/sys/contrib/dev/acpica/dmbuffer.c
  projects/mips/sys/contrib/dev/acpica/dmnames.c
  projects/mips/sys/contrib/dev/acpica/dmobject.c
  projects/mips/sys/contrib/dev/acpica/dmopcode.c
  projects/mips/sys/contrib/dev/acpica/dmresrc.c
  projects/mips/sys/contrib/dev/acpica/dmresrcl.c
  projects/mips/sys/contrib/dev/acpica/dmresrcs.c
  projects/mips/sys/contrib/dev/acpica/dmutils.c
  projects/mips/sys/contrib/dev/acpica/dmwalk.c
  projects/mips/sys/contrib/dev/acpica/dsfield.c
  projects/mips/sys/contrib/dev/acpica/dsinit.c
  projects/mips/sys/contrib/dev/acpica/dsmethod.c
  projects/mips/sys/contrib/dev/acpica/dsmthdat.c
  projects/mips/sys/contrib/dev/acpica/dsobject.c
  projects/mips/sys/contrib/dev/acpica/dsopcode.c
  projects/mips/sys/contrib/dev/acpica/dsutils.c
  projects/mips/sys/contrib/dev/acpica/dswexec.c
  projects/mips/sys/contrib/dev/acpica/dswload.c
  projects/mips/sys/contrib/dev/acpica/dswscope.c
  projects/mips/sys/contrib/dev/acpica/dswstate.c
  projects/mips/sys/contrib/dev/acpica/evevent.c
  projects/mips/sys/contrib/dev/acpica/evgpe.c
  projects/mips/sys/contrib/dev/acpica/evgpeblk.c
  projects/mips/sys/contrib/dev/acpica/evmisc.c
  projects/mips/sys/contrib/dev/acpica/evregion.c
  projects/mips/sys/contrib/dev/acpica/evrgnini.c
  projects/mips/sys/contrib/dev/acpica/evsci.c
  projects/mips/sys/contrib/dev/acpica/evxface.c
  projects/mips/sys/contrib/dev/acpica/evxfevnt.c
  projects/mips/sys/contrib/dev/acpica/evxfregn.c
  projects/mips/sys/contrib/dev/acpica/exconfig.c
  projects/mips/sys/contrib/dev/acpica/exconvrt.c
  projects/mips/sys/contrib/dev/acpica/excreate.c
  projects/mips/sys/contrib/dev/acpica/exdump.c
  projects/mips/sys/contrib/dev/acpica/exfield.c
  projects/mips/sys/contrib/dev/acpica/exfldio.c
  projects/mips/sys/contrib/dev/acpica/exmisc.c
  projects/mips/sys/contrib/dev/acpica/exmutex.c
  projects/mips/sys/contrib/dev/acpica/exnames.c
  projects/mips/sys/contrib/dev/acpica/exoparg1.c
  projects/mips/sys/contrib/dev/acpica/exoparg2.c
  projects/mips/sys/contrib/dev/acpica/exoparg3.c
  projects/mips/sys/contrib/dev/acpica/exoparg6.c
  projects/mips/sys/contrib/dev/acpica/exprep.c
  projects/mips/sys/contrib/dev/acpica/exregion.c
  projects/mips/sys/contrib/dev/acpica/exresnte.c
  projects/mips/sys/contrib/dev/acpica/exresolv.c
  projects/mips/sys/contrib/dev/acpica/exresop.c
  projects/mips/sys/contrib/dev/acpica/exstore.c
  projects/mips/sys/contrib/dev/acpica/exstoren.c
  projects/mips/sys/contrib/dev/acpica/exstorob.c
  projects/mips/sys/contrib/dev/acpica/exsystem.c
  projects/mips/sys/contrib/dev/acpica/exutils.c
  projects/mips/sys/contrib/dev/acpica/hwacpi.c
  projects/mips/sys/contrib/dev/acpica/hwgpe.c
  projects/mips/sys/contrib/dev/acpica/hwregs.c
  projects/mips/sys/contrib/dev/acpica/hwsleep.c
  projects/mips/sys/contrib/dev/acpica/hwtimer.c
  projects/mips/sys/contrib/dev/acpica/nsaccess.c
  projects/mips/sys/contrib/dev/acpica/nsalloc.c
  projects/mips/sys/contrib/dev/acpica/nsdump.c
  projects/mips/sys/contrib/dev/acpica/nsdumpdv.c
  projects/mips/sys/contrib/dev/acpica/nseval.c
  projects/mips/sys/contrib/dev/acpica/nsinit.c
  projects/mips/sys/contrib/dev/acpica/nsload.c
  projects/mips/sys/contrib/dev/acpica/nsnames.c
  projects/mips/sys/contrib/dev/acpica/nsobject.c
  projects/mips/sys/contrib/dev/acpica/nsparse.c
  projects/mips/sys/contrib/dev/acpica/nssearch.c
  projects/mips/sys/contrib/dev/acpica/nsutils.c
  projects/mips/sys/contrib/dev/acpica/nswalk.c
  projects/mips/sys/contrib/dev/acpica/nsxfeval.c
  projects/mips/sys/contrib/dev/acpica/nsxfname.c
  projects/mips/sys/contrib/dev/acpica/nsxfobj.c
  projects/mips/sys/contrib/dev/acpica/psargs.c
  projects/mips/sys/contrib/dev/acpica/psloop.c
  projects/mips/sys/contrib/dev/acpica/psopcode.c
  projects/mips/sys/contrib/dev/acpica/psparse.c
  projects/mips/sys/contrib/dev/acpica/psscope.c
  projects/mips/sys/contrib/dev/acpica/pstree.c
  projects/mips/sys/contrib/dev/acpica/psutils.c
  projects/mips/sys/contrib/dev/acpica/pswalk.c
  projects/mips/sys/contrib/dev/acpica/psxface.c
  projects/mips/sys/contrib/dev/acpica/rsaddr.c
  projects/mips/sys/contrib/dev/acpica/rscalc.c
  projects/mips/sys/contrib/dev/acpica/rscreate.c
  projects/mips/sys/contrib/dev/acpica/rsdump.c
  projects/mips/sys/contrib/dev/acpica/rsinfo.c
  projects/mips/sys/contrib/dev/acpica/rsio.c
  projects/mips/sys/contrib/dev/acpica/rsirq.c
  projects/mips/sys/contrib/dev/acpica/rslist.c
  projects/mips/sys/contrib/dev/acpica/rsmemory.c
  projects/mips/sys/contrib/dev/acpica/rsmisc.c
  projects/mips/sys/contrib/dev/acpica/rsutils.c
  projects/mips/sys/contrib/dev/acpica/rsxface.c
  projects/mips/sys/contrib/dev/acpica/tbfadt.c
  projects/mips/sys/contrib/dev/acpica/tbfind.c
  projects/mips/sys/contrib/dev/acpica/tbinstal.c
  projects/mips/sys/contrib/dev/acpica/tbutils.c
  projects/mips/sys/contrib/dev/acpica/tbxface.c
  projects/mips/sys/contrib/dev/acpica/tbxfroot.c
  projects/mips/sys/contrib/dev/acpica/utalloc.c
  projects/mips/sys/contrib/dev/acpica/utcache.c
  projects/mips/sys/contrib/dev/acpica/utclib.c
  projects/mips/sys/contrib/dev/acpica/utcopy.c
  projects/mips/sys/contrib/dev/acpica/utdebug.c
  projects/mips/sys/contrib/dev/acpica/utdelete.c
  projects/mips/sys/contrib/dev/acpica/uteval.c
  projects/mips/sys/contrib/dev/acpica/utglobal.c
  projects/mips/sys/contrib/dev/acpica/utinit.c
  projects/mips/sys/contrib/dev/acpica/utmath.c
  projects/mips/sys/contrib/dev/acpica/utmisc.c
  projects/mips/sys/contrib/dev/acpica/utmutex.c
  projects/mips/sys/contrib/dev/acpica/utobject.c
  projects/mips/sys/contrib/dev/acpica/utresrc.c
  projects/mips/sys/contrib/dev/acpica/utstate.c
  projects/mips/sys/contrib/dev/acpica/uttrack.c
  projects/mips/sys/contrib/dev/acpica/utxface.c
  projects/mips/sys/dev/sound/pcm/fake.c
  projects/mips/sys/dev/sound/pcm/feeder_fmt.c
  projects/mips/sys/dev/usb/bluetooth/
  projects/mips/sys/gnu/fs/ext2fs/sparc64-bitops.h
  projects/mips/sys/i386/conf/MAC
  projects/mips/sys/ia64/conf/MAC
  projects/mips/sys/kern/subr_clist.c
  projects/mips/sys/legacy/
  projects/mips/sys/netgraph/bluetooth/drivers/ubt/TODO
  projects/mips/sys/netinet/ip_dummynet.c
  projects/mips/sys/netinet/ip_fw2.c
  projects/mips/sys/netinet/ip_fw_nat.c
  projects/mips/sys/netinet/ip_fw_pfil.c
  projects/mips/sys/pc98/conf/MAC
  projects/mips/sys/powerpc/conf/MAC
  projects/mips/sys/sparc64/conf/MAC
  projects/mips/sys/sun4v/conf/MAC
  projects/mips/sys/sys/clist.h
  projects/mips/sys/tools/emu10k1-mkalsa.sh
  projects/mips/usr.bin/ee/Artistic
  projects/mips/usr.bin/ee/FREEBSD-upgrade
  projects/mips/usr.bin/ee/README
  projects/mips/usr.bin/ee/ee.1
  projects/mips/usr.bin/ee/ee.c
  projects/mips/usr.bin/ee/ee.i18n.guide
  projects/mips/usr.bin/ee/new_curse.c
  projects/mips/usr.bin/ee/new_curse.h
  projects/mips/usr.bin/ee/nls/en_US.US-ASCII/
  projects/mips/usr.bin/window/
Modified:
  projects/mips/   (props changed)
  projects/mips/ObsoleteFiles.inc
  projects/mips/UPDATING
  projects/mips/bin/cp/utils.c
  projects/mips/bin/df/df.1
  projects/mips/bin/df/df.c
  projects/mips/bin/rm/rm.c
  projects/mips/bin/sh/alias.c
  projects/mips/bin/sh/eval.c
  projects/mips/bin/sh/eval.h
  projects/mips/bin/sh/exec.c
  projects/mips/bin/sh/histedit.c
  projects/mips/bin/sh/main.c
  projects/mips/bin/sh/memalloc.c
  projects/mips/bin/sh/memalloc.h
  projects/mips/bin/sh/miscbltin.c
  projects/mips/bin/sh/mkinit.c
  projects/mips/bin/sh/mksyntax.c
  projects/mips/bin/sh/parser.c
  projects/mips/bin/sh/sh.1
  projects/mips/bin/sh/trap.c
  projects/mips/bin/sh/var.c
  projects/mips/bin/test/TEST.sh
  projects/mips/bin/test/test.c
  projects/mips/cddl/usr.sbin/Makefile
  projects/mips/contrib/bind9/   (props changed)
  projects/mips/contrib/bind9/CHANGES
  projects/mips/contrib/bind9/COPYRIGHT
  projects/mips/contrib/bind9/FAQ
  projects/mips/contrib/bind9/FAQ.xml
  projects/mips/contrib/bind9/Makefile.in
  projects/mips/contrib/bind9/README
  projects/mips/contrib/bind9/README.idnkit
  projects/mips/contrib/bind9/acconfig.h
  projects/mips/contrib/bind9/bin/Makefile.in
  projects/mips/contrib/bind9/bin/check/Makefile.in
  projects/mips/contrib/bind9/bin/check/check-tool.c
  projects/mips/contrib/bind9/bin/check/check-tool.h
  projects/mips/contrib/bind9/bin/check/named-checkconf.8
  projects/mips/contrib/bind9/bin/check/named-checkconf.c
  projects/mips/contrib/bind9/bin/check/named-checkconf.docbook
  projects/mips/contrib/bind9/bin/check/named-checkconf.html
  projects/mips/contrib/bind9/bin/check/named-checkzone.8
  projects/mips/contrib/bind9/bin/check/named-checkzone.c
  projects/mips/contrib/bind9/bin/check/named-checkzone.docbook
  projects/mips/contrib/bind9/bin/check/named-checkzone.html
  projects/mips/contrib/bind9/bin/dig/Makefile.in
  projects/mips/contrib/bind9/bin/dig/dig.1
  projects/mips/contrib/bind9/bin/dig/dig.c
  projects/mips/contrib/bind9/bin/dig/dig.docbook
  projects/mips/contrib/bind9/bin/dig/dig.html
  projects/mips/contrib/bind9/bin/dig/dighost.c
  projects/mips/contrib/bind9/bin/dig/host.1
  projects/mips/contrib/bind9/bin/dig/host.c
  projects/mips/contrib/bind9/bin/dig/host.docbook
  projects/mips/contrib/bind9/bin/dig/host.html
  projects/mips/contrib/bind9/bin/dig/include/dig/dig.h
  projects/mips/contrib/bind9/bin/dig/nslookup.1
  projects/mips/contrib/bind9/bin/dig/nslookup.c
  projects/mips/contrib/bind9/bin/dig/nslookup.docbook
  projects/mips/contrib/bind9/bin/dig/nslookup.html
  projects/mips/contrib/bind9/bin/dnssec/Makefile.in
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.8
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.html
  projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.8
  projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.html
  projects/mips/contrib/bind9/bin/dnssec/dnssectool.c
  projects/mips/contrib/bind9/bin/dnssec/dnssectool.h
  projects/mips/contrib/bind9/bin/named/Makefile.in
  projects/mips/contrib/bind9/bin/named/builtin.c
  projects/mips/contrib/bind9/bin/named/client.c
  projects/mips/contrib/bind9/bin/named/config.c
  projects/mips/contrib/bind9/bin/named/control.c
  projects/mips/contrib/bind9/bin/named/controlconf.c
  projects/mips/contrib/bind9/bin/named/include/named/builtin.h
  projects/mips/contrib/bind9/bin/named/include/named/client.h
  projects/mips/contrib/bind9/bin/named/include/named/config.h
  projects/mips/contrib/bind9/bin/named/include/named/control.h
  projects/mips/contrib/bind9/bin/named/include/named/globals.h
  projects/mips/contrib/bind9/bin/named/include/named/interfacemgr.h
  projects/mips/contrib/bind9/bin/named/include/named/listenlist.h
  projects/mips/contrib/bind9/bin/named/include/named/log.h
  projects/mips/contrib/bind9/bin/named/include/named/logconf.h
  projects/mips/contrib/bind9/bin/named/include/named/lwaddr.h
  projects/mips/contrib/bind9/bin/named/include/named/lwdclient.h
  projects/mips/contrib/bind9/bin/named/include/named/lwresd.h
  projects/mips/contrib/bind9/bin/named/include/named/lwsearch.h
  projects/mips/contrib/bind9/bin/named/include/named/main.h
  projects/mips/contrib/bind9/bin/named/include/named/notify.h
  projects/mips/contrib/bind9/bin/named/include/named/ns_smf_globals.h
  projects/mips/contrib/bind9/bin/named/include/named/query.h
  projects/mips/contrib/bind9/bin/named/include/named/server.h
  projects/mips/contrib/bind9/bin/named/include/named/sortlist.h
  projects/mips/contrib/bind9/bin/named/include/named/tkeyconf.h
  projects/mips/contrib/bind9/bin/named/include/named/tsigconf.h
  projects/mips/contrib/bind9/bin/named/include/named/types.h
  projects/mips/contrib/bind9/bin/named/include/named/update.h
  projects/mips/contrib/bind9/bin/named/include/named/xfrout.h
  projects/mips/contrib/bind9/bin/named/include/named/zoneconf.h
  projects/mips/contrib/bind9/bin/named/interfacemgr.c
  projects/mips/contrib/bind9/bin/named/listenlist.c
  projects/mips/contrib/bind9/bin/named/log.c
  projects/mips/contrib/bind9/bin/named/logconf.c
  projects/mips/contrib/bind9/bin/named/lwaddr.c
  projects/mips/contrib/bind9/bin/named/lwdclient.c
  projects/mips/contrib/bind9/bin/named/lwderror.c
  projects/mips/contrib/bind9/bin/named/lwdgabn.c
  projects/mips/contrib/bind9/bin/named/lwdgnba.c
  projects/mips/contrib/bind9/bin/named/lwdgrbn.c
  projects/mips/contrib/bind9/bin/named/lwdnoop.c
  projects/mips/contrib/bind9/bin/named/lwresd.8
  projects/mips/contrib/bind9/bin/named/lwresd.c
  projects/mips/contrib/bind9/bin/named/lwresd.docbook
  projects/mips/contrib/bind9/bin/named/lwresd.html
  projects/mips/contrib/bind9/bin/named/lwsearch.c
  projects/mips/contrib/bind9/bin/named/main.c
  projects/mips/contrib/bind9/bin/named/named.8
  projects/mips/contrib/bind9/bin/named/named.conf.5
  projects/mips/contrib/bind9/bin/named/named.conf.docbook
  projects/mips/contrib/bind9/bin/named/named.conf.html
  projects/mips/contrib/bind9/bin/named/named.docbook
  projects/mips/contrib/bind9/bin/named/named.html
  projects/mips/contrib/bind9/bin/named/notify.c
  projects/mips/contrib/bind9/bin/named/query.c
  projects/mips/contrib/bind9/bin/named/server.c
  projects/mips/contrib/bind9/bin/named/sortlist.c
  projects/mips/contrib/bind9/bin/named/tkeyconf.c
  projects/mips/contrib/bind9/bin/named/tsigconf.c
  projects/mips/contrib/bind9/bin/named/unix/Makefile.in
  projects/mips/contrib/bind9/bin/named/unix/include/named/os.h
  projects/mips/contrib/bind9/bin/named/unix/os.c
  projects/mips/contrib/bind9/bin/named/update.c
  projects/mips/contrib/bind9/bin/named/xfrout.c
  projects/mips/contrib/bind9/bin/named/zoneconf.c
  projects/mips/contrib/bind9/bin/nsupdate/Makefile.in
  projects/mips/contrib/bind9/bin/nsupdate/nsupdate.1
  projects/mips/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/mips/contrib/bind9/bin/nsupdate/nsupdate.docbook
  projects/mips/contrib/bind9/bin/nsupdate/nsupdate.html
  projects/mips/contrib/bind9/bin/rndc/Makefile.in
  projects/mips/contrib/bind9/bin/rndc/include/rndc/os.h
  projects/mips/contrib/bind9/bin/rndc/rndc-confgen.8
  projects/mips/contrib/bind9/bin/rndc/rndc-confgen.c
  projects/mips/contrib/bind9/bin/rndc/rndc-confgen.docbook
  projects/mips/contrib/bind9/bin/rndc/rndc-confgen.html
  projects/mips/contrib/bind9/bin/rndc/rndc.8
  projects/mips/contrib/bind9/bin/rndc/rndc.c
  projects/mips/contrib/bind9/bin/rndc/rndc.conf
  projects/mips/contrib/bind9/bin/rndc/rndc.conf.5
  projects/mips/contrib/bind9/bin/rndc/rndc.conf.docbook
  projects/mips/contrib/bind9/bin/rndc/rndc.conf.html
  projects/mips/contrib/bind9/bin/rndc/rndc.docbook
  projects/mips/contrib/bind9/bin/rndc/rndc.html
  projects/mips/contrib/bind9/bin/rndc/unix/Makefile.in
  projects/mips/contrib/bind9/bin/rndc/unix/os.c
  projects/mips/contrib/bind9/bin/rndc/util.c
  projects/mips/contrib/bind9/bin/rndc/util.h
  projects/mips/contrib/bind9/config.guess
  projects/mips/contrib/bind9/config.h.in
  projects/mips/contrib/bind9/configure.in
  projects/mips/contrib/bind9/doc/Makefile.in
  projects/mips/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.html
  projects/mips/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/mips/contrib/bind9/doc/arm/Makefile.in
  projects/mips/contrib/bind9/doc/arm/man.dig.html
  projects/mips/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/mips/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/mips/contrib/bind9/doc/arm/man.host.html
  projects/mips/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/mips/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/mips/contrib/bind9/doc/arm/man.named.html
  projects/mips/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/mips/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/mips/contrib/bind9/doc/arm/man.rndc.html
  projects/mips/contrib/bind9/doc/misc/Makefile.in
  projects/mips/contrib/bind9/doc/misc/format-options.pl
  projects/mips/contrib/bind9/doc/misc/ipv6
  projects/mips/contrib/bind9/doc/misc/migration
  projects/mips/contrib/bind9/doc/misc/options
  projects/mips/contrib/bind9/doc/misc/sort-options.pl
  projects/mips/contrib/bind9/lib/Makefile.in
  projects/mips/contrib/bind9/lib/bind9/Makefile.in
  projects/mips/contrib/bind9/lib/bind9/api
  projects/mips/contrib/bind9/lib/bind9/check.c
  projects/mips/contrib/bind9/lib/bind9/getaddresses.c
  projects/mips/contrib/bind9/lib/bind9/include/Makefile.in
  projects/mips/contrib/bind9/lib/bind9/include/bind9/Makefile.in
  projects/mips/contrib/bind9/lib/bind9/include/bind9/check.h
  projects/mips/contrib/bind9/lib/bind9/include/bind9/getaddresses.h
  projects/mips/contrib/bind9/lib/bind9/include/bind9/version.h
  projects/mips/contrib/bind9/lib/bind9/version.c
  projects/mips/contrib/bind9/lib/dns/Makefile.in
  projects/mips/contrib/bind9/lib/dns/acache.c
  projects/mips/contrib/bind9/lib/dns/acl.c
  projects/mips/contrib/bind9/lib/dns/adb.c
  projects/mips/contrib/bind9/lib/dns/api
  projects/mips/contrib/bind9/lib/dns/byaddr.c
  projects/mips/contrib/bind9/lib/dns/cache.c
  projects/mips/contrib/bind9/lib/dns/callbacks.c
  projects/mips/contrib/bind9/lib/dns/compress.c
  projects/mips/contrib/bind9/lib/dns/db.c
  projects/mips/contrib/bind9/lib/dns/dbiterator.c
  projects/mips/contrib/bind9/lib/dns/dbtable.c
  projects/mips/contrib/bind9/lib/dns/diff.c
  projects/mips/contrib/bind9/lib/dns/dispatch.c
  projects/mips/contrib/bind9/lib/dns/dlz.c
  projects/mips/contrib/bind9/lib/dns/dnssec.c
  projects/mips/contrib/bind9/lib/dns/ds.c
  projects/mips/contrib/bind9/lib/dns/dst_api.c
  projects/mips/contrib/bind9/lib/dns/dst_internal.h
  projects/mips/contrib/bind9/lib/dns/dst_lib.c
  projects/mips/contrib/bind9/lib/dns/dst_openssl.h
  projects/mips/contrib/bind9/lib/dns/dst_parse.c
  projects/mips/contrib/bind9/lib/dns/dst_parse.h
  projects/mips/contrib/bind9/lib/dns/dst_result.c
  projects/mips/contrib/bind9/lib/dns/forward.c
  projects/mips/contrib/bind9/lib/dns/gen-unix.h
  projects/mips/contrib/bind9/lib/dns/gen.c
  projects/mips/contrib/bind9/lib/dns/gssapi_link.c
  projects/mips/contrib/bind9/lib/dns/gssapictx.c
  projects/mips/contrib/bind9/lib/dns/hmac_link.c
  projects/mips/contrib/bind9/lib/dns/include/Makefile.in
  projects/mips/contrib/bind9/lib/dns/include/dns/Makefile.in
  projects/mips/contrib/bind9/lib/dns/include/dns/acache.h
  projects/mips/contrib/bind9/lib/dns/include/dns/acl.h
  projects/mips/contrib/bind9/lib/dns/include/dns/adb.h
  projects/mips/contrib/bind9/lib/dns/include/dns/bit.h
  projects/mips/contrib/bind9/lib/dns/include/dns/byaddr.h
  projects/mips/contrib/bind9/lib/dns/include/dns/cache.h
  projects/mips/contrib/bind9/lib/dns/include/dns/callbacks.h
  projects/mips/contrib/bind9/lib/dns/include/dns/cert.h
  projects/mips/contrib/bind9/lib/dns/include/dns/compress.h
  projects/mips/contrib/bind9/lib/dns/include/dns/db.h
  projects/mips/contrib/bind9/lib/dns/include/dns/dbiterator.h
  projects/mips/contrib/bind9/lib/dns/include/dns/dbtable.h
  projects/mips/contrib/bind9/lib/dns/include/dns/diff.h
  projects/mips/contrib/bind9/lib/dns/include/dns/dispatch.h
  projects/mips/contrib/bind9/lib/dns/include/dns/dlz.h
  projects/mips/contrib/bind9/lib/dns/include/dns/dnssec.h
  projects/mips/contrib/bind9/lib/dns/include/dns/ds.h
  projects/mips/contrib/bind9/lib/dns/include/dns/events.h
  projects/mips/contrib/bind9/lib/dns/include/dns/fixedname.h
  projects/mips/contrib/bind9/lib/dns/include/dns/forward.h
  projects/mips/contrib/bind9/lib/dns/include/dns/journal.h
  projects/mips/contrib/bind9/lib/dns/include/dns/keyflags.h
  projects/mips/contrib/bind9/lib/dns/include/dns/keytable.h
  projects/mips/contrib/bind9/lib/dns/include/dns/keyvalues.h
  projects/mips/contrib/bind9/lib/dns/include/dns/lib.h
  projects/mips/contrib/bind9/lib/dns/include/dns/log.h
  projects/mips/contrib/bind9/lib/dns/include/dns/lookup.h
  projects/mips/contrib/bind9/lib/dns/include/dns/master.h
  projects/mips/contrib/bind9/lib/dns/include/dns/masterdump.h
  projects/mips/contrib/bind9/lib/dns/include/dns/message.h
  projects/mips/contrib/bind9/lib/dns/include/dns/name.h
  projects/mips/contrib/bind9/lib/dns/include/dns/ncache.h
  projects/mips/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/mips/contrib/bind9/lib/dns/include/dns/opcode.h
  projects/mips/contrib/bind9/lib/dns/include/dns/order.h
  projects/mips/contrib/bind9/lib/dns/include/dns/peer.h
  projects/mips/contrib/bind9/lib/dns/include/dns/portlist.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rbt.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rcode.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdataclass.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdatalist.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdataset.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdatasetiter.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdataslab.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rdatatype.h
  projects/mips/contrib/bind9/lib/dns/include/dns/request.h
  projects/mips/contrib/bind9/lib/dns/include/dns/resolver.h
  projects/mips/contrib/bind9/lib/dns/include/dns/result.h
  projects/mips/contrib/bind9/lib/dns/include/dns/rootns.h
  projects/mips/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/mips/contrib/bind9/lib/dns/include/dns/sdlz.h
  projects/mips/contrib/bind9/lib/dns/include/dns/secalg.h
  projects/mips/contrib/bind9/lib/dns/include/dns/secproto.h
  projects/mips/contrib/bind9/lib/dns/include/dns/soa.h
  projects/mips/contrib/bind9/lib/dns/include/dns/ssu.h
  projects/mips/contrib/bind9/lib/dns/include/dns/stats.h
  projects/mips/contrib/bind9/lib/dns/include/dns/tcpmsg.h
  projects/mips/contrib/bind9/lib/dns/include/dns/time.h
  projects/mips/contrib/bind9/lib/dns/include/dns/timer.h
  projects/mips/contrib/bind9/lib/dns/include/dns/tkey.h
  projects/mips/contrib/bind9/lib/dns/include/dns/tsig.h
  projects/mips/contrib/bind9/lib/dns/include/dns/ttl.h
  projects/mips/contrib/bind9/lib/dns/include/dns/types.h
  projects/mips/contrib/bind9/lib/dns/include/dns/validator.h
  projects/mips/contrib/bind9/lib/dns/include/dns/version.h
  projects/mips/contrib/bind9/lib/dns/include/dns/view.h
  projects/mips/contrib/bind9/lib/dns/include/dns/xfrin.h
  projects/mips/contrib/bind9/lib/dns/include/dns/zone.h
  projects/mips/contrib/bind9/lib/dns/include/dns/zonekey.h
  projects/mips/contrib/bind9/lib/dns/include/dns/zt.h
  projects/mips/contrib/bind9/lib/dns/include/dst/Makefile.in
  projects/mips/contrib/bind9/lib/dns/include/dst/dst.h
  projects/mips/contrib/bind9/lib/dns/include/dst/gssapi.h
  projects/mips/contrib/bind9/lib/dns/include/dst/lib.h
  projects/mips/contrib/bind9/lib/dns/include/dst/result.h
  projects/mips/contrib/bind9/lib/dns/journal.c
  projects/mips/contrib/bind9/lib/dns/key.c
  projects/mips/contrib/bind9/lib/dns/keytable.c
  projects/mips/contrib/bind9/lib/dns/lib.c
  projects/mips/contrib/bind9/lib/dns/log.c
  projects/mips/contrib/bind9/lib/dns/lookup.c
  projects/mips/contrib/bind9/lib/dns/master.c
  projects/mips/contrib/bind9/lib/dns/masterdump.c
  projects/mips/contrib/bind9/lib/dns/message.c
  projects/mips/contrib/bind9/lib/dns/name.c
  projects/mips/contrib/bind9/lib/dns/ncache.c
  projects/mips/contrib/bind9/lib/dns/nsec.c
  projects/mips/contrib/bind9/lib/dns/openssl_link.c
  projects/mips/contrib/bind9/lib/dns/openssldh_link.c
  projects/mips/contrib/bind9/lib/dns/openssldsa_link.c
  projects/mips/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/mips/contrib/bind9/lib/dns/order.c
  projects/mips/contrib/bind9/lib/dns/peer.c
  projects/mips/contrib/bind9/lib/dns/portlist.c
  projects/mips/contrib/bind9/lib/dns/rbt.c
  projects/mips/contrib/bind9/lib/dns/rbtdb.c
  projects/mips/contrib/bind9/lib/dns/rbtdb.h
  projects/mips/contrib/bind9/lib/dns/rbtdb64.c
  projects/mips/contrib/bind9/lib/dns/rbtdb64.h
  projects/mips/contrib/bind9/lib/dns/rcode.c
  projects/mips/contrib/bind9/lib/dns/rdata.c
  projects/mips/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/mips/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h
  projects/mips/contrib/bind9/lib/dns/rdata/ch_3/a_1.c
  projects/mips/contrib/bind9/lib/dns/rdata/ch_3/a_1.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/cert_37.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/cert_37.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/cname_5.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/cname_5.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dname_39.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dname_39.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ds_43.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ds_43.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/gpos_27.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/gpos_27.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/isdn_20.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/isdn_20.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/key_25.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/key_25.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/loc_29.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/loc_29.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mb_7.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mb_7.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/md_3.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/md_3.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mf_4.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mf_4.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mg_8.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mg_8.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/minfo_14.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/minfo_14.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mr_9.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mr_9.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/mx_15.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ns_2.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ns_2.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/null_10.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/null_10.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nxt_30.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/nxt_30.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/opt_41.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/opt_41.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/proforma.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/proforma.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ptr_12.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/ptr_12.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rp_17.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rp_17.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rt_21.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/rt_21.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/sig_24.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/sig_24.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/soa_6.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/soa_6.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/spf_99.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/spf_99.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/tkey_249.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/tkey_249.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/txt_16.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/unspec_103.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/unspec_103.h
  projects/mips/contrib/bind9/lib/dns/rdata/generic/x25_19.c
  projects/mips/contrib/bind9/lib/dns/rdata/generic/x25_19.h
  projects/mips/contrib/bind9/lib/dns/rdata/hs_4/a_1.c
  projects/mips/contrib/bind9/lib/dns/rdata/hs_4/a_1.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/a6_38.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/a6_38.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/a_1.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/a_1.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/apl_42.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/kx_36.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/kx_36.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/px_26.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/px_26.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/srv_33.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/srv_33.h
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/wks_11.c
  projects/mips/contrib/bind9/lib/dns/rdata/in_1/wks_11.h
  projects/mips/contrib/bind9/lib/dns/rdata/rdatastructpre.h
  projects/mips/contrib/bind9/lib/dns/rdata/rdatastructsuf.h
  projects/mips/contrib/bind9/lib/dns/rdatalist.c
  projects/mips/contrib/bind9/lib/dns/rdatalist_p.h
  projects/mips/contrib/bind9/lib/dns/rdataset.c
  projects/mips/contrib/bind9/lib/dns/rdatasetiter.c
  projects/mips/contrib/bind9/lib/dns/rdataslab.c
  projects/mips/contrib/bind9/lib/dns/request.c
  projects/mips/contrib/bind9/lib/dns/resolver.c
  projects/mips/contrib/bind9/lib/dns/result.c
  projects/mips/contrib/bind9/lib/dns/rootns.c
  projects/mips/contrib/bind9/lib/dns/sdb.c
  projects/mips/contrib/bind9/lib/dns/sdlz.c
  projects/mips/contrib/bind9/lib/dns/soa.c
  projects/mips/contrib/bind9/lib/dns/ssu.c
  projects/mips/contrib/bind9/lib/dns/stats.c
  projects/mips/contrib/bind9/lib/dns/tcpmsg.c
  projects/mips/contrib/bind9/lib/dns/time.c
  projects/mips/contrib/bind9/lib/dns/timer.c
  projects/mips/contrib/bind9/lib/dns/tkey.c
  projects/mips/contrib/bind9/lib/dns/tsig.c
  projects/mips/contrib/bind9/lib/dns/ttl.c
  projects/mips/contrib/bind9/lib/dns/validator.c
  projects/mips/contrib/bind9/lib/dns/version.c
  projects/mips/contrib/bind9/lib/dns/view.c
  projects/mips/contrib/bind9/lib/dns/xfrin.c
  projects/mips/contrib/bind9/lib/dns/zone.c
  projects/mips/contrib/bind9/lib/dns/zonekey.c
  projects/mips/contrib/bind9/lib/dns/zt.c
  projects/mips/contrib/bind9/lib/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/alpha/Makefile.in
  projects/mips/contrib/bind9/lib/isc/alpha/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/api
  projects/mips/contrib/bind9/lib/isc/assertions.c
  projects/mips/contrib/bind9/lib/isc/base64.c
  projects/mips/contrib/bind9/lib/isc/bitstring.c
  projects/mips/contrib/bind9/lib/isc/buffer.c
  projects/mips/contrib/bind9/lib/isc/bufferlist.c
  projects/mips/contrib/bind9/lib/isc/commandline.c
  projects/mips/contrib/bind9/lib/isc/entropy.c
  projects/mips/contrib/bind9/lib/isc/error.c
  projects/mips/contrib/bind9/lib/isc/event.c
  projects/mips/contrib/bind9/lib/isc/fsaccess.c
  projects/mips/contrib/bind9/lib/isc/hash.c
  projects/mips/contrib/bind9/lib/isc/heap.c
  projects/mips/contrib/bind9/lib/isc/hex.c
  projects/mips/contrib/bind9/lib/isc/hmacmd5.c
  projects/mips/contrib/bind9/lib/isc/hmacsha.c
  projects/mips/contrib/bind9/lib/isc/ia64/Makefile.in
  projects/mips/contrib/bind9/lib/isc/ia64/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/include/isc/app.h
  projects/mips/contrib/bind9/lib/isc/include/isc/assertions.h
  projects/mips/contrib/bind9/lib/isc/include/isc/base64.h
  projects/mips/contrib/bind9/lib/isc/include/isc/bitstring.h
  projects/mips/contrib/bind9/lib/isc/include/isc/boolean.h
  projects/mips/contrib/bind9/lib/isc/include/isc/buffer.h
  projects/mips/contrib/bind9/lib/isc/include/isc/bufferlist.h
  projects/mips/contrib/bind9/lib/isc/include/isc/commandline.h
  projects/mips/contrib/bind9/lib/isc/include/isc/entropy.h
  projects/mips/contrib/bind9/lib/isc/include/isc/error.h
  projects/mips/contrib/bind9/lib/isc/include/isc/event.h
  projects/mips/contrib/bind9/lib/isc/include/isc/eventclass.h
  projects/mips/contrib/bind9/lib/isc/include/isc/file.h
  projects/mips/contrib/bind9/lib/isc/include/isc/formatcheck.h
  projects/mips/contrib/bind9/lib/isc/include/isc/fsaccess.h
  projects/mips/contrib/bind9/lib/isc/include/isc/hash.h
  projects/mips/contrib/bind9/lib/isc/include/isc/heap.h
  projects/mips/contrib/bind9/lib/isc/include/isc/hex.h
  projects/mips/contrib/bind9/lib/isc/include/isc/hmacmd5.h
  projects/mips/contrib/bind9/lib/isc/include/isc/hmacsha.h
  projects/mips/contrib/bind9/lib/isc/include/isc/interfaceiter.h
  projects/mips/contrib/bind9/lib/isc/include/isc/ipv6.h
  projects/mips/contrib/bind9/lib/isc/include/isc/lang.h
  projects/mips/contrib/bind9/lib/isc/include/isc/lex.h
  projects/mips/contrib/bind9/lib/isc/include/isc/lfsr.h
  projects/mips/contrib/bind9/lib/isc/include/isc/lib.h
  projects/mips/contrib/bind9/lib/isc/include/isc/list.h
  projects/mips/contrib/bind9/lib/isc/include/isc/log.h
  projects/mips/contrib/bind9/lib/isc/include/isc/magic.h
  projects/mips/contrib/bind9/lib/isc/include/isc/md5.h
  projects/mips/contrib/bind9/lib/isc/include/isc/mem.h
  projects/mips/contrib/bind9/lib/isc/include/isc/msgcat.h
  projects/mips/contrib/bind9/lib/isc/include/isc/msgs.h
  projects/mips/contrib/bind9/lib/isc/include/isc/mutexblock.h
  projects/mips/contrib/bind9/lib/isc/include/isc/netaddr.h
  projects/mips/contrib/bind9/lib/isc/include/isc/netscope.h
  projects/mips/contrib/bind9/lib/isc/include/isc/ondestroy.h
  projects/mips/contrib/bind9/lib/isc/include/isc/os.h
  projects/mips/contrib/bind9/lib/isc/include/isc/parseint.h
  projects/mips/contrib/bind9/lib/isc/include/isc/platform.h.in
  projects/mips/contrib/bind9/lib/isc/include/isc/portset.h
  projects/mips/contrib/bind9/lib/isc/include/isc/print.h
  projects/mips/contrib/bind9/lib/isc/include/isc/quota.h
  projects/mips/contrib/bind9/lib/isc/include/isc/random.h
  projects/mips/contrib/bind9/lib/isc/include/isc/ratelimiter.h
  projects/mips/contrib/bind9/lib/isc/include/isc/refcount.h
  projects/mips/contrib/bind9/lib/isc/include/isc/region.h
  projects/mips/contrib/bind9/lib/isc/include/isc/resource.h
  projects/mips/contrib/bind9/lib/isc/include/isc/result.h
  projects/mips/contrib/bind9/lib/isc/include/isc/resultclass.h
  projects/mips/contrib/bind9/lib/isc/include/isc/rwlock.h
  projects/mips/contrib/bind9/lib/isc/include/isc/serial.h
  projects/mips/contrib/bind9/lib/isc/include/isc/sha1.h
  projects/mips/contrib/bind9/lib/isc/include/isc/sha2.h
  projects/mips/contrib/bind9/lib/isc/include/isc/sockaddr.h
  projects/mips/contrib/bind9/lib/isc/include/isc/socket.h
  projects/mips/contrib/bind9/lib/isc/include/isc/stdio.h
  projects/mips/contrib/bind9/lib/isc/include/isc/stdlib.h
  projects/mips/contrib/bind9/lib/isc/include/isc/string.h
  projects/mips/contrib/bind9/lib/isc/include/isc/symtab.h
  projects/mips/contrib/bind9/lib/isc/include/isc/task.h
  projects/mips/contrib/bind9/lib/isc/include/isc/taskpool.h
  projects/mips/contrib/bind9/lib/isc/include/isc/timer.h
  projects/mips/contrib/bind9/lib/isc/include/isc/types.h
  projects/mips/contrib/bind9/lib/isc/include/isc/util.h
  projects/mips/contrib/bind9/lib/isc/include/isc/version.h
  projects/mips/contrib/bind9/lib/isc/inet_aton.c
  projects/mips/contrib/bind9/lib/isc/inet_ntop.c
  projects/mips/contrib/bind9/lib/isc/inet_pton.c
  projects/mips/contrib/bind9/lib/isc/lex.c
  projects/mips/contrib/bind9/lib/isc/lfsr.c
  projects/mips/contrib/bind9/lib/isc/lib.c
  projects/mips/contrib/bind9/lib/isc/log.c
  projects/mips/contrib/bind9/lib/isc/md5.c
  projects/mips/contrib/bind9/lib/isc/mem.c
  projects/mips/contrib/bind9/lib/isc/mips/Makefile.in
  projects/mips/contrib/bind9/lib/isc/mips/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/mips/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/mutexblock.c
  projects/mips/contrib/bind9/lib/isc/netaddr.c
  projects/mips/contrib/bind9/lib/isc/netscope.c
  projects/mips/contrib/bind9/lib/isc/nls/Makefile.in
  projects/mips/contrib/bind9/lib/isc/nls/msgcat.c
  projects/mips/contrib/bind9/lib/isc/noatomic/Makefile.in
  projects/mips/contrib/bind9/lib/isc/noatomic/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/nothreads/Makefile.in
  projects/mips/contrib/bind9/lib/isc/nothreads/condition.c
  projects/mips/contrib/bind9/lib/isc/nothreads/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/nothreads/include/isc/condition.h
  projects/mips/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h
  projects/mips/contrib/bind9/lib/isc/nothreads/include/isc/once.h
  projects/mips/contrib/bind9/lib/isc/nothreads/include/isc/thread.h
  projects/mips/contrib/bind9/lib/isc/nothreads/mutex.c
  projects/mips/contrib/bind9/lib/isc/nothreads/thread.c
  projects/mips/contrib/bind9/lib/isc/ondestroy.c
  projects/mips/contrib/bind9/lib/isc/parseint.c
  projects/mips/contrib/bind9/lib/isc/portset.c
  projects/mips/contrib/bind9/lib/isc/powerpc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/powerpc/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/print.c
  projects/mips/contrib/bind9/lib/isc/pthreads/Makefile.in
  projects/mips/contrib/bind9/lib/isc/pthreads/condition.c
  projects/mips/contrib/bind9/lib/isc/pthreads/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/pthreads/include/isc/condition.h
  projects/mips/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h
  projects/mips/contrib/bind9/lib/isc/pthreads/include/isc/once.h
  projects/mips/contrib/bind9/lib/isc/pthreads/include/isc/thread.h
  projects/mips/contrib/bind9/lib/isc/pthreads/mutex.c
  projects/mips/contrib/bind9/lib/isc/pthreads/thread.c
  projects/mips/contrib/bind9/lib/isc/quota.c
  projects/mips/contrib/bind9/lib/isc/random.c
  projects/mips/contrib/bind9/lib/isc/ratelimiter.c
  projects/mips/contrib/bind9/lib/isc/refcount.c
  projects/mips/contrib/bind9/lib/isc/region.c
  projects/mips/contrib/bind9/lib/isc/result.c
  projects/mips/contrib/bind9/lib/isc/rwlock.c
  projects/mips/contrib/bind9/lib/isc/serial.c
  projects/mips/contrib/bind9/lib/isc/sha1.c
  projects/mips/contrib/bind9/lib/isc/sha2.c
  projects/mips/contrib/bind9/lib/isc/sockaddr.c
  projects/mips/contrib/bind9/lib/isc/sparc64/Makefile.in
  projects/mips/contrib/bind9/lib/isc/sparc64/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/string.c
  projects/mips/contrib/bind9/lib/isc/strtoul.c
  projects/mips/contrib/bind9/lib/isc/symtab.c
  projects/mips/contrib/bind9/lib/isc/task.c
  projects/mips/contrib/bind9/lib/isc/task_p.h
  projects/mips/contrib/bind9/lib/isc/taskpool.c
  projects/mips/contrib/bind9/lib/isc/timer.c
  projects/mips/contrib/bind9/lib/isc/timer_p.h
  projects/mips/contrib/bind9/lib/isc/unix/Makefile.in
  projects/mips/contrib/bind9/lib/isc/unix/app.c
  projects/mips/contrib/bind9/lib/isc/unix/dir.c
  projects/mips/contrib/bind9/lib/isc/unix/entropy.c
  projects/mips/contrib/bind9/lib/isc/unix/errno2result.c
  projects/mips/contrib/bind9/lib/isc/unix/errno2result.h
  projects/mips/contrib/bind9/lib/isc/unix/file.c
  projects/mips/contrib/bind9/lib/isc/unix/fsaccess.c
  projects/mips/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c
  projects/mips/contrib/bind9/lib/isc/unix/ifiter_ioctl.c
  projects/mips/contrib/bind9/lib/isc/unix/ifiter_sysctl.c
  projects/mips/contrib/bind9/lib/isc/unix/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/dir.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/int.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/keyboard.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/net.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/netdb.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/offset.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/stat.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/stdtime.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/strerror.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/syslog.h
  projects/mips/contrib/bind9/lib/isc/unix/include/isc/time.h
  projects/mips/contrib/bind9/lib/isc/unix/interfaceiter.c
  projects/mips/contrib/bind9/lib/isc/unix/ipv6.c
  projects/mips/contrib/bind9/lib/isc/unix/keyboard.c
  projects/mips/contrib/bind9/lib/isc/unix/net.c
  projects/mips/contrib/bind9/lib/isc/unix/os.c
  projects/mips/contrib/bind9/lib/isc/unix/resource.c
  projects/mips/contrib/bind9/lib/isc/unix/socket.c
  projects/mips/contrib/bind9/lib/isc/unix/socket_p.h
  projects/mips/contrib/bind9/lib/isc/unix/stdio.c
  projects/mips/contrib/bind9/lib/isc/unix/stdtime.c
  projects/mips/contrib/bind9/lib/isc/unix/strerror.c
  projects/mips/contrib/bind9/lib/isc/unix/syslog.c
  projects/mips/contrib/bind9/lib/isc/unix/time.c
  projects/mips/contrib/bind9/lib/isc/version.c
  projects/mips/contrib/bind9/lib/isc/x86_32/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_32/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isc/x86_64/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_64/include/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
  projects/mips/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h
  projects/mips/contrib/bind9/lib/isccc/Makefile.in
  projects/mips/contrib/bind9/lib/isccc/alist.c
  projects/mips/contrib/bind9/lib/isccc/api
  projects/mips/contrib/bind9/lib/isccc/base64.c
  projects/mips/contrib/bind9/lib/isccc/cc.c
  projects/mips/contrib/bind9/lib/isccc/ccmsg.c
  projects/mips/contrib/bind9/lib/isccc/include/Makefile.in
  projects/mips/contrib/bind9/lib/isccc/include/isccc/Makefile.in
  projects/mips/contrib/bind9/lib/isccc/include/isccc/alist.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/base64.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/cc.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/events.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/lib.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/result.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/sexpr.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/symtab.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/symtype.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/types.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/util.h
  projects/mips/contrib/bind9/lib/isccc/include/isccc/version.h
  projects/mips/contrib/bind9/lib/isccc/lib.c
  projects/mips/contrib/bind9/lib/isccc/result.c
  projects/mips/contrib/bind9/lib/isccc/sexpr.c
  projects/mips/contrib/bind9/lib/isccc/symtab.c
  projects/mips/contrib/bind9/lib/isccc/version.c
  projects/mips/contrib/bind9/lib/isccfg/Makefile.in
  projects/mips/contrib/bind9/lib/isccfg/aclconf.c
  projects/mips/contrib/bind9/lib/isccfg/api
  projects/mips/contrib/bind9/lib/isccfg/include/Makefile.in
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/grammar.h
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/log.h
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h
  projects/mips/contrib/bind9/lib/isccfg/include/isccfg/version.h
  projects/mips/contrib/bind9/lib/isccfg/log.c
  projects/mips/contrib/bind9/lib/isccfg/namedconf.c
  projects/mips/contrib/bind9/lib/isccfg/parser.c
  projects/mips/contrib/bind9/lib/isccfg/version.c
  projects/mips/contrib/bind9/lib/lwres/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/api
  projects/mips/contrib/bind9/lib/lwres/assert_p.h
  projects/mips/contrib/bind9/lib/lwres/context.c
  projects/mips/contrib/bind9/lib/lwres/context_p.h
  projects/mips/contrib/bind9/lib/lwres/gai_strerror.c
  projects/mips/contrib/bind9/lib/lwres/getaddrinfo.c
  projects/mips/contrib/bind9/lib/lwres/gethost.c
  projects/mips/contrib/bind9/lib/lwres/getipnode.c
  projects/mips/contrib/bind9/lib/lwres/getnameinfo.c
  projects/mips/contrib/bind9/lib/lwres/getrrset.c
  projects/mips/contrib/bind9/lib/lwres/herror.c
  projects/mips/contrib/bind9/lib/lwres/include/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/include/lwres/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/include/lwres/context.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/int.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/ipv6.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/lang.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/list.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/lwpacket.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/lwres.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/netdb.h.in
  projects/mips/contrib/bind9/lib/lwres/include/lwres/platform.h.in
  projects/mips/contrib/bind9/lib/lwres/include/lwres/result.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/stdlib.h
  projects/mips/contrib/bind9/lib/lwres/include/lwres/version.h
  projects/mips/contrib/bind9/lib/lwres/lwbuffer.c
  projects/mips/contrib/bind9/lib/lwres/lwconfig.c
  projects/mips/contrib/bind9/lib/lwres/lwinetaton.c
  projects/mips/contrib/bind9/lib/lwres/lwinetntop.c
  projects/mips/contrib/bind9/lib/lwres/lwinetpton.c
  projects/mips/contrib/bind9/lib/lwres/lwpacket.c
  projects/mips/contrib/bind9/lib/lwres/lwres_gabn.c
  projects/mips/contrib/bind9/lib/lwres/lwres_gnba.c
  projects/mips/contrib/bind9/lib/lwres/lwres_grbn.c
  projects/mips/contrib/bind9/lib/lwres/lwres_noop.c
  projects/mips/contrib/bind9/lib/lwres/lwresutil.c
  projects/mips/contrib/bind9/lib/lwres/man/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/man/lwres.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_config.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_config.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_config.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_context.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_context.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_context.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.html
  projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.3
  projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.docbook
  projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.html
  projects/mips/contrib/bind9/lib/lwres/print.c
  projects/mips/contrib/bind9/lib/lwres/print_p.h
  projects/mips/contrib/bind9/lib/lwres/strtoul.c
  projects/mips/contrib/bind9/lib/lwres/unix/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/unix/include/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in
  projects/mips/contrib/bind9/lib/lwres/unix/include/lwres/net.h
  projects/mips/contrib/bind9/lib/lwres/version.c
  projects/mips/contrib/bind9/libtool.m4
  projects/mips/contrib/bind9/ltmain.sh
  projects/mips/contrib/bind9/make/Makefile.in
  projects/mips/contrib/bind9/make/includes.in
  projects/mips/contrib/bind9/make/mkdep.in
  projects/mips/contrib/bind9/make/rules.in
  projects/mips/contrib/bind9/version
  projects/mips/contrib/cpio/   (props changed)
  projects/mips/contrib/csup/   (props changed)
  projects/mips/contrib/csup/updater.c
  projects/mips/contrib/file/   (props changed)
  projects/mips/contrib/gdb/   (props changed)
  projects/mips/contrib/gdtoa/   (props changed)
  projects/mips/contrib/ipfilter/lib/load_http.c
  projects/mips/contrib/less/   (props changed)
  projects/mips/contrib/libpcap/   (props changed)
  projects/mips/contrib/ncurses/   (props changed)
  projects/mips/contrib/netcat/   (props changed)
  projects/mips/contrib/netcat/nc.1
  projects/mips/contrib/netcat/netcat.c
  projects/mips/contrib/ntp/   (props changed)
  projects/mips/contrib/ntp/ntpd/ntp_crypto.c
  projects/mips/contrib/openbsm/   (props changed)
  projects/mips/contrib/openpam/   (props changed)
  projects/mips/contrib/pf/   (props changed)
  projects/mips/contrib/sendmail/   (props changed)
  projects/mips/contrib/tcpdump/   (props changed)
  projects/mips/contrib/top/   (props changed)
  projects/mips/contrib/top/install-sh   (props changed)
  projects/mips/crypto/openssh/   (props changed)
  projects/mips/crypto/openssl/   (props changed)
  projects/mips/etc/Makefile
  projects/mips/etc/defaults/rc.conf
  projects/mips/etc/mtree/BSD.include.dist
  projects/mips/etc/mtree/BSD.local.dist
  projects/mips/etc/mtree/BSD.usr.dist
  projects/mips/etc/network.subr
  projects/mips/etc/periodic/daily/100.clean-disks
  projects/mips/etc/periodic/daily/460.status-mail-rejects
  projects/mips/etc/rc.d/Makefile
  projects/mips/etc/rc.d/amd
  projects/mips/etc/rc.d/archdep
  projects/mips/etc/rc.d/fsck
  projects/mips/etc/rc.d/ip6fw
  projects/mips/etc/rc.d/ipfilter
  projects/mips/etc/rc.d/ipfs
  projects/mips/etc/rc.d/ipfw
  projects/mips/etc/rc.d/ipnat
  projects/mips/etc/rc.d/jail
  projects/mips/etc/rc.d/keyserv
  projects/mips/etc/rc.d/mountd
  projects/mips/etc/rc.d/moused
  projects/mips/etc/rc.d/netif
  projects/mips/etc/rc.d/network_ipv6
  projects/mips/etc/rc.d/nfsd
  projects/mips/etc/rc.d/nisdomain
  projects/mips/etc/rc.d/nscd
  projects/mips/etc/rc.d/ntpd
  projects/mips/etc/rc.d/pf
  projects/mips/etc/rc.d/pflog
  projects/mips/etc/rc.d/pfsync
  projects/mips/etc/rc.d/quota
  projects/mips/etc/rc.d/yppasswdd
  projects/mips/etc/rc.subr
  projects/mips/etc/syslog.conf
  projects/mips/games/fortune/datfiles/fortunes
  projects/mips/games/fortune/datfiles/fortunes-o.real
  projects/mips/include/Makefile
  projects/mips/lib/bind/Makefile
  projects/mips/lib/bind/config.h
  projects/mips/lib/bind/config.mk
  projects/mips/lib/bind/dns/Makefile
  projects/mips/lib/bind/dns/code.h
  projects/mips/lib/bind/dns/dns/enumclass.h
  projects/mips/lib/bind/dns/dns/enumtype.h
  projects/mips/lib/bind/dns/dns/rdatastruct.h
  projects/mips/lib/bind/isc/Makefile
  projects/mips/lib/bind/isc/isc/platform.h
  projects/mips/lib/bind/lwres/Makefile
  projects/mips/lib/bind/lwres/lwres/netdb.h
  projects/mips/lib/bind/lwres/lwres/platform.h
  projects/mips/lib/libarchive/Makefile
  projects/mips/lib/libc/   (props changed)
  projects/mips/lib/libc/arm/Makefile.inc
  projects/mips/lib/libc/arm/gen/_setjmp.S
  projects/mips/lib/libc/arm/gen/setjmp.S
  projects/mips/lib/libc/gen/popen.c
  projects/mips/lib/libc/net/nsdispatch.c
  projects/mips/lib/libc/net/resolver.3
  projects/mips/lib/libc/posix1e/acl_entry.c
  projects/mips/lib/libc/resolv/res_comp.c
  projects/mips/lib/libc/rpc/svc_dg.c
  projects/mips/lib/libc/rpc/svc_generic.c
  projects/mips/lib/libc/stdio/asprintf.c   (props changed)
  projects/mips/lib/libc/stdtime/   (props changed)
  projects/mips/lib/libc/stdtime/strftime.c
  projects/mips/lib/libc/stdtime/time2posix.3
  projects/mips/lib/libc/string/ffsll.c   (props changed)
  projects/mips/lib/libc/string/flsll.c   (props changed)
  projects/mips/lib/libc/string/wcpcpy.c   (props changed)
  projects/mips/lib/libc/sys/bind.2
  projects/mips/lib/libc/sys/jail.2
  projects/mips/lib/libpmc/libpmc.c
  projects/mips/lib/libpmc/pmc.core2.3
  projects/mips/lib/libstand/Makefile
  projects/mips/lib/libstand/bootp.c
  projects/mips/lib/libstand/rpc.c
  projects/mips/lib/libstand/tftp.c
  projects/mips/lib/libthread_db/libthr_db.c
  projects/mips/lib/libthread_db/thread_db.h
  projects/mips/lib/libufs/type.c
  projects/mips/lib/libufs/ufs_disk_close.3
  projects/mips/lib/libusb/   (props changed)
  projects/mips/lib/libusb/libusb.3
  projects/mips/lib/libusb/libusb20.c
  projects/mips/lib/libusb/libusb20.h
  projects/mips/lib/libusb/libusb20_int.h
  projects/mips/lib/libusb/libusb20_ugen20.c
  projects/mips/lib/libusb/usb.h   (props changed)
  projects/mips/lib/libusbhid/descr.c
  projects/mips/lib/libutil/   (props changed)
  projects/mips/lib/libutil/flopen.3
  projects/mips/lib/libutil/flopen.c
  projects/mips/lib/libutil/pidfile.3
  projects/mips/lib/msun/src/e_rem_pio2.c
  projects/mips/lib/msun/src/e_rem_pio2f.c
  projects/mips/lib/msun/src/k_cosf.c
  projects/mips/lib/msun/src/k_sinf.c
  projects/mips/lib/msun/src/k_tanf.c
  projects/mips/lib/msun/src/math_private.h
  projects/mips/libexec/rtld-elf/rtld.h
  projects/mips/sbin/   (props changed)
  projects/mips/sbin/dhclient/dhclient.c
  projects/mips/sbin/dump/optr.c
  projects/mips/sbin/fsck_ffs/fsck.h
  projects/mips/sbin/fsck_ffs/gjournal.c
  projects/mips/sbin/fsck_msdosfs/fsck_msdosfs.8
  projects/mips/sbin/fsck_msdosfs/main.c
  projects/mips/sbin/geom/class/part/geom_part.c
  projects/mips/sbin/geom/core/geom.c
  projects/mips/sbin/geom/core/geom.h
  projects/mips/sbin/ifconfig/Makefile
  projects/mips/sbin/ifconfig/ifieee80211.c
  projects/mips/sbin/ipfw/   (props changed)
  projects/mips/sbin/ipfw/dummynet.c
  projects/mips/sbin/ipfw/ipfw.8
  projects/mips/sbin/ipfw/ipfw2.c
  projects/mips/sbin/kldload/kldload.8
  projects/mips/sbin/kldload/kldload.c
  projects/mips/sbin/mksnap_ffs/Makefile
  projects/mips/sbin/mksnap_ffs/mksnap_ffs.8
  projects/mips/sbin/mksnap_ffs/mksnap_ffs.c
  projects/mips/sbin/mount/mount.c
  projects/mips/sbin/mount_nfs/Makefile
  projects/mips/sbin/mount_nfs/mount_nfs.8
  projects/mips/sbin/mount_nfs/mount_nfs.c
  projects/mips/share/colldef/Makefile
  projects/mips/share/doc/bind9/Makefile
  projects/mips/share/examples/kld/dyn_sysctl/dyn_sysctl.c
  projects/mips/share/examples/kld/syscall/module/syscall.c
  projects/mips/share/man/man3/Makefile
  projects/mips/share/man/man3/queue.3
  projects/mips/share/man/man4/Makefile
  projects/mips/share/man/man4/acpi.4
  projects/mips/share/man/man4/altq.4
  projects/mips/share/man/man4/audit.4
  projects/mips/share/man/man4/ch.4
  projects/mips/share/man/man4/gif.4
  projects/mips/share/man/man4/if_bridge.4
  projects/mips/share/man/man4/ip.4
  projects/mips/share/man/man4/iwn.4
  projects/mips/share/man/man4/miibus.4
  projects/mips/share/man/man4/msk.4
  projects/mips/share/man/man4/multicast.4
  projects/mips/share/man/man4/ng_ipfw.4
  projects/mips/share/man/man4/pcm.4
  projects/mips/share/man/man4/ral.4
  projects/mips/share/man/man4/rum.4
  projects/mips/share/man/man4/scsi.4
  projects/mips/share/man/man4/ural.4
  projects/mips/share/man/man4/vlan.4
  projects/mips/share/man/man5/fstab.5
  projects/mips/share/man/man5/src.conf.5
  projects/mips/share/man/man9/Makefile
  projects/mips/share/man/man9/VOP_ACCESS.9
  projects/mips/share/man/man9/rmlock.9
  projects/mips/share/man/man9/sx.9
  projects/mips/share/misc/committers-ports.dot
  projects/mips/share/misc/committers-src.dot
  projects/mips/share/misc/pci_vendors
  projects/mips/share/mk/bsd.own.mk
  projects/mips/share/mklocale/Makefile
  projects/mips/share/monetdef/Makefile
  projects/mips/share/monetdef/de_CH.ISO8859-1.src
  projects/mips/share/msgdef/Makefile
  projects/mips/share/numericdef/Makefile
  projects/mips/share/timedef/Makefile
  projects/mips/share/timedef/de_DE.ISO8859-1.src
  projects/mips/share/timedef/de_DE.UTF-8.src
  projects/mips/share/timedef/ja_JP.SJIS.src
  projects/mips/share/timedef/ja_JP.eucJP.src
  projects/mips/share/timedef/ko_KR.UTF-8.src
  projects/mips/share/timedef/ko_KR.eucKR.src
  projects/mips/share/timedef/pl_PL.ISO8859-2.src
  projects/mips/share/timedef/pl_PL.UTF-8.src
  projects/mips/share/timedef/pt_PT.ISO8859-1.src
  projects/mips/share/timedef/pt_PT.UTF-8.src
  projects/mips/share/zoneinfo/   (props changed)
  projects/mips/share/zoneinfo/africa
  projects/mips/share/zoneinfo/antarctica
  projects/mips/share/zoneinfo/asia
  projects/mips/share/zoneinfo/australasia
  projects/mips/share/zoneinfo/backward
  projects/mips/share/zoneinfo/etcetera
  projects/mips/share/zoneinfo/europe
  projects/mips/share/zoneinfo/factory
  projects/mips/share/zoneinfo/leapseconds
  projects/mips/share/zoneinfo/northamerica
  projects/mips/share/zoneinfo/pacificnew
  projects/mips/share/zoneinfo/southamerica
  projects/mips/share/zoneinfo/systemv
  projects/mips/share/zoneinfo/zone.tab
  projects/mips/sys/   (props changed)
  projects/mips/sys/amd64/acpica/OsdEnvironment.c
  projects/mips/sys/amd64/acpica/acpi_machdep.c
  projects/mips/sys/amd64/acpica/acpi_wakeup.c
  projects/mips/sys/amd64/acpica/madt.c
  projects/mips/sys/amd64/amd64/dump_machdep.c
  projects/mips/sys/amd64/amd64/local_apic.c
  projects/mips/sys/amd64/amd64/machdep.c
  projects/mips/sys/amd64/amd64/minidump_machdep.c
  projects/mips/sys/amd64/amd64/support.S
  projects/mips/sys/amd64/conf/DEFAULTS
  projects/mips/sys/amd64/conf/GENERIC
  projects/mips/sys/amd64/conf/NOTES
  projects/mips/sys/amd64/include/param.h
  projects/mips/sys/amd64/include/xen/   (props changed)
  projects/mips/sys/amd64/isa/clock.c
  projects/mips/sys/amd64/linux32/linux.h
  projects/mips/sys/amd64/linux32/linux32_sysent.c
  projects/mips/sys/arm/arm/dump_machdep.c
  projects/mips/sys/arm/arm/intr.c
  projects/mips/sys/arm/arm/locore.S
  projects/mips/sys/arm/arm/pmap.c
  projects/mips/sys/arm/at91/at91.c
  projects/mips/sys/arm/at91/at91_cfata.c
  projects/mips/sys/arm/at91/at91_mci.c
  projects/mips/sys/arm/at91/at91_twi.c
  projects/mips/sys/arm/at91/if_ate.c
  projects/mips/sys/arm/conf/AVILA
  projects/mips/sys/arm/include/intr.h
  projects/mips/sys/arm/mv/ic.c
  projects/mips/sys/arm/mv/twsi.c
  projects/mips/sys/arm/sa11x0/sa11x0_irqhandler.c
  projects/mips/sys/arm/xscale/i80321/i80321.c
  projects/mips/sys/arm/xscale/i80321/i80321_pci.c
  projects/mips/sys/arm/xscale/i8134x/i81342.c
  projects/mips/sys/arm/xscale/ixp425/avila_ata.c
  projects/mips/sys/arm/xscale/ixp425/avila_led.c
  projects/mips/sys/arm/xscale/ixp425/cambria_led.c
  projects/mips/sys/arm/xscale/ixp425/files.ixp425
  projects/mips/sys/arm/xscale/ixp425/if_npe.c
  projects/mips/sys/arm/xscale/ixp425/ixp425.c
  projects/mips/sys/arm/xscale/ixp425/ixp425_iic.c
  projects/mips/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/mips/sys/arm/xscale/ixp425/ixp425_qmgr.h
  projects/mips/sys/arm/xscale/pxa/pxa_icu.c
  projects/mips/sys/boot/common/boot.c
  projects/mips/sys/boot/common/ufsread.c
  projects/mips/sys/boot/forth/loader.conf
  projects/mips/sys/boot/i386/libi386/Makefile
  projects/mips/sys/boot/i386/libi386/biosacpi.c
  projects/mips/sys/boot/i386/libi386/biosdisk.c
  projects/mips/sys/boot/i386/libi386/biospnp.c
  projects/mips/sys/boot/ia64/ski/acpi_stub.c
  projects/mips/sys/boot/pc98/boot2/sys.c
  projects/mips/sys/boot/uboot/lib/disk.c
  projects/mips/sys/boot/uboot/lib/net.c
  projects/mips/sys/cam/scsi/scsi_target.c
  projects/mips/sys/cddl/boot/zfs/zfssubr.c   (props changed)
  projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris.c
  projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  projects/mips/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/mips/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/mips/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  projects/mips/sys/compat/freebsd32/freebsd32_misc.c
  projects/mips/sys/compat/freebsd32/freebsd32_proto.h
  projects/mips/sys/compat/freebsd32/freebsd32_syscall.h
  projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/mips/sys/compat/freebsd32/freebsd32_sysent.c
  projects/mips/sys/compat/freebsd32/syscalls.master
  projects/mips/sys/compat/linprocfs/linprocfs.c
  projects/mips/sys/compat/linux/linux_file.c
  projects/mips/sys/compat/linux/linux_getcwd.c
  projects/mips/sys/compat/linux/linux_ioctl.c
  projects/mips/sys/compat/linux/linux_mib.c
  projects/mips/sys/compat/linux/linux_misc.c
  projects/mips/sys/compat/linux/linux_socket.c
  projects/mips/sys/compat/linux/linux_stats.c
  projects/mips/sys/compat/ndis/subr_usbd.c
  projects/mips/sys/compat/svr4/svr4_fcntl.c
  projects/mips/sys/compat/svr4/svr4_ioctl.c
  projects/mips/sys/compat/svr4/svr4_misc.c
  projects/mips/sys/compat/svr4/svr4_resource.c
  projects/mips/sys/compat/svr4/svr4_signal.c
  projects/mips/sys/compat/svr4/svr4_socket.c
  projects/mips/sys/compat/svr4/svr4_sockio.c
  projects/mips/sys/compat/svr4/svr4_stat.c
  projects/mips/sys/compat/svr4/svr4_stream.c
  projects/mips/sys/compat/svr4/svr4_sysconfig.h
  projects/mips/sys/compat/svr4/svr4_sysent.c
  projects/mips/sys/conf/NOTES
  projects/mips/sys/conf/files
  projects/mips/sys/conf/files.i386
  projects/mips/sys/conf/files.powerpc
  projects/mips/sys/conf/kern.pre.mk
  projects/mips/sys/conf/options
  projects/mips/sys/contrib/altq/altq/altq_subr.c
  projects/mips/sys/contrib/dev/acpica/   (props changed)
  projects/mips/sys/contrib/dev/acpica/acpica_prep.sh
  projects/mips/sys/contrib/dev/acpica/common/adfile.c
  projects/mips/sys/contrib/dev/acpica/common/adisasm.c
  projects/mips/sys/contrib/dev/acpica/common/adwalk.c
  projects/mips/sys/contrib/dev/acpica/common/dmrestag.c
  projects/mips/sys/contrib/dev/acpica/common/dmtable.c
  projects/mips/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/mips/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/mips/sys/contrib/dev/acpica/common/getopt.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/mips/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/mips/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/mips/sys/contrib/dev/acpica/compiler/asllength.c
  projects/mips/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslload.c
  projects/mips/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/mips/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/mips/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/mips/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/mips/sys/contrib/dev/acpica/compiler/asltree.c
  projects/mips/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/mips/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/mips/sys/contrib/dev/acpica/osunixxf.c
  projects/mips/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  projects/mips/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/mips/sys/contrib/pf/   (props changed)
  projects/mips/sys/contrib/pf/net/if_pflog.c
  projects/mips/sys/contrib/pf/net/pf.c
  projects/mips/sys/contrib/pf/net/pf_if.c
  projects/mips/sys/contrib/pf/net/pf_ioctl.c
  projects/mips/sys/crypto/via/padlock_hash.c
  projects/mips/sys/ddb/db_textdump.c
  projects/mips/sys/dev/acpi_support/acpi_aiboost.c
  projects/mips/sys/dev/acpi_support/acpi_asus.c
  projects/mips/sys/dev/acpi_support/acpi_fujitsu.c
  projects/mips/sys/dev/acpi_support/acpi_ibm.c
  projects/mips/sys/dev/acpi_support/acpi_panasonic.c
  projects/mips/sys/dev/acpi_support/acpi_sony.c
  projects/mips/sys/dev/acpi_support/acpi_toshiba.c
  projects/mips/sys/dev/acpica/Osd/OsdDebug.c
  projects/mips/sys/dev/acpica/Osd/OsdHardware.c
  projects/mips/sys/dev/acpica/Osd/OsdInterrupt.c
  projects/mips/sys/dev/acpica/Osd/OsdMemory.c
  projects/mips/sys/dev/acpica/Osd/OsdSchedule.c
  projects/mips/sys/dev/acpica/Osd/OsdStream.c
  projects/mips/sys/dev/acpica/Osd/OsdSynch.c
  projects/mips/sys/dev/acpica/Osd/OsdTable.c
  projects/mips/sys/dev/acpica/acpi.c
  projects/mips/sys/dev/acpica/acpi_acad.c
  projects/mips/sys/dev/acpica/acpi_battery.c
  projects/mips/sys/dev/acpica/acpi_button.c
  projects/mips/sys/dev/acpica/acpi_cmbat.c
  projects/mips/sys/dev/acpica/acpi_cpu.c
  projects/mips/sys/dev/acpica/acpi_dock.c
  projects/mips/sys/dev/acpica/acpi_ec.c
  projects/mips/sys/dev/acpica/acpi_hpet.c
  projects/mips/sys/dev/acpica/acpi_if.m
  projects/mips/sys/dev/acpica/acpi_isab.c
  projects/mips/sys/dev/acpica/acpi_lid.c
  projects/mips/sys/dev/acpica/acpi_package.c
  projects/mips/sys/dev/acpica/acpi_pci.c
  projects/mips/sys/dev/acpica/acpi_pci_link.c
  projects/mips/sys/dev/acpica/acpi_pcib.c
  projects/mips/sys/dev/acpica/acpi_pcib_acpi.c
  projects/mips/sys/dev/acpica/acpi_pcib_pci.c
  projects/mips/sys/dev/acpica/acpi_perf.c
  projects/mips/sys/dev/acpica/acpi_powerres.c
  projects/mips/sys/dev/acpica/acpi_quirk.c
  projects/mips/sys/dev/acpica/acpi_resource.c
  projects/mips/sys/dev/acpica/acpi_smbat.c
  projects/mips/sys/dev/acpica/acpi_thermal.c
  projects/mips/sys/dev/acpica/acpi_throttle.c
  projects/mips/sys/dev/acpica/acpi_timer.c
  projects/mips/sys/dev/acpica/acpi_video.c
  projects/mips/sys/dev/acpica/acpivar.h
  projects/mips/sys/dev/agp/agp_ali.c
  projects/mips/sys/dev/agp/agp_amd.c
  projects/mips/sys/dev/agp/agp_ati.c
  projects/mips/sys/dev/agp/agp_nvidia.c
  projects/mips/sys/dev/agp/agp_sis.c
  projects/mips/sys/dev/aic7xxx/aicasm/Makefile
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  projects/mips/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
  projects/mips/sys/dev/asmc/asmc.c
  projects/mips/sys/dev/ata/   (props changed)
  projects/mips/sys/dev/ata/ata-all.h
  projects/mips/sys/dev/ata/ata-pci.h
  projects/mips/sys/dev/ata/ata-usb.c   (contents, props changed)
  projects/mips/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/mips/sys/dev/ata/chipsets/ata-ahci.c
  projects/mips/sys/dev/ata/chipsets/ata-intel.c
  projects/mips/sys/dev/ata/chipsets/ata-nvidia.c
  projects/mips/sys/dev/ath/if_ath.c
  projects/mips/sys/dev/bge/if_bge.c
  projects/mips/sys/dev/bwi/if_bwi.c
  projects/mips/sys/dev/ce/if_ce.c
  projects/mips/sys/dev/cfe/cfe_console.c
  projects/mips/sys/dev/cfi/cfi_core.c
  projects/mips/sys/dev/cp/if_cp.c
  projects/mips/sys/dev/ctau/if_ct.c
  projects/mips/sys/dev/cx/if_cx.c
  projects/mips/sys/dev/cxgb/   (props changed)
  projects/mips/sys/dev/cxgb/cxgb_main.c
  projects/mips/sys/dev/cxgb/cxgb_multiq.c
  projects/mips/sys/dev/cxgb/cxgb_sge.c
  projects/mips/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/mips/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/mips/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/mips/sys/dev/dc/if_dc.c
  projects/mips/sys/dev/dcons/dcons_os.c
  projects/mips/sys/dev/e1000/if_em.c
  projects/mips/sys/dev/e1000/if_igb.c
  projects/mips/sys/dev/eisa/eisaconf.c
  projects/mips/sys/dev/fdc/fdc_acpi.c
  projects/mips/sys/dev/firewire/firewire.c
  projects/mips/sys/dev/firewire/if_fwe.c
  projects/mips/sys/dev/firewire/if_fwip.c
  projects/mips/sys/dev/fxp/if_fxp.c
  projects/mips/sys/dev/if_ndis/if_ndis.c
  projects/mips/sys/dev/if_ndis/if_ndis_usb.c
  projects/mips/sys/dev/if_ndis/if_ndisvar.h
  projects/mips/sys/dev/iir/iir.c
  projects/mips/sys/dev/iir/iir_ctrl.c
  projects/mips/sys/dev/ipmi/ipmi_acpi.c
  projects/mips/sys/dev/iwn/if_iwn.c
  projects/mips/sys/dev/ixgb/if_ixgb.c
  projects/mips/sys/dev/kbd/kbd.c
  projects/mips/sys/dev/kbdmux/kbdmux.c
  projects/mips/sys/dev/lmc/if_lmc.c
  projects/mips/sys/dev/lmc/if_lmc.h
  projects/mips/sys/dev/mca/mca_bus.c
  projects/mips/sys/dev/mge/if_mge.c
  projects/mips/sys/dev/mii/e1000phy.c
  projects/mips/sys/dev/mii/e1000phyreg.h
  projects/mips/sys/dev/msk/if_msk.c
  projects/mips/sys/dev/msk/if_mskreg.h
  projects/mips/sys/dev/mxge/if_mxge.c
  projects/mips/sys/dev/mxge/if_mxge_var.h
  projects/mips/sys/dev/ncv/ncr53c500_pccard.c
  projects/mips/sys/dev/nfe/if_nfe.c
  projects/mips/sys/dev/nge/if_nge.c
  projects/mips/sys/dev/nmdm/nmdm.c
  projects/mips/sys/dev/nsp/nsp_pccard.c
  projects/mips/sys/dev/ofw/ofw_console.c
  projects/mips/sys/dev/ofw/ofw_standard.c
  projects/mips/sys/dev/pcf/pcf.c
  projects/mips/sys/dev/pcf/pcfvar.h
  projects/mips/sys/dev/pci/pci.c
  projects/mips/sys/dev/pci/pcivar.h
  projects/mips/sys/dev/pdq/if_fpa.c
  projects/mips/sys/dev/puc/pucdata.c
  projects/mips/sys/dev/ral/rt2560.c
  projects/mips/sys/dev/re/if_re.c
  projects/mips/sys/dev/rp/rp.c
  projects/mips/sys/dev/sf/if_sf.c
  projects/mips/sys/dev/si/si.c
  projects/mips/sys/dev/sis/if_sis.c
  projects/mips/sys/dev/smc/if_smc.c
  projects/mips/sys/dev/smc/if_smcvar.h
  projects/mips/sys/dev/snc/if_snc.c
  projects/mips/sys/dev/snc/if_sncvar.h
  projects/mips/sys/dev/sound/clone.c
  projects/mips/sys/dev/sound/driver.c
  projects/mips/sys/dev/sound/isa/ad1816.c
  projects/mips/sys/dev/sound/isa/ess.c
  projects/mips/sys/dev/sound/isa/gusc.c
  projects/mips/sys/dev/sound/isa/mss.c
  projects/mips/sys/dev/sound/isa/sb16.c
  projects/mips/sys/dev/sound/isa/sb8.c
  projects/mips/sys/dev/sound/isa/sbc.c
  projects/mips/sys/dev/sound/isa/sndbuf_dma.c
  projects/mips/sys/dev/sound/macio/aoa.c
  projects/mips/sys/dev/sound/macio/davbus.c
  projects/mips/sys/dev/sound/macio/i2s.c
  projects/mips/sys/dev/sound/macio/snapper.c
  projects/mips/sys/dev/sound/macio/tumbler.c
  projects/mips/sys/dev/sound/midi/midi.c
  projects/mips/sys/dev/sound/midi/mpu401.c
  projects/mips/sys/dev/sound/midi/sequencer.c
  projects/mips/sys/dev/sound/midi/sequencer.h
  projects/mips/sys/dev/sound/pci/als4000.c
  projects/mips/sys/dev/sound/pci/atiixp.c
  projects/mips/sys/dev/sound/pci/aureal.c
  projects/mips/sys/dev/sound/pci/cmi.c
  projects/mips/sys/dev/sound/pci/cs4281.c
  projects/mips/sys/dev/sound/pci/csa.c
  projects/mips/sys/dev/sound/pci/csapcm.c
  projects/mips/sys/dev/sound/pci/ds1.c
  projects/mips/sys/dev/sound/pci/emu10k1.c
  projects/mips/sys/dev/sound/pci/emu10kx-midi.c
  projects/mips/sys/dev/sound/pci/emu10kx-pcm.c
  projects/mips/sys/dev/sound/pci/emu10kx.c
  projects/mips/sys/dev/sound/pci/envy24.c
  projects/mips/sys/dev/sound/pci/envy24ht.c
  projects/mips/sys/dev/sound/pci/es137x.c
  projects/mips/sys/dev/sound/pci/fm801.c
  projects/mips/sys/dev/sound/pci/hda/hdac.c
  projects/mips/sys/dev/sound/pci/ich.c
  projects/mips/sys/dev/sound/pci/maestro.c
  projects/mips/sys/dev/sound/pci/maestro3.c
  projects/mips/sys/dev/sound/pci/neomagic.c
  projects/mips/sys/dev/sound/pci/solo.c
  projects/mips/sys/dev/sound/pci/spicds.c
  projects/mips/sys/dev/sound/pci/t4dwave.c
  projects/mips/sys/dev/sound/pci/via8233.c
  projects/mips/sys/dev/sound/pci/via82c686.c
  projects/mips/sys/dev/sound/pci/vibes.c
  projects/mips/sys/dev/sound/pcm/ac97.c
  projects/mips/sys/dev/sound/pcm/ac97_patch.c
  projects/mips/sys/dev/sound/pcm/buffer.c
  projects/mips/sys/dev/sound/pcm/buffer.h
  projects/mips/sys/dev/sound/pcm/channel.c
  projects/mips/sys/dev/sound/pcm/channel.h
  projects/mips/sys/dev/sound/pcm/channel_if.m
  projects/mips/sys/dev/sound/pcm/dsp.c
  projects/mips/sys/dev/sound/pcm/dsp.h
  projects/mips/sys/dev/sound/pcm/feeder.c
  projects/mips/sys/dev/sound/pcm/feeder.h
  projects/mips/sys/dev/sound/pcm/feeder_rate.c
  projects/mips/sys/dev/sound/pcm/feeder_volume.c
  projects/mips/sys/dev/sound/pcm/mixer.c
  projects/mips/sys/dev/sound/pcm/mixer.h
  projects/mips/sys/dev/sound/pcm/sndstat.c
  projects/mips/sys/dev/sound/pcm/sound.c
  projects/mips/sys/dev/sound/pcm/sound.h
  projects/mips/sys/dev/sound/pcm/vchan.c
  projects/mips/sys/dev/sound/pcm/vchan.h
  projects/mips/sys/dev/sound/sbus/cs4231.c
  projects/mips/sys/dev/sound/unit.c
  projects/mips/sys/dev/sound/usb/uaudio.c   (contents, props changed)
  projects/mips/sys/dev/sound/usb/uaudio.h   (contents, props changed)
  projects/mips/sys/dev/sound/usb/uaudio_pcm.c   (contents, props changed)
  projects/mips/sys/dev/sound/usb/uaudioreg.h   (contents, props changed)
  projects/mips/sys/dev/sound/version.h
  projects/mips/sys/dev/spibus/spibus.c
  projects/mips/sys/dev/ste/if_ste.c
  projects/mips/sys/dev/stg/tmc18c30.h
  projects/mips/sys/dev/stg/tmc18c30_subr.c
  projects/mips/sys/dev/stge/if_stge.c
  projects/mips/sys/dev/syscons/daemon/daemon_saver.c
  projects/mips/sys/dev/syscons/scterm-teken.c
  projects/mips/sys/dev/syscons/syscons.c
  projects/mips/sys/dev/syscons/sysmouse.c
  projects/mips/sys/dev/syscons/teken/sequences
  projects/mips/sys/dev/syscons/teken/teken.c
  projects/mips/sys/dev/syscons/teken/teken.h
  projects/mips/sys/dev/syscons/teken/teken_demo.c
  projects/mips/sys/dev/syscons/teken/teken_stress.c
  projects/mips/sys/dev/syscons/teken/teken_subr_compat.h
  projects/mips/sys/dev/tsec/if_tsec.c
  projects/mips/sys/dev/uart/uart_tty.c
  projects/mips/sys/dev/ubsec/ubsec.c
  projects/mips/sys/dev/usb/controller/at91dci.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/at91dci.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/at91dci_atmelarm.c   (props changed)
  projects/mips/sys/dev/usb/controller/atmegadci.c
  projects/mips/sys/dev/usb/controller/atmegadci.h
  projects/mips/sys/dev/usb/controller/atmegadci_atmelarm.c
  projects/mips/sys/dev/usb/controller/avr32dci.c
  projects/mips/sys/dev/usb/controller/avr32dci.h
  projects/mips/sys/dev/usb/controller/ehci.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/ehci.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/ehci_pci.c   (props changed)
  projects/mips/sys/dev/usb/controller/musb_otg.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/musb_otg.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/musb_otg_atmelarm.c   (props changed)
  projects/mips/sys/dev/usb/controller/ohci.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/ohci.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/ohci_atmelarm.c   (props changed)
  projects/mips/sys/dev/usb/controller/ohci_pci.c   (props changed)
  projects/mips/sys/dev/usb/controller/uhci.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/uhci.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/uhci_pci.c   (props changed)
  projects/mips/sys/dev/usb/controller/usb_controller.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/uss820dci.c   (contents, props changed)
  projects/mips/sys/dev/usb/controller/uss820dci.h   (contents, props changed)
  projects/mips/sys/dev/usb/controller/uss820dci_atmelarm.c   (props changed)
  projects/mips/sys/dev/usb/input/uhid.c   (contents, props changed)
  projects/mips/sys/dev/usb/input/ukbd.c   (contents, props changed)
  projects/mips/sys/dev/usb/input/ums.c   (contents, props changed)
  projects/mips/sys/dev/usb/input/usb_rdesc.h   (props changed)
  projects/mips/sys/dev/usb/misc/udbp.c   (contents, props changed)
  projects/mips/sys/dev/usb/misc/udbp.h   (props changed)
  projects/mips/sys/dev/usb/misc/ufm.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_aue.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_auereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_axe.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_axereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_cdce.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_cdcereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_cue.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_cuereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_kue.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_kuefw.h   (props changed)
  projects/mips/sys/dev/usb/net/if_kuereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_rue.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_ruereg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_udav.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/if_udavreg.h   (contents, props changed)
  projects/mips/sys/dev/usb/net/usb_ethernet.c   (contents, props changed)
  projects/mips/sys/dev/usb/net/usb_ethernet.h   (contents, props changed)
  projects/mips/sys/dev/usb/quirk/usb_quirk.c   (contents, props changed)
  projects/mips/sys/dev/usb/quirk/usb_quirk.h   (props changed)
  projects/mips/sys/dev/usb/serial/u3g.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uark.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/ubsa.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/ubser.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uchcom.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/ucycom.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/ufoma.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uftdi.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uftdi_reg.h   (props changed)
  projects/mips/sys/dev/usb/serial/ugensa.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uipaq.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/ulpt.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/umct.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/umodem.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/umoscom.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uplcom.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/usb_serial.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/usb_serial.h   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uslcom.c
  projects/mips/sys/dev/usb/serial/uvisor.c   (contents, props changed)
  projects/mips/sys/dev/usb/serial/uvscom.c   (contents, props changed)
  projects/mips/sys/dev/usb/storage/rio500_usb.h   (props changed)
  projects/mips/sys/dev/usb/storage/umass.c   (contents, props changed)
  projects/mips/sys/dev/usb/storage/urio.c   (contents, props changed)
  projects/mips/sys/dev/usb/storage/ustorage_fs.c   (contents, props changed)
  projects/mips/sys/dev/usb/template/usb_template.c   (contents, props changed)
  projects/mips/sys/dev/usb/template/usb_template.h   (contents, props changed)
  projects/mips/sys/dev/usb/template/usb_template_cdce.c   (contents, props changed)
  projects/mips/sys/dev/usb/template/usb_template_msc.c   (contents, props changed)
  projects/mips/sys/dev/usb/template/usb_template_mtp.c   (contents, props changed)
  projects/mips/sys/dev/usb/ufm_ioctl.h   (props changed)
  projects/mips/sys/dev/usb/usb.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_bus.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_busdma.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_busdma.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_cdc.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_compat_linux.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_compat_linux.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_controller.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_core.c   (props changed)
  projects/mips/sys/dev/usb/usb_core.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_debug.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_debug.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_defs.h   (props changed)
  projects/mips/sys/dev/usb/usb_dev.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_dev.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_device.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_device.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_dynamic.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_dynamic.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_endian.h   (props changed)
  projects/mips/sys/dev/usb/usb_error.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_error.h   (props changed)
  projects/mips/sys/dev/usb/usb_generic.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_generic.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_handle_request.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_handle_request.h   (props changed)
  projects/mips/sys/dev/usb/usb_hid.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_hid.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_hub.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_hub.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_if.m   (props changed)
  projects/mips/sys/dev/usb/usb_ioctl.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_lookup.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_lookup.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_mbuf.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_mbuf.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_mfunc.h   (props changed)
  projects/mips/sys/dev/usb/usb_msctest.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_msctest.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_parse.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_parse.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_pci.h   (props changed)
  projects/mips/sys/dev/usb/usb_process.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_process.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_request.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_request.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_revision.h   (props changed)
  projects/mips/sys/dev/usb/usb_transfer.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_transfer.h   (contents, props changed)
  projects/mips/sys/dev/usb/usb_util.c   (contents, props changed)
  projects/mips/sys/dev/usb/usb_util.h   (props changed)
  projects/mips/sys/dev/usb/usbdevs   (contents, props changed)
  projects/mips/sys/dev/usb/usbhid.h   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_rum.c   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_rumfw.h   (props changed)
  projects/mips/sys/dev/usb/wlan/if_rumreg.h   (props changed)
  projects/mips/sys/dev/usb/wlan/if_rumvar.h   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_uath.c
  projects/mips/sys/dev/usb/wlan/if_uathvar.h
  projects/mips/sys/dev/usb/wlan/if_upgt.c
  projects/mips/sys/dev/usb/wlan/if_upgtvar.h
  projects/mips/sys/dev/usb/wlan/if_ural.c   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_uralreg.h   (props changed)
  projects/mips/sys/dev/usb/wlan/if_uralvar.h   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_zyd.c   (contents, props changed)
  projects/mips/sys/dev/usb/wlan/if_zydfw.h   (props changed)
  projects/mips/sys/dev/usb/wlan/if_zydreg.h   (contents, props changed)
  projects/mips/sys/dev/vge/if_vge.c
  projects/mips/sys/dev/vr/if_vr.c
  projects/mips/sys/dev/wb/if_wb.c
  projects/mips/sys/dev/wi/if_wi.c
  projects/mips/sys/dev/wi/if_wivar.h
  projects/mips/sys/dev/xen/console/console.c
  projects/mips/sys/dev/xen/netfront/   (props changed)
  projects/mips/sys/dev/xen/netfront/netfront.c
  projects/mips/sys/dev/xen/xenpci/   (props changed)
  projects/mips/sys/dev/xl/if_xl.c
  projects/mips/sys/fs/cd9660/cd9660_rrip.c
  projects/mips/sys/fs/cd9660/cd9660_vnops.c
  projects/mips/sys/fs/devfs/devfs_devs.c
  projects/mips/sys/fs/devfs/devfs_vnops.c
  projects/mips/sys/fs/fifofs/fifo_vnops.c
  projects/mips/sys/fs/msdosfs/msdosfs_vnops.c
  projects/mips/sys/fs/nfs/nfs_commonacl.c
  projects/mips/sys/fs/nfs/nfs_commonport.c
  projects/mips/sys/fs/nfs/nfs_commonsubs.c
  projects/mips/sys/fs/nfs/nfsport.h
  projects/mips/sys/fs/nfsclient/nfs_clbio.c
  projects/mips/sys/fs/nfsclient/nfs_clnode.c
  projects/mips/sys/fs/nfsclient/nfs_clstate.c
  projects/mips/sys/fs/nfsclient/nfs_clvfsops.c
  projects/mips/sys/fs/nfsclient/nfs_clvnops.c
  projects/mips/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/mips/sys/fs/nfsserver/nfs_nfsdport.c
  projects/mips/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/mips/sys/fs/nullfs/null_subr.c
  projects/mips/sys/fs/nullfs/null_vnops.c
  projects/mips/sys/fs/procfs/procfs_status.c
  projects/mips/sys/fs/pseudofs/pseudofs_vncache.c
  projects/mips/sys/fs/pseudofs/pseudofs_vnops.c
  projects/mips/sys/fs/smbfs/smbfs_io.c
  projects/mips/sys/fs/tmpfs/tmpfs_vnops.c
  projects/mips/sys/fs/udf/osta.c
  projects/mips/sys/fs/unionfs/union_subr.c
  projects/mips/sys/geom/geom.h
  projects/mips/sys/geom/geom_io.c
  projects/mips/sys/geom/geom_subr.c
  projects/mips/sys/geom/label/g_label.c
  projects/mips/sys/geom/vinum/geom_vinum_create.c
  projects/mips/sys/geom/vinum/geom_vinum_drive.c
  projects/mips/sys/gnu/fs/ext2fs/ext2_fs.h
  projects/mips/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  projects/mips/sys/gnu/fs/ext2fs/ext2_lookup.c
  projects/mips/sys/gnu/fs/ext2fs/ext2_vfsops.c
  projects/mips/sys/gnu/fs/ext2fs/ext2_vnops.c
  projects/mips/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/mips/sys/i386/acpica/OsdEnvironment.c
  projects/mips/sys/i386/acpica/acpi_machdep.c
  projects/mips/sys/i386/acpica/acpi_wakeup.c
  projects/mips/sys/i386/acpica/madt.c
  projects/mips/sys/i386/conf/DEFAULTS
  projects/mips/sys/i386/conf/GENERIC
  projects/mips/sys/i386/conf/NOTES
  projects/mips/sys/i386/cpufreq/est.c
  projects/mips/sys/i386/cpufreq/hwpstate.c
  projects/mips/sys/i386/cpufreq/p4tcc.c
  projects/mips/sys/i386/i386/dump_machdep.c
  projects/mips/sys/i386/i386/local_apic.c
  projects/mips/sys/i386/i386/machdep.c
  projects/mips/sys/i386/i386/minidump_machdep.c
  projects/mips/sys/i386/i386/sys_machdep.c
  projects/mips/sys/i386/ibcs2/ibcs2_misc.c
  projects/mips/sys/i386/ibcs2/ibcs2_socksys.c
  projects/mips/sys/i386/ibcs2/ibcs2_sysent.c
  projects/mips/sys/i386/include/apicvar.h
  projects/mips/sys/i386/include/legacyvar.h
  projects/mips/sys/i386/isa/clock.c
  projects/mips/sys/i386/isa/vesa.c
  projects/mips/sys/i386/linux/linux.h
  projects/mips/sys/i386/linux/linux_sysent.c
  projects/mips/sys/i386/pci/pci_bus.c
  projects/mips/sys/i386/xen/clock.c
  projects/mips/sys/i386/xen/mp_machdep.c
  projects/mips/sys/ia64/acpica/OsdEnvironment.c
  projects/mips/sys/ia64/acpica/acpi_machdep.c
  projects/mips/sys/ia64/acpica/acpi_wakeup.c
  projects/mips/sys/ia64/acpica/madt.c
  projects/mips/sys/ia64/conf/GENERIC
  projects/mips/sys/ia64/ia64/dump_machdep.c
  projects/mips/sys/ia64/ia64/mp_machdep.c
  projects/mips/sys/ia64/ia64/nexus.c
  projects/mips/sys/ia64/ia64/ssc.c
  projects/mips/sys/kern/bus_if.m
  projects/mips/sys/kern/init_main.c
  projects/mips/sys/kern/init_sysent.c
  projects/mips/sys/kern/kern_acct.c
  projects/mips/sys/kern/kern_alq.c
  projects/mips/sys/kern/kern_conf.c
  projects/mips/sys/kern/kern_cpu.c
  projects/mips/sys/kern/kern_cpuset.c
  projects/mips/sys/kern/kern_descrip.c
  projects/mips/sys/kern/kern_environment.c
  projects/mips/sys/kern/kern_event.c
  projects/mips/sys/kern/kern_exec.c
  projects/mips/sys/kern/kern_exit.c
  projects/mips/sys/kern/kern_fork.c
  projects/mips/sys/kern/kern_jail.c
  projects/mips/sys/kern/kern_ktrace.c
  projects/mips/sys/kern/kern_linker.c
  projects/mips/sys/kern/kern_lock.c
  projects/mips/sys/kern/kern_lockf.c
  projects/mips/sys/kern/kern_malloc.c
  projects/mips/sys/kern/kern_mbuf.c
  projects/mips/sys/kern/kern_mib.c
  projects/mips/sys/kern/kern_mutex.c
  projects/mips/sys/kern/kern_osd.c
  projects/mips/sys/kern/kern_poll.c
  projects/mips/sys/kern/kern_priv.c
  projects/mips/sys/kern/kern_proc.c
  projects/mips/sys/kern/kern_prot.c
  projects/mips/sys/kern/kern_rmlock.c
  projects/mips/sys/kern/kern_rwlock.c
  projects/mips/sys/kern/kern_shutdown.c
  projects/mips/sys/kern/kern_sx.c
  projects/mips/sys/kern/kern_sysctl.c
  projects/mips/sys/kern/kern_uuid.c
  projects/mips/sys/kern/kern_vimage.c
  projects/mips/sys/kern/kern_xxx.c
  projects/mips/sys/kern/link_elf.c
  projects/mips/sys/kern/link_elf_obj.c
  projects/mips/sys/kern/linker_if.m
  projects/mips/sys/kern/makesyscalls.sh
  projects/mips/sys/kern/subr_bus.c
  projects/mips/sys/kern/subr_trap.c
  projects/mips/sys/kern/sys_pipe.c
  projects/mips/sys/kern/sys_socket.c
  projects/mips/sys/kern/sysv_msg.c
  projects/mips/sys/kern/sysv_sem.c
  projects/mips/sys/kern/sysv_shm.c
  projects/mips/sys/kern/tty.c
  projects/mips/sys/kern/tty_pts.c
  projects/mips/sys/kern/uipc_domain.c
  projects/mips/sys/kern/uipc_mbuf.c
  projects/mips/sys/kern/uipc_mbuf2.c
  projects/mips/sys/kern/uipc_mqueue.c
  projects/mips/sys/kern/uipc_sem.c
  projects/mips/sys/kern/uipc_shm.c
  projects/mips/sys/kern/uipc_sockbuf.c
  projects/mips/sys/kern/uipc_socket.c
  projects/mips/sys/kern/uipc_syscalls.c
  projects/mips/sys/kern/uipc_usrreq.c
  projects/mips/sys/kern/vfs_acl.c
  projects/mips/sys/kern/vfs_aio.c
  projects/mips/sys/kern/vfs_bio.c
  projects/mips/sys/kern/vfs_cache.c
  projects/mips/sys/kern/vfs_cluster.c
  projects/mips/sys/kern/vfs_default.c
  projects/mips/sys/kern/vfs_extattr.c
  projects/mips/sys/kern/vfs_lookup.c
  projects/mips/sys/kern/vfs_mount.c
  projects/mips/sys/kern/vfs_subr.c
  projects/mips/sys/kern/vfs_syscalls.c
  projects/mips/sys/kern/vfs_vnops.c
  projects/mips/sys/kern/vnode_if.src
  projects/mips/sys/kgssapi/gsstest.c
  projects/mips/sys/modules/Makefile
  projects/mips/sys/modules/acpi/acpi/Makefile
  projects/mips/sys/modules/acpi/acpi_aiboost/Makefile
  projects/mips/sys/modules/acpi/acpi_asus/Makefile
  projects/mips/sys/modules/acpi/acpi_dock/Makefile
  projects/mips/sys/modules/acpi/acpi_fujitsu/Makefile
  projects/mips/sys/modules/acpi/acpi_ibm/Makefile
  projects/mips/sys/modules/acpi/acpi_panasonic/Makefile
  projects/mips/sys/modules/acpi/acpi_sony/Makefile
  projects/mips/sys/modules/acpi/acpi_toshiba/Makefile
  projects/mips/sys/modules/acpi/acpi_video/Makefile
  projects/mips/sys/modules/bridgestp/Makefile
  projects/mips/sys/modules/cpufreq/Makefile
  projects/mips/sys/modules/cxgb/iw_cxgb/Makefile
  projects/mips/sys/modules/cxgb/tom/Makefile
  projects/mips/sys/modules/dtrace/Makefile
  projects/mips/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/mips/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/mips/sys/modules/dummynet/Makefile
  projects/mips/sys/modules/fdc/Makefile
  projects/mips/sys/modules/firewire/fwip/Makefile
  projects/mips/sys/modules/geom/geom_part/geom_part_ebr/Makefile
  projects/mips/sys/modules/ibcs2/Makefile
  projects/mips/sys/modules/if_ef/Makefile
  projects/mips/sys/modules/if_gif/Makefile
  projects/mips/sys/modules/if_ppp/Makefile
  projects/mips/sys/modules/if_stf/Makefile
  projects/mips/sys/modules/if_tun/Makefile
  projects/mips/sys/modules/if_vlan/Makefile
  projects/mips/sys/modules/ip6_mroute_mod/   (props changed)
  projects/mips/sys/modules/ip6_mroute_mod/Makefile
  projects/mips/sys/modules/ip_mroute_mod/Makefile
  projects/mips/sys/modules/ipfw/Makefile
  projects/mips/sys/modules/ipfw_nat/Makefile
  projects/mips/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/mips/sys/modules/linprocfs/Makefile
  projects/mips/sys/modules/linux/Makefile
  projects/mips/sys/modules/mac_lomac/Makefile
  projects/mips/sys/modules/netgraph/atm/atm/Makefile
  projects/mips/sys/modules/netgraph/bluetooth/ubt/Makefile
  projects/mips/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
  projects/mips/sys/modules/netgraph/ether/Makefile
  projects/mips/sys/modules/netgraph/gif/Makefile
  projects/mips/sys/modules/nfsclient/Makefile
  projects/mips/sys/modules/nfsserver/Makefile
  projects/mips/sys/modules/pf/Makefile
  projects/mips/sys/modules/pseudofs/Makefile
  projects/mips/sys/modules/sem/Makefile
  projects/mips/sys/modules/sound/sound/Makefile
  projects/mips/sys/modules/svr4/Makefile
  projects/mips/sys/modules/sysvipc/sysvmsg/Makefile
  projects/mips/sys/modules/sysvipc/sysvsem/Makefile
  projects/mips/sys/modules/sysvipc/sysvshm/Makefile
  projects/mips/sys/modules/ufs/Makefile
  projects/mips/sys/modules/usb/Makefile
  projects/mips/sys/modules/usb/zyd/Makefile
  projects/mips/sys/modules/wlan/Makefile
  projects/mips/sys/modules/zfs/Makefile
  projects/mips/sys/net/bpf.c
  projects/mips/sys/net/bridgestp.c
  projects/mips/sys/net/flowtable.c
  projects/mips/sys/net/flowtable.h
  projects/mips/sys/net/if.c
  projects/mips/sys/net/if.h
  projects/mips/sys/net/if_arcsubr.c
  projects/mips/sys/net/if_atmsubr.c
  projects/mips/sys/net/if_bridge.c
  projects/mips/sys/net/if_ef.c
  projects/mips/sys/net/if_ethersubr.c
  projects/mips/sys/net/if_fddisubr.c
  projects/mips/sys/net/if_fwsubr.c
  projects/mips/sys/net/if_gif.c
  projects/mips/sys/net/if_gif.h
  projects/mips/sys/net/if_iso88025subr.c
  projects/mips/sys/net/if_loop.c
  projects/mips/sys/net/if_mib.c
  projects/mips/sys/net/if_stf.c
  projects/mips/sys/net/if_tap.c
  projects/mips/sys/net/if_tun.c
  projects/mips/sys/net/if_var.h
  projects/mips/sys/net/if_vlan.c
  projects/mips/sys/net/netisr.c
  projects/mips/sys/net/netisr.h
  projects/mips/sys/net/pfil.h
  projects/mips/sys/net/raw_cb.c
  projects/mips/sys/net/raw_usrreq.c
  projects/mips/sys/net/route.c
  projects/mips/sys/net/route.h
  projects/mips/sys/net/rtsock.c
  projects/mips/sys/net/vnet.h
  projects/mips/sys/net80211/_ieee80211.h
  projects/mips/sys/net80211/ieee80211.c
  projects/mips/sys/net80211/ieee80211.h
  projects/mips/sys/net80211/ieee80211_crypto.c
  projects/mips/sys/net80211/ieee80211_crypto.h
  projects/mips/sys/net80211/ieee80211_crypto_ccmp.c
  projects/mips/sys/net80211/ieee80211_crypto_tkip.c
  projects/mips/sys/net80211/ieee80211_ddb.c
  projects/mips/sys/net80211/ieee80211_dfs.c
  projects/mips/sys/net80211/ieee80211_freebsd.c
  projects/mips/sys/net80211/ieee80211_hostap.c
  projects/mips/sys/net80211/ieee80211_ht.c
  projects/mips/sys/net80211/ieee80211_ht.h
  projects/mips/sys/net80211/ieee80211_input.c
  projects/mips/sys/net80211/ieee80211_ioctl.c
  projects/mips/sys/net80211/ieee80211_ioctl.h
  projects/mips/sys/net80211/ieee80211_monitor.c
  projects/mips/sys/net80211/ieee80211_node.c
  projects/mips/sys/net80211/ieee80211_node.h
  projects/mips/sys/net80211/ieee80211_output.c
  projects/mips/sys/net80211/ieee80211_phy.h
  projects/mips/sys/net80211/ieee80211_proto.c
  projects/mips/sys/net80211/ieee80211_proto.h
  projects/mips/sys/net80211/ieee80211_radiotap.c
  projects/mips/sys/net80211/ieee80211_scan.c
  projects/mips/sys/net80211/ieee80211_scan.h
  projects/mips/sys/net80211/ieee80211_scan_sta.c
  projects/mips/sys/net80211/ieee80211_sta.c
  projects/mips/sys/net80211/ieee80211_superg.c
  projects/mips/sys/net80211/ieee80211_tdma.c
  projects/mips/sys/net80211/ieee80211_var.h
  projects/mips/sys/netatalk/aarp.c
  projects/mips/sys/netatalk/ddp_input.c
  projects/mips/sys/netatalk/ddp_output.c
  projects/mips/sys/netatalk/ddp_usrreq.c
  projects/mips/sys/netgraph/atm/ng_atm.c
  projects/mips/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/mips/sys/netgraph/netgraph.h
  projects/mips/sys/netgraph/ng_base.c
  projects/mips/sys/netgraph/ng_eiface.c
  projects/mips/sys/netgraph/ng_ether.c
  projects/mips/sys/netgraph/ng_gif.c
  projects/mips/sys/netgraph/ng_iface.c
  projects/mips/sys/netgraph/ng_ip_input.c
  projects/mips/sys/netgraph/ng_ipfw.c
  projects/mips/sys/netgraph/ng_ipfw.h
  projects/mips/sys/netgraph/ng_ksocket.c
  projects/mips/sys/netgraph/ng_message.h
  projects/mips/sys/netinet/accf_data.c
  projects/mips/sys/netinet/accf_dns.c
  projects/mips/sys/netinet/accf_http.c
  projects/mips/sys/netinet/if_ether.c
  projects/mips/sys/netinet/igmp.c
  projects/mips/sys/netinet/igmp.h
  projects/mips/sys/netinet/in.c
  projects/mips/sys/netinet/in.h
  projects/mips/sys/netinet/in_gif.c
  projects/mips/sys/netinet/in_mcast.c
  projects/mips/sys/netinet/in_pcb.c
  projects/mips/sys/netinet/in_pcb.h
  projects/mips/sys/netinet/in_proto.c
  projects/mips/sys/netinet/in_rmx.c
  projects/mips/sys/netinet/ip_divert.c
  projects/mips/sys/netinet/ip_dummynet.h
  projects/mips/sys/netinet/ip_fw.h
  projects/mips/sys/netinet/ip_icmp.c
  projects/mips/sys/netinet/ip_input.c
  projects/mips/sys/netinet/ip_ipsec.c
  projects/mips/sys/netinet/ip_ipsec.h
  projects/mips/sys/netinet/ip_mroute.c
  projects/mips/sys/netinet/ip_options.c
  projects/mips/sys/netinet/ip_output.c
  projects/mips/sys/netinet/ip_var.h
  projects/mips/sys/netinet/raw_ip.c
  projects/mips/sys/netinet/sctp_os_bsd.h
  projects/mips/sys/netinet/sctp_pcb.c
  projects/mips/sys/netinet/sctp_sysctl.c
  projects/mips/sys/netinet/sctp_sysctl.h
  projects/mips/sys/netinet/sctp_uio.h
  projects/mips/sys/netinet/sctputil.c
  projects/mips/sys/netinet/tcp_debug.c
  projects/mips/sys/netinet/tcp_hostcache.c
  projects/mips/sys/netinet/tcp_input.c
  projects/mips/sys/netinet/tcp_output.c
  projects/mips/sys/netinet/tcp_subr.c
  projects/mips/sys/netinet/tcp_syncache.c
  projects/mips/sys/netinet/tcp_syncache.h
  projects/mips/sys/netinet/tcp_timewait.c
  projects/mips/sys/netinet/tcp_usrreq.c
  projects/mips/sys/netinet/tcp_var.h
  projects/mips/sys/netinet/udp_usrreq.c
  projects/mips/sys/netinet/udp_var.h
  projects/mips/sys/netinet6/frag6.c
  projects/mips/sys/netinet6/icmp6.c
  projects/mips/sys/netinet6/in6.c
  projects/mips/sys/netinet6/in6.h
  projects/mips/sys/netinet6/in6_gif.c
  projects/mips/sys/netinet6/in6_ifattach.c
  projects/mips/sys/netinet6/in6_mcast.c
  projects/mips/sys/netinet6/in6_pcb.c
  projects/mips/sys/netinet6/in6_proto.c
  projects/mips/sys/netinet6/in6_rmx.c
  projects/mips/sys/netinet6/ip6_input.c
  projects/mips/sys/netinet6/ip6_mroute.c
  projects/mips/sys/netinet6/ip6_output.c
  projects/mips/sys/netinet6/ip6_var.h
  projects/mips/sys/netinet6/ip6protosw.h
  projects/mips/sys/netinet6/mld6.c
  projects/mips/sys/netinet6/nd6.c
  projects/mips/sys/netinet6/nd6.h
  projects/mips/sys/netinet6/nd6_rtr.c
  projects/mips/sys/netinet6/raw_ip6.c
  projects/mips/sys/netinet6/scope6.c
  projects/mips/sys/netinet6/udp6_usrreq.c
  projects/mips/sys/netinet6/vinet6.h
  projects/mips/sys/netipsec/ipsec.c
  projects/mips/sys/netipsec/ipsec_input.c
  projects/mips/sys/netipsec/key.c
  projects/mips/sys/netipsec/key.h
  projects/mips/sys/netipsec/keysock.c
  projects/mips/sys/netipsec/xform_ipip.c
  projects/mips/sys/netipx/ipx_input.c
  projects/mips/sys/netipx/spx_debug.c
  projects/mips/sys/netnatm/natm_proto.c
  projects/mips/sys/netsmb/smb_trantcp.c
  projects/mips/sys/nfsclient/bootp_subr.c
  projects/mips/sys/nfsclient/nfs_bio.c
  projects/mips/sys/nfsclient/nfs_diskless.c
  projects/mips/sys/nfsclient/nfs_socket.c
  projects/mips/sys/nfsclient/nfs_vfsops.c
  projects/mips/sys/nfsserver/nfs.h
  projects/mips/sys/nfsserver/nfs_srvkrpc.c
  projects/mips/sys/nfsserver/nfs_srvsock.c
  projects/mips/sys/nfsserver/nfs_syscalls.c
  projects/mips/sys/nlm/nlm_advlock.c
  projects/mips/sys/pc98/conf/GENERIC
  projects/mips/sys/pci/if_rl.c
  projects/mips/sys/powerpc/aim/machdep.c
  projects/mips/sys/powerpc/aim/platform_chrp.c
  projects/mips/sys/powerpc/booke/machdep.c
  projects/mips/sys/powerpc/booke/platform_bare.c
  projects/mips/sys/powerpc/booke/pmap.c
  projects/mips/sys/powerpc/conf/GENERIC
  projects/mips/sys/powerpc/conf/MPC85XX
  projects/mips/sys/powerpc/conf/NOTES
  projects/mips/sys/powerpc/include/ocpbus.h
  projects/mips/sys/powerpc/include/pio.h
  projects/mips/sys/powerpc/mpc85xx/atpic.c
  projects/mips/sys/powerpc/mpc85xx/ocpbus.c
  projects/mips/sys/powerpc/mpc85xx/ocpbus.h
  projects/mips/sys/powerpc/ofw/ofw_real.c
  projects/mips/sys/powerpc/powermac/cuda.c
  projects/mips/sys/powerpc/powermac/pmu.c
  projects/mips/sys/powerpc/powerpc/bus_machdep.c
  projects/mips/sys/powerpc/powerpc/cpu.c
  projects/mips/sys/powerpc/powerpc/openpic.c
  projects/mips/sys/powerpc/psim/ata_iobus.c
  projects/mips/sys/rpc/authunix_prot.c
  projects/mips/sys/rpc/clnt_dg.c
  projects/mips/sys/rpc/clnt_rc.c
  projects/mips/sys/rpc/clnt_vc.c
  projects/mips/sys/rpc/svc.c
  projects/mips/sys/rpc/svc.h
  projects/mips/sys/rpc/svc_auth.c
  projects/mips/sys/rpc/svc_dg.c
  projects/mips/sys/rpc/svc_vc.c
  projects/mips/sys/rpc/xdr.h
  projects/mips/sys/security/audit/audit_pipe.c
  projects/mips/sys/security/audit/audit_syscalls.c
  projects/mips/sys/security/mac/mac_atalk.c
  projects/mips/sys/security/mac/mac_framework.c
  projects/mips/sys/security/mac/mac_inet.c
  projects/mips/sys/security/mac/mac_inet6.c
  projects/mips/sys/security/mac/mac_internal.h
  projects/mips/sys/security/mac/mac_net.c
  projects/mips/sys/security/mac/mac_socket.c
  projects/mips/sys/security/mac_biba/mac_biba.c
  projects/mips/sys/security/mac_bsdextended/mac_bsdextended.c
  projects/mips/sys/security/mac_lomac/mac_lomac.c
  projects/mips/sys/security/mac_mls/mac_mls.c
  projects/mips/sys/security/mac_stub/mac_stub.c
  projects/mips/sys/security/mac_test/mac_test.c
  projects/mips/sys/sparc64/conf/GENERIC
  projects/mips/sys/sparc64/sparc64/dump_machdep.c
  projects/mips/sys/sun4v/conf/GENERIC
  projects/mips/sys/sun4v/include/pcpu.h
  projects/mips/sys/sun4v/sun4v/dump_machdep.c
  projects/mips/sys/sun4v/sun4v/hvcons.c
  projects/mips/sys/sys/bio.h
  projects/mips/sys/sys/buf.h
  projects/mips/sys/sys/buf_ring.h
  projects/mips/sys/sys/bus.h
  projects/mips/sys/sys/conf.h
  projects/mips/sys/sys/cpu.h
  projects/mips/sys/sys/cpuset.h
  projects/mips/sys/sys/domain.h
  projects/mips/sys/sys/event.h
  projects/mips/sys/sys/jail.h
  projects/mips/sys/sys/kernel.h
  projects/mips/sys/sys/kobj.h
  projects/mips/sys/sys/lock.h
  projects/mips/sys/sys/mount.h
  projects/mips/sys/sys/mutex.h
  projects/mips/sys/sys/namei.h
  projects/mips/sys/sys/param.h
  projects/mips/sys/sys/pcpu.h
  projects/mips/sys/sys/pmc.h
  projects/mips/sys/sys/priv.h
  projects/mips/sys/sys/proc.h
  projects/mips/sys/sys/protosw.h
  projects/mips/sys/sys/queue.h
  projects/mips/sys/sys/rmlock.h
  projects/mips/sys/sys/rwlock.h
  projects/mips/sys/sys/sockbuf.h
  projects/mips/sys/sys/socketvar.h
  projects/mips/sys/sys/sockio.h
  projects/mips/sys/sys/soundcard.h
  projects/mips/sys/sys/sx.h
  projects/mips/sys/sys/syscallsubr.h
  projects/mips/sys/sys/sysent.h
  projects/mips/sys/sys/systm.h
  projects/mips/sys/sys/tty.h
  projects/mips/sys/sys/ucred.h
  projects/mips/sys/sys/user.h
  projects/mips/sys/sys/vimage.h
  projects/mips/sys/sys/vnode.h
  projects/mips/sys/ufs/ffs/ffs_softdep.c
  projects/mips/sys/ufs/ffs/ffs_vfsops.c
  projects/mips/sys/ufs/ufs/dirhash.h
  projects/mips/sys/ufs/ufs/ufs_dirhash.c
  projects/mips/sys/ufs/ufs/ufs_vnops.c
  projects/mips/sys/vm/swap_pager.c
  projects/mips/sys/vm/vm_contig.c
  projects/mips/sys/vm/vm_fault.c
  projects/mips/sys/vm/vm_glue.c
  projects/mips/sys/vm/vm_map.c
  projects/mips/sys/vm/vm_mmap.c
  projects/mips/sys/vm/vm_object.c
  projects/mips/sys/vm/vm_page.c
  projects/mips/sys/vm/vm_page.h
  projects/mips/sys/vm/vm_pageout.c
  projects/mips/sys/vm/vm_pager.h
  projects/mips/sys/vm/vnode_pager.c
  projects/mips/sys/xdr/xdr_mem.c
  projects/mips/sys/xen/evtchn.h   (props changed)
  projects/mips/sys/xen/evtchn/evtchn.c
  projects/mips/sys/xen/hypervisor.h   (props changed)
  projects/mips/sys/xen/xen_intr.h   (props changed)
  projects/mips/sys/xen/xenbus/xenbus_xs.c
  projects/mips/tools/regression/README
  projects/mips/tools/regression/bin/sh/set-e/not2.0
  projects/mips/tools/regression/file/flock/Makefile
  projects/mips/tools/regression/file/flock/flock.c
  projects/mips/tools/regression/fstest/fstest.c
  projects/mips/tools/regression/lib/libutil/test-flopen.c
  projects/mips/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t   (props changed)
  projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t   (props changed)
  projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t   (props changed)
  projects/mips/tools/tools/README
  projects/mips/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/mips/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/mips/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/mips/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/mips/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/mips/tools/tools/pciid/mk_pci_vendors.pl
  projects/mips/usr.bin/Makefile
  projects/mips/usr.bin/calendar/calendars/calendar.music
  projects/mips/usr.bin/csup/   (props changed)
  projects/mips/usr.bin/dig/Makefile
  projects/mips/usr.bin/ee/Makefile
  projects/mips/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
  projects/mips/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
  projects/mips/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
  projects/mips/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg   (contents, props changed)
  projects/mips/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg   (contents, props changed)
  projects/mips/usr.bin/find/function.c
  projects/mips/usr.bin/fstat/zfs.c
  projects/mips/usr.bin/kdump/mkioctls
  projects/mips/usr.bin/killall/killall.1
  projects/mips/usr.bin/killall/killall.c
  projects/mips/usr.bin/netstat/route.c
  projects/mips/usr.bin/nfsstat/nfsstat.1
  projects/mips/usr.bin/nfsstat/nfsstat.c
  projects/mips/usr.bin/perror/perror.c
  projects/mips/usr.bin/procstat/   (props changed)
  projects/mips/usr.bin/tail/extern.h
  projects/mips/usr.bin/tail/forward.c
  projects/mips/usr.bin/tail/misc.c
  projects/mips/usr.bin/tail/read.c
  projects/mips/usr.bin/tail/reverse.c
  projects/mips/usr.bin/tail/tail.1
  projects/mips/usr.bin/tail/tail.c
  projects/mips/usr.bin/truss/amd64-fbsd.c
  projects/mips/usr.bin/truss/amd64-fbsd32.c
  projects/mips/usr.bin/truss/amd64-linux32.c
  projects/mips/usr.bin/truss/i386-fbsd.c
  projects/mips/usr.bin/truss/i386-linux.c
  projects/mips/usr.bin/truss/ia64-fbsd.c
  projects/mips/usr.bin/truss/mips-fbsd.c
  projects/mips/usr.bin/truss/powerpc-fbsd.c
  projects/mips/usr.bin/truss/sparc64-fbsd.c
  projects/mips/usr.sbin/Makefile
  projects/mips/usr.sbin/acpi/Makefile.inc
  projects/mips/usr.sbin/acpi/acpiconf/acpiconf.c
  projects/mips/usr.sbin/acpi/acpidb/Makefile
  projects/mips/usr.sbin/acpi/acpidb/acpidb.c
  projects/mips/usr.sbin/acpi/acpidump/acpi.c
  projects/mips/usr.sbin/acpi/iasl/Makefile
  projects/mips/usr.sbin/arp/Makefile
  projects/mips/usr.sbin/arp/arp.c
  projects/mips/usr.sbin/dumpcis/cardinfo.h   (props changed)
  projects/mips/usr.sbin/dumpcis/cis.h   (props changed)
  projects/mips/usr.sbin/flowctl/flowctl.c
  projects/mips/usr.sbin/ifmcstat/ifmcstat.8
  projects/mips/usr.sbin/ifmcstat/ifmcstat.c
  projects/mips/usr.sbin/ipfwpcap/Makefile
  projects/mips/usr.sbin/ipfwpcap/ipfwpcap.c
  projects/mips/usr.sbin/jail/jail.8
  projects/mips/usr.sbin/jail/jail.c
  projects/mips/usr.sbin/jexec/Makefile
  projects/mips/usr.sbin/jexec/jexec.8
  projects/mips/usr.sbin/jexec/jexec.c
  projects/mips/usr.sbin/jls/Makefile
  projects/mips/usr.sbin/jls/jls.8
  projects/mips/usr.sbin/jls/jls.c
  projects/mips/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/mips/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/mips/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/mips/usr.sbin/makefs/getid.c   (props changed)
  projects/mips/usr.sbin/mergemaster/mergemaster.sh
  projects/mips/usr.sbin/mountd/exports.5
  projects/mips/usr.sbin/mountd/mountd.8
  projects/mips/usr.sbin/mountd/mountd.c
  projects/mips/usr.sbin/named/Makefile
  projects/mips/usr.sbin/nfscbd/nfscbd.c
  projects/mips/usr.sbin/nfsd/nfsd.8
  projects/mips/usr.sbin/nfsd/nfsd.c
  projects/mips/usr.sbin/nfsd/nfsv4.4
  projects/mips/usr.sbin/nfsdumpstate/nfsdumpstate.c
  projects/mips/usr.sbin/nfsrevoke/nfsrevoke.c
  projects/mips/usr.sbin/nfsuserd/Makefile
  projects/mips/usr.sbin/nfsuserd/nfsuserd.c
  projects/mips/usr.sbin/pkg_install/info/main.c
  projects/mips/usr.sbin/pmcstat/pmcstat.8
  projects/mips/usr.sbin/powerd/powerd.c
  projects/mips/usr.sbin/pstat/Makefile
  projects/mips/usr.sbin/pstat/pstat.c
  projects/mips/usr.sbin/sysinstall/devices.c
  projects/mips/usr.sbin/syslogd/syslog.conf.5
  projects/mips/usr.sbin/tcpdrop/tcpdrop.8
  projects/mips/usr.sbin/tcpdrop/tcpdrop.c
  projects/mips/usr.sbin/usbconfig/usbconfig.8
  projects/mips/usr.sbin/wpa/hostapd/driver_freebsd.c
  projects/mips/usr.sbin/zic/   (props changed)
  projects/mips/usr.sbin/zic/README
  projects/mips/usr.sbin/zic/Theory
  projects/mips/usr.sbin/zic/zdump.8
  projects/mips/usr.sbin/zic/zdump.c
  projects/mips/usr.sbin/zic/zic.8

Modified: projects/mips/ObsoleteFiles.inc
==============================================================================
--- projects/mips/ObsoleteFiles.inc	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/ObsoleteFiles.inc	Fri Jun 12 11:50:44 2009	(r194056)
@@ -14,6 +14,52 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090605: removal of clists
+OLD_FILES+=usr/include/sys/clist.h
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
+# 20090530: removal of early.sh
+OLD_FILES+=etc/rc.d/early.sh
+# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
+OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
+OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
+# 20090527: removal of legacy USB stack
+OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/hid.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
+OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
+OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
+OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
+OLD_DIRS+=usr/include/legacy/dev/usb
+OLD_DIRS+=usr/include/legacy/dev
+OLD_DIRS+=usr/include/legacy
+# 20090526: removal of makekey(8)
+OLD_FILES+=libexec/makekey
+OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd

Modified: projects/mips/UPDATING
==============================================================================
--- projects/mips/UPDATING	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/UPDATING	Fri Jun 12 11:50:44 2009	(r194056)
@@ -22,6 +22,61 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090611:
+	The layout of struct thread has changed.  Kernel and modules
+	need to be rebuilt.
+
+20090608:
+	The layout of structs ifnet, domain, protosw and vnet_net has
+	changed.  Kernel modules need to be rebuilt.
+	Bump __FreeBSD_version to 800097.
+
+20090602:
+	window(1) has been removed from the base system. It can now be
+	installed from ports. The port is called misc/window.
+
+20090601:
+	The way we are storing and accessing `routing table' entries
+	has changed. Programs reading the FIB, like netstat, need to
+	be re-compiled.
+
+20090601:
+	A new netisr implementation has been added for FreeBSD 8.  Network
+	file system modules, such as igmp, ipdivert, and others, should be
+	rebuilt.
+	Bump __FreeBSD_version to 800096.
+
+20090531:
+	For those who use ipfw and especially pf, those two firewalls
+	are now started BEFORE the network is initialized (i.e., before
+	rc.d/netif). Please review your rules to make sure that your
+	interfaces will be properly described.
+
+20090530:
+	Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
+	is no more valid.
+
+20090530:
+	Add VOP_ACCESSX(9).  File system modules need to be rebuilt.
+	Bump __FreeBSD_version to 800094.
+
+20090529:
+	Add mnt_xflag field to 'struct mount'.  File system modules
+	need to be rebuilt.
+	Bump __FreeBSD_version to 800093.
+
+20090528:
+	The compiling option ADAPTIVE_SX has been retired while it has been
+	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+	The KPI for sx_init_flags() changes as accepting flags:
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+	has been introduced in order to handle the reversed logic.
+	Bump __FreeBSD_version to 800092.
+
+20090527:
+	Add support for hierarchical jails.  Remove global securelevel.
+	Bump __FreeBSD_version to 800091.
+
 20090523:
 	The layout of struct vnet_net has changed, therefore modules
 	need to be rebuilt.

Modified: projects/mips/bin/cp/utils.c
==============================================================================
--- projects/mips/bin/cp/utils.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/cp/utils.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -365,7 +365,7 @@ setfile(struct stat *fs, int fd)
 	if (!gotstat || fs->st_flags != ts.st_flags)
 		if (fdval ?
 		    fchflags(fd, fs->st_flags) :
-		    (islink ? (errno = ENOSYS) :
+		    (islink ? lchflags(to.p_path, fs->st_flags) :
 		    chflags(to.p_path, fs->st_flags))) {
 			warn("chflags: %s", to.p_path);
 			rval = 1;

Modified: projects/mips/bin/df/df.1
==============================================================================
--- projects/mips/bin/df/df.1	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/df/df.1	Fri Jun 12 11:50:44 2009	(r194056)
@@ -78,15 +78,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 10 for sizes.
 .It Fl h
-"Human-readable" output.
+.Dq Human-readable
+output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte in order to reduce the number of
 digits to four or fewer using base 2 for sizes.
+Inodes statistics, if enabled with
+.Fl i ,
+are always printed in base 10.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k

Modified: projects/mips/bin/df/df.c
==============================================================================
--- projects/mips/bin/df/df.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/df/df.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -369,6 +369,23 @@ prthumanval(int64_t bytes)
 }
 
 /*
+ * Print an inode count in "human-readable" format.
+ */
+static void
+prthumanvalinode(int64_t bytes)
+{
+	char buf[6];
+	int flags;
+
+	flags = HN_NOSPACE | HN_DECIMAL | HN_DIVISOR_1000;
+
+	humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
+	    bytes, "", HN_AUTOSCALE, flags);
+
+	(void)printf(" %5s", buf);
+}
+
+/*
  * Convert statfs returned file system size into BLOCKSIZE units.
  * Attempts to avoid overflow for large file systems.
  */
@@ -413,8 +430,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
-			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
-			mwp->ifree = imax(mwp->ifree, (int)strlen("ifree"));
+			mwp->iused = imax(hflag ? 0 : mwp->iused,
+			    (int)strlen("  iused"));
+			mwp->ifree = imax(hflag ? 0 : mwp->ifree,
+			    (int)strlen("ifree"));
 			(void)printf(" %*s %*s %%iused",
 			    mwp->iused - 2, "iused", mwp->ifree, "ifree");
 		}
@@ -440,8 +459,15 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (iflag) {
 		inodes = sfsp->f_files;
 		used = inodes - sfsp->f_ffree;
-		(void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used,
-		    mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 :
+		if (hflag) {
+			(void)printf("  ");
+			prthumanvalinode(used);
+			prthumanvalinode(sfsp->f_ffree);
+		} else {
+			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			    mwp->ifree, (intmax_t)sfsp->f_ffree);
+		}
+		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
 		    (double)used / (double)inodes * 100.0);
 	} else
 		(void)printf("  ");

Modified: projects/mips/bin/rm/rm.c
==============================================================================
--- projects/mips/bin/rm/rm.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/rm/rm.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -234,7 +234,7 @@ rm_tree(char **argv)
 			else if (!uid &&
 				 (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 				 !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
-				 chflags(p->fts_accpath,
+				 lchflags(p->fts_accpath,
 					 p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0)
 				goto err;
 			continue;
@@ -253,7 +253,7 @@ rm_tree(char **argv)
 		if (!uid &&
 		    (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(p->fts_accpath,
+			rval = lchflags(p->fts_accpath,
 				       p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			/*
@@ -368,7 +368,7 @@ rm_file(char **argv)
 		if (!uid && !S_ISWHT(sb.st_mode) &&
 		    (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
-			rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
+			rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
 		if (rval == 0) {
 			if (S_ISWHT(sb.st_mode))
 				rval = undelete(f);

Modified: projects/mips/bin/sh/alias.c
==============================================================================
--- projects/mips/bin/sh/alias.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/alias.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -97,7 +97,7 @@ setalias(char *name, char *val)
 	ap->val = savestr(val);
 #else /* hack */
 	{
-	int len = strlen(val);
+	size_t len = strlen(val);
 	ap->val = ckmalloc(len + 2);
 	memcpy(ap->val, val, len);
 	ap->val[len] = ' ';	/* fluff */

Modified: projects/mips/bin/sh/eval.c
==============================================================================
--- projects/mips/bin/sh/eval.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/eval.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -83,6 +83,7 @@ MKINIT int evalskip;		/* set if we are s
 STATIC int skipcount;		/* number of levels to skip */
 MKINIT int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
+STATIC int builtin_flags;	/* evalcommand flags for builtins */
 
 
 char *commandname;
@@ -147,7 +148,7 @@ evalcmd(int argc, char **argv)
                         STPUTC('\0', concat);
                         p = grabstackstr(concat);
                 }
-                evalstring(p);
+                evalstring(p, builtin_flags & EV_TESTED);
         }
         return exitstatus;
 }
@@ -158,7 +159,7 @@ evalcmd(int argc, char **argv)
  */
 
 void
-evalstring(char *s)
+evalstring(char *s, int flags)
 {
 	union node *n;
 	struct stackmark smark;
@@ -167,7 +168,7 @@ evalstring(char *s)
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
 		if (n != NULL)
-			evaltree(n, 0);
+			evaltree(n, flags);
 		popstackmark(&smark);
 	}
 	popfile();
@@ -593,7 +594,7 @@ evalcommand(union node *cmd, int flags, 
 	char *lastarg;
 	int realstatus;
 	int do_clearcmdentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &argv;
 	(void) &argc;
@@ -839,6 +840,7 @@ evalcommand(union node *cmd, int flags, 
 		commandname = argv[0];
 		argptr = argv + 1;
 		optptr = NULL;			/* initialize nextopt */
+		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();
 cmddone:

Modified: projects/mips/bin/sh/eval.h
==============================================================================
--- projects/mips/bin/sh/eval.h	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/eval.h	Fri Jun 12 11:50:44 2009	(r194056)
@@ -46,7 +46,7 @@ struct backcmd {		/* result of evalbackc
 };
 
 int evalcmd(int, char **);
-void evalstring(char *);
+void evalstring(char *, int);
 union node;	/* BLETCH for ansi C */
 void evaltree(union node *, int);
 void evalbackcmd(union node *, struct backcmd *);

Modified: projects/mips/bin/sh/exec.c
==============================================================================
--- projects/mips/bin/sh/exec.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/exec.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -187,7 +187,8 @@ padvance(char **path, char *name)
 	if (*path == NULL)
 		return NULL;
 	start = *path;
-	for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+	for (p = start; *p && *p != ':' && *p != '%'; p++)
+		; /* nothing */
 	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
 	while (stackblocksize() < len)
 		growstackblock();

Modified: projects/mips/bin/sh/histedit.c
==============================================================================
--- projects/mips/bin/sh/histedit.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/histedit.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -350,7 +350,7 @@ histcmd(int argc, char **argv)
 				if (displayhist) {
 					out2str(s);
 				}
-				evalstring(s);
+				evalstring(s, 0);
 				if (displayhist && hist) {
 					/*
 					 *  XXX what about recursive and
@@ -382,7 +382,7 @@ histcmd(int argc, char **argv)
 		fclose(efp);
 		editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
 		sprintf(editcmd, "%s %s", editor, editfile);
-		evalstring(editcmd);	/* XXX - should use no JC command */
+		evalstring(editcmd, 0);	/* XXX - should use no JC command */
 		INTON;
 		readcmdfile(editfile);	/* XXX - should read back - quick tst */
 		unlink(editfile);

Modified: projects/mips/bin/sh/main.c
==============================================================================
--- projects/mips/bin/sh/main.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/main.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -178,7 +178,7 @@ state2:
 state3:
 	state = 4;
 	if (minusc) {
-		evalstring(minusc);
+		evalstring(minusc, 0);
 	}
 	if (sflag || minusc == NULL) {
 state4:	/* XXX ??? - why isn't this before the "if" statement */

Modified: projects/mips/bin/sh/memalloc.c
==============================================================================
--- projects/mips/bin/sh/memalloc.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/memalloc.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  */
 
 pointer
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	pointer p;
 

Modified: projects/mips/bin/sh/memalloc.h
==============================================================================
--- projects/mips/bin/sh/memalloc.h	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/memalloc.h	Fri Jun 12 11:50:44 2009	(r194056)
@@ -33,6 +33,8 @@
  * $FreeBSD$
  */
 
+#include <string.h>
+
 struct stackmark {
 	struct stack_block *stackp;
 	char *stacknxt;
@@ -46,7 +48,7 @@ extern int stacknleft;
 extern int sstrnleft;
 extern int herefd;
 
-pointer ckmalloc(int);
+pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
 char *savestr(char *);

Modified: projects/mips/bin/sh/miscbltin.c
==============================================================================
--- projects/mips/bin/sh/miscbltin.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/miscbltin.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -103,8 +103,6 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
-	struct termios told, tnew;
-	int tsaved;
 
 	rflag = 0;
 	prompt = NULL;
@@ -151,26 +149,11 @@ readcmd(int argc __unused, char **argv _
 
 	if (tv.tv_sec >= 0) {
 		/*
-		 * See if we can disable input processing; this will
-		 * not give the desired result if we are in a pipeline
-		 * and someone upstream is still in line-by-line mode.
-		 */
-		tsaved = 0;
-		if (tcgetattr(0, &told) == 0) {
-			memcpy(&tnew, &told, sizeof(told));
-			cfmakeraw(&tnew);
-			tnew.c_iflag |= told.c_iflag & ICRNL;
-			tcsetattr(0, TCSANOW, &tnew);
-			tsaved = 1;
-		}
-		/*
 		 * Wait for something to become available.
 		 */
 		FD_ZERO(&ifds);
 		FD_SET(0, &ifds);
 		status = select(1, &ifds, NULL, NULL, &tv);
-		if (tsaved)
-			tcsetattr(0, TCSANOW, &told);
 		/*
 		 * If there's nothing ready, return an error.
 		 */

Modified: projects/mips/bin/sh/mkinit.c
==============================================================================
--- projects/mips/bin/sh/mkinit.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/mkinit.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -159,7 +159,7 @@ void addstr(char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
 FILE *ckfopen(char *, char *);
-void *ckmalloc(int);
+void *ckmalloc(size_t);
 char *savestr(char *);
 void error(char *);
 
@@ -464,7 +464,7 @@ ckfopen(char *file, char *mode)
 }
 
 void *
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	char *p;
 

Modified: projects/mips/bin/sh/mksyntax.c
==============================================================================
--- projects/mips/bin/sh/mksyntax.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/mksyntax.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -354,7 +354,7 @@ output_type_macros(void)
 	char **pp;
 
 	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)";
+		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
 	if (digit_contig)

Modified: projects/mips/bin/sh/parser.c
==============================================================================
--- projects/mips/bin/sh/parser.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/parser.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -898,7 +898,7 @@ readtoken1(int firstc, char const *synta
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &out;
 	(void) &quotef;
@@ -1323,7 +1323,7 @@ parsebackq: {
 	struct jmploc *volatile savehandler;
 	int savelen;
 	int saveprompt;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &saveprompt;
 #endif

Modified: projects/mips/bin/sh/sh.1
==============================================================================
--- projects/mips/bin/sh/sh.1	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/sh.1	Fri Jun 12 11:50:44 2009	(r194056)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd May 31, 2009
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1682,6 +1682,7 @@ If
 is given
 it is used as the exit status of the shell;
 otherwise the exit status of the preceding command is used.
+The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p
 The specified names are exported so that they will
@@ -1949,7 +1950,7 @@ If the
 .Fl t
 option is specified and the
 .Ar timeout
-elapses before any input is supplied,
+elapses before a complete line of input is supplied,
 the
 .Ic read
 command will return an exit status of 1 without assigning any values.

Modified: projects/mips/bin/sh/trap.c
==============================================================================
--- projects/mips/bin/sh/trap.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/trap.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -416,7 +416,7 @@ dotrap(void)
 					if (i == SIGCHLD)
 						ignore_sigchld++;
 					savestatus = exitstatus;
-					evalstring(trap[i]);
+					evalstring(trap[i], 0);
 					exitstatus = savestatus;
 					if (i == SIGCHLD)
 						ignore_sigchld--;
@@ -471,7 +471,7 @@ exitshell(int status)
 	handler = &loc1;
 	if ((p = trap[0]) != NULL && *p != '\0') {
 		trap[0] = NULL;
-		evalstring(p);
+		evalstring(p, 0);
 	}
 l1:   handler = &loc2;			/* probably unnecessary */
 	flushall();

Modified: projects/mips/bin/sh/var.c
==============================================================================
--- projects/mips/bin/sh/var.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/sh/var.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -195,7 +195,7 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
 	int err = 0;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &err;
 #endif

Modified: projects/mips/bin/test/TEST.sh
==============================================================================
--- projects/mips/bin/test/TEST.sh	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/test/TEST.sh	Fri Jun 12 11:50:44 2009	(r194056)
@@ -133,5 +133,45 @@ t 0 '"a" -a ! ""'
 t 1 '""'
 t 0 '! ""'
 
+t 0 '!'
+t 0 '\('
+t 0 '\)'
+
+t 1 '\( = \)'
+t 0 '\( != \)'
+t 0 '\( ! \)'
+t 0 '\( \( \)'
+t 0 '\( \) \)'
+t 0 '! = !'
+t 1 '! != !'
+t 1 '-n = \)'
+t 0 '! != \)'
+t 1 '! = a'
+t 0 '! != -n'
+t 0 '! -c /etc/passwd'
+
+t 0 '! \( = \)'
+t 1 '! \( != \)'
+t 1 '! = = ='
+t 0 '! = = \)'
+t 0 '! "" -o ""'
+t 1 '! "x" -o ""'
+t 1 '! "" -o "x"'
+t 1 '! "x" -o "x"'
+t 0 '\( -f /etc/passwd \)'
+t 1 '\( ! = \)'
+t 0 '\( ! "" \)'
+t 1 '\( ! -e \)'
+
+t 0 '0 -eq 0 -a -d /'
+t 0 '-s = "" -o "" = ""'
+t 0 '"" = "" -o -s = ""'
+t 1 '-s = "" -o -s = ""'
+t 0 '-z x -o x = "#" -o x = x'
+t 1 '-z y -o y = "#" -o y = x'
+t 0 '0 -ne 0 -o ! -f /'
+t 0 '1 -ne 0 -o ! -f /etc/passwd'
+t 1 '0 -ne 0 -o ! -f /etc/passwd'
+
 echo ""
 echo "Syntax errors: $ERROR Failed: $FAILED"

Modified: projects/mips/bin/test/test.c
==============================================================================
--- projects/mips/bin/test/test.c	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/bin/test/test.c	Fri Jun 12 11:50:44 2009	(r194056)
@@ -163,6 +163,7 @@ struct t_op {
 struct t_op const *t_wp_op;
 int nargc;
 char **t_wp;
+int parenlevel;
 
 static int	aexpr(enum token);
 static int	binop(void);
@@ -171,7 +172,9 @@ static int	filstat(char *, enum token);
 static int	getn(const char *);
 static intmax_t	getq(const char *);
 static int	intcmp(const char *, const char *);
-static int	isoperand(void);
+static int	isunopoperand(void);
+static int	islparenoperand(void);
+static int	isrparenoperand(void);
 static int	newerf(const char *, const char *);
 static int	nexpr(enum token);
 static int	oexpr(enum token);
@@ -205,7 +208,14 @@ main(int argc, char **argv)
 #endif
 	nargc = argc;
 	t_wp = &argv[1];
-	res = !oexpr(t_lex(*t_wp));
+	parenlevel = 0;
+	if (nargc == 4 && strcmp(*t_wp, "!") == 0) {
+		/* Things like ! "" -o x do not fit in the normal grammar. */
+		--nargc;
+		++t_wp;
+		res = oexpr(t_lex(*t_wp));
+	} else
+		res = !oexpr(t_lex(*t_wp));
 
 	if (--nargc > 0)
 		syntax(*t_wp, "unexpected operator");
@@ -268,12 +278,16 @@ primary(enum token n)
 	if (n == EOI)
 		return 0;		/* missing expression */
 	if (n == LPAREN) {
+		parenlevel++;
 		if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) ==
-		    RPAREN)
+		    RPAREN) {
+			parenlevel--;
 			return 0;	/* missing expression */
+		}
 		res = oexpr(nn);
 		if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN)
 			syntax(NULL, "closing paren expected");
+		parenlevel--;
 		return res;
 	}
 	if (t_wp_op && t_wp_op->op_type == UNOP) {
@@ -410,8 +424,10 @@ t_lex(char *s)
 	}
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
-			if ((op->op_type == UNOP && isoperand()) ||
-			    (op->op_num == LPAREN && nargc == 1))
+			if (((op->op_type == UNOP || op->op_type == BUNOP)
+						&& isunopoperand()) ||
+			    (op->op_num == LPAREN && islparenoperand()) ||
+			    (op->op_num == RPAREN && isrparenoperand()))
 				break;
 			t_wp_op = op;
 			return op->op_num;
@@ -423,7 +439,7 @@ t_lex(char *s)
 }
 
 static int
-isoperand(void)
+isunopoperand(void)
 {
 	struct t_op const *op = ops;
 	char *s;
@@ -431,19 +447,53 @@ isoperand(void)
 
 	if (nargc == 1)
 		return 1;
-	if (nargc == 2)
-		return 0;
 	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP &&
-			    (t[0] != ')' || t[1] != '\0');
+			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
+		op++;
+	}
+	return 0;
+}
+
+static int
+islparenoperand(void)
+{
+	struct t_op const *op = ops;
+	char *s;
+
+	if (nargc == 1)
+		return 1;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	if (nargc != 3)
+		return 0;
+	while (op->op_text) {
+		if (strcmp(s, op->op_text) == 0)
+			return op->op_type == BINOP;
 		op++;
 	}
 	return 0;
 }
 
+static int
+isrparenoperand(void)
+{
+	char *s;
+
+	if (nargc == 1)
+		return 0;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	return 0;
+}
+
 /* atoi with error detection */
 static int
 getn(const char *s)

Modified: projects/mips/cddl/usr.sbin/Makefile
==============================================================================
--- projects/mips/cddl/usr.sbin/Makefile	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/cddl/usr.sbin/Makefile	Fri Jun 12 11:50:44 2009	(r194056)
@@ -3,6 +3,7 @@
 .include <bsd.own.mk>
 
 SUBDIR=	dtrace \
+	lockstat \
 	${_zdb}
 
 .if ${MK_ZFS} != "no"

Modified: projects/mips/contrib/bind9/CHANGES
==============================================================================
--- projects/mips/contrib/bind9/CHANGES	Fri Jun 12 11:16:13 2009	(r194055)
+++ projects/mips/contrib/bind9/CHANGES	Fri Jun 12 11:50:44 2009	(r194056)
@@ -1,18 +1,258 @@
-	--- 9.4.3-P2 released ---
+
+	--- 9.6.1rc1 released ---
+
+2599.	[bug]		Address rapid memory growth when validation fails.
+			[RT #19654]
+
+2597.	[bug]		Handle a validation failure with a insecure delegation
+			from a NSEC3 signed master/slave zone.  [RT #19464]
+
+2596.	[bug]		Stale tree nodes of cache/dynamic rbtdb could stay
+			long, leading to inefficient memory usage or rejecting
+			newer cache entries in the worst case. [RT #19563]
+
+2595.	[bug]		Fix unknown extended rcodes in dig. [RT #19625]
+
+2592.	[bug]		Treat "any" as a type in nsupdate. [RT #19455]
+
+2591.	[bug]		named could die when processing a update in
+			removed_orphaned_ds(). [RT #19507]
+
+2588.	[bug]		SO_REUSEADDR could be set unconditionally after failure
+			of bind(2) call.  This should be rare and mostly
+			harmless, but may cause interference with other
+			processes that happen to use the same port. [RT #19642]
+
+2586.	[bug]		Missing cleanup of SIG rdataset in searching a DLZ DB
+			or SDB. [RT #19577]
+
+2585.	[bug]		Uninitialized socket name could be referenced via a
+			statistics channel, triggering an assertion failure in
+			XML rendering. [RT #19427]
+
+2584.	[bug]		alpha: gcc optimization could break atomic operations.
+			[RT #19227]
+
+2583.	[port]		netbsd: provide a control to not add the compile
+			date to the version string, -DNO_VERSION_DATE.
+
+2582.	[bug]		Don't emit warning log message when we attempt to
+			remove non-existant journal. [RT #19516]
 
 2579.	[bug]		DNSSEC lookaside validation failed to handle unknown
 			algorithms. [RT #19479]
 
-	--- 9.4.3-P1 released ---
+2578.	[bug]		Changed default sig-signing-type to 65534, because
+			65535 turns out to be reserved.  [RT #19477]
+
+2499.	[port]		solaris: lib/lwres/getaddrinfo.c namespace clash.
+			[RT #18837]
+
+	--- 9.6.1b1 released ---
+
+2577.	[doc]		Clarified some statistics counters. [RT #19454]
+
+2576.	[bug]		NSEC record were not being correctly signed when
+			a zone transitions from insecure to secure.
+			Handle such incorrectly signed zones. [RT #19114]
+
+2574.	[doc]		Document nsupdate -g and -o. [RT #19351]
+
+2573.	[bug]		Replacing a non-CNAME record with a CNAME record in a
+			single transaction in a signed zone failed. [RT #19397]
+
+2568.	[bug]		Report when the write to indicate a otherwise
+			successful start fails. [RT #19360]
+
+2567.	[bug]		dst__privstruct_writefile() could miss write errors.
+			write_public_key() could miss write errors.
+			dnssec-dsfromkey could miss write errors.
+			[RT #19360]
+
+2564.	[bug]		Only take EDNS fallback steps when processing timeouts.
+			[RT #19405]
+
+2563.	[bug]		Dig could leak a socket causing it to wait forever
+			to exit. [RT #19359]
+
+2562.	[doc]		ARM: miscellaneous improvements, reorganization,
+			and some new content.
+
+2561.	[doc]		Add isc-config.sh(1) man page. [RT #16378]
+
+2560.	[bug]		Add #include <config.h> to iptable.c. [RT #18258]
+
+2559.	[bug]		dnssec-dsfromkey could compute bad DS records when
+			reading from a K* files.  [RT #19357]
+
+2557.	[cleanup]	PCI compliance:
+			* new libisc log module file
+			* isc_dir_chroot() now also changes the working
+			  directory to "/".
+			* additional INSISTs
+			* additional logging when files can't be removed.
+
+2556.	[port]		Solaris: mkdir(2) on tmpfs filesystems does not do the
+			error checks in the correct order resulting in the
+			wrong error code sometimes being returned. [RT #19249]
+			
+2554.	[bug]		Validation of uppercase queries from NSEC3 zones could
+			fail. [RT #19297]
+
+2553.	[bug]		Reference leak on DNSSEC validation errors. [RT #19291]
+
+2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+			[RT #19340]
+
+2551.	[bug]		Potential Reference leak on return. [RT #19341]
+
+2550.	[bug]		Check --with-openssl=<path> finds <openssl/opensslv.h>.
+			[RT #19343]
+
+2549.	[port]		linux: define NR_OPEN if not currently defined.
+			[RT #19344]
+
+2548.	[bug]		Install iterated_hash.h. [RT #19335]
+
+2547.	[bug]		openssl_link.c:mem_realloc() could reference an
+			out-of-range area of the source buffer.  New public
+			function isc_mem_reallocate() was introduced to address
+			this bug. [RT #19313]
+
+2545.	[doc]		ARM: Legal hostname checking (check-names) is
+			for SRV RDATA too. [RT #19304]
+
+2544.	[cleanup]	Removed unused structure members in adb.c. [RT #19225]
+
+2543.	[contrib]	Update contrib/zkt to version 0.98. [RT #19113]
+
+2542.	[doc]		Update the description of dig +adflag. [RT #19290]
+
+2541.	[bug]		Conditionally update dispatch manager statistics.
+			[RT #19247]
+
+2539.	[security]	Update the interaction between recursion, allow-query,
+			allow-query-cache and allow-recursion.  [RT #19198]
+
+2538.	[bug]		cache/ADB memory could grow over max-cache-size,
+			especially with threads and smaller max-cache-size
+			values. [RT #19240]
+
+2537.	[experimental]	Added more statistics counters including those on socket
+			I/O events and query RTT histograms. [RT #18802]
+
+2536.	[cleanup]	Silence some warnings when -Werror=format-security is
+			specified. [RT #19083]
+
+2535.	[bug]		dig +showsearh and +trace interacted badly. [RT #19091]
+
+2532.	[bug]		dig: check the question section of the response to
+			see if it matches the asked question. [RT #18495]
+
+2531.	[bug]		Change #2207 was incomplete. [RT #19098]
+
+2530.	[bug]		named failed to reject insecure to secure transitions
+			via UPDATE. [RT #19101]
+
+2529.	[cleanup]	Upgrade libtool to silence complaints from recent
+			version of autoconf. [RT #18657]
+
+2528.   [cleanup]       Silence spurious configure warning about
+                        --datarootdir [RT #19096]
+
+2527.	[bug]		named could reuse cache on reload with
+			enabling/disabling validation. [RT #19119]
+
+2525.	[experimental]	New logging category "query-errors" to provide detailed
+			internal information about query failures, especially
+			about server failures. [RT #19027]
+
+2524.	[port]		sunos: dnssec-signzone needs strtoul(). [RT #19129]
+
+2523.	[bug]		Random type rdata freed by dns_nsec_typepresent().
+			[RT #19112]
+
+2522.	[security]	Handle -1 from DSA_do_verify() and EVP_VerifyFinal().
+
+2521.	[bug]		Improve epoll cross compilation support. [RT #19047]
+
+2519.	[bug]		dig/host with -4 or -6 didn't work if more than two
+			nameserver addresses of the excluded address family
+			preceded in resolv.conf. [RT #19081]
+
+2517.	[bug]		dig +trace with -4 or -6 failed when it chose a
+			nameserver address of the excluded address.
+			[RT #18843]
+
+2516.	[bug]		glue sort for responses was performed even when not
+			needed. [RT #19039]
+
+2514.	[bug]		dig/host failed with -4 or -6 when resolv.conf contains
+			a nameserver of the excluded address family.
+			[RT #18848]
+
+2511.	[cleanup]	dns_rdata_tofmttext() add const to linebreak.
+			[RT #18885]
+
+2506.	[port]		solaris: Check at configure time if 
+			hack_shutup_pthreadonceinit is needed. [RT #19037]
+
+2505.	[port]		Treat amd64 similarly to x86_64 when determining
+			atomic operation support. [RT #19031]
+
+2503.	[port]		linux: improve compatibility with Linux Standard
+			Base. [RT #18793]
+
+2502.	[cleanup]	isc_radix: Improve compliance with coding style,
+			document function in <isc/radix.h>. [RT #18534]
+
+	--- 9.6.0 released ---
+
+2520.	[bug]		Update xml statistics version number to 2.0 as change
+			#2388 made the schema incompatible to the previous
+			version. [RT #19080]
+
+	--- 9.6.0rc2 released ---
+
+2515.	[port]		win32: build dnssec-dsfromkey and dnssec-keyfromlabel.
+			[RT #19063]
+
+2513	[bug]		Fix windows cli build. [RT #19062]
+
+2510.	[bug]		"dig +sigchase" could trigger REQUIRE failures.
+			[RT #19033]
+
+2509.	[bug]		Specifying a fixed query source port was broken.
+			[RT #19051]
 
-2522.	[security]	Handle -1 from DSA_do_verify().
+2504.	[bug]		Address race condition in the socket code. [RT #18899]
+
+	--- 9.6.0rc1 released ---
 
 2498.	[bug]		Removed a bogus function argument used with
 			ISC_SOCKET_USE_POLLWATCH: it could cause compiler
 			warning or crash named with the debug 1 level
 			of logging. [RT #18917]
 
-	--- 9.4.3 released ---
+2497.	[bug]		Don't add RRSIG bit to NSEC3 bit map for insecure
+			delegation.
+
+2496.	[bug]		Add sanity length checks to NSID option. [RT #18813]
+
+2495.	[bug]		Tighten RRSIG checks. [RT #18795]
+
+2494.	[bug]		isc/radix.h, dns/sdlz.h and dns/dlz.h were not being
+			installed. [RT #18826]
+
+2493.	[bug]		The linux capabilities code was not correctly cleaning
+			up after itself. [RT #18767]
+
+2492.	[func]		Rndc status now reports the number of cpus discovered
+			and the number of worker threads when running
+			multi-threaded. [RT #18273]
+
+2491.	[func]		Attempt to re-use a local port if we are already using
+			the port. [RT #18548]
 
 2490.	[port]		aix: work around a kernel bug where IPV6_RECVPKTINFO
 			is cleared when IPV6_V6ONLY is set. [RT #18785]
@@ -23,7 +263,58 @@
 			Define ISC_SOCKET_USE_POLLWATCH at build time to enable
 			this workaround. [RT #18870]
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 12:05:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1FED11065690;
	Fri, 12 Jun 2009 12:05:56 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D3998FC17;
	Fri, 12 Jun 2009 12:05:56 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CC5t0F081469;
	Fri, 12 Jun 2009 12:05:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CC5tXP081468;
	Fri, 12 Jun 2009 12:05:55 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906121205.n5CC5tXP081468@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 12 Jun 2009 12:05:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194057 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 12:05:57 -0000

Author: rpaulo
Date: Fri Jun 12 12:05:55 2009
New Revision: 194057
URL: http://svn.freebsd.org/changeset/base/194057

Log:
  Flush HWMP table on vap detach.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Fri Jun 12 11:50:44 2009	(r194056)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Fri Jun 12 12:05:55 2009	(r194057)
@@ -165,10 +165,14 @@ void
 ieee80211_hwmp_vdetach(struct ieee80211vap *vap)
 {
 	struct ieee80211_hwmp_state *hs = vap->iv_hwmp;
+	struct ieee80211_hwmp_fi *fi, *next;
 
-	/* XXX missing flush table */
+	TAILQ_FOREACH_SAFE(fi, &hs->hs_head, fi_next, next) {
+		TAILQ_REMOVE(&hs->hs_head, fi, fi_next);
+		free(fi, M_80211_HWMP);
+	}
 	mtx_destroy(&hs->hs_lock);
-	free(vap->iv_hwmp, M_80211_VAP);
+	free(vap->iv_hwmp, M_80211_HWMP);
 }
 
 void

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 12:10:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3CAA106564A;
	Fri, 12 Jun 2009 12:10:10 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E28108FC0C;
	Fri, 12 Jun 2009 12:10:10 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CCAARR081642;
	Fri, 12 Jun 2009 12:10:10 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CCAAlK081641;
	Fri, 12 Jun 2009 12:10:10 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200906121210.n5CCAAlK081641@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 12 Jun 2009 12:10:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194058 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 12:10:11 -0000

Author: gonzo
Date: Fri Jun 12 12:10:10 2009
New Revision: 194058
URL: http://svn.freebsd.org/changeset/base/194058

Log:
  - Switch no normal RPC oimplementation. Unaligned access bug has
      been fixed

Modified:
  projects/mips/sys/mips/conf/AR71XX

Modified: projects/mips/sys/mips/conf/AR71XX
==============================================================================
--- projects/mips/sys/mips/conf/AR71XX	Fri Jun 12 12:05:55 2009	(r194057)
+++ projects/mips/sys/mips/conf/AR71XX	Fri Jun 12 12:10:10 2009	(r194058)
@@ -25,7 +25,7 @@ options		NFS_ROOT		#NFS usable as /, req
 options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
-options		NFS_LEGACYRPC
+# options		NFS_LEGACYRPC
 # Debugging for use in -current
 # options		INVARIANTS
 # options		INVARIANT_SUPPORT

From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 12 12:17:33 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8EA1E106564A;
	Fri, 12 Jun 2009 12:17:33 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6301B8FC12;
	Fri, 12 Jun 2009 12:17:33 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CCHXHx081843;
	Fri, 12 Jun 2009 12:17:33 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CCHXXd081841;
	Fri, 12 Jun 2009 12:17:33 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200906121217.n5CCHXXd081841@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 12 Jun 2009 12:17:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194059 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jun 2009 12:17:33 -0000

Author: gonzo
Date: Fri Jun 12 12:17:32 2009
New Revision: 194059
URL: http://svn.freebsd.org/changeset/base/194059

Log:
  - Fix functions prototypes to make compiler happy

Modified:
  projects/mips/sys/mips/atheros/ar71xx_pci.c
  projects/mips/sys/mips/atheros/if_arge.c

Modified: projects/mips/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xx_pci.c	Fri Jun 12 12:10:10 2009	(r194058)
+++ projects/mips/sys/mips/atheros/ar71xx_pci.c	Fri Jun 12 12:17:32 2009	(r194059)
@@ -182,8 +182,8 @@ ar71xx_pci_conf_setup(int bus, int slot,
 }
 
 static uint32_t
-ar71xx_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
-    int bytes)
+ar71xx_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, 
+    u_int reg, int bytes)
 {
 	uint32_t data;
 	uint32_t cmd, shift, mask;
@@ -219,8 +219,8 @@ ar71xx_pci_read_config(device_t dev, int
 }
 
 static void
-ar71xx_pci_write_config(device_t dev, int bus, int slot, int func, int reg,
-    uint32_t data, int bytes)
+ar71xx_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, 
+    u_int reg, uint32_t data, int bytes)
 {
 	uint32_t cmd;
 

Modified: projects/mips/sys/mips/atheros/if_arge.c
==============================================================================
--- projects/mips/sys/mips/atheros/if_arge.c	Fri Jun 12 12:10:10 2009	(r194058)
+++ projects/mips/sys/mips/atheros/if_arge.c	Fri Jun 12 12:17:32 2009	(r194059)
@@ -106,7 +106,7 @@ static int arge_tx_ring_init(struct arge
 #ifdef DEVICE_POLLING
 static void arge_poll(struct ifnet *, enum poll_cmd, int);
 #endif
-static void arge_shutdown(device_t);
+static int arge_shutdown(device_t);
 static void arge_start(struct ifnet *);
 static void arge_start_locked(struct ifnet *);
 static void arge_stop(struct arge_softc *);
@@ -459,7 +459,7 @@ arge_resume(device_t dev)
 	return 0;
 }
 
-static void
+static int
 arge_shutdown(device_t dev)
 {
 	struct arge_softc	*sc;
@@ -469,6 +469,8 @@ arge_shutdown(device_t dev)
 	ARGE_LOCK(sc);
 	arge_stop(sc);
 	ARGE_UNLOCK(sc);
+
+	return (0);
 }
 
 static int

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 08:04:58 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE5541065672;
	Sat, 13 Jun 2009 08:04:58 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B82E28FC17;
	Sat, 13 Jun 2009 08:04:58 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5D84wDR006972;
	Sat, 13 Jun 2009 08:04:58 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5D84vi0006940;
	Sat, 13 Jun 2009 08:04:57 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906130804.n5D84vi0006940@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 08:04:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194100 - in projects/openssl_098_merge_8: .
	contrib/csup contrib/gdb/gdb contrib/ntp/ntpd etc
	etc/defaults etc/mtree etc/rc.d lib/libc/stdtime lib/libpmc
	lib/libthread_db lib/libufs li...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 08:04:59 -0000

Author: simon
Date: Sat Jun 13 08:04:56 2009
New Revision: 194100
URL: http://svn.freebsd.org/changeset/base/194100

Log:
  Merge from head.

Added:
  projects/openssl_098_merge_8/share/colldef/hr_HR.ISO8859-2.src
     - copied unchanged from r194099, head/share/colldef/hr_HR.ISO8859-2.src
  projects/openssl_098_merge_8/share/man/man4/alc.4
     - copied unchanged from r194099, head/share/man/man4/alc.4
  projects/openssl_098_merge_8/share/man/man4/mwl.4
     - copied unchanged from r194099, head/share/man/man4/mwl.4
  projects/openssl_098_merge_8/share/man/man4/mwlfw.4
     - copied unchanged from r194099, head/share/man/man4/mwlfw.4
  projects/openssl_098_merge_8/share/man/man9/BUS_NEW_PASS.9
     - copied unchanged from r194099, head/share/man/man9/BUS_NEW_PASS.9
  projects/openssl_098_merge_8/share/man/man9/bus_generic_new_pass.9
     - copied unchanged from r194099, head/share/man/man9/bus_generic_new_pass.9
  projects/openssl_098_merge_8/share/man/man9/bus_set_pass.9
     - copied unchanged from r194099, head/share/man/man9/bus_set_pass.9
  projects/openssl_098_merge_8/share/monetdef/pt_PT.ISO8859-15.src
     - copied unchanged from r194099, head/share/monetdef/pt_PT.ISO8859-15.src
  projects/openssl_098_merge_8/share/monetdef/pt_PT.UTF-8.src
     - copied unchanged from r194099, head/share/monetdef/pt_PT.UTF-8.src
  projects/openssl_098_merge_8/share/numericdef/de_CH.ISO8859-1.src
     - copied unchanged from r194099, head/share/numericdef/de_CH.ISO8859-1.src
  projects/openssl_098_merge_8/share/syscons/keymaps/danish.iso.acc.kbd
     - copied unchanged from r194099, head/share/syscons/keymaps/danish.iso.acc.kbd
  projects/openssl_098_merge_8/share/syscons/keymaps/pl_PL.dvorak.kbd
     - copied unchanged from r194099, head/share/syscons/keymaps/pl_PL.dvorak.kbd
  projects/openssl_098_merge_8/share/syscons/keymaps/uk.dvorak.kbd
     - copied unchanged from r194099, head/share/syscons/keymaps/uk.dvorak.kbd
  projects/openssl_098_merge_8/sys/arm/mv/mvwin.h
     - copied unchanged from r194099, head/sys/arm/mv/mvwin.h
  projects/openssl_098_merge_8/sys/dev/alc/
     - copied from r194099, head/sys/dev/alc/
  projects/openssl_098_merge_8/sys/geom/label/g_label_gpt.c
     - copied unchanged from r194099, head/sys/geom/label/g_label_gpt.c
  projects/openssl_098_merge_8/sys/kern/subr_acl_nfs4.c
     - copied unchanged from r194099, head/sys/kern/subr_acl_nfs4.c
  projects/openssl_098_merge_8/sys/libkern/jenkins.h
     - copied unchanged from r194099, head/sys/libkern/jenkins.h
  projects/openssl_098_merge_8/sys/modules/alc/
     - copied from r194099, head/sys/modules/alc/
  projects/openssl_098_merge_8/sys/tools/sound/
     - copied from r194099, head/sys/tools/sound/
Deleted:
  projects/openssl_098_merge_8/share/man/man9/devclass_add_driver.9
  projects/openssl_098_merge_8/sys/tools/emu10k1-mkalsa.sh
  projects/openssl_098_merge_8/sys/tools/feeder_eq_mkfilter.awk
  projects/openssl_098_merge_8/sys/tools/feeder_rate_mkfilter.awk
  projects/openssl_098_merge_8/sys/tools/snd_fxdiv_gen.awk
Modified:
  projects/openssl_098_merge_8/   (props changed)
  projects/openssl_098_merge_8/UPDATING
  projects/openssl_098_merge_8/contrib/csup/rcsfile.c
  projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c
  projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c
  projects/openssl_098_merge_8/etc/defaults/rc.conf
  projects/openssl_098_merge_8/etc/mtree/BSD.local.dist
  projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist
  projects/openssl_098_merge_8/etc/rc.d/fsck
  projects/openssl_098_merge_8/etc/rc.d/jail
  projects/openssl_098_merge_8/etc/syslog.conf
  projects/openssl_098_merge_8/etc/termcap.small
  projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c
  projects/openssl_098_merge_8/lib/libpmc/libpmc.c
  projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3
  projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c
  projects/openssl_098_merge_8/lib/libthread_db/thread_db.h
  projects/openssl_098_merge_8/lib/libufs/type.c
  projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3
  projects/openssl_098_merge_8/lib/libusb/   (props changed)
  projects/openssl_098_merge_8/lib/libusb/libusb.3
  projects/openssl_098_merge_8/lib/libusb/libusb20.c
  projects/openssl_098_merge_8/lib/libusb/libusb20.h
  projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c
  projects/openssl_098_merge_8/lib/libusb/libusb20_int.h
  projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c
  projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3
  projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3
  projects/openssl_098_merge_8/lib/msun/src/math_private.h
  projects/openssl_098_merge_8/sbin/dhclient/dhclient.c
  projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8
  projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c
  projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8
  projects/openssl_098_merge_8/share/colldef/Makefile
  projects/openssl_098_merge_8/share/man/man4/Makefile
  projects/openssl_098_merge_8/share/man/man4/acpi.4
  projects/openssl_098_merge_8/share/man/man4/altq.4
  projects/openssl_098_merge_8/share/man/man4/iwn.4
  projects/openssl_098_merge_8/share/man/man4/miibus.4
  projects/openssl_098_merge_8/share/man/man4/ng_ipfw.4
  projects/openssl_098_merge_8/share/man/man4/vlan.4
  projects/openssl_098_merge_8/share/man/man9/Makefile
  projects/openssl_098_merge_8/share/misc/committers-src.dot
  projects/openssl_098_merge_8/share/mklocale/Makefile
  projects/openssl_098_merge_8/share/mklocale/ja_JP.SJIS.src
  projects/openssl_098_merge_8/share/mklocale/ja_JP.eucJP.src
  projects/openssl_098_merge_8/share/monetdef/Makefile
  projects/openssl_098_merge_8/share/monetdef/de_CH.ISO8859-1.src
  projects/openssl_098_merge_8/share/msgdef/Makefile
  projects/openssl_098_merge_8/share/numericdef/Makefile
  projects/openssl_098_merge_8/share/syscons/keymaps/INDEX.keymaps
  projects/openssl_098_merge_8/share/syscons/keymaps/Makefile
  projects/openssl_098_merge_8/share/termcap/termcap.src
  projects/openssl_098_merge_8/share/timedef/Makefile
  projects/openssl_098_merge_8/share/timedef/ja_JP.SJIS.src
  projects/openssl_098_merge_8/share/timedef/ja_JP.eucJP.src
  projects/openssl_098_merge_8/share/timedef/ko_KR.UTF-8.src
  projects/openssl_098_merge_8/share/timedef/ko_KR.eucKR.src
  projects/openssl_098_merge_8/share/timedef/pl_PL.ISO8859-2.src
  projects/openssl_098_merge_8/share/timedef/pl_PL.UTF-8.src
  projects/openssl_098_merge_8/share/zoneinfo/   (props changed)
  projects/openssl_098_merge_8/share/zoneinfo/asia
  projects/openssl_098_merge_8/sys/amd64/amd64/local_apic.c
  projects/openssl_098_merge_8/sys/amd64/amd64/machdep.c
  projects/openssl_098_merge_8/sys/amd64/conf/DEFAULTS
  projects/openssl_098_merge_8/sys/amd64/conf/GENERIC
  projects/openssl_098_merge_8/sys/amd64/conf/NOTES
  projects/openssl_098_merge_8/sys/amd64/isa/clock.c
  projects/openssl_098_merge_8/sys/arm/arm/intr.c
  projects/openssl_098_merge_8/sys/arm/arm/locore.S
  projects/openssl_098_merge_8/sys/arm/at91/at91.c
  projects/openssl_098_merge_8/sys/arm/at91/at91_cfata.c
  projects/openssl_098_merge_8/sys/arm/at91/at91_mci.c
  projects/openssl_098_merge_8/sys/arm/at91/at91_twi.c
  projects/openssl_098_merge_8/sys/arm/at91/if_ate.c
  projects/openssl_098_merge_8/sys/arm/include/intr.h
  projects/openssl_098_merge_8/sys/arm/mv/common.c
  projects/openssl_098_merge_8/sys/arm/mv/discovery/db78xxx.c
  projects/openssl_098_merge_8/sys/arm/mv/discovery/discovery.c
  projects/openssl_098_merge_8/sys/arm/mv/ic.c
  projects/openssl_098_merge_8/sys/arm/mv/kirkwood/db88f6xxx.c
  projects/openssl_098_merge_8/sys/arm/mv/kirkwood/kirkwood.c
  projects/openssl_098_merge_8/sys/arm/mv/mvreg.h
  projects/openssl_098_merge_8/sys/arm/mv/orion/db88f5xxx.c
  projects/openssl_098_merge_8/sys/arm/mv/orion/orion.c
  projects/openssl_098_merge_8/sys/arm/mv/twsi.c
  projects/openssl_098_merge_8/sys/arm/sa11x0/sa11x0_irqhandler.c
  projects/openssl_098_merge_8/sys/arm/xscale/i80321/i80321.c
  projects/openssl_098_merge_8/sys/arm/xscale/i80321/i80321_pci.c
  projects/openssl_098_merge_8/sys/arm/xscale/i8134x/i81342.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/avila_ata.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/avila_led.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/cambria_led.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/if_npe.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/ixp425.c
  projects/openssl_098_merge_8/sys/arm/xscale/ixp425/ixp425_iic.c
  projects/openssl_098_merge_8/sys/arm/xscale/pxa/pxa_icu.c
  projects/openssl_098_merge_8/sys/boot/forth/loader.conf
  projects/openssl_098_merge_8/sys/cam/scsi/scsi_target.c
  projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_proto.h
  projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_syscall.h
  projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_sysent.c
  projects/openssl_098_merge_8/sys/compat/freebsd32/syscalls.master
  projects/openssl_098_merge_8/sys/compat/linux/linux_misc.c
  projects/openssl_098_merge_8/sys/compat/svr4/svr4_stat.c
  projects/openssl_098_merge_8/sys/conf/NOTES
  projects/openssl_098_merge_8/sys/conf/files
  projects/openssl_098_merge_8/sys/conf/options
  projects/openssl_098_merge_8/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/openssl_098_merge_8/sys/contrib/pf/net/if_pflog.c
  projects/openssl_098_merge_8/sys/dev/acpica/Osd/OsdSchedule.c
  projects/openssl_098_merge_8/sys/dev/acpica/Osd/OsdSynch.c
  projects/openssl_098_merge_8/sys/dev/acpica/acpi_pcib_acpi.c
  projects/openssl_098_merge_8/sys/dev/acpica/acpivar.h
  projects/openssl_098_merge_8/sys/dev/agp/agp_ali.c
  projects/openssl_098_merge_8/sys/dev/agp/agp_amd.c
  projects/openssl_098_merge_8/sys/dev/agp/agp_ati.c
  projects/openssl_098_merge_8/sys/dev/agp/agp_nvidia.c
  projects/openssl_098_merge_8/sys/dev/agp/agp_sis.c
  projects/openssl_098_merge_8/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/openssl_098_merge_8/sys/dev/ce/if_ce.c
  projects/openssl_098_merge_8/sys/dev/cfi/cfi_core.c
  projects/openssl_098_merge_8/sys/dev/cp/if_cp.c
  projects/openssl_098_merge_8/sys/dev/ctau/if_ct.c
  projects/openssl_098_merge_8/sys/dev/cx/if_cx.c
  projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_main.c
  projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_multiq.c
  projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_sge.c
  projects/openssl_098_merge_8/sys/dev/e1000/if_igb.c
  projects/openssl_098_merge_8/sys/dev/eisa/eisaconf.c
  projects/openssl_098_merge_8/sys/dev/fxp/if_fxp.c
  projects/openssl_098_merge_8/sys/dev/if_ndis/if_ndis.c
  projects/openssl_098_merge_8/sys/dev/kbdmux/kbdmux.c
  projects/openssl_098_merge_8/sys/dev/ksyms/ksyms.c
  projects/openssl_098_merge_8/sys/dev/mca/mca_bus.c
  projects/openssl_098_merge_8/sys/dev/mge/if_mge.c
  projects/openssl_098_merge_8/sys/dev/ncv/ncr53c500_pccard.c
  projects/openssl_098_merge_8/sys/dev/nmdm/nmdm.c
  projects/openssl_098_merge_8/sys/dev/nsp/nsp_pccard.c
  projects/openssl_098_merge_8/sys/dev/ofw/ofw_standard.c
  projects/openssl_098_merge_8/sys/dev/pcf/pcf.c
  projects/openssl_098_merge_8/sys/dev/pcf/pcfvar.h
  projects/openssl_098_merge_8/sys/dev/pdq/if_fpa.c
  projects/openssl_098_merge_8/sys/dev/smc/if_smc.c
  projects/openssl_098_merge_8/sys/dev/smc/if_smcvar.h
  projects/openssl_098_merge_8/sys/dev/snc/if_snc.c
  projects/openssl_098_merge_8/sys/dev/snc/if_sncvar.h
  projects/openssl_098_merge_8/sys/dev/sound/midi/midi.c
  projects/openssl_098_merge_8/sys/dev/sound/midi/mpu401.c
  projects/openssl_098_merge_8/sys/dev/sound/pcm/channel.h
  projects/openssl_098_merge_8/sys/dev/sound/pcm/mixer.h
  projects/openssl_098_merge_8/sys/dev/sound/pcm/sound.h
  projects/openssl_098_merge_8/sys/dev/sound/sbus/cs4231.c
  projects/openssl_098_merge_8/sys/dev/spibus/spibus.c
  projects/openssl_098_merge_8/sys/dev/stg/tmc18c30.h
  projects/openssl_098_merge_8/sys/dev/stg/tmc18c30_subr.c
  projects/openssl_098_merge_8/sys/dev/syscons/teken/teken_demo.c
  projects/openssl_098_merge_8/sys/dev/syscons/teken/teken_stress.c
  projects/openssl_098_merge_8/sys/dev/uart/uart_cpu_mv.c
  projects/openssl_098_merge_8/sys/dev/ubsec/ubsec.c
  projects/openssl_098_merge_8/sys/dev/usb/controller/ehci_mbus.c
  projects/openssl_098_merge_8/sys/dev/usb/input/ukbd.c
  projects/openssl_098_merge_8/sys/dev/usb/input/ums.c
  projects/openssl_098_merge_8/sys/dev/usb/serial/uchcom.c
  projects/openssl_098_merge_8/sys/dev/usb/serial/ufoma.c
  projects/openssl_098_merge_8/sys/dev/usb/serial/uplcom.c
  projects/openssl_098_merge_8/sys/dev/usb/serial/uslcom.c
  projects/openssl_098_merge_8/sys/dev/usb/storage/umass.c
  projects/openssl_098_merge_8/sys/dev/usb/storage/ustorage_fs.c
  projects/openssl_098_merge_8/sys/dev/usb/usb_compat_linux.c
  projects/openssl_098_merge_8/sys/dev/usb/usb_core.h
  projects/openssl_098_merge_8/sys/dev/usb/usb_dev.c
  projects/openssl_098_merge_8/sys/dev/usb/usb_handle_request.c
  projects/openssl_098_merge_8/sys/dev/usb/usb_if.m
  projects/openssl_098_merge_8/sys/dev/usb/wlan/if_urtw.c
  projects/openssl_098_merge_8/sys/dev/usb/wlan/if_zyd.c
  projects/openssl_098_merge_8/sys/dev/usb/wlan/if_zydreg.h
  projects/openssl_098_merge_8/sys/dev/wb/if_wb.c
  projects/openssl_098_merge_8/sys/dev/wi/if_wi.c
  projects/openssl_098_merge_8/sys/dev/wi/if_wivar.h
  projects/openssl_098_merge_8/sys/dev/xen/netfront/   (props changed)
  projects/openssl_098_merge_8/sys/dev/xen/xenpci/   (props changed)
  projects/openssl_098_merge_8/sys/fs/cd9660/cd9660_lookup.c
  projects/openssl_098_merge_8/sys/fs/cd9660/cd9660_vnops.c
  projects/openssl_098_merge_8/sys/fs/devfs/devfs_vnops.c
  projects/openssl_098_merge_8/sys/fs/fifofs/fifo_vnops.c
  projects/openssl_098_merge_8/sys/fs/msdosfs/msdosfs_vnops.c
  projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clbio.c
  projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clvnops.c
  projects/openssl_098_merge_8/sys/fs/pseudofs/pseudofs_vnops.c
  projects/openssl_098_merge_8/sys/geom/geom.h
  projects/openssl_098_merge_8/sys/geom/geom_io.c
  projects/openssl_098_merge_8/sys/geom/label/g_label.c
  projects/openssl_098_merge_8/sys/geom/label/g_label.h
  projects/openssl_098_merge_8/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  projects/openssl_098_merge_8/sys/i386/acpica/acpi_machdep.c
  projects/openssl_098_merge_8/sys/i386/conf/DEFAULTS
  projects/openssl_098_merge_8/sys/i386/conf/GENERIC
  projects/openssl_098_merge_8/sys/i386/conf/NOTES
  projects/openssl_098_merge_8/sys/i386/i386/local_apic.c
  projects/openssl_098_merge_8/sys/i386/i386/machdep.c
  projects/openssl_098_merge_8/sys/i386/include/legacyvar.h
  projects/openssl_098_merge_8/sys/i386/isa/clock.c
  projects/openssl_098_merge_8/sys/i386/isa/vesa.c
  projects/openssl_098_merge_8/sys/i386/pci/pci_bus.c
  projects/openssl_098_merge_8/sys/kern/bus_if.m
  projects/openssl_098_merge_8/sys/kern/init_main.c
  projects/openssl_098_merge_8/sys/kern/kern_event.c
  projects/openssl_098_merge_8/sys/kern/kern_fork.c
  projects/openssl_098_merge_8/sys/kern/kern_jail.c
  projects/openssl_098_merge_8/sys/kern/kern_lockf.c
  projects/openssl_098_merge_8/sys/kern/link_elf_obj.c
  projects/openssl_098_merge_8/sys/kern/linker_if.m
  projects/openssl_098_merge_8/sys/kern/subr_bus.c
  projects/openssl_098_merge_8/sys/kern/sys_pipe.c
  projects/openssl_098_merge_8/sys/kern/sysv_shm.c
  projects/openssl_098_merge_8/sys/kern/tty.c
  projects/openssl_098_merge_8/sys/kern/tty_pts.c
  projects/openssl_098_merge_8/sys/kern/uipc_mqueue.c
  projects/openssl_098_merge_8/sys/kern/uipc_socket.c
  projects/openssl_098_merge_8/sys/kern/uipc_syscalls.c
  projects/openssl_098_merge_8/sys/kern/vfs_aio.c
  projects/openssl_098_merge_8/sys/kern/vfs_subr.c
  projects/openssl_098_merge_8/sys/kern/vfs_syscalls.c
  projects/openssl_098_merge_8/sys/kern/vfs_vnops.c
  projects/openssl_098_merge_8/sys/kern/vnode_if.src
  projects/openssl_098_merge_8/sys/mips/malta/gt_pci.c
  projects/openssl_098_merge_8/sys/mips/mips/mainbus.c
  projects/openssl_098_merge_8/sys/modules/Makefile
  projects/openssl_098_merge_8/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/openssl_098_merge_8/sys/modules/ip6_mroute_mod/   (props changed)
  projects/openssl_098_merge_8/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/openssl_098_merge_8/sys/modules/sound/sound/Makefile
  projects/openssl_098_merge_8/sys/net/bpf.c
  projects/openssl_098_merge_8/sys/net/flowtable.c
  projects/openssl_098_merge_8/sys/net/flowtable.h
  projects/openssl_098_merge_8/sys/net/if.c
  projects/openssl_098_merge_8/sys/net/if_arcsubr.c
  projects/openssl_098_merge_8/sys/net/if_bridge.c
  projects/openssl_098_merge_8/sys/net/if_ethersubr.c
  projects/openssl_098_merge_8/sys/net/if_fddisubr.c
  projects/openssl_098_merge_8/sys/net/if_fwsubr.c
  projects/openssl_098_merge_8/sys/net/if_gif.c
  projects/openssl_098_merge_8/sys/net/if_gif.h
  projects/openssl_098_merge_8/sys/net/if_iso88025subr.c
  projects/openssl_098_merge_8/sys/net/if_tap.c
  projects/openssl_098_merge_8/sys/net/if_tun.c
  projects/openssl_098_merge_8/sys/net/if_var.h
  projects/openssl_098_merge_8/sys/net/pfkeyv2.h
  projects/openssl_098_merge_8/sys/net/rtsock.c
  projects/openssl_098_merge_8/sys/net80211/_ieee80211.h
  projects/openssl_098_merge_8/sys/net80211/ieee80211.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211.h
  projects/openssl_098_merge_8/sys/net80211/ieee80211_crypto_ccmp.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_dfs.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_ht.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_ioctl.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_node.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_node.h
  projects/openssl_098_merge_8/sys/net80211/ieee80211_proto.h
  projects/openssl_098_merge_8/sys/net80211/ieee80211_radiotap.c
  projects/openssl_098_merge_8/sys/net80211/ieee80211_sta.c
  projects/openssl_098_merge_8/sys/netgraph/netgraph.h
  projects/openssl_098_merge_8/sys/netgraph/ng_base.c
  projects/openssl_098_merge_8/sys/netgraph/ng_eiface.c
  projects/openssl_098_merge_8/sys/netgraph/ng_ether.c
  projects/openssl_098_merge_8/sys/netgraph/ng_iface.c
  projects/openssl_098_merge_8/sys/netgraph/ng_ip_input.c
  projects/openssl_098_merge_8/sys/netgraph/ng_ipfw.c
  projects/openssl_098_merge_8/sys/netgraph/ng_ipfw.h
  projects/openssl_098_merge_8/sys/netgraph/ng_message.h
  projects/openssl_098_merge_8/sys/netinet/igmp.h
  projects/openssl_098_merge_8/sys/netinet/in_proto.c
  projects/openssl_098_merge_8/sys/netinet/ip_dummynet.h
  projects/openssl_098_merge_8/sys/netinet/ip_fw.h
  projects/openssl_098_merge_8/sys/netinet/ip_input.c
  projects/openssl_098_merge_8/sys/netinet/ip_output.c
  projects/openssl_098_merge_8/sys/netinet/ipfw/ip_dummynet.c   (contents, props changed)
  projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw2.c   (contents, props changed)
  projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw_pfil.c   (contents, props changed)
  projects/openssl_098_merge_8/sys/netinet/tcp_debug.c
  projects/openssl_098_merge_8/sys/netinet/tcp_input.c
  projects/openssl_098_merge_8/sys/netinet/tcp_usrreq.c
  projects/openssl_098_merge_8/sys/netinet/tcp_var.h
  projects/openssl_098_merge_8/sys/netinet/udp.h
  projects/openssl_098_merge_8/sys/netinet/udp_usrreq.c
  projects/openssl_098_merge_8/sys/netinet/udp_var.h
  projects/openssl_098_merge_8/sys/netinet6/in6.c
  projects/openssl_098_merge_8/sys/netinet6/mld6.c
  projects/openssl_098_merge_8/sys/netipsec/ipsec.c
  projects/openssl_098_merge_8/sys/netipsec/ipsec_input.c
  projects/openssl_098_merge_8/sys/netipsec/ipsec_output.c
  projects/openssl_098_merge_8/sys/netipsec/key.c
  projects/openssl_098_merge_8/sys/netipsec/key.h
  projects/openssl_098_merge_8/sys/netipsec/keydb.h
  projects/openssl_098_merge_8/sys/netipsec/xform_ipip.c
  projects/openssl_098_merge_8/sys/netipx/spx_debug.c
  projects/openssl_098_merge_8/sys/nfsclient/nfs_bio.c
  projects/openssl_098_merge_8/sys/nfsserver/nfs_srvkrpc.c
  projects/openssl_098_merge_8/sys/powerpc/aim/machdep.c
  projects/openssl_098_merge_8/sys/powerpc/aim/platform_chrp.c
  projects/openssl_098_merge_8/sys/powerpc/ofw/ofw_real.c
  projects/openssl_098_merge_8/sys/powerpc/powermac/cuda.c
  projects/openssl_098_merge_8/sys/powerpc/powermac/pmu.c
  projects/openssl_098_merge_8/sys/powerpc/powerpc/openpic.c
  projects/openssl_098_merge_8/sys/powerpc/psim/ata_iobus.c
  projects/openssl_098_merge_8/sys/rpc/clnt_rc.c
  projects/openssl_098_merge_8/sys/security/audit/audit_pipe.c
  projects/openssl_098_merge_8/sys/sys/bio.h
  projects/openssl_098_merge_8/sys/sys/buf_ring.h
  projects/openssl_098_merge_8/sys/sys/bus.h
  projects/openssl_098_merge_8/sys/sys/event.h
  projects/openssl_098_merge_8/sys/sys/jail.h
  projects/openssl_098_merge_8/sys/sys/kobj.h
  projects/openssl_098_merge_8/sys/sys/mbuf.h
  projects/openssl_098_merge_8/sys/sys/mount.h
  projects/openssl_098_merge_8/sys/sys/proc.h
  projects/openssl_098_merge_8/sys/sys/soundcard.h
  projects/openssl_098_merge_8/sys/sys/vimage.h
  projects/openssl_098_merge_8/sys/vm/vm_map.c
  projects/openssl_098_merge_8/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/openssl_098_merge_8/usr.bin/fstat/zfs.c
  projects/openssl_098_merge_8/usr.sbin/arp/Makefile
  projects/openssl_098_merge_8/usr.sbin/arp/arp.c
  projects/openssl_098_merge_8/usr.sbin/flowctl/flowctl.c
  projects/openssl_098_merge_8/usr.sbin/jail/jail.c
  projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/openssl_098_merge_8/usr.sbin/makefs/getid.c   (props changed)
  projects/openssl_098_merge_8/usr.sbin/mergemaster/mergemaster.sh
  projects/openssl_098_merge_8/usr.sbin/nfsd/nfsv4.4
  projects/openssl_098_merge_8/usr.sbin/nscd/Makefile
  projects/openssl_098_merge_8/usr.sbin/nscd/agent.c
  projects/openssl_098_merge_8/usr.sbin/nscd/agent.h
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.c
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.h
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.c
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.h
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.c
  projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.h
  projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.c
  projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.h
  projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.c
  projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.h
  projects/openssl_098_merge_8/usr.sbin/nscd/config.c
  projects/openssl_098_merge_8/usr.sbin/nscd/config.h
  projects/openssl_098_merge_8/usr.sbin/nscd/debug.c
  projects/openssl_098_merge_8/usr.sbin/nscd/debug.h
  projects/openssl_098_merge_8/usr.sbin/nscd/hashtable.h
  projects/openssl_098_merge_8/usr.sbin/nscd/log.c
  projects/openssl_098_merge_8/usr.sbin/nscd/mp_rs_query.c
  projects/openssl_098_merge_8/usr.sbin/nscd/mp_ws_query.c
  projects/openssl_098_merge_8/usr.sbin/nscd/nscd.c
  projects/openssl_098_merge_8/usr.sbin/nscd/nscdcli.c
  projects/openssl_098_merge_8/usr.sbin/nscd/parser.c
  projects/openssl_098_merge_8/usr.sbin/nscd/protocol.c
  projects/openssl_098_merge_8/usr.sbin/nscd/protocol.h
  projects/openssl_098_merge_8/usr.sbin/nscd/query.c
  projects/openssl_098_merge_8/usr.sbin/nscd/query.h
  projects/openssl_098_merge_8/usr.sbin/nscd/singletons.c
  projects/openssl_098_merge_8/usr.sbin/pstat/Makefile
  projects/openssl_098_merge_8/usr.sbin/pstat/pstat.c
  projects/openssl_098_merge_8/usr.sbin/sysinstall/devices.c
  projects/openssl_098_merge_8/usr.sbin/syslogd/syslog.conf.5

Modified: projects/openssl_098_merge_8/UPDATING
==============================================================================
--- projects/openssl_098_merge_8/UPDATING	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/UPDATING	Sat Jun 13 08:04:56 2009	(r194100)
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090611:
+	The layout of struct thread has changed.  Kernel and modules
+	need to be rebuilt.
+
 20090608:
 	The layout of structs ifnet, domain, protosw and vnet_net has
 	changed.  Kernel modules need to be rebuilt.

Modified: projects/openssl_098_merge_8/contrib/csup/rcsfile.c
==============================================================================
--- projects/openssl_098_merge_8/contrib/csup/rcsfile.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/contrib/csup/rcsfile.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -730,7 +730,7 @@ rcsfile_print(struct rcsfile *rf)
 		lprintf(1, "Strict!\n");
 	if (rf->comment != NULL)
 		lprintf(1, "comment: '%s'\n", rf->comment);
-	if (rf->expand != EXPAND_DEFAULT);
+	if (rf->expand != EXPAND_DEFAULT)
 		lprintf(1, "expand: '%s'\n", keyword_encode_expand(rf->expand));
 	
 	/* Print all deltas. */

Modified: projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c
==============================================================================
--- projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -1230,6 +1230,22 @@ backtrace_command_1 (char *count_exp, in
     printf_filtered ("(More stack frames follow...)\n");
 }
 
+struct backtrace_command_args
+  {
+    char *count_exp;
+    int show_locals;
+    int from_tty;
+  };
+
+/* Stub to call backtrace_command_1 by way of an error catcher.  */
+static int
+backtrace_command_stub (void *data)
+{
+  struct backtrace_command_args *args = (struct backtrace_command_args *)data;
+  backtrace_command_1 (args->count_exp, args->show_locals, args->from_tty);
+  return 0;
+}
+
 static void
 backtrace_command (char *arg, int from_tty)
 {
@@ -1237,6 +1253,7 @@ backtrace_command (char *arg, int from_t
   char **argv = (char **) NULL;
   int argIndicatingFullTrace = (-1), totArgLen = 0, argc = 0;
   char *argPtr = arg;
+  struct backtrace_command_args btargs;
 
   if (arg != (char *) NULL)
     {
@@ -1286,7 +1303,10 @@ backtrace_command (char *arg, int from_t
 	}
     }
 
-  backtrace_command_1 (argPtr, (argIndicatingFullTrace >= 0), from_tty);
+  btargs.count_exp = argPtr;
+  btargs.show_locals = (argIndicatingFullTrace >= 0);
+  btargs.from_tty = from_tty;
+  catch_errors (backtrace_command_stub, (char *)&btargs, "", RETURN_MASK_ERROR);
 
   if (argIndicatingFullTrace >= 0 && totArgLen > 0)
     xfree (argPtr);
@@ -1299,7 +1319,11 @@ static void backtrace_full_command (char
 static void
 backtrace_full_command (char *arg, int from_tty)
 {
-  backtrace_command_1 (arg, 1, from_tty);
+  struct backtrace_command_args btargs;
+  btargs.count_exp = arg;
+  btargs.show_locals = 1;
+  btargs.from_tty = from_tty;
+  catch_errors (backtrace_command_stub, (char *)&btargs, "", RETURN_MASK_ERROR);
 }
 
 

Modified: projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c
==============================================================================
--- projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -570,7 +570,7 @@ crypto_recv(
 			peer->issuer = emalloc(vallen + 1);
 			strcpy(peer->issuer, peer->subject);
 			temp32 = (fstamp >> 16) & 0xffff;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "flags 0x%x host %s signature %s", fstamp,
 			    peer->subject, OBJ_nid2ln(temp32));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -636,7 +636,8 @@ crypto_recv(
 			}
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "cert %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "cert %s 0x%x %s (%u) fs %u",
 			    cinfo->subject, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -685,7 +686,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "iff fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "iff fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -733,7 +734,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "gq fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "gq fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -774,7 +775,7 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_VRFY |
 			    CRYPTO_FLAG_PROV;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "mv fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "mv fs %u",
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -828,7 +829,7 @@ crypto_recv(
 			peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -893,7 +894,7 @@ crypto_recv(
 				peer->crypto &= ~CRYPTO_FLAG_AUTO;
 			peer->crypto |= CRYPTO_FLAG_AGREE;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "cook %x ts %u fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u",
 			    peer->pcookie, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -944,7 +945,7 @@ crypto_recv(
 			peer->pkeyid = bp->key;
 			peer->crypto |= CRYPTO_FLAG_AUTO;
 			peer->flash &= ~TEST8;
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "auto seq %d key %x ts %u fs %u", bp->seq,
 			    bp->key, ntohl(ep->tstamp),
 			    ntohl(ep->fstamp));
@@ -987,7 +988,8 @@ crypto_recv(
 			peer->crypto |= CRYPTO_FLAG_SIGN;
 			peer->flash &= ~TEST8;
 			temp32 = cinfo->nid;
-			sprintf(statstr, "sign %s 0x%x %s (%u) fs %u",
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "sign %s 0x%x %s (%u) fs %u",
 			    cinfo->issuer, cinfo->flags,
 			    OBJ_nid2ln(temp32), temp32,
 			    ntohl(ep->fstamp));
@@ -1071,7 +1073,8 @@ crypto_recv(
 			crypto_flags |= CRYPTO_FLAG_TAI;
 			peer->crypto |= CRYPTO_FLAG_LEAP;
 			peer->flash &= ~TEST8;
-			sprintf(statstr, "leap %u ts %u fs %u", vallen,
+			snprintf(statstr, NTP_MAXSTRLEN,
+			    "leap %u ts %u fs %u", vallen,
 			    ntohl(ep->tstamp), ntohl(ep->fstamp));
 			record_crypto_stats(&peer->srcadr, statstr);
 #ifdef DEBUG
@@ -1127,7 +1130,7 @@ crypto_recv(
 		 * cheerfully ignored, as the message is not sent.
 		 */
 		if (rval > XEVNT_TSP) {
-			sprintf(statstr,
+			snprintf(statstr, NTP_MAXSTRLEN,
 			    "error %x opcode %x ts %u fs %u", rval,
 			    code, tstamp, fstamp);
 			record_crypto_stats(&peer->srcadr, statstr);
@@ -1453,7 +1456,8 @@ crypto_xmit(
 	 */
 	if (rval != XEVNT_OK) {
 		opcode |= CRYPTO_ERROR;
-		sprintf(statstr, "error %x opcode %x", rval, opcode);
+		snprintf(statstr, NTP_MAXSTRLEN,
+		    "error %x opcode %x", rval, opcode);
 		record_crypto_stats(srcadr_sin, statstr);
 		report_event(rval, NULL);
 #ifdef DEBUG
@@ -1952,7 +1956,8 @@ crypto_update(void)
 		if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey))
 			tai_leap.siglen = htonl(len);
 	}
-	sprintf(statstr, "update ts %u", ntohl(hostval.tstamp)); 
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "update ts %u", ntohl(hostval.tstamp)); 
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3606,7 +3611,7 @@ crypto_key(
 	 */
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s mod %d", &linkname[2],
+	snprintf(statstr, NTP_MAXSTRLEN, "%s mod %d", &linkname[2],
 	    EVP_PKEY_size(pkey) * 8);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
@@ -3715,8 +3720,8 @@ crypto_cert(
 
 	if ((ptr = strrchr(linkname, '\n')) != NULL)
 		*ptr = '\0'; 
-	sprintf(statstr, "%s 0x%x len %lu", &linkname[2], ret->flags,
-	    len);
+	snprintf(statstr, NTP_MAXSTRLEN,
+	    "%s 0x%x len %lu", &linkname[2], ret->flags, len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG
 	if (debug)
@@ -3832,7 +3837,7 @@ crypto_tai(
 	for (j = 0; j < i; j++)
 		*ptr++ = htonl(leapsec[j]);
 	crypto_flags |= CRYPTO_FLAG_TAI;
-	sprintf(statstr, "%s fs %u leap %u len %u", cp, fstamp,
+	snprintf(statstr, NTP_MAXSTRLEN, "%s fs %u leap %u len %u", cp, fstamp,
 	   leapsec[--j], len);
 	record_crypto_stats(NULL, statstr);
 #ifdef DEBUG

Modified: projects/openssl_098_merge_8/etc/defaults/rc.conf
==============================================================================
--- projects/openssl_098_merge_8/etc/defaults/rc.conf	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/defaults/rc.conf	Sat Jun 13 08:04:56 2009	(r194100)
@@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 -
 
 root_rw_mount="YES"	# Set to NO to inhibit remounting root read-write.
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
+fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
 netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.

Modified: projects/openssl_098_merge_8/etc/mtree/BSD.local.dist
==============================================================================
--- projects/openssl_098_merge_8/etc/mtree/BSD.local.dist	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/mtree/BSD.local.dist	Sat Jun 13 08:04:56 2009	(r194100)
@@ -541,12 +541,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Modified: projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist	Sat Jun 13 08:04:56 2009	(r194100)
@@ -357,12 +357,30 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_ES.ISO8859-1
             ..
+            ca_FR.ISO8859-1
+            ..
+            ca_IT.ISO8859-1
+            ..
+            ca_AD.ISO8859-15
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-15
+            ..
+            ca_IT.ISO8859-15
+            ..
+            ca_AD.UTF-8
+            ..
             ca_ES.UTF-8
             ..
+            ca_FR.UTF-8
+            ..
+            ca_IT.UTF-8
+            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8

Modified: projects/openssl_098_merge_8/etc/rc.d/fsck
==============================================================================
--- projects/openssl_098_merge_8/etc/rc.d/fsck	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/rc.d/fsck	Sat Jun 13 08:04:56 2009	(r194100)
@@ -44,8 +44,8 @@ fsck_start()
 			;;
 		8)
 			if checkyesno fsck_y_enable; then
-				echo "File system preen failed, trying fsck -y."
-				fsck -y
+				echo "File system preen failed, trying fsck -y ${fsck_y_flags}"
+				fsck -y ${fsck_y_flags}
 				case $? in
 				0)
 					;;

Modified: projects/openssl_098_merge_8/etc/rc.d/jail
==============================================================================
--- projects/openssl_098_merge_8/etc/rc.d/jail	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/rc.d/jail	Sat Jun 13 08:04:56 2009	(r194100)
@@ -52,7 +52,7 @@ init_variables()
 	eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\"
 		[ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] &&  break
 		i=$((i + 1))
@@ -132,7 +132,6 @@ init_variables()
 	debug "$_j procdir: $_procdir"
 	debug "$_j ruleset: $_ruleset"
 	debug "$_j fstab: $_fstab"
-	debug "$_j consolelog: $_consolelog"
 
 	i=0
 	while : ; do
@@ -147,7 +146,7 @@ init_variables()
 	debug "$_j exec start: $_exec_start"
 
 	i=1
-	while [ true ]; do
+	while : ; do
 		eval out=\"\${_exec_afterstart${i}:-''}\"
 
 		if [ -z "$out" ]; then
@@ -642,7 +641,7 @@ jail_start()
 		if [ "$?" -eq 0 ] ; then
 			_jail_id=$(head -1 ${_tmp_jail})
 			i=1
-			while [ true ]; do
+			while : ; do
 				eval out=\"\${_exec_afterstart${i}:-''}\"
 
 				if [ -z "$out" ]; then

Modified: projects/openssl_098_merge_8/etc/syslog.conf
==============================================================================
--- projects/openssl_098_merge_8/etc/syslog.conf	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/syslog.conf	Sat Jun 13 08:04:56 2009	(r194100)
@@ -28,3 +28,4 @@ cron.*						/var/log/cron
 # news.notice					/var/log/news/news.notice
 !ppp
 *.*						/var/log/ppp.log
+!*

Modified: projects/openssl_098_merge_8/etc/termcap.small
==============================================================================
--- projects/openssl_098_merge_8/etc/termcap.small	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/etc/termcap.small	Sat Jun 13 08:04:56 2009	(r194100)
@@ -138,7 +138,7 @@ cons60l1|cons60-iso8859-1:\
 cons60l1-m|cons60-iso8859-1-mono:\
 	:li#60:tc=cons25l1-m:
 # ISO 8859-7 FreeBSD console with ACS support
-cons25l7:cons25-iso8859-7:\
+cons25l7|cons25-iso8859-7:\
 	:ac=f\260g\261{\360}\243+\253,\273i\247:\
 	:tc=cons25w:
 cons25l7-m|cons25-iso8859-7-mono:\

Modified: projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -57,7 +57,7 @@ extern char *	tzname[];
 #define IN_THIS	2
 #define IN_ALL	3
 
-#define PAD_DEFAULT 0
+#define PAD_DEFAULT	0
 #define PAD_LESS	1
 #define PAD_SPACE	2
 #define PAD_ZERO	3
@@ -65,7 +65,7 @@ extern char *	tzname[];
 static const char* fmt_padding[][4] = {
 	/* DEFAULT,	LESS,	SPACE,	ZERO */
 #define PAD_FMT_MONTHDAY	0
-#define PAD_FMT_HMS			0
+#define PAD_FMT_HMS		0
 #define PAD_FMT_CENTURY		0
 #define PAD_FMT_SHORTYEAR	0
 #define PAD_FMT_MONTH		0

Modified: projects/openssl_098_merge_8/lib/libpmc/libpmc.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libpmc/libpmc.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libpmc/libpmc.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -591,22 +591,22 @@ iap_allocate_pmc(enum pmc_event pe, char
 			pmc_config->pm_caps |= PMC_CAP_USER;
 		} else if (KWMATCH(p, IAP_KW_ANYTHREAD)) {
 			pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY;
-		} else if (KWMATCH(p, IAP_KW_CORE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) {
 			n = pmc_parse_mask(iap_core_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_AGENT)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) {
 			n = pmc_parse_mask(iap_agent_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_PREFETCH)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) {
 			n = pmc_parse_mask(iap_prefetch_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
-		} else if (KWMATCH(p, IAP_KW_CACHESTATE)) {
+		} else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) {
 			n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate);
 		} else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE &&
-		    KWMATCH(p, IAP_KW_TRANSITION)) {
+		    KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) {
 			n = pmc_parse_mask(iap_transition_mask, p, &evmask);
 			if (n != 1)
 				return (-1);
@@ -614,10 +614,10 @@ iap_allocate_pmc(enum pmc_event pe, char
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME ||
 		    cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) {
-			if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) {
+			if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) {
 				n = pmc_parse_mask(iap_snoopresponse_mask, p,
 				    &evmask);
-			} else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) {
+			} else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) {
 				n = pmc_parse_mask(iap_snooptype_mask, p,
 				    &evmask);
 			} else

Modified: projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3
==============================================================================
--- projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3	Sat Jun 13 08:04:56 2009	(r194100)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
+.\" Copyright (c) 2008,2009 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 12, 2008
+.Dd June 8, 2009
 .Os
 .Dt PMC.CORE2 3
 .Sh NAME
@@ -42,7 +42,7 @@ family CPUs
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
-These CPUs contains two classes of PMCs:
+These CPUs may contain upto two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
@@ -66,6 +66,7 @@ Intel Core2 PMCs are documented in
 .Ss CORE2 FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
+Not all CPUs in this family implement fixed-function counters.
 .Ss CORE2 PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"

Modified: projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -457,6 +457,7 @@ pt_thr_get_info(const td_thrhandle_t *th
 {
 	const td_thragent_t *ta = th->th_ta;
 	struct ptrace_lwpinfo linfo;
+	int traceme;
 	int state;
 	int ret;
 
@@ -470,7 +471,8 @@ pt_thr_get_info(const td_thrhandle_t *th
 	if (ret != 0)
 		return (TD_ERR);
 	ret = thr_pread_int(ta, th->th_thread + ta->thread_off_report_events,
-	    &info->ti_traceme);
+	    &traceme);
+	info->ti_traceme = traceme;
 	if (ret != 0)
 		return (TD_ERR);
 	ret = ps_pread(ta->ph, th->th_thread + ta->thread_off_event_mask,

Modified: projects/openssl_098_merge_8/lib/libthread_db/thread_db.h
==============================================================================
--- projects/openssl_098_merge_8/lib/libthread_db/thread_db.h	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libthread_db/thread_db.h	Sat Jun 13 08:04:56 2009	(r194100)
@@ -184,7 +184,7 @@ typedef struct {
 	int		ti_pri;
 	lwpid_t		ti_lid;
 	char		ti_db_suspended;
-	int		ti_traceme;
+	char		ti_traceme;
 	sigset_t	ti_sigmask;
 	sigset_t	ti_pending;
 	psaddr_t	ti_tls;

Modified: projects/openssl_098_merge_8/lib/libufs/type.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libufs/type.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libufs/type.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -108,7 +108,10 @@ again:	if ((ret = stat(name, &st)) < 0) 
 		 */
 		name = oname;
 	}
-	if (ret >= 0 && S_ISCHR(st.st_mode)) {
+	if (ret >= 0 && S_ISREG(st.st_mode)) {
+		/* Possibly a disk image, give it a try.  */
+		;
+	} else if (ret >= 0 && S_ISCHR(st.st_mode)) {
 		/* This is what we need, do nothing. */
 		;
 	} else if ((fs = getfsfile(name)) != NULL) {

Modified: projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3
==============================================================================
--- projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3	Sat Jun 13 08:04:56 2009	(r194100)
@@ -53,7 +53,7 @@ and populate the structure pointed to by
 The disk is opened read-only.
 The specified
 .Fa name
-may be either a mountpoint, or a device name.
+may be either a mountpoint, a device name or a filesystem image.
 The
 .Fn ufs_disk_fillout
 function assumes there is a valid superblock and will fail if not,

Modified: projects/openssl_098_merge_8/lib/libusb/libusb.3
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb.3	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb.3	Sat Jun 13 08:04:56 2009	(r194100)
@@ -117,8 +117,6 @@ USB access library (libusb -lusb)
 .Ft const char *
 .Fn libusb20_dev_get_desc "struct libusb20_device *pdev"
 .Ft int
-.Fn libusb20_dev_claim_interface "struct libusb20_device *pdev" "uint8_t iface_index"
-.Ft int
 .Fn libusb20_dev_close "struct libusb20_device *pdev"
 .Ft int
 .Fn libusb20_dev_detach_kernel_driver "struct libusb20_device *pdev" "uint8_t iface_index"
@@ -135,8 +133,6 @@ USB access library (libusb -lusb)
 .Ft int
 .Fn libusb20_dev_process "struct libusb20_device *pdev"
 .Ft int
-.Fn libusb20_dev_release_interface "struct libusb20_device *pdev" "uint8_t iface_index"
-.Ft int
 .Fn libusb20_dev_request_sync "struct libusb20_device *pdev" "struct LIBUSB20_CONTROL_SETUP_DECODED *setup" "void *data" "uint16_t *pactlen" "uint32_t timeout" "uint8_t flags"
 .Ft int
 .Fn libusb20_dev_req_string_sync "struct libusb20_device *pdev" "uint8_t index" "uint16_t langid" "void *ptr" "uint16_t len"
@@ -517,14 +513,6 @@ The format of the string is: "drivername
 .
 .Pp
 .
-.Fn libusb20_dev_claim_interface
-This function will try to claim the given USB interface given by
-.Fa iface_index .
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
 .Fn libusb20_dev_close
 will close the given USB device.
 .
@@ -601,14 +589,6 @@ detached.
 .
 .Pp
 .
-.Fn libusb20_dev_release_interface
-will try to release a claimed USB interface for the specified USB device.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
 .Fn libusb20_dev_request_sync
 will perform a synchronous control request on the given
 USB device.

Modified: projects/openssl_098_merge_8/lib/libusb/libusb20.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb20.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb20.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -65,8 +65,6 @@ dummy_callback(struct libusb20_transfer 
 #define	dummy_get_config_desc_full (void *)dummy_int
 #define	dummy_get_config_index (void *)dummy_int
 #define	dummy_set_config_index (void *)dummy_int
-#define	dummy_claim_interface (void *)dummy_int
-#define	dummy_release_interface (void *)dummy_int
 #define	dummy_set_alt_index (void *)dummy_int
 #define	dummy_reset_device (void *)dummy_int
 #define	dummy_set_power_mode (void *)dummy_int
@@ -451,24 +449,6 @@ libusb20_tr_start(struct libusb20_transf
 /* USB device operations */
 
 int
-libusb20_dev_claim_interface(struct libusb20_device *pdev, uint8_t ifaceIndex)
-{
-	int error;
-
-	if (ifaceIndex >= 32) {
-		error = LIBUSB20_ERROR_INVALID_PARAM;
-	} else if (pdev->claimed_interfaces & (1 << ifaceIndex)) {
-		error = LIBUSB20_ERROR_NOT_FOUND;
-	} else {
-		error = pdev->methods->claim_interface(pdev, ifaceIndex);
-	}
-	if (!error) {
-		pdev->claimed_interfaces |= (1 << ifaceIndex);
-	}
-	return (error);
-}
-
-int
 libusb20_dev_close(struct libusb20_device *pdev)
 {
 	struct libusb20_transfer *xfer;
@@ -494,7 +474,11 @@ libusb20_dev_close(struct libusb20_devic
 
 	pdev->is_opened = 0;
 
-	pdev->claimed_interfaces = 0;
+	/* 
+	 * The following variable is only used by the libusb v0.1
+	 * compat layer:
+	 */
+	pdev->claimed_interface = 0;
 
 	return (error);
 }
@@ -580,24 +564,6 @@ libusb20_dev_open(struct libusb20_device
 }
 
 int
-libusb20_dev_release_interface(struct libusb20_device *pdev, uint8_t ifaceIndex)
-{
-	int error;
-
-	if (ifaceIndex >= 32) {
-		error = LIBUSB20_ERROR_INVALID_PARAM;
-	} else if (!(pdev->claimed_interfaces & (1 << ifaceIndex))) {
-		error = LIBUSB20_ERROR_NOT_FOUND;
-	} else {
-		error = pdev->methods->release_interface(pdev, ifaceIndex);
-	}
-	if (!error) {
-		pdev->claimed_interfaces &= ~(1 << ifaceIndex);
-	}
-	return (error);
-}
-
-int
 libusb20_dev_reset(struct libusb20_device *pdev)
 {
 	int error;

Modified: projects/openssl_098_merge_8/lib/libusb/libusb20.h
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb20.h	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb20.h	Sat Jun 13 08:04:56 2009	(r194100)
@@ -237,7 +237,6 @@ void   *libusb20_tr_get_priv_sc1(struct 
 
 const char *libusb20_dev_get_backend_name(struct libusb20_device *pdev);
 const char *libusb20_dev_get_desc(struct libusb20_device *pdev);
-int	libusb20_dev_claim_interface(struct libusb20_device *pdev, uint8_t iface_index);
 int	libusb20_dev_close(struct libusb20_device *pdev);
 int	libusb20_dev_detach_kernel_driver(struct libusb20_device *pdev, uint8_t iface_index);
 int	libusb20_dev_set_config_index(struct libusb20_device *pdev, uint8_t configIndex);
@@ -246,7 +245,6 @@ int	libusb20_dev_get_fd(struct libusb20_
 int	libusb20_dev_kernel_driver_active(struct libusb20_device *pdev, uint8_t iface_index);
 int	libusb20_dev_open(struct libusb20_device *pdev, uint16_t transfer_max);
 int	libusb20_dev_process(struct libusb20_device *pdev);
-int	libusb20_dev_release_interface(struct libusb20_device *pdev, uint8_t iface_index);
 int	libusb20_dev_request_sync(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags);
 int	libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len);
 int	libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len);

Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -99,26 +99,6 @@ struct usb_parse_state {
 	uint8_t	preparse;
 };
 
-static uint8_t
-usb_get_first_claimed_interface(usb_dev_handle * dev)
-{
-	struct libusb20_device *pdev = (void *)dev;
-	uint32_t x;
-	uint8_t y;
-
-	x = pdev->claimed_interfaces;
-
-	for (y = 0; y != 32; y++) {
-		if (x & (1 << y))
-			break;
-	}
-
-	if (y == 32)
-		y = 0xFF;		/* dummy */
-
-	return (y);
-}
-
 static struct libusb20_transfer *
 usb_get_transfer_by_ep_no(usb_dev_handle * dev, uint8_t ep_no)
 {
@@ -746,12 +726,9 @@ usb_set_configuration(usb_dev_handle * u
 int
 usb_claim_interface(usb_dev_handle * dev, int interface)
 {
-	int err;
-
-	err = libusb20_dev_claim_interface((void *)dev, interface);
+	struct libusb20_device *pdev = (void *)dev;
 
-	if (err)
-		return (-1);
+	pdev->claimed_interface = interface;
 
 	return (0);
 }
@@ -759,23 +736,18 @@ usb_claim_interface(usb_dev_handle * dev
 int
 usb_release_interface(usb_dev_handle * dev, int interface)
 {
-	int err;
-
-	err = libusb20_dev_release_interface((void *)dev, interface);
-
-	if (err)
-		return (-1);
-
+	/* do nothing */
 	return (0);
 }
 
 int
 usb_set_altinterface(usb_dev_handle * dev, int alternate)
 {
+	struct libusb20_device *pdev = (void *)dev;
 	int err;
 	uint8_t iface;
 
-	iface = usb_get_first_claimed_interface(dev);
+	iface = pdev->claimed_interface;
 
 	err = libusb20_dev_set_alt_index((void *)dev, iface, alternate);
 

Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_int.h
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb20_int.h	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb20_int.h	Sat Jun 13 08:04:56 2009	(r194100)
@@ -90,14 +90,12 @@ typedef int (libusb20_dummy_int_t)(void)
 typedef void (libusb20_dummy_void_t)(void);
 
 /* USB device specific */
-typedef int (libusb20_claim_interface_t)(struct libusb20_device *pdev, uint8_t iface_index);
 typedef int (libusb20_detach_kernel_driver_t)(struct libusb20_device *pdev, uint8_t iface_index);
 typedef int (libusb20_do_request_sync_t)(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags);
 typedef int (libusb20_get_config_desc_full_t)(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t index);
 typedef int (libusb20_get_config_index_t)(struct libusb20_device *pdev, uint8_t *pindex);
 typedef int (libusb20_kernel_driver_active_t)(struct libusb20_device *pdev, uint8_t iface_index);
 typedef int (libusb20_process_t)(struct libusb20_device *pdev);
-typedef int (libusb20_release_interface_t)(struct libusb20_device *pdev, uint8_t iface_index);
 typedef int (libusb20_reset_device_t)(struct libusb20_device *pdev);
 typedef int (libusb20_set_power_mode_t)(struct libusb20_device *pdev, uint8_t power_mode);
 typedef int (libusb20_get_power_mode_t)(struct libusb20_device *pdev, uint8_t *power_mode);
@@ -112,14 +110,12 @@ typedef void (libusb20_tr_submit_t)(stru
 typedef void (libusb20_tr_cancel_async_t)(struct libusb20_transfer *xfer);
 
 #define	LIBUSB20_DEVICE(m,n) \
-  m(n, claim_interface) \
   m(n, detach_kernel_driver) \
   m(n, do_request_sync) \
   m(n, get_config_desc_full) \
   m(n, get_config_index) \
   m(n, kernel_driver_active) \
   m(n, process) \
-  m(n, release_interface) \
   m(n, reset_device) \
   m(n, set_power_mode) \
   m(n, get_power_mode) \
@@ -198,8 +194,8 @@ struct libusb20_device {
 	/* libUSB v0.1 compat data */
 	void   *priv01Data;
 
-	/* claimed interfaces */
-	uint32_t claimed_interfaces;
+	/* claimed interface */
+	uint8_t claimed_interface;
 
 	/* device file handle */
 	int	file;

Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c
==============================================================================
--- projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -67,8 +67,6 @@ const struct libusb20_backend_methods li
 static libusb20_get_config_desc_full_t ugen20_get_config_desc_full;
 static libusb20_get_config_index_t ugen20_get_config_index;
 static libusb20_set_config_index_t ugen20_set_config_index;
-static libusb20_claim_interface_t ugen20_claim_interface;
-static libusb20_release_interface_t ugen20_release_interface;
 static libusb20_set_alt_index_t ugen20_set_alt_index;
 static libusb20_reset_device_t ugen20_reset_device;
 static libusb20_set_power_mode_t ugen20_set_power_mode;
@@ -517,28 +515,6 @@ ugen20_set_config_index(struct libusb20_
 }
 
 static int
-ugen20_claim_interface(struct libusb20_device *pdev, uint8_t iface_index)
-{
-	int temp = iface_index;
-
-	if (ioctl(pdev->file_ctrl, USB_CLAIM_INTERFACE, &temp)) {
-		return (LIBUSB20_ERROR_OTHER);
-	}
-	return (0);
-}
-
-static int
-ugen20_release_interface(struct libusb20_device *pdev, uint8_t iface_index)
-{
-	int temp = iface_index;
-
-	if (ioctl(pdev->file_ctrl, USB_RELEASE_INTERFACE, &temp)) {
-		return (LIBUSB20_ERROR_OTHER);
-	}
-	return (0);
-}
-
-static int
 ugen20_set_alt_index(struct libusb20_device *pdev,
     uint8_t iface_index, uint8_t alt_index)
 {

Modified: projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3
==============================================================================
--- projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3	Sat Jun 13 08:04:56 2009	(r194100)
@@ -35,6 +35,7 @@
 .Lb libutil
 .Sh SYNOPSIS
 .In sys/types.h
+.In sys/user.h
 .In libutil.h
 .Ft struct kinfo_file *
 .Fn kinfo_getfile "pid_t pid" "int *cntp"
@@ -58,7 +59,7 @@ mib.
 While the kernel returns a packed structure, this function expands the
 data into a fixed record format.
 .Sh RETURN VALUES
-The
+On success the
 .Fn kinfo_getfile
 function returns a pointer to an array of
 .Vt struct kinfo_file
@@ -67,6 +68,10 @@ The array was obtained by an internal ca
 .Xr malloc 3
 and must be freed by the caller with a call to
 .Xr free 3 .
+On failure the
+.Fn kinfo_getfile
+function returns
+.Dv NULL .
 .Sh SEE ALSO
 .Xr free 3 ,
 .Xr kinfo_getvmmap 3 ,

Modified: projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3
==============================================================================
--- projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3	Sat Jun 13 08:04:56 2009	(r194100)
@@ -35,6 +35,7 @@
 .Lb libutil
 .Sh SYNOPSIS
 .In sys/types.h
+.In sys/user.h
 .In libutil.h
 .Ft struct kinfo_vmentry *
 .Fn kinfo_getfile "pid_t pid" "int *cntp"
@@ -58,7 +59,7 @@ mib.
 While the kernel returns a packed structure, this function expands the
 data into a fixed record format.
 .Sh RETURN VALUES
-The
+On success the
 .Fn kinfo_getvmmap
 function returns a pointer to an array of
 .Vt struct kinfo_vmentry
@@ -67,6 +68,10 @@ The array was obtained by an internal ca
 .Xr malloc 3
 and must be freed by the caller with a call to
 .Xr free 3 .
+On failure the
+.Fn kinfo_getvmmap
+function returns
+.Dv NULL .
 .Sh SEE ALSO
 .Xr free 3 ,
 .Xr kinfo_getfile 3 ,

Modified: projects/openssl_098_merge_8/lib/msun/src/math_private.h
==============================================================================
--- projects/openssl_098_merge_8/lib/msun/src/math_private.h	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/lib/msun/src/math_private.h	Sat Jun 13 08:04:56 2009	(r194100)
@@ -262,7 +262,7 @@ irint(double x)
 {
 	int n;
 
-	asm("cvtsd2si %1,%0" : "=r" (n) : "Y" (x));
+	asm("cvtsd2si %1,%0" : "=r" (n) : "x" (x));
 	return (n);
 }
 #define	HAVE_EFFICIENT_IRINT

Modified: projects/openssl_098_merge_8/sbin/dhclient/dhclient.c
==============================================================================
--- projects/openssl_098_merge_8/sbin/dhclient/dhclient.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/sbin/dhclient/dhclient.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -1977,7 +1977,7 @@ supersede:
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "prepend option",
 						    dhcp_options[i].name);
@@ -1996,24 +1996,34 @@ supersede:
 					dp[len] = '\0';
 					break;
 				case ACTION_APPEND:
+					/*
+					 * When we append, we assume that we're
+					 * appending to text.  Some MS servers
+					 * include a NUL byte at the end of
+					 * the search string provided.
+					 */
 					len = ip->client->
 					    config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "append option",
 						    dhcp_options[i].name);
 						goto supersede;
 					}
-					dp = dbuf;
-					memcpy(dp,
+					memcpy(dbuf,
 						lease->options[i].data,
 						lease->options[i].len);
-					memcpy(dp + lease->options[i].len,
+					for (dp = dbuf + lease->options[i].len;
+					    dp > dbuf; dp--, len--)
+						if (dp[-1] != '\0')
+							break;
+					memcpy(dp,
 						ip->client->
 						config->defaults[i].data,
 						ip->client->
 						config->defaults[i].len);
+					dp = dbuf;
 					dp[len] = '\0';
 				}
 			} else {

Modified: projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8
==============================================================================
--- projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8	Sat Jun 13 08:04:56 2009	(r194100)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 1995
+.Dd June 4, 2009
 .Dt FSCK_MSDOSFS 8
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@
 .Sh SYNOPSIS
 .Nm
 .Fl p
-.Op Fl f
+.Op Fl Cf
 .Ar filesystem ...
 .Nm
-.Op Fl ny
+.Op Fl Cny
 .Ar filesystem ...
 .Sh DESCRIPTION
 The
@@ -80,6 +80,10 @@ making any changes.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl C
+Compatibility with the corresponding
+.Xr fsck 8
+option (skip check if clean), defined to no-op.
 .It Fl F
 Compatibility with the wrapper
 .Xr fsck 8

Modified: projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c
==============================================================================
--- projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c	Sat Jun 13 08:04:56 2009	(r194100)
@@ -74,8 +74,10 @@ main(int argc, char **argv)
 	int ch;
 
 	skipclean = 1;
-	while ((ch = getopt(argc, argv, "fFnpy")) != -1) {
+	while ((ch = getopt(argc, argv, "CfFnpy")) != -1) {
 		switch (ch) {
+		case 'C': /* for fsck_ffs compatibility */
+			break;
 		case 'f':
 			skipclean = 0;
 			break;

Modified: projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8
==============================================================================
--- projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8	Sat Jun 13 04:56:45 2009	(r194099)
+++ projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8	Sat Jun 13 08:04:56 2009	(r194100)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 13:49:13 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 837931065694;
	Sat, 13 Jun 2009 13:49:13 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BDD48FC1B;
	Sat, 13 Jun 2009 13:49:13 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DDnDJU015459;
	Sat, 13 Jun 2009 13:49:13 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DDnDKH015455;
	Sat, 13 Jun 2009 13:49:13 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131349.n5DDnDKH015455@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 13:49:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194108 - in
	projects/openssl_098_merge_8/crypto/openssl: . apps certs
	certs/demo certs/expired crypto crypto/aes crypto/aes/asm
	crypto/asn1 crypto/bf crypto/bio crypto/bn crypto/bn/asm...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 13:49:14 -0000

Author: simon
Date: Sat Jun 13 13:49:12 2009
New Revision: 194108
URL: http://svn.freebsd.org/changeset/base/194108

Log:
  Merge OpenSSL 0.9.8k into FreeBSD base.

Added:
  projects/openssl_098_merge_8/crypto/openssl/apps/cms.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/cms.c
  projects/openssl_098_merge_8/crypto/openssl/apps/genpkey.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/genpkey.c
  projects/openssl_098_merge_8/crypto/openssl/apps/md4.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/md4.c
  projects/openssl_098_merge_8/crypto/openssl/apps/pkey.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/pkey.c
  projects/openssl_098_merge_8/crypto/openssl/apps/pkeyparam.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/pkeyparam.c
  projects/openssl_098_merge_8/crypto/openssl/apps/pkeyutl.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/pkeyutl.c
  projects/openssl_098_merge_8/crypto/openssl/apps/ts.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/ts.c
  projects/openssl_098_merge_8/crypto/openssl/apps/tsget
     - copied unchanged from r194101, vendor-crypto/openssl/dist/apps/tsget
  projects/openssl_098_merge_8/crypto/openssl/certs/README.RootCerts
     - copied unchanged from r194101, vendor-crypto/openssl/dist/certs/README.RootCerts
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes_wrap.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/aes_wrap.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes_x86core.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/aes_x86core.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-armv4.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/asm/aes-armv4.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-ppc.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/asm/aes-ppc.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-s390x.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/asm/aes-s390x.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/asm/aes-sparcv9.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-x86_64.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/aes/asm/aes-x86_64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/ameth_lib.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/ameth_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1_locl.h
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/asn1_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn_mime.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/asn_mime.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/bio_asn1.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/bio_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/bio_ndef.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/bio_ndef.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_nx509.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/asn1/x_nx509.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/alpha-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/alpha-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/armv4-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/armv4-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/mips3-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/mips3-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/mo-586.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/mo-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/ppc-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/ppc-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/ppc64-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/ppc64-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/s390x-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/s390x-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/s390x.S
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/s390x.S
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/sparcv9-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/sparcv9a-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/via-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/via-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/x86-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/x86-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/x86_64-mont.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/asm/x86_64-mont.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_opt.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/bn_opt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_x931p.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/bn/bn_x931p.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/buffer/buf_str.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/buffer/buf_str.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/camellia/asm/
     - copied from r194101, vendor-crypto/openssl/dist/crypto/camellia/asm/
  projects/openssl_098_merge_8/crypto/openssl/crypto/cms/
     - copied from r194101, vendor-crypto/openssl/dist/crypto/cms/
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/des_lib.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/des/des_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_utl.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/dsa/dsa_utl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dyn_lck.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/dyn_lck.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err_bio.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/err/err_bio.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err_def.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/err/err_def.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err_str.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/err/err_str.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/dig_eng.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/evp/dig_eng.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_seed.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/evp/e_seed.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/enc_min.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/evp/enc_min.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_cnf.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/evp/evp_cnf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/fips_err.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/fips_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/fips_err.h
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/fips_err.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/jpake/
     - copied from r194101, vendor-crypto/openssl/dist/crypto/jpake/
  projects/openssl_098_merge_8/crypto/openssl/crypto/o_init.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/o_init.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ppccpuid.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/ppccpuid.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_eng.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/rand/rand_eng.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/rc4_fblk.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/rc4/rc4_fblk.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eng.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/rsa/rsa_eng.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_x931g.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/rsa/rsa_x931g.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/s390xcpuid.S
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/s390xcpuid.S
  projects/openssl_098_merge_8/crypto/openssl/crypto/seed/
     - copied from r194101, vendor-crypto/openssl/dist/crypto/seed/
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/sha/asm/sha1-x86_64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/sha/asm/sha512-x86_64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/sparcv9cap.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/crypto/sparcv9cap.c
  projects/openssl_098_merge_8/crypto/openssl/demos/jpake/
     - copied from r194101, vendor-crypto/openssl/dist/demos/jpake/
  projects/openssl_098_merge_8/crypto/openssl/engines/e_capi.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/engines/e_capi.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_capi.ec
     - copied unchanged from r194101, vendor-crypto/openssl/dist/engines/e_capi.ec
  projects/openssl_098_merge_8/crypto/openssl/engines/e_capi_err.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/engines/e_capi_err.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_capi_err.h
     - copied unchanged from r194101, vendor-crypto/openssl/dist/engines/e_capi_err.h
  projects/openssl_098_merge_8/crypto/openssl/fips/
     - copied from r194101, vendor-crypto/openssl/dist/fips/
  projects/openssl_098_merge_8/crypto/openssl/test/SHAmix.r
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/SHAmix.r
  projects/openssl_098_merge_8/crypto/openssl/test/SHAmix.x
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/SHAmix.x
  projects/openssl_098_merge_8/crypto/openssl/test/bftest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/bftest.c
  projects/openssl_098_merge_8/crypto/openssl/test/bntest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/bntest.c
  projects/openssl_098_merge_8/crypto/openssl/test/casttest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/casttest.c
  projects/openssl_098_merge_8/crypto/openssl/test/cms-examples.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/cms-examples.pl
  projects/openssl_098_merge_8/crypto/openssl/test/cms-test.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/cms-test.pl
  projects/openssl_098_merge_8/crypto/openssl/test/destest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/destest.c
  projects/openssl_098_merge_8/crypto/openssl/test/dhtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/dhtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/dsatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/dsatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/ecdhtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/ecdhtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/ecdsatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/ecdsatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/ectest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/ectest.c
  projects/openssl_098_merge_8/crypto/openssl/test/enginetest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/enginetest.c
  projects/openssl_098_merge_8/crypto/openssl/test/evp_test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/evp_test.c
  projects/openssl_098_merge_8/crypto/openssl/test/exptest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/exptest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_aesavs.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_aesavs.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_desmovs.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_desmovs.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_dsatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_dsatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_dssvs.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_dssvs.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_hmactest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_hmactest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_randtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_randtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_rngvs.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_rngvs.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_rsagtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_rsagtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_rsastest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_rsastest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_rsavtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_rsavtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_shatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_shatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/fips_test_suite.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/fips_test_suite.c
  projects/openssl_098_merge_8/crypto/openssl/test/hmactest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/hmactest.c
  projects/openssl_098_merge_8/crypto/openssl/test/ideatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/ideatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/jpaketest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/jpaketest.c
  projects/openssl_098_merge_8/crypto/openssl/test/md2test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/md2test.c
  projects/openssl_098_merge_8/crypto/openssl/test/md4test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/md4test.c
  projects/openssl_098_merge_8/crypto/openssl/test/md5test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/md5test.c
  projects/openssl_098_merge_8/crypto/openssl/test/mdc2test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/mdc2test.c
  projects/openssl_098_merge_8/crypto/openssl/test/randtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/randtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/rc2test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/rc2test.c
  projects/openssl_098_merge_8/crypto/openssl/test/rc4test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/rc4test.c
  projects/openssl_098_merge_8/crypto/openssl/test/rc5test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/rc5test.c
  projects/openssl_098_merge_8/crypto/openssl/test/rmdtest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/rmdtest.c
  projects/openssl_098_merge_8/crypto/openssl/test/rsa_test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/rsa_test.c
  projects/openssl_098_merge_8/crypto/openssl/test/sha1test.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/sha1test.c
  projects/openssl_098_merge_8/crypto/openssl/test/sha256t.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/sha256t.c
  projects/openssl_098_merge_8/crypto/openssl/test/sha512t.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/sha512t.c
  projects/openssl_098_merge_8/crypto/openssl/test/shatest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/shatest.c
  projects/openssl_098_merge_8/crypto/openssl/test/smcont.txt
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/smcont.txt
  projects/openssl_098_merge_8/crypto/openssl/test/smime-certs/
     - copied from r194101, vendor-crypto/openssl/dist/test/smime-certs/
  projects/openssl_098_merge_8/crypto/openssl/test/ssltest.c
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/ssltest.c
  projects/openssl_098_merge_8/crypto/openssl/test/testfipsssl   (props changed)
     - copied unchanged from r194101, vendor-crypto/openssl/dist/test/testfipsssl
  projects/openssl_098_merge_8/crypto/openssl/util/arx.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/util/arx.pl
  projects/openssl_098_merge_8/crypto/openssl/util/fipslink.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/util/fipslink.pl
  projects/openssl_098_merge_8/crypto/openssl/util/mksdef.pl
     - copied unchanged from r194101, vendor-crypto/openssl/dist/util/mksdef.pl
Deleted:
  projects/openssl_098_merge_8/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head
  projects/openssl_098_merge_8/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS
  projects/openssl_098_merge_8/crypto/openssl/certs/RegTP-5R.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/RegTP-6R.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/aol1.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/aol2.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/aoltw1.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/aoltw2.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/argena.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/argeng.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/demo/nortelCA.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/demo/timCA.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/demo/tjhCA.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/demo/vsigntca.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/eng1.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/eng2.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/eng3.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/eng4.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/eng5.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/ICE-CA.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/ICE-root.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/ICE-user.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/RegTP-4R.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/factory.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/rsa-cca.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/rsa-ssca.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/vsign2.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/expired/vsign3.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/thawteCb.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/thawteCp.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/vsign1.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/vsign3.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/vsignss.pem
  projects/openssl_098_merge_8/crypto/openssl/certs/wellsfgo.pem
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/asm/md5-sparcv9.S
Modified:
  projects/openssl_098_merge_8/crypto/openssl/   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/CHANGES
  projects/openssl_098_merge_8/crypto/openssl/Configure
  projects/openssl_098_merge_8/crypto/openssl/FAQ
  projects/openssl_098_merge_8/crypto/openssl/INSTALL
  projects/openssl_098_merge_8/crypto/openssl/LICENSE
  projects/openssl_098_merge_8/crypto/openssl/Makefile
  projects/openssl_098_merge_8/crypto/openssl/Makefile.org
  projects/openssl_098_merge_8/crypto/openssl/Makefile.shared
  projects/openssl_098_merge_8/crypto/openssl/NEWS
  projects/openssl_098_merge_8/crypto/openssl/README
  projects/openssl_098_merge_8/crypto/openssl/apps/Makefile
  projects/openssl_098_merge_8/crypto/openssl/apps/apps.c
  projects/openssl_098_merge_8/crypto/openssl/apps/apps.h
  projects/openssl_098_merge_8/crypto/openssl/apps/asn1pars.c
  projects/openssl_098_merge_8/crypto/openssl/apps/ca.c
  projects/openssl_098_merge_8/crypto/openssl/apps/crl.c
  projects/openssl_098_merge_8/crypto/openssl/apps/dgst.c
  projects/openssl_098_merge_8/crypto/openssl/apps/dsa.c
  projects/openssl_098_merge_8/crypto/openssl/apps/ec.c
  projects/openssl_098_merge_8/crypto/openssl/apps/enc.c
  projects/openssl_098_merge_8/crypto/openssl/apps/engine.c
  projects/openssl_098_merge_8/crypto/openssl/apps/gendsa.c
  projects/openssl_098_merge_8/crypto/openssl/apps/genrsa.c
  projects/openssl_098_merge_8/crypto/openssl/apps/nseq.c
  projects/openssl_098_merge_8/crypto/openssl/apps/ocsp.c
  projects/openssl_098_merge_8/crypto/openssl/apps/openssl.c
  projects/openssl_098_merge_8/crypto/openssl/apps/pkcs12.c
  projects/openssl_098_merge_8/crypto/openssl/apps/pkcs8.c
  projects/openssl_098_merge_8/crypto/openssl/apps/progs.h
  projects/openssl_098_merge_8/crypto/openssl/apps/progs.pl
  projects/openssl_098_merge_8/crypto/openssl/apps/rand.c
  projects/openssl_098_merge_8/crypto/openssl/apps/req.c
  projects/openssl_098_merge_8/crypto/openssl/apps/rsa.c
  projects/openssl_098_merge_8/crypto/openssl/apps/rsautl.c
  projects/openssl_098_merge_8/crypto/openssl/apps/s_apps.h
  projects/openssl_098_merge_8/crypto/openssl/apps/s_cb.c
  projects/openssl_098_merge_8/crypto/openssl/apps/s_client.c
  projects/openssl_098_merge_8/crypto/openssl/apps/s_server.c
  projects/openssl_098_merge_8/crypto/openssl/apps/smime.c
  projects/openssl_098_merge_8/crypto/openssl/apps/speed.c
  projects/openssl_098_merge_8/crypto/openssl/apps/spkac.c
  projects/openssl_098_merge_8/crypto/openssl/apps/version.c
  projects/openssl_098_merge_8/crypto/openssl/apps/x509.c
  projects/openssl_098_merge_8/crypto/openssl/config
  projects/openssl_098_merge_8/crypto/openssl/crypto/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes_cbc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes_core.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/aes_ige.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/aes/asm/aes-ia64.S
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_bytes.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_mbstr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_object.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_sign.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_strex.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_strnid.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_type.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/a_verify.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1_gen.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1_par.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn1t.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn_moid.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/asn_pack.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/nsseq.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/p5_pbe.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/p5_pbev2.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/p8_pkey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_bitst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_crl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_req.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_spki.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_x509.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/t_x509a.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_dec.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_enc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_fre.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_new.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_prn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_typ.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/tasn_utl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_algor.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_bignum.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_crl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_exten.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_long.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_name.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/asn1/x_x509a.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bf/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/bf/bf_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bf/blowfish.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/b_print.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/b_sock.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bio.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bss_bio.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bss_dgram.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bss_file.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bss_mem.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bio/bss_sock.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/asm/ia64.S
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_blind.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_div.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_exp.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_gcd.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_gf2m.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_lcl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_mont.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_mul.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_nist.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_prime.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_prime.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_prime.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_rand.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bn_shift.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/bn/bntest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/buffer/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/buffer/buffer.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/camellia/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/camellia/camellia.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/camellia/cmll_misc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/cast/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/cast/c_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/cast/cast.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/comp/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/comp/c_zlib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/comp/comp.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/comp/comp_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/conf.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/conf_api.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/conf_mall.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/conf_mod.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/conf/conf_sap.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/cryptlib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/cryptlib.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/crypto.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/asm/des_enc.m4
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/des.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/des_enc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/des_old.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/des_old.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/ecb_enc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/enc_read.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/enc_writ.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/set_key.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/times/usparc.cc
  projects/openssl_098_merge_8/crypto/openssl/crypto/des/xcbc_enc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh_check.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh_gen.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dh/dh_key.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_gen.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_key.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_ossl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_sign.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dsa/dsa_vrf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/dso/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/ec.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/ec_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/ec_key.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/ec_mult.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ec/ectest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ecdh/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ecdh/ecdhtest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ecdsa/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ecdsa/ecdsatest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ecdsa/ecs_ossl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_all.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_cnf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_int.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_padlock.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_pkey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_table.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/engine.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/enginetest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err_all.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/err_prn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/err/openssl.ec
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/bio_md.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/c_allc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/digest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_aes.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_camellia.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_des.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_des3.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_null.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/e_rc4.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_acnf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_enc.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_pbe.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_pkey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evp_test.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/evptests.txt
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_dss.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_dss1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_md2.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_md4.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_md5.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_mdc2.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_sha.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/m_sha1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/names.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/p5_crpt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/p5_crpt2.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/p_sign.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/evp/p_verify.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ex_data.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/hmac/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/hmac/hmac.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/hmac/hmac.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/idea/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/idea/i_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/idea/idea.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/krb5/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/lhash/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/md2/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/md2/md2.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md2/md2_dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/md32_common.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md4/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/md4/md4.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md4/md4_dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/md4/md4_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md4/md4test.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/asm/md5-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/asm/md5-x86_64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/md5.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/md5_dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/md5_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/md5/md5test.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/mdc2/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/mdc2/mdc2.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/mdc2/mdc2dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/mem.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/mem_clr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/mem_dbg.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/o_str.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/obj_dat.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/obj_dat.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/obj_dat.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/obj_mac.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/obj_mac.num
  projects/openssl_098_merge_8/crypto/openssl/crypto/objects/objects.txt
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp_asn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp_ht.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp_srv.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ocsp/ocsp_vfy.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/opensslconf.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/opensslconf.h.in
  projects/openssl_098_merge_8/crypto/openssl/crypto/opensslv.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/ossl_typ.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem_all.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem_info.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem_x509.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pem/pem_xaux.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/perlasm/x86_64-xlate.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/perlasm/x86ms.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/perlasm/x86nasm.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/perlasm/x86unix.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_add.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_asn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_attr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_crpt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_crt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_decr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_init.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_key.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_kiss.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_mutl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_npas.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_p8d.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_p8e.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/p12_utl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs12/pkcs12.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/p7/a1   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/p7/a2   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/p7/cert.p7c   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/p7/smime.p7m   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/p7/smime.p7s   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/pk7_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/pk7_attr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/pk7_mime.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pkcs7/pk7_smime.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/pqueue/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/pqueue/pq_compat.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/md_rand.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_lcl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_nw.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/rand_unix.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rand/randfile.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc2/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc2/rc2.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc2/rc2_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/asm/rc4-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/asm/rc4-ia64.S
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/rc4.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc4/rc4_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc5/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc5/rc5.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rc5/rc5_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/README
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/asm/rmd-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/ripemd.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/rmd_dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/rmd_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/ripemd/rmdtest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eay.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_err.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_gen.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_null.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_oaep.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_pss.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_sign.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_ssl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_test.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_x931.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/asm/sha1-586.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/asm/sha1-ia64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/asm/sha512-ia64.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha1_one.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha1dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha1test.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha256.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha512.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha_dgst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/sha_locl.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/sha/shatest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/stack/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/stack/safestack.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/store/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/store/str_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/symhacks.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/txt_db/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ui/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/ui/ui_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/ui/ui_openssl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/by_dir.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_att.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_cmp.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_trs.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_txt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_vfy.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509_vpm.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509cset.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509/x509spki.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/Makefile
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/ext_dat.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_cache.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_data.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_int.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_map.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_node.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/pcy_tree.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/tabtest.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_addr.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_akey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_akeya.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_alt.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_asid.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_bcons.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_bitst.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_conf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_cpols.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_crld.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_enum.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_extku.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_genn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_ia5.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_info.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_int.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_lib.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_ncons.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_ocsp.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_pci.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_pcons.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_pku.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_pmaps.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_prn.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_purp.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_skey.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_sxnet.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3_utl.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3conf.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/v3prin.c
  projects/openssl_098_merge_8/crypto/openssl/crypto/x509v3/x509v3.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/x86_64cpuid.pl
  projects/openssl_098_merge_8/crypto/openssl/crypto/x86cpuid.pl
  projects/openssl_098_merge_8/crypto/openssl/demos/asn1/ocsp.c
  projects/openssl_098_merge_8/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h
  projects/openssl_098_merge_8/crypto/openssl/demos/engines/ibmca/hw_ibmca_err.h
  projects/openssl_098_merge_8/crypto/openssl/demos/engines/zencod/hw_zencod_err.h
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/ciphers.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/dgst.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/enc.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/ocsp.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/openssl.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/rand.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/rsautl.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/s_client.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/s_server.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/verify.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/apps/x509.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/c-indentation.el
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/DH_set_method.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/DSA_set_method.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/RAND_bytes.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/RAND_egd.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/RAND_set_rand_method.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/RSA_set_method.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/des_modes.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/crypto/engine.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/openssl_button.gif   (props changed)
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_SESSION_free.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_free.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssl/SSL_read.pod
  projects/openssl_098_merge_8/crypto/openssl/doc/ssleay.txt
  projects/openssl_098_merge_8/crypto/openssl/doc/standards.txt
  projects/openssl_098_merge_8/crypto/openssl/e_os.h
  projects/openssl_098_merge_8/crypto/openssl/engines/Makefile
  projects/openssl_098_merge_8/crypto/openssl/engines/e_4758cca_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_aep.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_aep_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_atalla_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_chil.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_chil_err.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_chil_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_cswift_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_gmp.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_gmp_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_nuron_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_sureware_err.h
  projects/openssl_098_merge_8/crypto/openssl/engines/e_ubsec.c
  projects/openssl_098_merge_8/crypto/openssl/engines/e_ubsec_err.h
  projects/openssl_098_merge_8/crypto/openssl/openssl.spec
  projects/openssl_098_merge_8/crypto/openssl/ssl/Makefile
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_both.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_clnt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_enc.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_lib.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_pkt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/d1_srvr.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/dtls1.h
  projects/openssl_098_merge_8/crypto/openssl/ssl/kssl.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s23_clnt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s23_srvr.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s2_clnt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s2_srvr.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s3_clnt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s3_enc.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s3_lib.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s3_pkt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/s3_srvr.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl.h
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl3.h
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_algs.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_asn1.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_cert.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_ciph.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_err.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_lib.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_locl.h
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_rsa.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_sess.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_stat.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssl_txt.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/ssltest.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/t1_enc.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/t1_lib.c
  projects/openssl_098_merge_8/crypto/openssl/ssl/tls1.h
  projects/openssl_098_merge_8/crypto/openssl/test/CAss.cnf
  projects/openssl_098_merge_8/crypto/openssl/test/Makefile
  projects/openssl_098_merge_8/crypto/openssl/test/Uss.cnf
  projects/openssl_098_merge_8/crypto/openssl/test/evptests.txt
  projects/openssl_098_merge_8/crypto/openssl/test/igetest.c
  projects/openssl_098_merge_8/crypto/openssl/test/times
  projects/openssl_098_merge_8/crypto/openssl/util/clean-depend.pl
  projects/openssl_098_merge_8/crypto/openssl/util/copy.pl
  projects/openssl_098_merge_8/crypto/openssl/util/domd
  projects/openssl_098_merge_8/crypto/openssl/util/libeay.num
  projects/openssl_098_merge_8/crypto/openssl/util/mk1mf.pl
  projects/openssl_098_merge_8/crypto/openssl/util/mkdef.pl
  projects/openssl_098_merge_8/crypto/openssl/util/mkerr.pl
  projects/openssl_098_merge_8/crypto/openssl/util/mkfiles.pl
  projects/openssl_098_merge_8/crypto/openssl/util/mklink.pl
  projects/openssl_098_merge_8/crypto/openssl/util/opensslwrap.sh
  projects/openssl_098_merge_8/crypto/openssl/util/pl/VC-32.pl
  projects/openssl_098_merge_8/crypto/openssl/util/pl/netware.pl
  projects/openssl_098_merge_8/crypto/openssl/util/shlib_wrap.sh
  projects/openssl_098_merge_8/crypto/openssl/util/ssleay.num

Modified: projects/openssl_098_merge_8/crypto/openssl/CHANGES
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/CHANGES	Sat Jun 13 13:35:18 2009	(r194107)
+++ projects/openssl_098_merge_8/crypto/openssl/CHANGES	Sat Jun 13 13:49:12 2009	(r194108)
@@ -2,13 +2,455 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8d and 0.9.8e  [23 Feb 2007]
+ Changes between 0.9.8j and 0.9.8k  [25 Mar 2009]
+
+  *) Don't set val to NULL when freeing up structures, it is freed up by
+     underlying code. If sizeof(void *) > sizeof(long) this can result in
+     zeroing past the valid field. (CVE-2009-0789)
+     [Paolo Ganci <Paolo.Ganci@AdNovum.CH>]
+
+  *) Fix bug where return value of CMS_SignerInfo_verify_content() was not
+     checked correctly. This would allow some invalid signed attributes to
+     appear to verify correctly. (CVE-2009-0591)
+     [Ivan Nestlerode <inestlerode@us.ibm.com>]
+
+  *) Reject UniversalString and BMPString types with invalid lengths. This
+     prevents a crash in ASN1_STRING_print_ex() which assumes the strings have
+     a legal length. (CVE-2009-0590)
+     [Steve Henson]
+
+  *) Set S/MIME signing as the default purpose rather than setting it 
+     unconditionally. This allows applications to override it at the store
+     level.
+     [Steve Henson]
+
+  *) Permit restricted recursion of ASN1 strings. This is needed in practice
+     to handle some structures.
+     [Steve Henson]
+
+  *) Improve efficiency of mem_gets: don't search whole buffer each time
+     for a '\n'
+     [Jeremy Shapiro <jnshapir@us.ibm.com>]
+
+  *) New -hex option for openssl rand.
+     [Matthieu Herrb]
+
+  *) Print out UTF8String and NumericString when parsing ASN1.
+     [Steve Henson]
+
+  *) Support NumericString type for name components.
+     [Steve Henson]
+
+  *) Allow CC in the environment to override the automatically chosen
+     compiler. Note that nothing is done to ensure flags work with the
+     chosen compiler.
+     [Ben Laurie]
+
+ Changes between 0.9.8i and 0.9.8j  [07 Jan 2009]
+
+  *) Properly check EVP_VerifyFinal() and similar return values
+     (CVE-2008-5077).
+     [Ben Laurie, Bodo Moeller, Google Security Team]
+
+  *) Enable TLS extensions by default.
+     [Ben Laurie]
+
+  *) Allow the CHIL engine to be loaded, whether the application is
+     multithreaded or not. (This does not release the developer from the
+     obligation to set up the dynamic locking callbacks.)
+     [Sander Temme <sander@temme.net>]
+
+  *) Use correct exit code if there is an error in dgst command.
+     [Steve Henson; problem pointed out by Roland Dirlewanger]
+
+  *) Tweak Configure so that you need to say "experimental-jpake" to enable
+     JPAKE, and need to use -DOPENSSL_EXPERIMENTAL_JPAKE in applications.
+     [Bodo Moeller]
+
+  *) Add experimental JPAKE support, including demo authentication in
+     s_client and s_server.
+     [Ben Laurie]
+
+  *) Set the comparison function in v3_addr_canonize().
+     [Rob Austein <sra@hactrn.net>]
+
+  *) Add support for XMPP STARTTLS in s_client.
+     [Philip Paeps <philip@freebsd.org>]
+
+  *) Change the server-side SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG behavior
+     to ensure that even with this option, only ciphersuites in the
+     server's preference list will be accepted.  (Note that the option
+     applies only when resuming a session, so the earlier behavior was
+     just about the algorithm choice for symmetric cryptography.)
+     [Bodo Moeller]
+
+ Changes between 0.9.8h and 0.9.8i  [15 Sep 2008]
+
+  *) Fix a state transitition in s3_srvr.c and d1_srvr.c
+     (was using SSL3_ST_CW_CLNT_HELLO_B, should be ..._ST_SW_SRVR_...).
+     [Nagendra Modadugu]
+
+  *) The fix in 0.9.8c that supposedly got rid of unsafe
+     double-checked locking was incomplete for RSA blinding,
+     addressing just one layer of what turns out to have been
+     doubly unsafe triple-checked locking.
+
+     So now fix this for real by retiring the MONT_HELPER macro
+     in crypto/rsa/rsa_eay.c.
+
+     [Bodo Moeller; problem pointed out by Marius Schilder]
+
+  *) Various precautionary measures:
+
+     - Avoid size_t integer overflow in HASH_UPDATE (md32_common.h).
+
+     - Avoid a buffer overflow in d2i_SSL_SESSION() (ssl_asn1.c).
+       (NB: This would require knowledge of the secret session ticket key
+       to exploit, in which case you'd be SOL either way.)
+
+     - Change bn_nist.c so that it will properly handle input BIGNUMs
+       outside the expected range.
+
+     - Enforce the 'num' check in BN_div() (bn_div.c) for non-BN_DEBUG
+       builds.
+
+     [Neel Mehta, Bodo Moeller]
+
+  *) Allow engines to be "soft loaded" - i.e. optionally don't die if
+     the load fails. Useful for distros.
+     [Ben Laurie and the FreeBSD team]
+
+  *) Add support for Local Machine Keyset attribute in PKCS#12 files.
+     [Steve Henson]
+
+  *) Fix BN_GF2m_mod_arr() top-bit cleanup code.
+     [Huang Ying]
+
+  *) Expand ENGINE to support engine supplied SSL client certificate functions.
+
+     This work was sponsored by Logica.
+     [Steve Henson]
+
+  *) Add CryptoAPI ENGINE to support use of RSA and DSA keys held in Windows
+     keystores. Support for SSL/TLS client authentication too.
+     Not compiled unless enable-capieng specified to Configure.
+
+     This work was sponsored by Logica.
+     [Steve Henson]
+
+  *) Fix bug in X509_ATTRIBUTE creation: dont set attribute using
+     ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain
+     attribute creation routines such as certifcate requests and PKCS#12
+     files.
+     [Steve Henson]
+
+ Changes between 0.9.8g and 0.9.8h  [28 May 2008]
+
+  *) Fix flaw if 'Server Key exchange message' is omitted from a TLS
+     handshake which could lead to a cilent crash as found using the
+     Codenomicon TLS test suite (CVE-2008-1672) 
+     [Steve Henson, Mark Cox]
+
+  *) Fix double free in TLS server name extensions which could lead to
+     a remote crash found by Codenomicon TLS test suite (CVE-2008-0891) 
+     [Joe Orton]
+
+  *) Clear error queue in SSL_CTX_use_certificate_chain_file()
+
+     Clear the error queue to ensure that error entries left from
+     older function calls do not interfere with the correct operation.
+     [Lutz Jaenicke, Erik de Castro Lopo]
+
+  *) Remove root CA certificates of commercial CAs:
+
+     The OpenSSL project does not recommend any specific CA and does not
+     have any policy with respect to including or excluding any CA.
+     Therefore it does not make any sense to ship an arbitrary selection
+     of root CA certificates with the OpenSSL software.
+     [Lutz Jaenicke]
+
+  *) RSA OAEP patches to fix two separate invalid memory reads.
+     The first one involves inputs when 'lzero' is greater than
+     'SHA_DIGEST_LENGTH' (it would read about SHA_DIGEST_LENGTH bytes
+     before the beginning of from). The second one involves inputs where
+     the 'db' section contains nothing but zeroes (there is a one-byte
+     invalid read after the end of 'db').
+     [Ivan Nestlerode <inestlerode@us.ibm.com>]
+
+  *) Partial backport from 0.9.9-dev:
+
+     Introduce bn_mul_mont (dedicated Montgomery multiplication
+     procedure) as a candidate for BIGNUM assembler implementation.
+     While 0.9.9-dev uses assembler for various architectures, only
+     x86_64 is available by default here in the 0.9.8 branch, and
+     32-bit x86 is available through a compile-time setting.
+
+     To try the 32-bit x86 assembler implementation, use Configure
+     option "enable-montasm" (which exists only for this backport).
+
+     As "enable-montasm" for 32-bit x86 disclaims code stability
+     anyway, in this constellation we activate additional code
+     backported from 0.9.9-dev for further performance improvements,
+     namely BN_from_montgomery_word.  (To enable this otherwise,
+     e.g. x86_64, try "-DMONT_FROM_WORD___NON_DEFAULT_0_9_8_BUILD".)
+
+     [Andy Polyakov (backport partially by Bodo Moeller)]
+
+  *) Add TLS session ticket callback. This allows an application to set
+     TLS ticket cipher and HMAC keys rather than relying on hardcoded fixed
+     values. This is useful for key rollover for example where several key
+     sets may exist with different names.
+     [Steve Henson]
+
+  *) Reverse ENGINE-internal logic for caching default ENGINE handles.
+     This was broken until now in 0.9.8 releases, such that the only way
+     a registered ENGINE could be used (assuming it initialises
+     successfully on the host) was to explicitly set it as the default
+     for the relevant algorithms. This is in contradiction with 0.9.7
+     behaviour and the documentation. With this fix, when an ENGINE is
+     registered into a given algorithm's table of implementations, the
+     'uptodate' flag is reset so that auto-discovery will be used next
+     time a new context for that algorithm attempts to select an
+     implementation.
+     [Ian Lister (tweaked by Geoff Thorpe)]
+
+  *) Backport of CMS code to OpenSSL 0.9.8. This differs from the 0.9.9
+     implemention in the following ways:
+
+     Lack of EVP_PKEY_ASN1_METHOD means algorithm parameters have to be
+     hard coded.
+
+     Lack of BER streaming support means one pass streaming processing is
+     only supported if data is detached: setting the streaming flag is
+     ignored for embedded content.
+
+     CMS support is disabled by default and must be explicitly enabled
+     with the enable-cms configuration option.
+     [Steve Henson]
+
+  *) Update the GMP engine glue to do direct copies between BIGNUM and
+     mpz_t when openssl and GMP use the same limb size. Otherwise the
+     existing "conversion via a text string export" trick is still used.
+     [Paul Sheer <paulsheer@gmail.com>]
+
+  *) Zlib compression BIO. This is a filter BIO which compressed and
+     uncompresses any data passed through it.
+     [Steve Henson]
+
+  *) Add AES_wrap_key() and AES_unwrap_key() functions to implement
+     RFC3394 compatible AES key wrapping.
+     [Steve Henson]
+
+  *) Add utility functions to handle ASN1 structures. ASN1_STRING_set0():
+     sets string data without copying. X509_ALGOR_set0() and
+     X509_ALGOR_get0(): set and retrieve X509_ALGOR (AlgorithmIdentifier)
+     data. Attribute function X509at_get0_data_by_OBJ(): retrieves data
+     from an X509_ATTRIBUTE structure optionally checking it occurs only
+     once. ASN1_TYPE_set1(): set and ASN1_TYPE structure copying supplied
+     data.
+     [Steve Henson]
+
+  *) Fix BN flag handling in RSA_eay_mod_exp() and BN_MONT_CTX_set()
+     to get the expected BN_FLG_CONSTTIME behavior.
+     [Bodo Moeller (Google)]
+  
+  *) Netware support:
+
+     - fixed wrong usage of ioctlsocket() when build for LIBC BSD sockets
+     - fixed do_tests.pl to run the test suite with CLIB builds too (CLIB_OPT)
+     - added some more tests to do_tests.pl
+     - fixed RunningProcess usage so that it works with newer LIBC NDKs too
+     - removed usage of BN_LLONG for CLIB builds to avoid runtime dependency
+     - added new Configure targets netware-clib-bsdsock, netware-clib-gcc,
+       netware-clib-bsdsock-gcc, netware-libc-bsdsock-gcc
+     - various changes to netware.pl to enable gcc-cross builds on Win32
+       platform
+     - changed crypto/bio/b_sock.c to work with macro functions (CLIB BSD)
+     - various changes to fix missing prototype warnings
+     - fixed x86nasm.pl to create correct asm files for NASM COFF output
+     - added AES, WHIRLPOOL and CPUID assembler code to build files
+     - added missing AES assembler make rules to mk1mf.pl
+     - fixed order of includes in apps/ocsp.c so that e_os.h settings apply
+     [Guenter Knauf <eflash@gmx.net>]
+
+  *) Implement certificate status request TLS extension defined in RFC3546.
+     A client can set the appropriate parameters and receive the encoded
+     OCSP response via a callback. A server can query the supplied parameters
+     and set the encoded OCSP response in the callback. Add simplified examples
+     to s_client and s_server.
+     [Steve Henson]
+
+ Changes between 0.9.8f and 0.9.8g  [19 Oct 2007]
+
+  *) Fix various bugs:
+     + Binary incompatibility of ssl_ctx_st structure
+     + DTLS interoperation with non-compliant servers
+     + Don't call get_session_cb() without proposed session
+     + Fix ia64 assembler code
+     [Andy Polyakov, Steve Henson]
+
+ Changes between 0.9.8e and 0.9.8f  [11 Oct 2007]
+
+  *) DTLS Handshake overhaul. There were longstanding issues with
+     OpenSSL DTLS implementation, which were making it impossible for
+     RFC 4347 compliant client to communicate with OpenSSL server.
+     Unfortunately just fixing these incompatibilities would "cut off"
+     pre-0.9.8f clients. To allow for hassle free upgrade post-0.9.8e
+     server keeps tolerating non RFC compliant syntax. The opposite is
+     not true, 0.9.8f client can not communicate with earlier server.
+     This update even addresses CVE-2007-4995.
+     [Andy Polyakov]
+
+  *) Changes to avoid need for function casts in OpenSSL: some compilers
+     (gcc 4.2 and later) reject their use.
+     [Kurt Roeckx <kurt@roeckx.be>, Peter Hartley <pdh@utter.chaos.org.uk>,
+      Steve Henson]
+  
+  *) Add RFC4507 support to OpenSSL. This includes the corrections in
+     RFC4507bis. The encrypted ticket format is an encrypted encoded
+     SSL_SESSION structure, that way new session features are automatically
+     supported.
+
+     If a client application caches session in an SSL_SESSION structure
+     support is transparent because tickets are now stored in the encoded
+     SSL_SESSION.
+     
+     The SSL_CTX structure automatically generates keys for ticket
+     protection in servers so again support should be possible
+     with no application modification.
+
+     If a client or server wishes to disable RFC4507 support then the option
+     SSL_OP_NO_TICKET can be set.
+
+     Add a TLS extension debugging callback to allow the contents of any client
+     or server extensions to be examined.
+
+     This work was sponsored by Google.
+     [Steve Henson]
+
+  *) Add initial support for TLS extensions, specifically for the server_name
+     extension so far.  The SSL_SESSION, SSL_CTX, and SSL data structures now
+     have new members for a host name.  The SSL data structure has an
+     additional member SSL_CTX *initial_ctx so that new sessions can be
+     stored in that context to allow for session resumption, even after the
+     SSL has been switched to a new SSL_CTX in reaction to a client's
+     server_name extension.
+
+     New functions (subject to change):
+
+         SSL_get_servername()
+         SSL_get_servername_type()
+         SSL_set_SSL_CTX()
+
+     New CTRL codes and macros (subject to change):
+
+         SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
+                                 - SSL_CTX_set_tlsext_servername_callback()
+         SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG
+                                      - SSL_CTX_set_tlsext_servername_arg()
+         SSL_CTRL_SET_TLSEXT_HOSTNAME           - SSL_set_tlsext_host_name()
+
+     openssl s_client has a new '-servername ...' option.
+
+     openssl s_server has new options '-servername_host ...', '-cert2 ...',
+     '-key2 ...', '-servername_fatal' (subject to change).  This allows
+     testing the HostName extension for a specific single host name ('-cert'
+     and '-key' remain fallbacks for handshakes without HostName
+     negotiation).  If the unrecogninzed_name alert has to be sent, this by
+     default is a warning; it becomes fatal with the '-servername_fatal'
+     option.
+
+     [Peter Sylvester,  Remy Allais, Christophe Renou, Steve Henson]
+
+  *) Add AES and SSE2 assembly language support to VC++ build.
+     [Steve Henson]
+
+  *) Mitigate attack on final subtraction in Montgomery reduction.
+     [Andy Polyakov]
+
+  *) Fix crypto/ec/ec_mult.c to work properly with scalars of value 0
+     (which previously caused an internal error).
+     [Bodo Moeller]
+
+  *) Squeeze another 10% out of IGE mode when in != out.
+     [Ben Laurie]
+
+  *) AES IGE mode speedup.
+     [Dean Gaudet (Google)]
+
+  *) Add the Korean symmetric 128-bit cipher SEED (see
+     http://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp) and
+     add SEED ciphersuites from RFC 4162:
+
+        TLS_RSA_WITH_SEED_CBC_SHA      =  "SEED-SHA"
+        TLS_DHE_DSS_WITH_SEED_CBC_SHA  =  "DHE-DSS-SEED-SHA"
+        TLS_DHE_RSA_WITH_SEED_CBC_SHA  =  "DHE-RSA-SEED-SHA"
+        TLS_DH_anon_WITH_SEED_CBC_SHA  =  "ADH-SEED-SHA"
+
+     To minimize changes between patchlevels in the OpenSSL 0.9.8
+     series, SEED remains excluded from compilation unless OpenSSL
+     is configured with 'enable-seed'.
+     [KISA, Bodo Moeller]
+
+  *) Mitigate branch prediction attacks, which can be practical if a
+     single processor is shared, allowing a spy process to extract
+     information.  For detailed background information, see
+     http://eprint.iacr.org/2007/039 (O. Aciicmez, S. Gueron,
+     J.-P. Seifert, "New Branch Prediction Vulnerabilities in OpenSSL
+     and Necessary Software Countermeasures").  The core of the change
+     are new versions BN_div_no_branch() and
+     BN_mod_inverse_no_branch() of BN_div() and BN_mod_inverse(),
+     respectively, which are slower, but avoid the security-relevant
+     conditional branches.  These are automatically called by BN_div()
+     and BN_mod_inverse() if the flag BN_FLG_CONSTTIME is set for one
+     of the input BIGNUMs.  Also, BN_is_bit_set() has been changed to
+     remove a conditional branch.
+
+     BN_FLG_CONSTTIME is the new name for the previous
+     BN_FLG_EXP_CONSTTIME flag, since it now affects more than just
+     modular exponentiation.  (Since OpenSSL 0.9.7h, setting this flag
+     in the exponent causes BN_mod_exp_mont() to use the alternative
+     implementation in BN_mod_exp_mont_consttime().)  The old name
+     remains as a deprecated alias.
+
+     Similary, RSA_FLAG_NO_EXP_CONSTTIME is replaced by a more general
+     RSA_FLAG_NO_CONSTTIME flag since the RSA implementation now uses
+     constant-time implementations for more than just exponentiation.
+     Here too the old name is kept as a deprecated alias.
+
+     BN_BLINDING_new() will now use BN_dup() for the modulus so that
+     the BN_BLINDING structure gets an independent copy of the
+     modulus.  This means that the previous "BIGNUM *m" argument to
+     BN_BLINDING_new() and to BN_BLINDING_create_param() now
+     essentially becomes "const BIGNUM *m", although we can't actually
+     change this in the header file before 0.9.9.  It allows
+     RSA_setup_blinding() to use BN_with_flags() on the modulus to
+     enable BN_FLG_CONSTTIME.
+
+     [Matthew D Wood (Intel Corp)]
+
+  *) In the SSL/TLS server implementation, be strict about session ID
+     context matching (which matters if an application uses a single
+     external cache for different purposes).  Previously,
+     out-of-context reuse was forbidden only if SSL_VERIFY_PEER was
+     set.  This did ensure strict client verification, but meant that,
+     with applications using a single external cache for quite
+     different requirements, clients could circumvent ciphersuite
+     restrictions for a given session ID context by starting a session
+     in a different context.
+     [Bodo Moeller]
 
   *) Include "!eNULL" in SSL_DEFAULT_CIPHER_LIST to make sure that
      a ciphersuite string such as "DEFAULT:RSA" cannot enable
      authentication-only ciphersuites.
      [Bodo Moeller]
 
+  *) Update the SSL_get_shared_ciphers() fix CVE-2006-3738 which was
+     not complete and could lead to a possible single byte overflow
+     (CVE-2007-5135) [Ben Laurie]
+
+ Changes between 0.9.8d and 0.9.8e  [23 Feb 2007]
+
   *) Since AES128 and AES256 (and similarly Camellia128 and
      Camellia256) share a single mask bit in the logic of
      ssl/ssl_ciph.c, the code for masking out disabled ciphers needs a
@@ -1047,7 +1489,20 @@
      differing sizes.
      [Richard Levitte]
 
- Changes between 0.9.7l and 0.9.7m  [xx XXX xxxx]
+ Changes between 0.9.7m and 0.9.7n  [xx XXX xxxx]
+
+  *) In the SSL/TLS server implementation, be strict about session ID
+     context matching (which matters if an application uses a single
+     external cache for different purposes).  Previously,
+     out-of-context reuse was forbidden only if SSL_VERIFY_PEER was
+     set.  This did ensure strict client verification, but meant that,
+     with applications using a single external cache for quite
+     different requirements, clients could circumvent ciphersuite
+     restrictions for a given session ID context by starting a session
+     in a different context.
+     [Bodo Moeller]
+
+ Changes between 0.9.7l and 0.9.7m  [23 Feb 2007]
 
   *) Cleanse PEM buffers before freeing them since they may contain 
      sensitive data.
@@ -1063,6 +1518,20 @@
      kludge to work properly if AES128 is available and AES256 isn't.
      [Victor Duchovni]
 
+  *) Expand security boundary to match 1.1.1 module.
+     [Steve Henson]
+
+  *) Remove redundant features: hash file source, editing of test vectors
+     modify fipsld to use external fips_premain.c signature.
+     [Steve Henson]
+
+  *) New perl script mkfipsscr.pl to create shell scripts or batch files to
+     run algorithm test programs.
+     [Steve Henson]
+
+  *) Make algorithm test programs more tolerant of whitespace.
+     [Steve Henson]
+
   *) Have SSL/TLS server implementation tolerate "mismatched" record
      protocol version while receiving ClientHello even if the
      ClientHello is fragmented.  (The server can't insist on the

Modified: projects/openssl_098_merge_8/crypto/openssl/Configure
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/Configure	Sat Jun 13 13:35:18 2009	(r194107)
+++ projects/openssl_098_merge_8/crypto/openssl/Configure	Sat Jun 13 13:49:12 2009	(r194108)
@@ -6,11 +6,13 @@ eval 'exec perl -S $0 ${1+"$@"}'
 ##
 
 require 5.000;
-use strict;
+eval 'use strict;';
+
+print STDERR "Warning: perl module strict not found.\n" if ($@);
 
 # see INSTALL for instructions.
 
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
 
 # Options:
 #
@@ -54,6 +56,8 @@ my $usage="Usage: Configure [no-<cipher>
 # [no-]zlib     [don't] compile support for zlib compression.
 # zlib-dynamic	Like "zlib", but the zlib library is expected to be a shared
 #		library and will be loaded in run-time by the OpenSSL library.
+# enable-montasm 0.9.8 branch only: enable Montgomery x86 assembler backport
+#               from 0.9.9
 # 386           generate 80386 code
 # no-sse2	disables IA-32 SSE2 code, above option implies no-sse2
 # no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)
@@ -97,6 +101,11 @@ my $usage="Usage: Configure [no-<cipher>
 # SHA512_ASM	sha512_block is implemented in assembler
 # AES_ASM	ASE_[en|de]crypt is implemented in assembler
 
+# Minimum warning options... any contributions to OpenSSL should at least get
+# past these. 
+
+my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
+
 my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
 
 # MD2_CHAR slags pentium pros
@@ -114,12 +123,12 @@ my $tlib="-lnsl -lsocket";
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
-my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
-my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
-my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o";
+my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o MAYBE-MO86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o rc4_skey.o:rm86-elf.o:r586-elf.o";
+my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o MAYBE-MO86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o rc4_skey.o:rm86-cof.o:r586-cof.o";
+my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o";
 
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o::::md5-x86_64.o:::rc4-x86_64.o::";
-my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o::";
+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
+my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
 
 my $no_asm="::::::::::";
 
@@ -150,12 +159,15 @@ my %table=(
 "debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o",
 "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
-"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",
+"debug-ben-debug",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG  -DDEBUG_SAFESTACK -g3 -O2 -pipe::(unknown)::::::",
 "debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
-"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
+"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -m32 -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
 "debug-steve-linux-pseudo64",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared",
 "debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -201,11 +213,11 @@ my %table=(
 "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
-"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 ####
 "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Solaris with Sun C setups
 # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
@@ -213,11 +225,11 @@ my %table=(
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
 "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
+"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
 ####
 "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
+"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
 
 #### SunOS configs, assuming sparc for the gcc one.
 #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
@@ -231,10 +243,10 @@ my %table=(
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
 "irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # N64 ABI builds.
 "irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### Unified HP-UX ANSI C configs.
 # Special notes:
@@ -321,8 +333,7 @@ my %table=(
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 ####
 "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-# -bpowerpc64-linux is transient option, -m64 should be the one to use...
-"linux-ppc64",	"gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -333,9 +344,9 @@ my %table=(
 "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -365,7 +376,7 @@ my %table=(
 # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
 # simply *happens* to work around a compiler bug in gcc 3.3.3,
 # triggered by RIPEMD160 code.
-"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
@@ -403,12 +414,12 @@ my %table=(
 
 #### IBM's AIX.
 "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
-"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:",
-"aix64-gcc","gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn::::::-X64",
+"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
+"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
 # at build time. $OBJECT_MODE is respected at ./config stage!
-"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
+"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
+"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
 
 #
 # Cray T90 and similar (SDSC)
@@ -479,15 +490,20 @@ my %table=(
 "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
 "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
 
-# NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools
+# NetWare from David Ward (dsward@novell.com)
+# requires either MetroWerks NLM development tools, or gcc / nlmconv
+# NetWare defaults socket bio to WinSock sockets. However,
+# the builds can be configured to use BSD sockets instead.
 # netware-clib => legacy CLib c-runtime support
-"netware-clib", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
+"netware-clib", "mwccnlm::::::${x86_gcc_opts}::",
+"netware-clib-bsdsock", "mwccnlm::::::${x86_gcc_opts}::",
+"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
+"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
 # netware-libc => LibC/NKS support
-# NetWare defaults socket bio to WinSock sockets. However, the LibC build can be
-# configured to use BSD sockets instead.
 "netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
 "netware-libc-bsdsock", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
 "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
+"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
 
 # DJGPP
 "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
@@ -500,8 +516,11 @@ my %table=(
 
 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
 "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### A/UX
@@ -530,7 +549,9 @@ my %table=(
 
 my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
 		    VC-NT VC-CE VC-WIN32
-		    BC-32 OS2-EMX netware-clib netware-libc netware-libc-bsdsock);
+		    BC-32 OS2-EMX
+		    netware-clib netware-clib-bsdsock
+		    netware-libc netware-libc-bsdsock);
 
 my $idx = 0;
 my $idx_cc = $idx++;
@@ -563,12 +584,18 @@ my $prefix="";
 my $openssldir="";
 my $exe_ext="";
 my $install_prefix="";
+my $fipslibdir="/usr/local/ssl/fips-1.0/lib/";
+my $nofipscanistercheck=0;
+my $fipsdso=0;
+my $fipscanisterinternal="n";
+my $baseaddr="0xFB00000";
 my $no_threads=0;
 my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_rfc3779=1; # but "no-rfc3779" is default
+my $montasm=1;   # but "no-montasm" is default
 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;
@@ -585,10 +612,11 @@ my $rc2	="crypto/rc2/rc2.h";
 my $bf	="crypto/bf/bf_locl.h";
 my $bn_asm	="bn_asm.o";
 my $des_enc="des_enc.o fcrypt_b.o";
+my $fips_des_enc="fips_des_enc.o";
 my $aes_enc="aes_core.o aes_cbc.o";
 my $bf_enc	="bf_enc.o";
 my $cast_enc="c_enc.o";
-my $rc4_enc="rc4_enc.o";
+my $rc4_enc="rc4_enc.o rc4_skey.o";
 my $rc5_enc="rc5_enc.o";
 my $md5_obj="";
 my $sha1_obj="";
@@ -596,27 +624,40 @@ my $rmd160_obj="";
 my $processor="";
 my $default_ranlib;
 my $perl;
+my $fips=0;
 
 
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
 
-my %disabled = ( # "what"         => "comment"
-		 "camellia"	  => "default",
-		 "gmp"		  => "default",
+my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
+                 "camellia"       => "default",
+                 "capieng"        => "default",
+                 "cms"            => "default",
+                 "gmp"            => "default",
+                 "jpake"          => "experimental",
                  "mdc2"           => "default",
+                 "montasm"        => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9)
                  "rc5"            => "default",
-		 "rfc3779"	  => "default",
+                 "rfc3779"        => "default",
+                 "seed"           => "default",
                  "shared"         => "default",
                  "zlib"           => "default",
                  "zlib-dynamic"   => "default"
                );
+my @experimental = ();
+
+# This is what $depflags will look like with the above defaults
+# (we need this to see if we should advise the user to run "make depend"):
+my $default_depflags = " -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED";
+
 
-# Additional "no-..." options will be collected in %disabled.
-# To remove something from %disabled, use e.g. "enable-rc5".
-# For symmetry, "disable-..." is a synonym for "no-...".
+# Explicit "no-..." options will be collected in %disabled along with the defaults.
+# To remove something from %disabled, use "enable-foo" (unless it's experimental).
+# For symmetry, "disable-foo" is a synonym for "no-foo".
 
-# This is what $depflags will look like with the above default:
-my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 ";
+# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable.
+# We will collect such requests in @experimental.
+# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO.
 
 
 my $no_sse2=0;
@@ -625,6 +666,7 @@ my $no_sse2=0;
 
 my $flags;
 my $depflags;
+my $openssl_experimental_defines;
 my $openssl_algorithm_defines;
 my $openssl_thread_defines;
 my $openssl_sys_defines="";
@@ -645,6 +687,7 @@ while($argv_unprocessed)
 	{
 	$flags="";
 	$depflags="";
+	$openssl_experimental_defines="";
 	$openssl_algorithm_defines="";
 	$openssl_thread_defines="";
 	$openssl_sys_defines="";
@@ -670,25 +713,35 @@ PROCESS_ARGS:
 
 		if (/^no-(.+)$/ || /^disable-(.+)$/)
 			{
-			if ($1 eq "ssl")
+			if (!($disabled{$1} eq "experimental"))
 				{
-				$disabled{"ssl2"} = "option(ssl)";
-				$disabled{"ssl3"} = "option(ssl)";
-				}
-			elsif ($1 eq "tls")
-				{
-				$disabled{"tls1"} = "option(tls)"
-				}
-			else
-				{
-				$disabled{$1} = "option";
+				if ($1 eq "ssl")
+					{
+					$disabled{"ssl2"} = "option(ssl)";
+					$disabled{"ssl3"} = "option(ssl)";
+					}
+				elsif ($1 eq "tls")
+					{
+					$disabled{"tls1"} = "option(tls)"
+					}
+				else
+					{
+					$disabled{$1} = "option";
+					}
 				}
 			}			
-		elsif (/^enable-(.+)$/)
+		elsif (/^enable-(.+)$/ || /^experimental-(.+)$/)
 			{
-			delete $disabled{$1};
+			my $algo = $1;
+			if ($disabled{$algo} eq "experimental")
+				{
+				die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n"
+					unless (/^experimental-/);
+				push @experimental, $algo;
+				}
+			delete $disabled{$algo};
 
-			$threads = 1 if ($1 eq "threads");
+			$threads = 1 if ($algo eq "threads");
 			}
 		elsif (/^--test-sanity$/)
 			{
@@ -719,12 +772,36 @@ PROCESS_ARGS:
 			}
 		elsif (/^386$/)
 			{ $processor=386; }
+		elsif (/^fips$/)
+			{
+			$fips=1;
+		        }
 		elsif (/^rsaref$/)
 			{
 			# No RSAref support any more since it's not needed.
 			# The check for the option is there so scripts aren't
 			# broken
 			}
+		elsif (/^nofipscanistercheck$/)
+			{
+			$fips = 1;
+			$nofipscanistercheck = 1;
+			}
+		elsif (/^fipscanisterbuild$/)
+			{
+			$fips = 1;
+			$nofipscanistercheck = 1;
+			$fipslibdir="";
+			$fipscanisterinternal="y";
+			}
+		elsif (/^fipsdso$/)
+			{
+			$fips = 1;
+			$nofipscanistercheck = 1;
+			$fipslibdir="";
+			$fipscanisterinternal="y";
+			$fipsdso = 1;
+			}
 		elsif (/^[-+]/)
 			{
 			if (/^-[lL](.*)$/)
@@ -759,6 +836,14 @@ PROCESS_ARGS:
 				{
 				$withargs{"zlib-include"}="-I$1";
 				}
+			elsif (/^--with-fipslibdir=(.*)$/)
+				{
+				$fipslibdir="$1/";
+				}
+			elsif (/^--with-baseaddr=(.*)$/)
+				{
+				$baseaddr="$1";
+				}
 			else
 				{
 				print STDERR $usage;
@@ -838,6 +923,10 @@ if (defined($disabled{"md5"}) || defined
 	$disabled{"tls1"} = "forced";
 	}
 
+if (defined($disabled{"tls1"}))
+	{
+	$disabled{"tlsext"} = "forced";
+	}
 
 if ($target eq "TABLE") {
 	foreach $target (sort keys %table) {
@@ -862,6 +951,54 @@ print "Configuring for $target\n";
 
 &usage if (!defined($table{$target}));
 
+my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+my $cc = $fields[$idx_cc];
+# Allow environment CC to override compiler...
+if($ENV{CC}) {
+    $cc = $ENV{CC};
+}
+my $cflags = $fields[$idx_cflags];
+my $unistd = $fields[$idx_unistd];
+my $thread_cflag = $fields[$idx_thread_cflag];
+my $sys_id = $fields[$idx_sys_id];
+my $lflags = $fields[$idx_lflags];
+my $bn_ops = $fields[$idx_bn_ops];
+my $cpuid_obj = $fields[$idx_cpuid_obj];
+my $bn_obj = $fields[$idx_bn_obj];
+my $des_obj = $fields[$idx_des_obj];
+my $aes_obj = $fields[$idx_aes_obj];
+my $bf_obj = $fields[$idx_bf_obj];
+my $md5_obj = $fields[$idx_md5_obj];
+my $sha1_obj = $fields[$idx_sha1_obj];
+my $cast_obj = $fields[$idx_cast_obj];
+my $rc4_obj = $fields[$idx_rc4_obj];
+my $rmd160_obj = $fields[$idx_rmd160_obj];
+my $rc5_obj = $fields[$idx_rc5_obj];
+my $dso_scheme = $fields[$idx_dso_scheme];
+my $shared_target = $fields[$idx_shared_target];
+my $shared_cflag = $fields[$idx_shared_cflag];
+my $shared_ldflag = $fields[$idx_shared_ldflag];
+my $shared_extension = $fields[$idx_shared_extension];
+my $ranlib = $fields[$idx_ranlib];
+my $arflags = $fields[$idx_arflags];
+
+if ($fips)
+	{
+	delete $disabled{"shared"} if ($disabled{"shared"} eq "default");
+	$disabled{"asm"}="forced"
+		if ($target !~ "VC\-.*" &&
+		    "$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::");
+	}
+
+foreach (sort @experimental)
+	{
+	my $ALGO;
+	($ALGO = $_) =~ tr/[a-z]/[A-Z]/;
+
+	# opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined
+	$openssl_experimental_defines .= "#define OPENSSL_NO_$ALGO\n";
+	$cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
+	}
 
 foreach (sort (keys %disabled))
 	{
@@ -877,6 +1014,8 @@ foreach (sort (keys %disabled))
 		{ $no_shared = 1; }
 	elsif (/^zlib$/)
 		{ $zlib = 0; }
+	elsif (/^montasm$/)
+		{ $montasm = 0; }
 	elsif (/^static-engine$/)
 		{ }
 	elsif (/^zlib-dynamic$/)
@@ -910,7 +1049,7 @@ foreach (sort (keys %disabled))
 				push @skip, $algo;
 				print " (skip dir)";
 
-				$depflags .="-DOPENSSL_NO_$ALGO ";
+				$depflags .= " -DOPENSSL_NO_$ALGO";

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 14:21:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85D76106564A;
	Sat, 13 Jun 2009 14:21:39 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73FC18FC14;
	Sat, 13 Jun 2009 14:21:39 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DELd2x016308;
	Sat, 13 Jun 2009 14:21:39 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DELdSA016306;
	Sat, 13 Jun 2009 14:21:39 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131421.n5DELdSA016306@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 14:21:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194113 -
	projects/openssl_098_merge_8/crypto/openssl/crypto/rsa
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 14:21:40 -0000

Author: simon
Date: Sat Jun 13 14:21:39 2009
New Revision: 194113
URL: http://svn.freebsd.org/changeset/base/194113

Log:
  Remove a few $FreeBSD$ which isn't needed anymore.

Modified:
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa.h
  projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eay.c

Modified: projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa.h
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa.h	Sat Jun 13 14:12:55 2009	(r194112)
+++ projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa.h	Sat Jun 13 14:21:39 2009	(r194113)
@@ -55,7 +55,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
 
 #ifndef HEADER_RSA_H
 #define HEADER_RSA_H

Modified: projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eay.c
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eay.c	Sat Jun 13 14:12:55 2009	(r194112)
+++ projects/openssl_098_merge_8/crypto/openssl/crypto/rsa/rsa_eay.c	Sat Jun 13 14:21:39 2009	(r194113)
@@ -108,7 +108,6 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-/* $FreeBSD$ */
 
 #include <stdio.h>
 #include "cryptlib.h"

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 14:25:52 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A1F71065674;
	Sat, 13 Jun 2009 14:25:52 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 07F7C8FC1B;
	Sat, 13 Jun 2009 14:25:52 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DEPpRt016431;
	Sat, 13 Jun 2009 14:25:51 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DEPpW4016428;
	Sat, 13 Jun 2009 14:25:51 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131425.n5DEPpW4016428@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 14:25:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194114 - in
	projects/openssl_098_merge_8/crypto/openssl: crypto/engine util/pl
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 14:25:52 -0000

Author: simon
Date: Sat Jun 13 14:25:51 2009
New Revision: 194114
URL: http://svn.freebsd.org/changeset/base/194114

Log:
  Remove a few more unneeded $FreeBSD$.

Modified:
  projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_cryptodev.c
  projects/openssl_098_merge_8/crypto/openssl/util/pl/Mingw32.pl

Modified: projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_cryptodev.c
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_cryptodev.c	Sat Jun 13 14:21:39 2009	(r194113)
+++ projects/openssl_098_merge_8/crypto/openssl/crypto/engine/eng_cryptodev.c	Sat Jun 13 14:25:51 2009	(r194114)
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-/* $FreeBSD$ */
 
 #include <openssl/objects.h>
 #include <openssl/engine.h>

Modified: projects/openssl_098_merge_8/crypto/openssl/util/pl/Mingw32.pl
==============================================================================
--- projects/openssl_098_merge_8/crypto/openssl/util/pl/Mingw32.pl	Sat Jun 13 14:21:39 2009	(r194113)
+++ projects/openssl_098_merge_8/crypto/openssl/util/pl/Mingw32.pl	Sat Jun 13 14:25:51 2009	(r194114)
@@ -1,5 +1,4 @@
 #!/usr/local/bin/perl
-# $FreeBSD$
 #
 # Mingw32.pl -- Mingw
 #

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 15:00:30 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F607106564A;
	Sat, 13 Jun 2009 15:00:30 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 130DD8FC15;
	Sat, 13 Jun 2009 15:00:30 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DF0T9T017233;
	Sat, 13 Jun 2009 15:00:29 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DF0TFL017229;
	Sat, 13 Jun 2009 15:00:29 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131500.n5DF0TFL017229@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 15:00:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194116 - in projects/openssl_098_merge_8/secure:
	lib/libcrypto usr.bin/openssl
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 15:00:30 -0000

Author: simon
Date: Sat Jun 13 15:00:29 2009
New Revision: 194116
URL: http://svn.freebsd.org/changeset/base/194116

Log:
  Build system updates for OpenSSL 0.9.8k.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc
  projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 15:00:29 2009	(r194116)
@@ -27,7 +27,7 @@ INCS=	crypto.h ebcdic.h opensslv.h ossl_
 
 # aes
 SRCS+=	aes_cbc.c aes_cfb.c aes_core.c aes_ctr.c aes_ecb.c aes_ige.c \
-	aes_misc.c aes_ofb.c
+	aes_misc.c aes_ofb.c aes_wrap.c
 INCS+=	aes.h aes_locl.h
 
 # asn1
@@ -324,6 +324,15 @@ SRCS+=	pcy_cache.c pcy_data.c pcy_lib.c 
 	v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
 INCS+=	x509v3.h
 
+# cms
+SRCS+=	cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
+	cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
+INCS+=	cms.h
+
+# jpake
+SRCS+=	jpake.c jpake_err.c
+INCS+=	jpake.h
+
 SRCS+=	buildinf.h
 INCS+=	opensslconf.h evp.h
 INCSDIR=	${INCLUDEDIR}/openssl
@@ -392,6 +401,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/buffer \
 	${LCRYPTO_SRC}/crypto/cast \
 	${LCRYPTO_SRC}/crypto/camellia \
+	${LCRYPTO_SRC}/crypto/cms \
 	${LCRYPTO_SRC}/crypto/comp \
 	${LCRYPTO_SRC}/crypto/conf \
 	${LCRYPTO_SRC}/crypto/des \
@@ -406,6 +416,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/evp \
 	${LCRYPTO_SRC}/crypto/hmac \
 	${_ideapath} \
+	${LCRYPTO_SRC}/crypto/jpake \
 	${LCRYPTO_SRC}/crypto/krb5 \
 	${LCRYPTO_SRC}/crypto/lhash \
 	${LCRYPTO_SRC}/crypto/md2 \

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc	Sat Jun 13 15:00:29 2009	(r194116)
@@ -34,7 +34,7 @@ man-update:
 	@(sec=${manpage:E}; \
 	pod=${manpage:R}.pod; \
 	cp ${LCRYPTO_DOC}/${_docs}/$$pod .; \
-	pod2man --section=$$sec --release="0.9.8e" --center="OpenSSL" \
+	pod2man --section=$$sec --release="0.9.8k" --center="OpenSSL" \
 	  $$pod > ${.CURDIR}/man/${manpage}; \
 	rm -f $$pod; \
 	${ECHO} ${manpage})

Modified: projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile	Sat Jun 13 15:00:29 2009	(r194116)
@@ -12,7 +12,7 @@ LDADD=	-lssl -lcrypto
 
 CFLAGS+= -DMONOLITH -I${.CURDIR}
 
-SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
+SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
 	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c \
 	engine.c errstr.c \
 	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 16:29:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B49F106566B;
	Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 69C458FC16;
	Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DGT5Gs018851;
	Sat, 13 Jun 2009 16:29:05 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DGT5fG018850;
	Sat, 13 Jun 2009 16:29:05 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131629.n5DGT5fG018850@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194119 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 16:29:05 -0000

Author: simon
Date: Sat Jun 13 16:29:05 2009
New Revision: 194119
URL: http://svn.freebsd.org/changeset/base/194119

Log:
  Enable the symmetric key block cipher SEED.
  
  This is not done by default in stock OpenSSL 0.9.8k, but I don't really
  see this causing problems.  It is enabled by default in OpenSSL 1.0.
  
  This also fixes a build error (as we don't define OPENSSL_NO_SEED).

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 15:39:12 2009	(r194118)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:29:05 2009	(r194119)
@@ -333,6 +333,10 @@ INCS+=	cms.h
 SRCS+=	jpake.c jpake_err.c
 INCS+=	jpake.h
 
+# seed
+SRCS+=	seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
+INCS+=	seed.h
+
 SRCS+=	buildinf.h
 INCS+=	opensslconf.h evp.h
 INCSDIR=	${INCLUDEDIR}/openssl
@@ -435,6 +439,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/rc5 \
 	${LCRYPTO_SRC}/crypto/ripemd \
 	${LCRYPTO_SRC}/crypto/rsa \
+	${LCRYPTO_SRC}/crypto/seed \
 	${LCRYPTO_SRC}/crypto/sha \
 	${LCRYPTO_SRC}/crypto/stack \
 	${LCRYPTO_SRC}/crypto/store \

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 16:34:40 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CDB71065688;
	Sat, 13 Jun 2009 16:34:40 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 299EA8FC19;
	Sat, 13 Jun 2009 16:34:40 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DGYeM1019001;
	Sat, 13 Jun 2009 16:34:40 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DGYd5I018995;
	Sat, 13 Jun 2009 16:34:39 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131634.n5DGYd5I018995@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 16:34:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194120 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 16:34:41 -0000

Author: simon
Date: Sat Jun 13 16:34:39 2009
New Revision: 194120
URL: http://svn.freebsd.org/changeset/base/194120

Log:
  jpake is marked experimental so disable it by default.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:34:39 2009	(r194120)
@@ -329,9 +329,9 @@ SRCS+=	cms_lib.c cms_asn1.c cms_att.c cm
 	cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
 INCS+=	cms.h
 
-# jpake
-SRCS+=	jpake.c jpake_err.c
-INCS+=	jpake.h
+# jpake - is marked experimental
+#SRCS+=	jpake.c jpake_err.c
+#INCS+=	jpake.h
 
 # seed
 SRCS+=	seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h	Sat Jun 13 16:34:39 2009	(r194120)
@@ -9,6 +9,10 @@
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* The Kerberos 5 support is MIT-specific. */
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h	Sat Jun 13 16:34:39 2009	(r194120)
@@ -9,6 +9,10 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h	Sat Jun 13 16:34:39 2009	(r194120)
@@ -9,6 +9,10 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h	Sat Jun 13 16:34:39 2009	(r194120)
@@ -9,6 +9,10 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h	Sat Jun 13 16:29:05 2009	(r194119)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h	Sat Jun 13 16:34:39 2009	(r194120)
@@ -9,6 +9,10 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 16:45:59 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5919106566C;
	Sat, 13 Jun 2009 16:45:58 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D33B58FC14;
	Sat, 13 Jun 2009 16:45:58 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DGjwTl019376;
	Sat, 13 Jun 2009 16:45:58 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DGjwpT019368;
	Sat, 13 Jun 2009 16:45:58 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131645.n5DGjwpT019368@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 16:45:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194121 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 16:45:59 -0000

Author: simon
Date: Sat Jun 13 16:45:58 2009
New Revision: 194121
URL: http://svn.freebsd.org/changeset/base/194121

Log:
  After further thought, for now disable SEED and CMS as they are not
  enabled upstream by default in 0.9.8.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:45:58 2009	(r194121)
@@ -325,17 +325,17 @@ SRCS+=	pcy_cache.c pcy_data.c pcy_lib.c 
 INCS+=	x509v3.h
 
 # cms
-SRCS+=	cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
-	cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
-INCS+=	cms.h
+#SRCS+=	cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
+#	cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
+#INCS+=	cms.h
 
 # jpake - is marked experimental
 #SRCS+=	jpake.c jpake_err.c
 #INCS+=	jpake.h
 
 # seed
-SRCS+=	seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
-INCS+=	seed.h
+#SRCS+=	seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
+#INCS+=	seed.h
 
 SRCS+=	buildinf.h
 INCS+=	opensslconf.h evp.h

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -5,6 +5,14 @@
 /* OpenSSL was configured with the following options: */
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -9,6 +9,14 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -5,6 +5,14 @@
 /* OpenSSL was configured with the following options: */
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -9,6 +9,14 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* jpake is marked experimental in OpenSSL 0.9.8. */
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -9,6 +9,14 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* jpake is marked experimental in OpenSSL 0.9.8. */
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -9,6 +9,14 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* jpake is marked experimental in OpenSSL 0.9.8. */
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h	Sat Jun 13 16:34:39 2009	(r194120)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h	Sat Jun 13 16:45:58 2009	(r194121)
@@ -9,6 +9,14 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
 /* jpake is marked experimental in OpenSSL 0.9.8. */
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 17:09:32 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 23FA8106566C;
	Sat, 13 Jun 2009 17:09:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12D638FC18;
	Sat, 13 Jun 2009 17:09:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DH9VCd019839;
	Sat, 13 Jun 2009 17:09:31 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DH9Vtv019838;
	Sat, 13 Jun 2009 17:09:31 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131709.n5DH9Vtv019838@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 17:09:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194122 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 17:09:32 -0000

Author: simon
Date: Sat Jun 13 17:09:31 2009
New Revision: 194122
URL: http://svn.freebsd.org/changeset/base/194122

Log:
  Also disable jpake on amd64.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h	Sat Jun 13 16:45:58 2009	(r194121)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h	Sat Jun 13 17:09:31 2009	(r194122)
@@ -17,6 +17,10 @@
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* The Kerberos 5 support is MIT-specific. */
 #ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 20:54:18 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 354271065676;
	Sat, 13 Jun 2009 20:54:18 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 22D358FC1B;
	Sat, 13 Jun 2009 20:54:18 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DKsI4W023921;
	Sat, 13 Jun 2009 20:54:18 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DKsIE2023920;
	Sat, 13 Jun 2009 20:54:18 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906132054.n5DKsIE2023920@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 20:54:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194125 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 20:54:18 -0000

Author: simon
Date: Sat Jun 13 20:54:17 2009
New Revision: 194125
URL: http://svn.freebsd.org/changeset/base/194125

Log:
  Add more new files from OpenSSL 0.9.8k.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 20:21:08 2009	(r194124)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 20:54:17 2009	(r194125)
@@ -21,7 +21,8 @@ MAN+=	config.5 des_modes.7
 
 # base sources
 SRCS=	cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.c \
-	mem_dbg.c o_dir.c o_str.c o_time.c tmdiff.c uid.c
+	mem_dbg.c o_dir.c o_str.c o_time.c tmdiff.c uid.c dyn_lck.c \
+	o_init.c fips_err.c
 INCS=	crypto.h ebcdic.h opensslv.h ossl_typ.h symhacks.h tmdiff.h \
 	../e_os.h ../e_os2.h
 
@@ -36,7 +37,7 @@ SRCS+=	a_bitstr.c a_bool.c a_bytes.c a_d
 	a_meth.c a_object.c a_octet.c a_print.c a_set.c a_sign.c \
 	a_strex.c a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c \
 	a_verify.c asn1_err.c asn1_gen.c asn1_lib.c asn1_par.c \
-	asn_moid.c asn_pack.c d2i_pr.c d2i_pu.c evp_asn1.c f_enum.c \
+	asn_moid.c asn_mime.c asn_pack.c d2i_pr.c d2i_pu.c evp_asn1.c f_enum.c \
 	f_int.c f_string.c i2d_pr.c i2d_pu.c n_pkey.c nsseq.c p5_pbe.c \
 	p5_pbev2.c p8_pkey.c t_bitst.c t_crl.c t_pkey.c t_req.c \
 	t_spki.c t_x509.c t_x509a.c tasn_dec.c tasn_enc.c tasn_fre.c \
@@ -69,7 +70,7 @@ INCS+=	bio.h bio_lcl.h
 # bn
 SRCS+=	bn_add.c bn_blind.c bn_const.c bn_ctx.c bn_depr.c bn_div.c \
 	bn_err.c bn_exp.c bn_exp2.c bn_gcd.c bn_gf2m.c bn_kron.c \
-	bn_lib.c bn_mod.c bn_mont.c bn_mpi.c bn_mul.c bn_nist.c \
+	bn_lib.c bn_mod.c bn_mont.c bn_mpi.c bn_mul.c bn_nist.c bn_opt.c \
 	bn_prime.c bn_print.c bn_rand.c bn_recp.c bn_shift.c bn_sqr.c \
 	bn_sqrt.c bn_word.c
 .if ${MACHINE_ARCH} == "i386"
@@ -83,7 +84,7 @@ SRCS+=	bn_asm.c
 INCS+=	bn.h
 
 # buffer
-SRCS+=	buf_err.c buffer.c
+SRCS+=	buf_err.c buf_str.c buffer.c
 INCS+=	buffer.h
 
 # cast
@@ -112,7 +113,7 @@ INCS+=	conf.h conf_api.h
 
 # des
 SRCS+=	cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c \
-	des_old.c des_old2.c ecb3_enc.c ecb_enc.c ede_cbcm_enc.c \
+	des_lib.c des_old.c des_old2.c ecb3_enc.c ecb_enc.c ede_cbcm_enc.c \
 	enc_read.c enc_writ.c fcrypt.c ofb64ede.c ofb64enc.c \
 	ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c read2pwd.c \
 	rpc_enc.c set_key.c str2key.c xcbc_enc.c
@@ -129,7 +130,7 @@ INCS+=	dh.h
 
 # dsa
 SRCS+=	dsa_asn1.c dsa_err.c dsa_depr.c dsa_gen.c dsa_key.c dsa_lib.c \
-	dsa_ossl.c dsa_sign.c dsa_vrf.c
+	dsa_ossl.c dsa_sign.c dsa_vrf.c dsa_utl.c
 INCS+=	dsa.h
 
 # dso
@@ -159,15 +160,15 @@ SRCS+=	eng_all.c eng_cnf.c eng_cryptodev
 INCS+=	engine.h
 
 # err
-SRCS+=	err.c err_all.c err_prn.c
+SRCS+=	err.c err_all.c err_prn.c err_def.c err_str.c err_bio.c
 INCS+=	err.h
 
 # evp
 SRCS+=	bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
-	digest.c e_aes.c e_bf.c e_cast.c e_des.c e_des3.c e_idea.c \
+	dig_eng.c digest.c e_aes.c e_bf.c e_cast.c e_des.c e_des3.c e_idea.c \
 	e_null.c e_old.c e_rc2.c e_rc4.c e_rc5.c e_xcbc_d.c encode.c \
-	evp_acnf.c evp_enc.c evp_err.c evp_key.c evp_lib.c evp_pbe.c \
-	evp_pkey.c m_dss.c m_dss1.c m_ecdsa.c m_md2.c m_md4.c m_md5.c \
+	evp_acnf.c evp_cnf.c evp_enc.c evp_err.c evp_key.c evp_lib.c evp_pbe.c \
+	evp_pkey.c e_seed.c enc_min.c m_dss.c m_dss1.c m_ecdsa.c m_md2.c m_md4.c m_md5.c \
 	m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.c names.c \
 	openbsd_hw.c p5_crpt.c p5_crpt2.c p_dec.c p_enc.c p_lib.c \
 	p_open.c p_seal.c p_sign.c p_verify.c
@@ -245,7 +246,7 @@ SRCS+=	pqueue.c
 INCS+=	pqueue.h pq_compat.h
 
 # rand
-SRCS+=	md_rand.c rand_egd.c rand_err.c rand_lib.c rand_unix.c randfile.c
+SRCS+=	md_rand.c rand_egd.c rand_err.c rand_lib.c rand_unix.c randfile.c rand_eng.c
 INCS+=	rand.h
 
 # rc2
@@ -253,7 +254,7 @@ SRCS+=	rc2_cbc.c rc2_ecb.c rc2_skey.c rc
 INCS+=	rc2.h
 
 # rc4
-SRCS+=	rc4_skey.c
+SRCS+=	rc4_skey.c rc4_fblk.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	rc4-586.s
 .else
@@ -277,7 +278,8 @@ INCS+=	ripemd.h
 # rsa
 SRCS+=	rsa_asn1.c rsa_chk.c rsa_eay.c rsa_err.c rsa_gen.c rsa_lib.c \
 	rsa_none.c rsa_null.c rsa_oaep.c rsa_pk1.c rsa_saos.c \
-	rsa_sign.c rsa_ssl.c rsa_depr.c rsa_pss.c rsa_x931.c
+	rsa_sign.c rsa_ssl.c rsa_depr.c rsa_pss.c rsa_x931.c rsa_x931g.c \
+	rsa_eng.c
 INCS+=	rsa.h
 
 # sha

From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 21:45:32 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4DE66106564A;
	Sat, 13 Jun 2009 21:45:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 01F878FC0A;
	Sat, 13 Jun 2009 21:45:32 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DLjVrD025060;
	Sat, 13 Jun 2009 21:45:31 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DLjVxf025059;
	Sat, 13 Jun 2009 21:45:31 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906132145.n5DLjVxf025059@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 21:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194129 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 21:45:32 -0000

Author: simon
Date: Sat Jun 13 21:45:31 2009
New Revision: 194129
URL: http://svn.freebsd.org/changeset/base/194129

Log:
  Add another new file from OpenSSL 0.9.8k.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 21:17:45 2009	(r194128)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 21:45:31 2009	(r194129)
@@ -72,7 +72,7 @@ SRCS+=	bn_add.c bn_blind.c bn_const.c bn
 	bn_err.c bn_exp.c bn_exp2.c bn_gcd.c bn_gf2m.c bn_kron.c \
 	bn_lib.c bn_mod.c bn_mont.c bn_mpi.c bn_mul.c bn_nist.c bn_opt.c \
 	bn_prime.c bn_print.c bn_rand.c bn_recp.c bn_shift.c bn_sqr.c \
-	bn_sqrt.c bn_word.c
+	bn_sqrt.c bn_word.c bn_x931p.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	bn-586.s co-586.s
 .elif ${MACHINE_ARCH} == "amd64"