From owner-svn-src-projects@freebsd.org  Mon Feb  1 18:50:54 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 825A1A97178
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  1 Feb 2016 18:50:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3CF751FB3;
 Mon,  1 Feb 2016 18:50:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u11IorFA085417;
 Mon, 1 Feb 2016 18:50:53 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u11IoqwE085411;
 Mon, 1 Feb 2016 18:50:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602011850.u11IoqwE085411@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 1 Feb 2016 18:50:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295127 - in projects/release-pkg/release: packages
 scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 18:50:54 -0000

Author: gjb
Date: Mon Feb  1 18:50:52 2016
New Revision: 295127
URL: https://svnweb.freebsd.org/changeset/base/295127

Log:
  Fix naming inconsistency with lib32 debug packages.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl
     - copied unchanged from r295126, projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl
  projects/release-pkg/release/packages/jail-lib32-debug.ucl
     - copied unchanged from r295126, projects/release-pkg/release/packages/jail-debug-lib32.ucl
  projects/release-pkg/release/packages/lib32-debug.ucl
     - copied unchanged from r295126, projects/release-pkg/release/packages/debug-lib32.ucl
  projects/release-pkg/release/packages/ssh-lib32-debug.ucl
     - copied unchanged from r295126, projects/release-pkg/release/packages/ssh-debug-lib32.ucl
  projects/release-pkg/release/packages/unbound-lib32-debug.ucl
     - copied unchanged from r295126, projects/release-pkg/release/packages/unbound-debug-lib32.ucl
Deleted:
  projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl
  projects/release-pkg/release/packages/debug-lib32.ucl
  projects/release-pkg/release/packages/jail-debug-lib32.ucl
  projects/release-pkg/release/packages/ssh-debug-lib32.ucl
  projects/release-pkg/release/packages/unbound-debug-lib32.ucl
Modified:
  projects/release-pkg/release/scripts/mtree-to-plist.awk

Copied: projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl (from r295126, projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl	Mon Feb  1 18:50:52 2016	(r295127, copy of r295126, projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "SNMP 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Copied: projects/release-pkg/release/packages/jail-lib32-debug.ucl (from r295126, projects/release-pkg/release/packages/jail-debug-lib32.ucl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/jail-lib32-debug.ucl	Mon Feb  1 18:50:52 2016	(r295127, copy of r295126, projects/release-pkg/release/packages/jail-debug-lib32.ucl)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Copied: projects/release-pkg/release/packages/lib32-debug.ucl (from r295126, projects/release-pkg/release/packages/debug-lib32.ucl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/lib32-debug.ucl	Mon Feb  1 18:50:52 2016	(r295127, copy of r295126, projects/release-pkg/release/packages/debug-lib32.ucl)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Copied: projects/release-pkg/release/packages/ssh-lib32-debug.ucl (from r295126, projects/release-pkg/release/packages/ssh-debug-lib32.ucl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/ssh-lib32-debug.ucl	Mon Feb  1 18:50:52 2016	(r295127, copy of r295126, projects/release-pkg/release/packages/ssh-debug-lib32.ucl)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+%DESC%
+EOD

Copied: projects/release-pkg/release/packages/unbound-lib32-debug.ucl (from r295126, projects/release-pkg/release/packages/unbound-debug-lib32.ucl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/unbound-lib32-debug.ucl	Mon Feb  1 18:50:52 2016	(r295127, copy of r295126, projects/release-pkg/release/packages/unbound-debug-lib32.ucl)
@@ -0,0 +1,14 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD

Modified: projects/release-pkg/release/scripts/mtree-to-plist.awk
==============================================================================
--- projects/release-pkg/release/scripts/mtree-to-plist.awk	Mon Feb  1 17:41:21 2016	(r295126)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	Mon Feb  1 18:50:52 2016	(r295127)
@@ -39,7 +39,7 @@
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
-			} else if (a[i] == "development" || a[i] == "profile") {
+			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")

From owner-svn-src-projects@freebsd.org  Tue Feb  2 16:47:52 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E9E5A991E4
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 16:47:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B601DE3A;
 Tue,  2 Feb 2016 16:47:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12GloLM075834;
 Tue, 2 Feb 2016 16:47:50 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12GloAF075831;
 Tue, 2 Feb 2016 16:47:50 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602021647.u12GloAF075831@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 16:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295155 - in projects/release-pkg: release/packages
 usr.bin/vi usr.bin/vi/catalog
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 16:47:52 -0000

Author: gjb
Date: Tue Feb  2 16:47:50 2016
New Revision: 295155
URL: https://svnweb.freebsd.org/changeset/base/295155

Log:
  Create a package for vi(1) and related files.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/vi-debug.ucl
  projects/release-pkg/release/packages/vi.ucl
Modified:
  projects/release-pkg/usr.bin/vi/Makefile
  projects/release-pkg/usr.bin/vi/catalog/Makefile

Added: projects/release-pkg/release/packages/vi-debug.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/vi-debug.ucl	Tue Feb  2 16:47:50 2016	(r295155)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Vi Editor (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Added: projects/release-pkg/release/packages/vi.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/vi.ucl	Tue Feb  2 16:47:50 2016	(r295155)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Vi Editor"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/usr.bin/vi/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/vi/Makefile	Tue Feb  2 16:35:37 2016	(r295154)
+++ projects/release-pkg/usr.bin/vi/Makefile	Tue Feb  2 16:47:50 2016	(r295155)
@@ -4,6 +4,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	vi
 SRCDIR=		${.CURDIR}/../../contrib/nvi
 SUBDIR+=	catalog
 

Modified: projects/release-pkg/usr.bin/vi/catalog/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/vi/catalog/Makefile	Tue Feb  2 16:35:37 2016	(r295154)
+++ projects/release-pkg/usr.bin/vi/catalog/Makefile	Tue Feb  2 16:47:50 2016	(r295155)
@@ -3,10 +3,14 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=vi
 V=	${.CURDIR}/../../../contrib/nvi
 
-CAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
+FILESGROUPS+=VICAT
+VICAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
 	uk_UA.KOI8-U zh_CN.GB2312
+VICATDIR=	${FILESDIR}
+VICATPACKAGE=	${PACKAGE}
 
 SCAN=	${V}/cl/*.c ${V}/common/*.c ${V}/ex/*.c ${V}/vi/*.c
 

From owner-svn-src-projects@freebsd.org  Tue Feb  2 17:33:39 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A3D9A98460
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 17:33:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D61CFC37;
 Tue,  2 Feb 2016 17:33:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12HXbol090166;
 Tue, 2 Feb 2016 17:33:37 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12HXbXU090162;
 Tue, 2 Feb 2016 17:33:37 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602021733.u12HXbXU090162@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 17:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295156 - in projects/release-pkg: etc release/packages
 usr.sbin/autofs
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 17:33:39 -0000

Author: gjb
Date: Tue Feb  2 17:33:37 2016
New Revision: 295156
URL: https://svnweb.freebsd.org/changeset/base/295156

Log:
  Create a package for autofs(5)
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/autofs-debug.ucl
  projects/release-pkg/release/packages/autofs.ucl
Modified:
  projects/release-pkg/etc/Makefile
  projects/release-pkg/usr.sbin/autofs/Makefile

Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile	Tue Feb  2 16:47:50 2016	(r295155)
+++ projects/release-pkg/etc/Makefile	Tue Feb  2 17:33:37 2016	(r295156)
@@ -3,6 +3,8 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=	FILES
+
 SUBDIR=	\
 	newsyslog.conf.d
 
@@ -79,8 +81,13 @@ BIN1+= apmd.conf
 .endif
 
 .if ${MK_AUTOFS} != "no"
-BIN1+= auto_master
+FILESGROUPS+=	AUTOFS
+AUTOFS+=	auto_master
 .endif
+AUTOFSDIR=	/etc
+AUTOFSMODE=	${BINMODE}
+AUTOFSPACKAGE=	autofs
+AUTOFSTAGS=	config
 
 .if ${MK_FREEBSD_UPDATE} != "no"
 BIN1+= freebsd-update.conf

Added: projects/release-pkg/release/packages/autofs-debug.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/autofs-debug.ucl	Tue Feb  2 17:33:37 2016	(r295156)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Autofs(5) Utilities (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Added: projects/release-pkg/release/packages/autofs.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/autofs.ucl	Tue Feb  2 17:33:37 2016	(r295156)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Autofs(5) Utilities"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/usr.sbin/autofs/Makefile
==============================================================================
--- projects/release-pkg/usr.sbin/autofs/Makefile	Tue Feb  2 16:47:50 2016	(r295155)
+++ projects/release-pkg/usr.sbin/autofs/Makefile	Tue Feb  2 17:33:37 2016	(r295156)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=autofs
 PROG=	automountd
 SRCS=	automount.c
 SRCS+=	automountd.c

From owner-svn-src-projects@freebsd.org  Tue Feb  2 19:37:38 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 028DCA99396
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 19:37:38 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com
 [IPv6:2a00:1450:400c:c09::22c])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B0F61C4C;
 Tue,  2 Feb 2016 19:37:37 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: by mail-wm0-x22c.google.com with SMTP id r129so133785688wmr.0;
 Tue, 02 Feb 2016 11:37:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=mbE+WBAv4Y8XLkc4XZqLtBuk1bWPsAIU3A1Sm93lqgQ=;
 b=MEXqk68VIYg/hMFl9RHHv4PUJtn7pZ/EQqoFidDKr3NlqPpEoehlE9mMsU7q7qlPJ8
 gVvAzuLQmAVXTuJh9Rr4oKc1Gn6S+sdJl+qY4APTHn9S7dR7+rRSAQkC8PqVNF4fM2Nd
 lF5iBJrO9J4vSOshJoZYJiS4XX3IoG0iTdeD30CS4bWY0BznDwzueIkNmsvJ/221x3zI
 WOE6mbTSySbVuCuZRZ+vPQrWLuUSOUf3kR+rtdwVva4lq3nbB3OITC4As8FEvTt71M83
 zAzOnBypXdUdk71zX3973RwmTlY+A7Mp0SR+foHYrP6sV9zxunaX6YSufm0Ba3FYub+Z
 jDBw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:sender:date:from:to:cc:subject:message-id
 :references:mime-version:content-type:content-disposition
 :in-reply-to:user-agent;
 bh=mbE+WBAv4Y8XLkc4XZqLtBuk1bWPsAIU3A1Sm93lqgQ=;
 b=dntjgpyPRb/2jpOrfDpG1bBN6zH8gWj4eDJedNbFIfGT9YslkbK730qV0bMUQDHMkS
 GwPQMdRJLeTd9HYV3PThAwle6UTp29ssSS2eJiRSktckGRXZn9TFzTg/kUNO8b/Bsanm
 +EmXw6Ggsb4bMao0ha1SlZMHloB/cbObTuKaJGAqeGGPPDRy8fnNM62NvJKzVZzLEGj+
 5VkvINLNvmxXFzrUU4z7dyaY/Ra1j23F855gfJ9LKkQWOHHvrLUoNI6gh43qr6kKfshj
 Pqb0a0UhK+C4EZR5/+oqqIkz3zABx+IYXW2QZZogtTnjRxWkhvMQJRezLgu8uOny/g3N
 BECQ==
X-Gm-Message-State: AG10YOQpmrEZTxsfPgatv9/1SvDlL43dS2mKX9Bstsg53XSV1crMnFWNFG90xIrCiSl6cA==
X-Received: by 10.195.12.75 with SMTP id eo11mr30012999wjd.50.1454441856094;
 Tue, 02 Feb 2016 11:37:36 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
 by smtp.gmail.com with ESMTPSA id u4sm2969959wjz.4.2016.02.02.11.37.35
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 02 Feb 2016 11:37:35 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Tue, 2 Feb 2016 20:37:33 +0100
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Glen Barber <gjb@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: Re: svn commit: r295155 - in projects/release-pkg: release/packages
 usr.bin/vi usr.bin/vi/catalog
Message-ID: <20160202193733.GE12205@ivaldir.etoilebsd.net>
References: <201602021647.u12GloAF075831@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="GxcwvYAGnODwn7V8"
Content-Disposition: inline
In-Reply-To: <201602021647.u12GloAF075831@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 19:37:38 -0000


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

On Tue, Feb 02, 2016 at 04:47:50PM +0000, Glen Barber wrote:
> Author: gjb
> Date: Tue Feb  2 16:47:50 2016
> New Revision: 295155
> URL: https://svnweb.freebsd.org/changeset/base/295155
>=20
> Log:
>   Create a package for vi(1) and related files.
>  =20
>   Sponsored by:	The FreeBSD Foundation
>=20
There are also documentation files in:
/usr/share/doc/usd/12.vi
/usr/share/doc/usd/12.viref

Those files does not belong anymore really to upstream nvi2 (as they have b=
een
removed in latest release) but by popular demand I have readded those, not =
sure
if they should belong to the vi package or the documentation package up to =
you
:)

Best regards,
Bapt

--GxcwvYAGnODwn7V8
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWsQV9AAoJEGOJi9zxtz5a40sP/0GF+K6KdeCkOtPu4dPBjeUp
yRWoEEfSgx+q7GFrGI5Qprz6nt8rx52EA3NS2YeveZ4mL6DqtaGN6TR6UD078uYs
vKsaC3HJgbP9I9YtErqM+6amyPpGpzIhdH082ma/bFOzYQrSLji2RWevh4gb7Aza
xsuEAAKZ0N4989v/wOmCY7hk/BdQP5OmdUmfeXkbitJMCXA/ORB+xgNfBZz38zXG
XDczT5AaXpZGD1ehwfYTqslw0YqHvquCYMx0ikzhHjZYQE3Dahztw/VLJ9CecbNr
EZhbUHJszQ8tvlOmTkKjaoZo5psFs8VzNPzu+DP13n//lJVz45295ogjvFgickvf
oC3iMDrg+Za24WLEfB7Ubvf/HvZ8kbtdhJtX+T49UvOMlxPBg8YxepeN187PFr49
FixbWO6oFiDwSE3zOaaUgrCVXp2fUL8bbble1TWsItHwgNaVkori+vyKeDI66Aj5
Ov4WrXccjOCpttii5GGUHl/SMuZd3QZrNg523KetRpnK9sNk7obEmsXAVUwbztou
pnmDtH3ypbjclobXH2BfnJGJOCsbV+P7PZaIXtDwnTGDI3kpY48Iz/Ywu6lPujjf
Y+Qrgs8ZQX73hp3yy/L/1nvEZwk/kT1ue4gHwZhu+LHRY1aXhZvh6VFxUUi+i48o
W5ayE0wBWnrUL5jJTkeG
=b/Ij
-----END PGP SIGNATURE-----

--GxcwvYAGnODwn7V8--

From owner-svn-src-projects@freebsd.org  Tue Feb  2 21:04:35 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E993A99524
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 21:04:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 29FA91A20;
 Tue,  2 Feb 2016 21:04:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12L4Y4p053098;
 Tue, 2 Feb 2016 21:04:34 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12L4XTj053095;
 Tue, 2 Feb 2016 21:04:33 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602022104.u12L4XTj053095@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 21:04:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295163 - in projects/release-pkg: release/packages
 usr.bin/ee
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 21:04:35 -0000

Author: gjb
Date: Tue Feb  2 21:04:33 2016
New Revision: 295163
URL: https://svnweb.freebsd.org/changeset/base/295163

Log:
  Create ee(1) package.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/ee-debug.ucl
  projects/release-pkg/release/packages/ee.ucl
Modified:
  projects/release-pkg/usr.bin/ee/Makefile

Added: projects/release-pkg/release/packages/ee-debug.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/ee-debug.ucl	Tue Feb  2 21:04:33 2016	(r295163)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "ee(1) Utility (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Added: projects/release-pkg/release/packages/ee.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/ee.ucl	Tue Feb  2 21:04:33 2016	(r295163)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "ee(1) Utility"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/usr.bin/ee/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/ee/Makefile	Tue Feb  2 20:50:09 2016	(r295162)
+++ projects/release-pkg/usr.bin/ee/Makefile	Tue Feb  2 21:04:33 2016	(r295163)
@@ -5,6 +5,7 @@
 CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
 	 -DHAS_SYS_WAIT
 
+PACKAGE=ee
 PROG=	ee
 LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
 MLINKS=	ee.1 ree.1 ee.1 edit.1

From owner-svn-src-projects@freebsd.org  Tue Feb  2 21:06:11 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5063AA995B0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 21:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 220CE1BA0;
 Tue,  2 Feb 2016 21:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12L6AgP053195;
 Tue, 2 Feb 2016 21:06:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12L6AQZ053193;
 Tue, 2 Feb 2016 21:06:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602022106.u12L6AQZ053193@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 21:06:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295164 - projects/release-pkg/etc/rc.d
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 21:06:11 -0000

Author: gjb
Date: Tue Feb  2 21:06:09 2016
New Revision: 295164
URL: https://svnweb.freebsd.org/changeset/base/295164

Log:
  Include virecover in vi package.
  
  Submitted by:	lidl
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/etc/rc.d/Makefile

Modified: projects/release-pkg/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/etc/rc.d/Makefile	Tue Feb  2 21:04:33 2016	(r295163)
+++ projects/release-pkg/etc/rc.d/Makefile	Tue Feb  2 21:06:09 2016	(r295164)
@@ -313,8 +313,12 @@ _utx=		utx
 .endif
 
 .if ${MK_VI} != "no"
-FILES+=		virecover
+FILESGROUPS+=	VI
+VI+=		virecover
 .endif
+VIDIR=		/etc/rc.d
+VIMODE=		${BINMODE}
+VIPACKAGE=	vi
 
 .if ${MK_WIRELESS} != "no"
 FILES+=		hostapd

From owner-svn-src-projects@freebsd.org  Tue Feb  2 22:26:59 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22E2EA982CD
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 22:26:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BFB71185B;
 Tue,  2 Feb 2016 22:26:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12MQv2X076988;
 Tue, 2 Feb 2016 22:26:57 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12MQn53076907;
 Tue, 2 Feb 2016 22:26:49 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602022226.u12MQn53076907@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 22:26:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295171 - in projects/release-pkg: bin/cat/tests
 bin/date/tests bin/dd/tests bin/expr/tests bin/ls/tests bin/mv/tests
 bin/pax/tests bin/pkill/tests bin/sh/tests bin/sh/tests/builtins bi...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 22:26:59 -0000

Author: gjb
Date: Tue Feb  2 22:26:49 2016
New Revision: 295171
URL: https://svnweb.freebsd.org/changeset/base/295171

Log:
  First pass to fix the 'tests' packages.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/tests-development.ucl
  projects/release-pkg/release/packages/tests-profile.ucl
Modified:
  projects/release-pkg/bin/cat/tests/Makefile
  projects/release-pkg/bin/date/tests/Makefile
  projects/release-pkg/bin/dd/tests/Makefile
  projects/release-pkg/bin/expr/tests/Makefile
  projects/release-pkg/bin/ls/tests/Makefile
  projects/release-pkg/bin/mv/tests/Makefile
  projects/release-pkg/bin/pax/tests/Makefile
  projects/release-pkg/bin/pkill/tests/Makefile
  projects/release-pkg/bin/sh/tests/Makefile
  projects/release-pkg/bin/sh/tests/builtins/Makefile
  projects/release-pkg/bin/sh/tests/errors/Makefile
  projects/release-pkg/bin/sh/tests/execution/Makefile
  projects/release-pkg/bin/sh/tests/expansion/Makefile
  projects/release-pkg/bin/sh/tests/parameters/Makefile
  projects/release-pkg/bin/sh/tests/parser/Makefile
  projects/release-pkg/bin/sh/tests/set-e/Makefile
  projects/release-pkg/bin/sleep/tests/Makefile
  projects/release-pkg/bin/test/tests/Makefile
  projects/release-pkg/cddl/lib/tests/Makefile
  projects/release-pkg/cddl/sbin/tests/Makefile
  projects/release-pkg/cddl/usr.bin/tests/Makefile
  projects/release-pkg/cddl/usr.sbin/tests/Makefile
  projects/release-pkg/gnu/lib/tests/Makefile
  projects/release-pkg/gnu/usr.bin/tests/Makefile
  projects/release-pkg/lib/atf/libatf-c++/tests/Makefile
  projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile
  projects/release-pkg/lib/atf/libatf-c/tests/Makefile
  projects/release-pkg/lib/atf/tests/Makefile
  projects/release-pkg/lib/atf/tests/test-programs/Makefile
  projects/release-pkg/lib/libarchive/tests/Makefile
  projects/release-pkg/lib/libc/tests/Makefile
  projects/release-pkg/lib/libc/tests/c063/Makefile
  projects/release-pkg/lib/libc/tests/db/Makefile
  projects/release-pkg/lib/libc/tests/gen/Makefile
  projects/release-pkg/lib/libc/tests/hash/Makefile
  projects/release-pkg/lib/libc/tests/inet/Makefile
  projects/release-pkg/lib/libc/tests/locale/Makefile
  projects/release-pkg/lib/libc/tests/net/Makefile
  projects/release-pkg/lib/libc/tests/nss/Makefile
  projects/release-pkg/lib/libc/tests/regex/Makefile
  projects/release-pkg/lib/libc/tests/resolv/Makefile
  projects/release-pkg/lib/libc/tests/rpc/Makefile
  projects/release-pkg/lib/libc/tests/setjmp/Makefile
  projects/release-pkg/lib/libc/tests/ssp/Makefile
  projects/release-pkg/lib/libc/tests/stdio/Makefile
  projects/release-pkg/lib/libc/tests/stdlib/Makefile
  projects/release-pkg/lib/libc/tests/string/Makefile
  projects/release-pkg/lib/libc/tests/sys/Makefile
  projects/release-pkg/lib/libc/tests/termios/Makefile
  projects/release-pkg/lib/libc/tests/time/Makefile
  projects/release-pkg/lib/libc/tests/tls/Makefile
  projects/release-pkg/lib/libc/tests/tls_dso/Makefile
  projects/release-pkg/lib/libc/tests/ttyio/Makefile
  projects/release-pkg/lib/libcrypt/tests/Makefile
  projects/release-pkg/lib/libmp/tests/Makefile
  projects/release-pkg/lib/libnv/tests/Makefile
  projects/release-pkg/lib/libpam/libpam/tests/Makefile
  projects/release-pkg/lib/libproc/tests/Makefile
  projects/release-pkg/lib/librt/tests/Makefile
  projects/release-pkg/lib/libthr/tests/Makefile
  projects/release-pkg/lib/libthr/tests/dlopen/Makefile
  projects/release-pkg/lib/libutil/tests/Makefile
  projects/release-pkg/lib/libxo/tests/Makefile
  projects/release-pkg/lib/libxo/tests/encoder/Makefile
  projects/release-pkg/lib/msun/tests/Makefile
  projects/release-pkg/lib/tests/Makefile
  projects/release-pkg/libexec/atf/tests/Makefile
  projects/release-pkg/libexec/rtld-elf/tests/Makefile
  projects/release-pkg/libexec/rtld-elf/tests/libpythagoras/Makefile
  projects/release-pkg/libexec/rtld-elf/tests/target/Makefile
  projects/release-pkg/sbin/devd/tests/Makefile
  projects/release-pkg/sbin/dhclient/tests/Makefile
  projects/release-pkg/sbin/growfs/tests/Makefile
  projects/release-pkg/sbin/ifconfig/tests/Makefile
  projects/release-pkg/sbin/mdconfig/tests/Makefile
  projects/release-pkg/secure/lib/tests/Makefile
  projects/release-pkg/secure/libexec/tests/Makefile
  projects/release-pkg/secure/usr.bin/tests/Makefile
  projects/release-pkg/secure/usr.sbin/tests/Makefile
  projects/release-pkg/share/examples/tests/Makefile
  projects/release-pkg/share/examples/tests/tests/Makefile
  projects/release-pkg/share/examples/tests/tests/plain/Makefile
  projects/release-pkg/sys/modules/tests/callout_test/Makefile
  projects/release-pkg/sys/modules/tests/framework/Makefile
  projects/release-pkg/tests/Makefile
  projects/release-pkg/usr.bin/apply/tests/Makefile
  projects/release-pkg/usr.bin/basename/tests/Makefile
  projects/release-pkg/usr.bin/bmake/tests/Makefile
  projects/release-pkg/usr.bin/bmake/tests/archives/Makefile
  projects/release-pkg/usr.bin/bmake/tests/basic/Makefile
  projects/release-pkg/usr.bin/bmake/tests/execution/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/Makefile
  projects/release-pkg/usr.bin/bmake/tests/suffixes/Makefile
  projects/release-pkg/usr.bin/bmake/tests/syntax/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/Makefile
  projects/release-pkg/usr.bin/bmake/tests/variables/Makefile
  projects/release-pkg/usr.bin/calendar/tests/Makefile
  projects/release-pkg/usr.bin/cmp/tests/Makefile
  projects/release-pkg/usr.bin/col/tests/Makefile
  projects/release-pkg/usr.bin/comm/tests/Makefile
  projects/release-pkg/usr.bin/cpio/tests/Makefile
  projects/release-pkg/usr.bin/cut/tests/Makefile
  projects/release-pkg/usr.bin/dirname/tests/Makefile
  projects/release-pkg/usr.bin/file2c/tests/Makefile
  projects/release-pkg/usr.bin/grep/tests/Makefile
  projects/release-pkg/usr.bin/gzip/tests/Makefile
  projects/release-pkg/usr.bin/ident/tests/Makefile
  projects/release-pkg/usr.bin/join/tests/Makefile
  projects/release-pkg/usr.bin/jot/tests/Makefile
  projects/release-pkg/usr.bin/lastcomm/tests/Makefile
  projects/release-pkg/usr.bin/limits/tests/Makefile
  projects/release-pkg/usr.bin/m4/tests/Makefile
  projects/release-pkg/usr.bin/mkimg/tests/Makefile
  projects/release-pkg/usr.bin/ncal/tests/Makefile
  projects/release-pkg/usr.bin/printf/tests/Makefile
  projects/release-pkg/usr.bin/sed/tests/Makefile
  projects/release-pkg/usr.bin/sed/tests/regress.multitest.out/Makefile
  projects/release-pkg/usr.bin/soelim/tests/Makefile
  projects/release-pkg/usr.bin/tar/tests/Makefile
  projects/release-pkg/usr.bin/timeout/tests/Makefile
  projects/release-pkg/usr.bin/tr/tests/Makefile
  projects/release-pkg/usr.bin/truncate/tests/Makefile
  projects/release-pkg/usr.bin/units/tests/Makefile
  projects/release-pkg/usr.bin/uudecode/tests/Makefile
  projects/release-pkg/usr.bin/uuencode/tests/Makefile
  projects/release-pkg/usr.bin/xargs/tests/Makefile
  projects/release-pkg/usr.bin/xo/tests/Makefile
  projects/release-pkg/usr.bin/yacc/tests/Makefile
  projects/release-pkg/usr.sbin/chown/tests/Makefile
  projects/release-pkg/usr.sbin/etcupdate/tests/Makefile
  projects/release-pkg/usr.sbin/fstyp/tests/Makefile
  projects/release-pkg/usr.sbin/makefs/tests/Makefile
  projects/release-pkg/usr.sbin/newsyslog/tests/Makefile
  projects/release-pkg/usr.sbin/nmtree/tests/Makefile
  projects/release-pkg/usr.sbin/pw/tests/Makefile
  projects/release-pkg/usr.sbin/rpcbind/tests/Makefile
  projects/release-pkg/usr.sbin/sa/tests/Makefile

Modified: projects/release-pkg/bin/cat/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/cat/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/cat/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=		cat_test
 
 FILESDIR=	${TESTSDIR}

Modified: projects/release-pkg/bin/date/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/date/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/date/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/bin/dd/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/dd/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/dd/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	dd_test
 
 .include <netbsd-tests.test.mk>

Modified: projects/release-pkg/bin/expr/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/expr/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/expr/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	expr_test
 
 ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'

Modified: projects/release-pkg/bin/ls/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/ls/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/ls/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_SH+=	ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root

Modified: projects/release-pkg/bin/mv/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/mv/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/mv/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	legacy_test
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/bin/pax/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/pax/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/pax/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/bin/pkill/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/pkill/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/pkill/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=			pgrep-F_test
 TAP_TESTS_SH+=			pgrep-LF_test
 TAP_TESTS_SH+=			pgrep-P_test

Modified: projects/release-pkg/bin/sh/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS+=	builtins
 TESTS_SUBDIRS+=	errors
 TESTS_SUBDIRS+=	execution

Modified: projects/release-pkg/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/builtins/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/builtins/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/errors/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/errors/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/errors/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/execution/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/execution/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/execution/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/expansion/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/expansion/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/parameters/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parameters/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/parameters/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sh/tests/set-e/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/set-e/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sh/tests/set-e/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTS=		${FILESDIR}/${FILES}
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: projects/release-pkg/bin/sleep/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/sleep/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/sleep/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	sleep_test
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/bin/test/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/test/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/bin/test/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	legacy_test
 # Some tests in here are silently not run when the tests are executed as
 # root.  Explicitly tell Kyua to drop privileges.

Modified: projects/release-pkg/cddl/lib/tests/Makefile
==============================================================================
--- projects/release-pkg/cddl/lib/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/cddl/lib/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/cddl/sbin/tests/Makefile
==============================================================================
--- projects/release-pkg/cddl/sbin/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/cddl/sbin/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/cddl/usr.bin/tests/Makefile
==============================================================================
--- projects/release-pkg/cddl/usr.bin/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/cddl/usr.bin/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/cddl/usr.sbin/tests/Makefile
==============================================================================
--- projects/release-pkg/cddl/usr.sbin/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/cddl/usr.sbin/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/gnu/lib/tests/Makefile
==============================================================================
--- projects/release-pkg/gnu/lib/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/gnu/lib/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/gnu/usr.bin/tests/Makefile
==============================================================================
--- projects/release-pkg/gnu/usr.bin/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/gnu/usr.bin/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/libatf-c++/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/atf/libatf-c++/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,7 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/libatf-c/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/atf/libatf-c/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/atf/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/atf/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,7 +2,12 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf
+TESTS+=		Kyuafile
+
 
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

Modified: projects/release-pkg/lib/atf/tests/test-programs/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/tests/test-programs/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/atf/tests/test-programs/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,7 +2,11 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
+TESTS+=		Kyuafile
 KYUAFILE=	yes
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/libarchive/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libarchive/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libarchive/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+=	functional_test

Modified: projects/release-pkg/lib/libc/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 SUBDIR=		tls_dso
 
 TESTS_SUBDIRS=	c063

Modified: projects/release-pkg/lib/libc/tests/c063/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/c063/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/c063/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 #TODO: t_o_search
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	faccessat_test
 NETBSD_ATF_TESTS_C+=	fchmodat_test
 NETBSD_ATF_TESTS_C+=	fchownat_test

Modified: projects/release-pkg/lib/libc/tests/db/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/db/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/db/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_db

Modified: projects/release-pkg/lib/libc/tests/gen/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/gen/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		arc4random_test
 ATF_TESTS_C+=		fmtcheck2_test
 ATF_TESTS_C+=		fmtmsg_test

Modified: projects/release-pkg/lib/libc/tests/hash/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/hash/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/hash/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=
 
 .if ${MK_OPENSSL} != "no"

Modified: projects/release-pkg/lib/libc/tests/inet/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/inet/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/inet/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	inet_network_test
 
 .include "../Makefile.netbsd-tests"

Modified: projects/release-pkg/lib/libc/tests/locale/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/locale/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/locale/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		btowc_test
 ATF_TESTS_C+=		c16rtomb_test
 ATF_TESTS_C+=		iswctype_test

Modified: projects/release-pkg/lib/libc/tests/net/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/net/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/net/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=	ether_test
 ATF_TESTS_C+=	eui64_aton_test
 ATF_TESTS_C+=	eui64_ntoa_test

Modified: projects/release-pkg/lib/libc/tests/nss/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/nss/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/nss/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libc/nss
+
 BINDIR=		${TESTSDIR}
 
 .PATH: ${.CURDIR:H}/resolv

Modified: projects/release-pkg/lib/libc/tests/regex/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/regex/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/regex/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 BINDIR=		${TESTSDIR}
 
 IMPLEMENTATION?=      -DREGEX_SPENCER

Modified: projects/release-pkg/lib/libc/tests/resolv/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/resolv/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/resolv/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libc/resolv
+
 BINDIR=		${TESTSDIR}
 
 FILES+=		mach

Modified: projects/release-pkg/lib/libc/tests/rpc/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/rpc/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/rpc/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 SRCS.xdr_test=		${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \
 			h_testbits.h
 

Modified: projects/release-pkg/lib/libc/tests/setjmp/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/setjmp/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/setjmp/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	setjmp_test
 NETBSD_ATF_TESTS_C+=	threadjmp_test
 

Modified: projects/release-pkg/lib/libc/tests/ssp/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/ssp/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/ssp/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NO_WERROR=
 WARNS?=	2
 

Modified: projects/release-pkg/lib/libc/tests/stdio/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/stdio/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/stdio/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		fdopen_test
 ATF_TESTS_C+=		fmemopen2_test
 ATF_TESTS_C+=		fopen2_test

Modified: projects/release-pkg/lib/libc/tests/stdlib/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/stdlib/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/stdlib/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		heapsort_test
 ATF_TESTS_C+=		mergesort_test
 ATF_TESTS_C+=		qsort_test

Modified: projects/release-pkg/lib/libc/tests/string/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/string/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/string/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		stpncpy_test
 ATF_TESTS_C+=		strerror2_test
 ATF_TESTS_C+=		wcscasecmp_test

Modified: projects/release-pkg/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/sys/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/sys/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=			queue_test
 
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,

Modified: projects/release-pkg/lib/libc/tests/termios/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/termios/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/termios/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	tcsetpgrp_test
 
 .include "../Makefile.netbsd-tests"

Modified: projects/release-pkg/lib/libc/tests/time/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/time/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/time/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	mktime_test
 NETBSD_ATF_TESTS_C+=	strptime_test
 

Modified: projects/release-pkg/lib/libc/tests/tls/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/tls/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/tls/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 .if !defined(NO_PIC)
 SUBDIR+=	dso
 .endif

Modified: projects/release-pkg/lib/libc/tests/tls_dso/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/tls_dso/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/tls_dso/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIB=		h_tls_dynamic
 SRCS=		h_tls_dynamic.c
 

Modified: projects/release-pkg/lib/libc/tests/ttyio/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/ttyio/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libc/tests/ttyio/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=	ttyio_test
 

Modified: projects/release-pkg/lib/libcrypt/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libcrypt/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libcrypt/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+= crypt_tests
 
 NETBSD_ATF_TESTS_C+= crypt_test

Modified: projects/release-pkg/lib/libmp/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libmp/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libmp/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_C+=	legacy_test
 
 LIBADD+=	mp

Modified: projects/release-pkg/lib/libnv/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libnv/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libnv/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_CXX=	\
 	dnv_tests \
 	nv_array_tests \

Modified: projects/release-pkg/lib/libpam/libpam/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libpam/libpam/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libpam/libpam/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/t
 

Modified: projects/release-pkg/lib/libproc/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libproc/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libproc/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=	proc_test
 
 PROGS=		target_prog

Modified: projects/release-pkg/lib/librt/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/librt/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/librt/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBADD=	rt
 
 NETBSD_ATF_TESTS_C=	sched_test

Modified: projects/release-pkg/lib/libthr/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libthr/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread
 
 # TODO: t_name (missing pthread_getname_np support in FreeBSD)

Modified: projects/release-pkg/lib/libthr/tests/dlopen/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/tests/dlopen/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libthr/tests/dlopen/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -4,6 +4,9 @@ TESTSRC=	${SRCTOP}/contrib/netbsd-tests/
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libthr/dlopen
 
 CFLAGS+=	-DTESTDIR=\"${TESTSDIR:Q}/\"

Modified: projects/release-pkg/lib/libutil/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libutil/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libutil/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_C+=	flopen_test
 TAP_TESTS_C+=	grp_test
 TAP_TESTS_C+=	humanize_number_test

Modified: projects/release-pkg/lib/libxo/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/libxo/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libxo/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 # Override the default suffix transformation rules for .c/.o -> .out

Modified: projects/release-pkg/lib/libxo/tests/encoder/Makefile
==============================================================================
--- projects/release-pkg/lib/libxo/tests/encoder/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/libxo/tests/encoder/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 .PATH: ${LIBXOSRC}/encoder/test

Modified: projects/release-pkg/lib/msun/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/msun/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/msun/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libm
 
 # All architectures on FreeBSD have fenv.h

Modified: projects/release-pkg/lib/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/lib/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/libexec/atf/tests/Makefile
==============================================================================
--- projects/release-pkg/libexec/atf/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/libexec/atf/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/libexec/rtld-elf/tests/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/libexec/rtld-elf/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,9 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 SUBDIR+=	libpythagoras target
 
 ATF_TESTS_C=	ld_library_pathfds

Modified: projects/release-pkg/libexec/rtld-elf/tests/libpythagoras/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/tests/libpythagoras/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/libexec/rtld-elf/tests/libpythagoras/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIB=		pythagoras
 SHLIB_MAJOR=	0
 

Modified: projects/release-pkg/libexec/rtld-elf/tests/target/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/tests/target/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/libexec/rtld-elf/tests/target/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 PROG=		target
 BINDIR=		${TESTSBASE}/libexec/rtld-elf
 

Added: projects/release-pkg/release/packages/tests-development.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/tests-development.ucl	Tue Feb  2 22:26:49 2016	(r295171)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT% (development)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Added: projects/release-pkg/release/packages/tests-profile.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/tests-profile.ucl	Tue Feb  2 22:26:49 2016	(r295171)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT% (profiling)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/sbin/devd/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/devd/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/sbin/devd/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C=	client_test
 TEST_METADATA.client_test=	required_programs="devd"
 TEST_METADATA.client_test+=	required_user="root"

Modified: projects/release-pkg/sbin/dhclient/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/dhclient/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/sbin/dhclient/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 .PATH:	${.CURDIR}/..
 
 PLAIN_TESTS_C=				option-domain-search_test

Modified: projects/release-pkg/sbin/growfs/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/growfs/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/sbin/growfs/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>

Modified: projects/release-pkg/sbin/ifconfig/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/ifconfig/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/sbin/ifconfig/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=		nonexistent_test
 
 .include <netbsd-tests.test.mk>

Modified: projects/release-pkg/sbin/mdconfig/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/mdconfig/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/sbin/mdconfig/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_SH=	mdconfig_test
 
 TEST_METADATA.mdconfig_test+=	required_user="root"

Modified: projects/release-pkg/secure/lib/tests/Makefile
==============================================================================
--- projects/release-pkg/secure/lib/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/secure/lib/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/secure/libexec/tests/Makefile
==============================================================================
--- projects/release-pkg/secure/libexec/tests/Makefile	Tue Feb  2 22:18:43 2016	(r295170)
+++ projects/release-pkg/secure/libexec/tests/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+

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

From owner-svn-src-projects@freebsd.org  Tue Feb  2 22:27:53 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B4B6A98305
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 22:27:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 282C619A0;
 Tue,  2 Feb 2016 22:27:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12MRq8D077117;
 Tue, 2 Feb 2016 22:27:52 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12MRmuV077084;
 Tue, 2 Feb 2016 22:27:48 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602022227.u12MRmuV077084@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 22:27:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295172 - in projects/release-pkg: . bin/csh bin/sh
 bin/test cddl/contrib/opensolaris/lib/libzfs/common contrib/libucl/tests
 contrib/libxo contrib/ofed/librdmacm/examples/build/cmatose ...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 22:27:53 -0000

Author: gjb
Date: Tue Feb  2 22:27:48 2016
New Revision: 295172
URL: https://svnweb.freebsd.org/changeset/base/295172

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/lib/libc/tests/gen/dlopen_empty_test.c
     - copied unchanged from r295171, head/lib/libc/tests/gen/dlopen_empty_test.c
  projects/release-pkg/sbin/nvmecontrol/power.c
     - copied unchanged from r295171, head/sbin/nvmecontrol/power.c
  projects/release-pkg/sys/arm/arm/swtch-v4.S
     - copied unchanged from r295171, head/sys/arm/arm/swtch-v4.S
  projects/release-pkg/sys/arm/arm/swtch-v6.S
     - copied unchanged from r295171, head/sys/arm/arm/swtch-v6.S
  projects/release-pkg/sys/boot/fdt/dts/riscv/
     - copied from r295171, head/sys/boot/fdt/dts/riscv/
  projects/release-pkg/sys/boot/ficl/riscv/
     - copied from r295171, head/sys/boot/ficl/riscv/
  projects/release-pkg/sys/conf/Makefile.riscv
     - copied unchanged from r295171, head/sys/conf/Makefile.riscv
  projects/release-pkg/sys/conf/files.riscv
     - copied unchanged from r295171, head/sys/conf/files.riscv
  projects/release-pkg/sys/conf/ldscript.riscv
     - copied unchanged from r295171, head/sys/conf/ldscript.riscv
  projects/release-pkg/sys/conf/options.riscv
     - copied unchanged from r295171, head/sys/conf/options.riscv
  projects/release-pkg/sys/dev/hwpmc/hwpmc_riscv.h
     - copied unchanged from r295171, head/sys/dev/hwpmc/hwpmc_riscv.h
  projects/release-pkg/sys/riscv/conf/
     - copied from r295171, head/sys/riscv/conf/
  projects/release-pkg/sys/riscv/htif/
     - copied from r295171, head/sys/riscv/htif/
  projects/release-pkg/sys/riscv/riscv/
     - copied from r295171, head/sys/riscv/riscv/
  projects/release-pkg/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
     - copied unchanged from r295171, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
  projects/release-pkg/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
     - copied unchanged from r295171, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
Deleted:
  projects/release-pkg/contrib/libucl/tests/.gitignore
  projects/release-pkg/contrib/libxo/.gitignore
  projects/release-pkg/contrib/unbound/.gitignore
  projects/release-pkg/sys/arm/arm/cpufunc_asm_arm10.S
Modified:
  projects/release-pkg/Makefile
  projects/release-pkg/Makefile.inc1
  projects/release-pkg/UPDATING
  projects/release-pkg/bin/csh/iconv_stub.c
  projects/release-pkg/bin/sh/redir.c
  projects/release-pkg/bin/sh/sh.1
  projects/release-pkg/bin/test/test.c
  projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
  projects/release-pkg/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
  projects/release-pkg/contrib/ofed/librdmacm/examples/build/mckey/Makefile
  projects/release-pkg/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
  projects/release-pkg/contrib/openresolv/Makefile
  projects/release-pkg/contrib/openresolv/resolvconf.8.in
  projects/release-pkg/contrib/openresolv/resolvconf.conf.5.in
  projects/release-pkg/contrib/openresolv/resolvconf.in
  projects/release-pkg/contrib/openresolv/unbound.in
  projects/release-pkg/contrib/smbfs/smbutil/print.c
  projects/release-pkg/crypto/openssh/sshd_config
  projects/release-pkg/crypto/openssh/sshd_config.5
  projects/release-pkg/lib/libc/tests/gen/Makefile
  projects/release-pkg/lib/libsysdecode/syscallnames.c
  projects/release-pkg/lib/libsysdecode/sysdecode.3
  projects/release-pkg/lib/libsysdecode/sysdecode.h
  projects/release-pkg/libexec/atrun/atrun.c
  projects/release-pkg/libexec/rtld-elf/map_object.c
  projects/release-pkg/sbin/nvmecontrol/Makefile
  projects/release-pkg/sbin/nvmecontrol/nvmecontrol.8
  projects/release-pkg/sbin/nvmecontrol/nvmecontrol.c
  projects/release-pkg/sbin/nvmecontrol/nvmecontrol.h
  projects/release-pkg/sbin/pfctl/pf_print_state.c
  projects/release-pkg/sbin/rcorder/rcorder.c
  projects/release-pkg/sbin/swapon/swapon.c
  projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c
  projects/release-pkg/sys/arm/arm/cpufunc.c
  projects/release-pkg/sys/arm/arm/cpufunc_asm.S
  projects/release-pkg/sys/arm/arm/cpufunc_asm_arm11.S
  projects/release-pkg/sys/arm/arm/cpufunc_asm_arm11x6.S
  projects/release-pkg/sys/arm/arm/cpufunc_asm_armv4.S
  projects/release-pkg/sys/arm/arm/cpufunc_asm_fa526.S
  projects/release-pkg/sys/arm/arm/db_interface.c
  projects/release-pkg/sys/arm/arm/devmap.c
  projects/release-pkg/sys/arm/arm/elf_trampoline.c
  projects/release-pkg/sys/arm/arm/genassym.c
  projects/release-pkg/sys/arm/arm/machdep.c
  projects/release-pkg/sys/arm/arm/mp_machdep.c
  projects/release-pkg/sys/arm/arm/pmap-v6.c
  projects/release-pkg/sys/arm/arm/pmap.c
  projects/release-pkg/sys/arm/arm/swtch.S
  projects/release-pkg/sys/arm/include/cpufunc.h
  projects/release-pkg/sys/arm/include/param.h
  projects/release-pkg/sys/arm/include/pmap-v6.h
  projects/release-pkg/sys/arm/include/pmap.h
  projects/release-pkg/sys/arm/include/smp.h
  projects/release-pkg/sys/arm/include/vm.h
  projects/release-pkg/sys/arm/mv/armadaxp/armadaxp.c
  projects/release-pkg/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/release-pkg/sys/arm/mv/mv_common.c
  projects/release-pkg/sys/arm/mv/mv_machdep.c
  projects/release-pkg/sys/arm/mv/orion/db88f5xxx.c
  projects/release-pkg/sys/arm/ti/omap4/pandaboard/pandaboard.c
  projects/release-pkg/sys/arm/ti/ti_cpuid.c
  projects/release-pkg/sys/arm/versatile/versatile_machdep.c
  projects/release-pkg/sys/arm64/arm64/copystr.c
  projects/release-pkg/sys/arm64/arm64/genassym.c
  projects/release-pkg/sys/arm64/arm64/gic_fdt.c
  projects/release-pkg/sys/arm64/arm64/intr_machdep.c
  projects/release-pkg/sys/arm64/arm64/locore.S
  projects/release-pkg/sys/arm64/arm64/machdep.c
  projects/release-pkg/sys/arm64/arm64/mp_machdep.c
  projects/release-pkg/sys/arm64/arm64/pmap.c
  projects/release-pkg/sys/arm64/arm64/swtch.S
  projects/release-pkg/sys/arm64/arm64/trap.c
  projects/release-pkg/sys/arm64/include/armreg.h
  projects/release-pkg/sys/arm64/include/pcb.h
  projects/release-pkg/sys/arm64/include/pmap.h
  projects/release-pkg/sys/boot/efi/libefi/efinet.c
  projects/release-pkg/sys/cam/scsi/scsi_pass.c
  projects/release-pkg/sys/cam/scsi/scsi_sa.c
  projects/release-pkg/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/release-pkg/sys/conf/Makefile.arm
  projects/release-pkg/sys/conf/NOTES
  projects/release-pkg/sys/conf/files.arm
  projects/release-pkg/sys/conf/kern.mk
  projects/release-pkg/sys/conf/kern.post.mk
  projects/release-pkg/sys/conf/kern.pre.mk
  projects/release-pkg/sys/conf/options.mips
  projects/release-pkg/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/release-pkg/sys/dev/bwn/if_bwn.c
  projects/release-pkg/sys/dev/e1000/if_em.c
  projects/release-pkg/sys/dev/ed/if_ed.c
  projects/release-pkg/sys/dev/ep/if_ep.c
  projects/release-pkg/sys/dev/fe/if_fe.c
  projects/release-pkg/sys/dev/fxp/if_fxp.c
  projects/release-pkg/sys/dev/iicbus/iic.c
  projects/release-pkg/sys/dev/iscsi_initiator/isc_cam.c
  projects/release-pkg/sys/dev/iscsi_initiator/isc_sm.c
  projects/release-pkg/sys/dev/iscsi_initiator/isc_soc.c
  projects/release-pkg/sys/dev/iscsi_initiator/isc_subr.c
  projects/release-pkg/sys/dev/iscsi_initiator/iscsi_subr.c
  projects/release-pkg/sys/dev/ixgbe/if_ix.c
  projects/release-pkg/sys/dev/ixgbe/ixgbe_common.c
  projects/release-pkg/sys/dev/ixgbe/ixgbe_phy.c
  projects/release-pkg/sys/dev/ixgbe/ixgbe_type.h
  projects/release-pkg/sys/dev/ixgbe/ixgbe_x540.c
  projects/release-pkg/sys/dev/ixgbe/ixgbe_x550.c
  projects/release-pkg/sys/dev/ixl/if_ixl.c
  projects/release-pkg/sys/dev/le/lance.c
  projects/release-pkg/sys/dev/malo/if_malo.c
  projects/release-pkg/sys/dev/md/md.c
  projects/release-pkg/sys/dev/mps/mps_mapping.c
  projects/release-pkg/sys/dev/mps/mps_sas.c
  projects/release-pkg/sys/dev/netmap/netmap_offloadings.c
  projects/release-pkg/sys/dev/nvme/nvme.h
  projects/release-pkg/sys/dev/oce/oce_if.h
  projects/release-pkg/sys/dev/otus/if_otus.c
  projects/release-pkg/sys/dev/sfxge/sfxge_rx.c
  projects/release-pkg/sys/dev/sfxge/sfxge_tx.c
  projects/release-pkg/sys/dev/sn/if_sn.c
  projects/release-pkg/sys/dev/tx/if_tx.c
  projects/release-pkg/sys/dev/usb/controller/ehcireg.h
  projects/release-pkg/sys/dev/usb/wlan/if_rsu.c
  projects/release-pkg/sys/dev/wi/if_wi.c
  projects/release-pkg/sys/dev/wi/if_wi_pci.c
  projects/release-pkg/sys/dev/xe/if_xe.c
  projects/release-pkg/sys/dev/xl/if_xl.c
  projects/release-pkg/sys/kern/kern_ktr.c
  projects/release-pkg/sys/kern/subr_mchain.c
  projects/release-pkg/sys/kern/uipc_debug.c
  projects/release-pkg/sys/kern/uipc_sockbuf.c
  projects/release-pkg/sys/kern/uipc_socket.c
  projects/release-pkg/sys/kgssapi/krb5/kcrypto_aes.c
  projects/release-pkg/sys/mips/conf/AR933X_BASE
  projects/release-pkg/sys/mips/conf/AR934X_BASE
  projects/release-pkg/sys/mips/conf/QCA955X_BASE
  projects/release-pkg/sys/mips/include/asm.h
  projects/release-pkg/sys/mips/include/cpufunc.h
  projects/release-pkg/sys/mips/include/cpuregs.h
  projects/release-pkg/sys/mips/rt305x/std.rt305x
  projects/release-pkg/sys/net/bridgestp.c
  projects/release-pkg/sys/net/if_epair.c
  projects/release-pkg/sys/net/if_mib.c
  projects/release-pkg/sys/net/netisr.c
  projects/release-pkg/sys/net/pfvar.h
  projects/release-pkg/sys/net80211/ieee80211.c
  projects/release-pkg/sys/net80211/ieee80211_acl.c
  projects/release-pkg/sys/net80211/ieee80211_action.c
  projects/release-pkg/sys/net80211/ieee80211_ageq.c
  projects/release-pkg/sys/net80211/ieee80211_amrr.c
  projects/release-pkg/sys/net80211/ieee80211_crypto_none.c
  projects/release-pkg/sys/net80211/ieee80211_ddb.c
  projects/release-pkg/sys/net80211/ieee80211_freebsd.c
  projects/release-pkg/sys/net80211/ieee80211_ht.c
  projects/release-pkg/sys/net80211/ieee80211_ioctl.c
  projects/release-pkg/sys/net80211/ieee80211_output.c
  projects/release-pkg/sys/net80211/ieee80211_power.c
  projects/release-pkg/sys/net80211/ieee80211_proto.c
  projects/release-pkg/sys/net80211/ieee80211_scan.c
  projects/release-pkg/sys/net80211/ieee80211_scan_sta.c
  projects/release-pkg/sys/net80211/ieee80211_scan_sw.c
  projects/release-pkg/sys/net80211/ieee80211_xauth.c
  projects/release-pkg/sys/netgraph/netflow/netflow.c
  projects/release-pkg/sys/netgraph/netflow/netflow_v9.c
  projects/release-pkg/sys/netgraph/netflow/ng_netflow.c
  projects/release-pkg/sys/netgraph/ng_base.c
  projects/release-pkg/sys/netinet/in_proto.c
  projects/release-pkg/sys/netinet/sctp_input.c
  projects/release-pkg/sys/netinet/sctp_output.c
  projects/release-pkg/sys/netinet/sctp_output.h
  projects/release-pkg/sys/netinet/sctp_sysctl.c
  projects/release-pkg/sys/netinet/sctp_uio.h
  projects/release-pkg/sys/netinet/sctp_var.h
  projects/release-pkg/sys/netinet/tcp_lro.c
  projects/release-pkg/sys/netinet/toecore.c
  projects/release-pkg/sys/netinet6/in6_proto.c
  projects/release-pkg/sys/netinet6/send.c
  projects/release-pkg/sys/netipsec/ipsec_mbuf.c
  projects/release-pkg/sys/netipsec/key_debug.c
  projects/release-pkg/sys/netpfil/ipfw/ip_fw_log.c
  projects/release-pkg/sys/powerpc/fpu/fpu_emu.c
  projects/release-pkg/sys/powerpc/fpu/fpu_emu.h
  projects/release-pkg/sys/powerpc/fpu/fpu_extern.h
  projects/release-pkg/sys/powerpc/include/reg.h
  projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c
  projects/release-pkg/sys/powerpc/powerpc/nexus.c
  projects/release-pkg/sys/rpc/replay.c
  projects/release-pkg/sys/sys/cdefs.h
  projects/release-pkg/sys/sys/kerneldump.h
  projects/release-pkg/sys/sys/socketvar.h
  projects/release-pkg/sys/tools/embed_mfs.sh
  projects/release-pkg/tests/sys/geom/class/gate/1_test.sh
  projects/release-pkg/tools/tools/nanobsd/defaults.sh
  projects/release-pkg/tools/tools/nanobsd/embedded/README
  projects/release-pkg/tools/tools/nanobsd/embedded/common
  projects/release-pkg/usr.bin/kdump/kdump.c
  projects/release-pkg/usr.bin/netstat/inet.c
  projects/release-pkg/usr.bin/netstat/sctp.c
  projects/release-pkg/usr.bin/netstat/unix.c
  projects/release-pkg/usr.bin/truss/aarch64-cloudabi64.c
  projects/release-pkg/usr.bin/truss/aarch64-freebsd.c
  projects/release-pkg/usr.bin/truss/amd64-cloudabi64.c
  projects/release-pkg/usr.bin/truss/amd64-freebsd.c
  projects/release-pkg/usr.bin/truss/amd64-freebsd32.c
  projects/release-pkg/usr.bin/truss/amd64-linux32.c
  projects/release-pkg/usr.bin/truss/arm-freebsd.c
  projects/release-pkg/usr.bin/truss/i386-freebsd.c
  projects/release-pkg/usr.bin/truss/i386-linux.c
  projects/release-pkg/usr.bin/truss/mips-freebsd.c
  projects/release-pkg/usr.bin/truss/powerpc-freebsd.c
  projects/release-pkg/usr.bin/truss/powerpc64-freebsd.c
  projects/release-pkg/usr.bin/truss/powerpc64-freebsd32.c
  projects/release-pkg/usr.bin/truss/sparc64-freebsd.c
  projects/release-pkg/usr.sbin/bsdconfig/bsdconfig
  projects/release-pkg/usr.sbin/bsdconfig/networking/share/media.subr
  projects/release-pkg/usr.sbin/bsdconfig/networking/share/resolv.subr
  projects/release-pkg/usr.sbin/bsdconfig/share/device.subr
  projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr
  projects/release-pkg/usr.sbin/bsdinstall/scripts/zfsboot
  projects/release-pkg/usr.sbin/sysrc/sysrc
  projects/release-pkg/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/cddl/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/release-pkg/contrib/libucl/   (props changed)
  projects/release-pkg/contrib/openresolv/   (props changed)
  projects/release-pkg/contrib/unbound/   (props changed)
  projects/release-pkg/crypto/openssh/   (props changed)
  projects/release-pkg/lib/libc/   (props changed)
  projects/release-pkg/sbin/   (props changed)
  projects/release-pkg/sys/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/sys/contrib/ipfilter/   (props changed)

Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -137,6 +137,7 @@ TGTS+=	${BITGTS}
 .ORDER: buildworld installworld
 .ORDER: buildworld distributeworld
 .ORDER: buildworld buildkernel
+.ORDER: installworld distribution
 .ORDER: buildkernel installkernel
 .ORDER: buildkernel installkernel.debug
 .ORDER: buildkernel reinstallkernel
@@ -329,7 +330,7 @@ bmake: .PHONY
 		${MMAKE} all; \
 		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
-tinderbox toolchains kernel-toolchains: upgrade_checks
+tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
 
 tinderbox:
 	@cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
@@ -340,6 +341,12 @@ toolchains:
 kernel-toolchains:
 	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
 
+kernels:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe
+
+worlds:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
+
 #
 # universe
 #

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/Makefile.inc1	Tue Feb  2 22:27:48 2016	(r295172)
@@ -72,7 +72,7 @@ SRCDIR?=	${.CURDIR}
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
-.if make(install*)
+.if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
@@ -127,7 +127,7 @@ SUBDIR+=	${_DIR}
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
-.if make(install*)
+.if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc
@@ -1125,9 +1125,7 @@ distrib-dirs: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
-distribution: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+distribution: distrib-dirs .MAKE .PHONY
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig

Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/UPDATING	Tue Feb  2 22:27:48 2016	(r295172)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160129:
+	Building ZFS pools on top of zvols is prohibited by default.  That
+	feature has never worked safely; it's always been prone to deadlocks.
+	Using a zvol as the backing store for a VM guest's virtual disk will
+	still work, even if the guest is using ZFS.  Legacy behavior can be
+	restored by setting vfs.zfs.vol.recursive=1.
+
 20160119:
 	The NONE and HPN patches has been removed from OpenSSH.  They are
 	still available in the security/openssh-portable port.

Modified: projects/release-pkg/bin/csh/iconv_stub.c
==============================================================================
--- projects/release-pkg/bin/csh/iconv_stub.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/bin/csh/iconv_stub.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);
 

Modified: projects/release-pkg/bin/sh/redir.c
==============================================================================
--- projects/release-pkg/bin/sh/redir.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/bin/sh/redir.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -70,6 +70,7 @@ struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
 	int fd0_redirected;
+	unsigned int empty_redirs;
 };
 
 
@@ -82,6 +83,9 @@ static struct redirtab *redirlist;
 */
 static int fd0_redirected = 0;
 
+/* Number of redirtabs that have not been allocated. */
+static unsigned int empty_redirs = 0;
+
 static void openredirect(union node *, char[10 ]);
 static int openhere(union node *);
 
@@ -115,12 +119,17 @@ redirect(union node *redir, int flags)
 		memory[i] = 0;
 	memory[1] = flags & REDIR_BACKQ;
 	if (flags & REDIR_PUSH) {
-		sv = ckmalloc(sizeof (struct redirtab));
-		for (i = 0 ; i < 10 ; i++)
-			sv->renamed[i] = EMPTY;
-		sv->fd0_redirected = fd0_redirected;
-		sv->next = redirlist;
-		redirlist = sv;
+		empty_redirs++;
+		if (redir != NULL) {
+			sv = ckmalloc(sizeof (struct redirtab));
+			for (i = 0 ; i < 10 ; i++)
+				sv->renamed[i] = EMPTY;
+			sv->fd0_redirected = fd0_redirected;
+			sv->empty_redirs = empty_redirs - 1;
+			sv->next = redirlist;
+			redirlist = sv;
+			empty_redirs = 0;
+		}
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
@@ -303,6 +312,12 @@ popredir(void)
 	struct redirtab *rp = redirlist;
 	int i;
 
+	INTOFF;
+	if (empty_redirs > 0) {
+		empty_redirs--;
+		INTON;
+		return;
+	}
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
 			if (rp->renamed[i] >= 0) {
@@ -313,8 +328,8 @@ popredir(void)
 			}
 		}
 	}
-	INTOFF;
 	fd0_redirected = rp->fd0_redirected;
+	empty_redirs = rp->empty_redirs;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;

Modified: projects/release-pkg/bin/sh/sh.1
==============================================================================
--- projects/release-pkg/bin/sh/sh.1	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/bin/sh/sh.1	Tue Feb  2 22:27:48 2016	(r295172)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2015
+.Dd January 30, 2016
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1952,13 +1952,20 @@ Execute the specified built-in command,
 This is useful when the user wishes to override a shell function
 with the same name as a built-in command.
 .It Ic cd Oo Fl L | P Oc Oo Fl e Oc Op Ar directory
+.It Ic cd Fl
 Switch to the specified
 .Ar directory ,
-or to the directory specified in the
+to the directory specified in the
 .Va HOME
 environment variable if no
 .Ar directory
-is specified.
+is specified or
+to the directory specified in the
+.Va OLDPWD
+environment variable if
+.Ar directory
+is
+.Fl .
 If
 .Ar directory
 does not begin with
@@ -1982,10 +1989,12 @@ the
 .Ic cd
 command will print out the name of the directory
 that it actually switched to
-if this is different from the name that the user gave.
-These may be different either because the
+if the
 .Va CDPATH
-mechanism was used or because a symbolic link was crossed.
+mechanism was used or if
+.Ar directory
+was
+.Fl .
 .Pp
 If the
 .Fl P
@@ -2774,6 +2783,10 @@ Initialization file for interactive shel
 Locale settings.
 These are inherited by children of the shell,
 and is used in a limited manner by the shell itself.
+.It Ev OLDPWD
+The previous current directory.
+This is used and updated by
+.Ic cd .
 .It Ev PWD
 An absolute pathname for the current directory,
 possibly containing symbolic links.

Modified: projects/release-pkg/bin/test/test.c
==============================================================================
--- projects/release-pkg/bin/test/test.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/bin/test/test.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -120,51 +120,53 @@ enum token {
 
 #define TOKEN_TYPE(token) ((token) & 0xff00)
 
-static struct t_op {
-	char op_text[4];
+static const struct t_op {
+	char op_text[2];
 	short op_num;
-} const ops [] = {
-	{"-r",	FILRD},
-	{"-w",	FILWR},
-	{"-x",	FILEX},
-	{"-e",	FILEXIST},
-	{"-f",	FILREG},
-	{"-d",	FILDIR},
-	{"-c",	FILCDEV},
-	{"-b",	FILBDEV},
-	{"-p",	FILFIFO},
-	{"-u",	FILSUID},
-	{"-g",	FILSGID},
-	{"-k",	FILSTCK},
-	{"-s",	FILGZ},
-	{"-t",	FILTT},
-	{"-z",	STREZ},
-	{"-n",	STRNZ},
-	{"-h",	FILSYM},		/* for backwards compat */
-	{"-O",	FILUID},
-	{"-G",	FILGID},
-	{"-L",	FILSYM},
-	{"-S",	FILSOCK},
+} ops1[] = {
 	{"=",	STREQ},
-	{"==",	STREQ},
-	{"!=",	STRNE},
 	{"<",	STRLT},
 	{">",	STRGT},
-	{"-eq",	INTEQ},
-	{"-ne",	INTNE},
-	{"-ge",	INTGE},
-	{"-gt",	INTGT},
-	{"-le",	INTLE},
-	{"-lt",	INTLT},
-	{"-nt",	FILNT},
-	{"-ot",	FILOT},
-	{"-ef",	FILEQ},
 	{"!",	UNOT},
-	{"-a",	BAND},
-	{"-o",	BOR},
 	{"(",	LPAREN},
 	{")",	RPAREN},
-	{"",	0}
+}, opsm1[] = {
+	{"r",	FILRD},
+	{"w",	FILWR},
+	{"x",	FILEX},
+	{"e",	FILEXIST},
+	{"f",	FILREG},
+	{"d",	FILDIR},
+	{"c",	FILCDEV},
+	{"b",	FILBDEV},
+	{"p",	FILFIFO},
+	{"u",	FILSUID},
+	{"g",	FILSGID},
+	{"k",	FILSTCK},
+	{"s",	FILGZ},
+	{"t",	FILTT},
+	{"z",	STREZ},
+	{"n",	STRNZ},
+	{"h",	FILSYM},		/* for backwards compat */
+	{"O",	FILUID},
+	{"G",	FILGID},
+	{"L",	FILSYM},
+	{"S",	FILSOCK},
+	{"a",	BAND},
+	{"o",	BOR},
+}, ops2[] = {
+	{"==",	STREQ},
+	{"!=",	STRNE},
+}, opsm2[] = {
+	{"eq",	INTEQ},
+	{"ne",	INTNE},
+	{"ge",	INTGE},
+	{"gt",	INTGT},
+	{"le",	INTLE},
+	{"lt",	INTLT},
+	{"nt",	FILNT},
+	{"ot",	FILOT},
+	{"ef",	FILEQ},
 };
 
 static int nargc;
@@ -416,35 +418,71 @@ filstat(char *nm, enum token mode)
 	}
 }
 
-static enum token
-t_lex(char *s)
+static int
+find_op_1char(const struct t_op *op, const struct t_op *end, const char *s)
 {
-	struct t_op const *op = ops;
+	char c;
 
-	if (s == 0) {
-		return EOI;
+	c = s[0];
+	while (op != end) {
+		if (c == *op->op_text)
+			return op->op_num;
+		op++;
 	}
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0) {
-			if (((TOKEN_TYPE(op->op_num) == UNOP ||
-			    TOKEN_TYPE(op->op_num) == BUNOP)
-						&& isunopoperand()) ||
-			    (op->op_num == LPAREN && islparenoperand()) ||
-			    (op->op_num == RPAREN && isrparenoperand()))
-				break;
+	return OPERAND;
+}
+
+static int
+find_op_2char(const struct t_op *op, const struct t_op *end, const char *s)
+{
+	while (op != end) {
+		if (s[0] == op->op_text[0] && s[1] == op->op_text[1])
 			return op->op_num;
-		}
 		op++;
 	}
 	return OPERAND;
 }
 
 static int
+find_op(const char *s)
+{
+	if (s[0] == '\0')
+		return OPERAND;
+	else if (s[1] == '\0')
+		return find_op_1char(ops1, (&ops1)[1], s);
+	else if (s[2] == '\0')
+		return s[0] == '-' ? find_op_1char(opsm1, (&opsm1)[1], s + 1) :
+		    find_op_2char(ops2, (&ops2)[1], s);
+	else if (s[3] == '\0')
+		return s[0] == '-' ? find_op_2char(opsm2, (&opsm2)[1], s + 1) :
+		    OPERAND;
+	else
+		return OPERAND;
+}
+
+static enum token
+t_lex(char *s)
+{
+	int num;
+
+	if (s == 0) {
+		return EOI;
+	}
+	num = find_op(s);
+	if (((TOKEN_TYPE(num) == UNOP || TOKEN_TYPE(num) == BUNOP)
+				&& isunopoperand()) ||
+	    (num == LPAREN && islparenoperand()) ||
+	    (num == RPAREN && isrparenoperand()))
+		return OPERAND;
+	return num;
+}
+
+static int
 isunopoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
 	char *t;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -452,20 +490,16 @@ isunopoperand(void)
 	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 TOKEN_TYPE(op->op_num) == BINOP &&
-			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP &&
+	    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 }
 
 static int
 islparenoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -474,12 +508,8 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0)
-			return TOKEN_TYPE(op->op_num) == BINOP;
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP;
 }
 
 static int

Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -26,6 +26,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2015 by Syneto S.R.L. All rights reserved.
  */
 
 /*
@@ -246,8 +247,9 @@ zpool_get_features(zpool_handle_t *zhp)
 		config = zpool_get_config(zhp, NULL);
 	}
 
-	verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
-	    &features) == 0);
+	if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
+	    &features) != 0)
+		return (NULL);
 
 	return (features);
 }

Modified: projects/release-pkg/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
==============================================================================
--- projects/release-pkg/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -5,7 +5,6 @@
 PROG=	cmatose
 MAN=
 SRCS=	cmatose.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/release-pkg/contrib/ofed/librdmacm/examples/build/mckey/Makefile
==============================================================================
--- projects/release-pkg/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -5,7 +5,6 @@
 PROG=	mckey
 MAN=
 SRCS=	mckey.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/release-pkg/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
==============================================================================
--- projects/release-pkg/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -5,7 +5,6 @@
 PROG=	udaddy
 MAN=
 SRCS=	udaddy.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/release-pkg/contrib/openresolv/Makefile
==============================================================================
--- projects/release-pkg/contrib/openresolv/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/openresolv/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -1,5 +1,5 @@
 PKG=		openresolv
-VERSION=	3.7.0
+VERSION=	3.7.1
 
 # Nasty hack so that make clean works without configure being run
 _CONFIG_MK!=	test -e config.mk && echo config.mk || echo config-null.mk
@@ -37,7 +37,7 @@ SED_RESTARTCMD=		-e 's:@RESTARTCMD \(.*\
 
 DISTPREFIX?=	${PKG}-${VERSION}
 DISTFILEGZ?=	${DISTPREFIX}.tar.gz
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.xz
 FOSSILID?=	current
 
 .SUFFIXES: .in
@@ -77,9 +77,9 @@ install: proginstall maninstall
 import:
 	rm -rf /tmp/${DISTPREFIX}
 	${INSTALL} -d /tmp/${DISTPREFIX}
-	cp README ${SRCS} /tmp/${DISPREFIX}
+	cp README ${SRCS} /tmp/${DISTPREFIX}
 
 dist:
 	fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ}
-	gunzip -c ${DISTFILEGZ} |  bzip2 >${DISTFILE}
+	gunzip -c ${DISTFILEGZ} | xz >${DISTFILE}
 	rm ${DISTFILEGZ}

Modified: projects/release-pkg/contrib/openresolv/resolvconf.8.in
==============================================================================
--- projects/release-pkg/contrib/openresolv/resolvconf.8.in	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/openresolv/resolvconf.8.in	Tue Feb  2 22:27:48 2016	(r295172)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 27, 2014
+.Dd April 27, 2015
 .Dt RESOLVCONF 8
 .Os
 .Sh NAME

Modified: projects/release-pkg/contrib/openresolv/resolvconf.conf.5.in
==============================================================================
--- projects/release-pkg/contrib/openresolv/resolvconf.conf.5.in	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/openresolv/resolvconf.conf.5.in	Tue Feb  2 22:27:48 2016	(r295172)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 2015
+.Dd May 14, 2015
 .Dt RESOLVCONF.CONF 5
 .Os
 .Sh NAME
@@ -91,6 +91,11 @@ To remove a block, you can use 192.168.*
 These interfaces name servers will only be queried for the domains listed
 in their resolv.conf.
 Useful for VPN domains.
+Setting
+.Sy private_interfaces Ns ="*"
+will stop the forwarding of the root zone and allows the local resolver to
+recursively query the root servers directly.
+Requires a local nameserver other than libc.
 This is equivalent to the
 .Nm resolvconf -p
 option.
@@ -149,7 +154,7 @@ When set to /dev/null or NULL,
 .Sy resolv_conf_local_only
 is defaulted to NO,
 .Sy local_nameservers
-is unset unless overriden and only the information set in
+is unset unless overridden and only the information set in
 .Nm
 is written to
 .Sy resolv_conf .
@@ -271,7 +276,7 @@ Each subscriber attempts to automaticall
 distribution has been catered for.
 Also, users could equally want to use a different version from the one
 installed by default, such as bind8 and bind9.
-To accomodate this, the subscribers have these files in configurable
+To accommodate this, the subscribers have these files in configurable
 variables, documented below.
 .Pp
 .Bl -tag -width indent

Modified: projects/release-pkg/contrib/openresolv/resolvconf.in
==============================================================================
--- projects/release-pkg/contrib/openresolv/resolvconf.in	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/openresolv/resolvconf.in	Tue Feb  2 22:27:48 2016	(r295172)
@@ -50,7 +50,6 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; th
 		interface_order="$(cat "$SYSCONFDIR"/interface-order)"
 	fi
 fi
-TMPDIR="$VARDIR/tmp"
 IFACEDIR="$VARDIR/interfaces"
 METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"

Modified: projects/release-pkg/contrib/openresolv/unbound.in
==============================================================================
--- projects/release-pkg/contrib/openresolv/unbound.in	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/openresolv/unbound.in	Tue Feb  2 22:27:48 2016	(r295172)
@@ -45,7 +45,8 @@ for d in $DOMAINS; do
 	ns="${d#*:}"
 	case "$unbound_insecure" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-		newconf="$newconf${NL}domain-insecure: \"$dn\""
+		newconf="$newconf${NL}server:$NL"
+		newconf="$newconf	domain-insecure: \"$dn\"$NL"
 		;;
 	esac
 	newconf="$newconf${NL}forward-zone:$NL	name: \"$dn\"$NL"

Modified: projects/release-pkg/contrib/smbfs/smbutil/print.c
==============================================================================
--- projects/release-pkg/contrib/smbfs/smbutil/print.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/contrib/smbfs/smbutil/print.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include <sysexits.h>

Modified: projects/release-pkg/crypto/openssh/sshd_config
==============================================================================
--- projects/release-pkg/crypto/openssh/sshd_config	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/crypto/openssh/sshd_config	Tue Feb  2 22:27:48 2016	(r295172)
@@ -45,7 +45,7 @@
 # Authentication:
 
 #LoginGraceTime 2m
-#PermitRootLogin prohibit-password
+#PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
 #MaxSessions 10

Modified: projects/release-pkg/crypto/openssh/sshd_config.5
==============================================================================
--- projects/release-pkg/crypto/openssh/sshd_config.5	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/crypto/openssh/sshd_config.5	Tue Feb  2 22:27:48 2016	(r295172)
@@ -1217,7 +1217,7 @@ The argument must be
 or
 .Dq no .
 The default is
-.Dq prohibit-password .
+.Dq no .
 Note that if
 .Cm ChallengeResponseAuthentication
 is

Modified: projects/release-pkg/lib/libc/tests/gen/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/lib/libc/tests/gen/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -15,6 +15,7 @@ ATF_TESTS_C+=		ftw_test
 ATF_TESTS_C+=		popen_test
 ATF_TESTS_C+=		posix_spawn_test
 ATF_TESTS_C+=		wordexp_test
+ATF_TESTS_C+=		dlopen_empty_test
 
 # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep
 # TODO: t_siginfo (fixes require further inspection)

Copied: projects/release-pkg/lib/libc/tests/gen/dlopen_empty_test.c (from r295171, head/lib/libc/tests/gen/dlopen_empty_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/lib/libc/tests/gen/dlopen_empty_test.c	Tue Feb  2 22:27:48 2016	(r295172, copy of r295171, head/lib/libc/tests/gen/dlopen_empty_test.c)
@@ -0,0 +1,97 @@
+/*-
+ * Copyright (c) 2016 Maksym Sobolyev
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/stat.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static const char *funname;
+static char *soname;
+
+static void
+sigsegv_handler(int sig __unused)
+{
+        unlink(soname);
+        free(soname);
+        atf_tc_fail("got SIGSEGV in the %s(3)", funname);
+}
+
+ATF_TC(dlopen_empty_test);
+ATF_TC_HEAD(dlopen_empty_test, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Tests the dlopen() of an empty file "
+                      "returns an error");
+}
+ATF_TC_BODY(dlopen_empty_test, tc)
+{
+        char tempname[] = "/tmp/temp.XXXXXX";
+        char *fname;
+        int fd;
+        void *dlh;
+        struct sigaction act, oact;
+
+        fname = mktemp(tempname);
+        ATF_REQUIRE_MSG(fname != NULL, "mktemp failed; errno=%d", errno);
+        asprintf(&soname, "%s.so", fname);
+        ATF_REQUIRE_MSG(soname != NULL, "asprintf failed; errno=%d", ENOMEM);
+        fd = open(soname, O_WRONLY | O_CREAT | O_TRUNC, DEFFILEMODE);
+        ATF_REQUIRE_MSG(fd != -1, "open(\"%s\") failed; errno=%d", soname, errno);
+        close(fd);
+
+        act.sa_handler = sigsegv_handler;
+        act.sa_flags = 0;
+        sigemptyset(&act.sa_mask);
+        ATF_CHECK_MSG(sigaction(SIGSEGV, &act, &oact) != -1,
+            "sigaction() failed");
+
+        funname = "dlopen";
+        dlh = dlopen(soname, RTLD_LAZY);
+        if (dlh != NULL) {
+                funname = "dlclose";
+                dlclose(dlh);
+        }
+        ATF_REQUIRE_MSG(dlh == NULL, "dlopen(\"%s\") did not fail", soname);
+        unlink(soname);
+        free(soname);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+        ATF_TP_ADD_TC(tp, dlopen_empty_test);
+
+        return (atf_no_error());
+}

Modified: projects/release-pkg/lib/libsysdecode/syscallnames.c
==============================================================================
--- projects/release-pkg/lib/libsysdecode/syscallnames.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/lib/libsysdecode/syscallnames.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -70,30 +70,30 @@ sysdecode_syscallname(enum sysdecode_abi
 {
 
 	switch (abi) {
-	case FREEBSD:
+	case SYSDECODE_ABI_FREEBSD:
 		if (code < nitems(syscallnames))
 			return (syscallnames[code]);
 		break;
 #if defined(__amd64__) || defined(__powerpc64__)
-	case FREEBSD32:
+	case SYSDECODE_ABI_FREEBSD32:
 		if (code < nitems(freebsd32_syscallnames))
 			return (freebsd32_syscallnames[code]);
 		break;
 #endif
 #if defined(__amd64__) || defined(__i386__)
-	case LINUX:
+	case SYSDECODE_ABI_LINUX:
 		if (code < nitems(linux_syscallnames))
 			return (linux_syscallnames[code]);
 		break;
 #endif
 #ifdef __amd64__
-	case LINUX32:
+	case SYSDECODE_ABI_LINUX32:
 		if (code < nitems(linux32_syscallnames))
 			return (linux32_syscallnames[code]);
 		break;
 #endif
 #if defined(__amd64__) || defined(__aarch64__)
-	case CLOUDABI64:
+	case SYSDECODE_ABI_CLOUDABI64:
 		if (code < nitems(cloudabi64_syscallnames))
 			return (cloudabi64_syscallnames[code]);
 		break;

Modified: projects/release-pkg/lib/libsysdecode/sysdecode.3
==============================================================================
--- projects/release-pkg/lib/libsysdecode/sysdecode.3	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/lib/libsysdecode/sysdecode.3	Tue Feb  2 22:27:48 2016	(r295172)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 24, 2016
+.Dd January 29, 2016
 .Dt SYSDECODE 3
 .Os
 .Sh NAME
@@ -44,23 +44,23 @@ The supported ABIs are named by the
 .Vt enum sysdecode_abi
 enumeration.
 .Pp
-.Bl -tag -width "Li UNKNOWN_ABI" -compact
-.It Li FREEBSD
+.Bl -tag -width "Li SYSDECODE_ABI_CLOUDABI64" -compact
+.It Li SYSDECODE_ABI_FREEBSD
 Native FreeBSD binaries.
 Supported on all platforms.
-.It Li FREEBSD32
+.It Li SYSDECODE_ABI_FREEBSD32
 32-bit FreeBSD binaries.
 Supported on amd64 and powerpc64.
-.It Li LINUX
+.It Li SYSDECODE_ABI_LINUX
 Linux binaries of the same platform.
 Supported on amd64 and i386.
-.It Li LINUX32
+.It Li SYSDECODE_ABI_LINUX32
 32-bit Linux binaries.
 Supported on amd64.
-.It Li CLOUDABI64
+.It Li SYSDECODE_ABI_CLOUDABI64
 64-bit CloudABI binaries.
 Supported on aarch64 and amd64.
-.It Li UNKNOWN_ABI
+.It Li SYSDECODE_ABI_UNKNOWN
 A placeholder for use when the ABI is not known.
 .El
 .Sh SEE ALSO

Modified: projects/release-pkg/lib/libsysdecode/sysdecode.h
==============================================================================
--- projects/release-pkg/lib/libsysdecode/sysdecode.h	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/lib/libsysdecode/sysdecode.h	Tue Feb  2 22:27:48 2016	(r295172)
@@ -30,12 +30,12 @@
 #define	__SYSDECODE_H__
 
 enum sysdecode_abi {
-	UNKNOWN_ABI = 0,
-	FREEBSD,
-	FREEBSD32,
-	LINUX,
-	LINUX32,
-	CLOUDABI64
+	SYSDECODE_ABI_UNKNOWN = 0,
+	SYSDECODE_ABI_FREEBSD,
+	SYSDECODE_ABI_FREEBSD32,
+	SYSDECODE_ABI_LINUX,
+	SYSDECODE_ABI_LINUX32,
+	SYSDECODE_ABI_CLOUDABI64
 };
 
 const char *sysdecode_ioctlname(unsigned long _val);

Modified: projects/release-pkg/libexec/atrun/atrun.c
==============================================================================
--- projects/release-pkg/libexec/atrun/atrun.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/libexec/atrun/atrun.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -459,8 +459,9 @@ main(int argc, char *argv[])
     int c;
     int run_batch;
 #ifdef __FreeBSD__
-    size_t ncpu, ncpusz;
+    size_t ncpusz;
     double load_avg = -1;
+    int ncpu;
 #else
     double load_avg = LOADAVG_MX;
 #endif

Modified: projects/release-pkg/libexec/rtld-elf/map_object.c
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/map_object.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/libexec/rtld-elf/map_object.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -38,7 +38,7 @@
 #include "debug.h"
 #include "rtld.h"
 
-static Elf_Ehdr *get_elf_header(int, const char *);
+static Elf_Ehdr *get_elf_header(int, const char *, const struct stat *);
 static int convert_prot(int);	/* Elf flags -> mmap protection */
 static int convert_flags(int); /* Elf flags -> mmap flags */
 
@@ -91,7 +91,7 @@ map_object(int fd, const char *path, con
     char *note_map;
     size_t note_map_len;
 
-    hdr = get_elf_header(fd, path);
+    hdr = get_elf_header(fd, path, sb);
     if (hdr == NULL)
 	return (NULL);
 
@@ -324,10 +324,16 @@ error:
 }
 
 static Elf_Ehdr *
-get_elf_header(int fd, const char *path)
+get_elf_header(int fd, const char *path, const struct stat *sbp)
 {
 	Elf_Ehdr *hdr;
 
+	/* Make sure file has enough data for the ELF header */
+	if (sbp != NULL && sbp->st_size < sizeof(Elf_Ehdr)) {
+		_rtld_error("%s: invalid file format", path);
+		return (NULL);
+	}
+
 	hdr = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE | MAP_PREFAULT_READ,
 	    fd, 0);
 	if (hdr == (Elf_Ehdr *)MAP_FAILED) {

Modified: projects/release-pkg/sbin/nvmecontrol/Makefile
==============================================================================
--- projects/release-pkg/sbin/nvmecontrol/Makefile	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/sbin/nvmecontrol/Makefile	Tue Feb  2 22:27:48 2016	(r295172)
@@ -2,7 +2,7 @@
 
 PROG=	nvmecontrol
 SRCS=	nvmecontrol.c devlist.c firmware.c identify.c logpage.c	\
-	perftest.c reset.c nvme_util.c
+	perftest.c reset.c nvme_util.c power.c
 MAN=	nvmecontrol.8
 
 .PATH:	${.CURDIR}/../../sys/dev/nvme

Modified: projects/release-pkg/sbin/nvmecontrol/nvmecontrol.8
==============================================================================
--- projects/release-pkg/sbin/nvmecontrol/nvmecontrol.8	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/sbin/nvmecontrol/nvmecontrol.8	Tue Feb  2 22:27:48 2016	(r295172)
@@ -70,6 +70,11 @@
 .Op Fl f Ar path_to_firmware
 .Op Fl a
 .Aq device id
+.Nm
+.Ic power
+.Op Fl l
+.Op Fl p power_state
+.Op fl w workload_hint
 .Sh DESCRIPTION
 NVM Express (NVMe) is a storage protocol standard, for SSDs and other
 high-speed storage devices over PCI Express.
@@ -120,6 +125,18 @@ Activate the firmware in slot 4 of the n
 .Pp
 Download the firmware image contained in "/tmp/nvme_firmware" to slot 7 of the
 nvme0 controller and activate it on the next reset.
+.Pp
+.Dl nvmecontrol power -l nvme0
+.Pp
+List all the current power modes.
+.Pp
+.Dl nvmecontrol power -p 3 nvme0
+.Pp
+Set the current power mode.
+.Pp
+.Dl nvmecontrol power nvme0
+.Pp
+Get the current power mode.
 .Sh AUTHORS
 .An -nosplit
 .Nm

Modified: projects/release-pkg/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- projects/release-pkg/sbin/nvmecontrol/nvmecontrol.c	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/sbin/nvmecontrol/nvmecontrol.c	Tue Feb  2 22:27:48 2016	(r295172)
@@ -58,6 +58,7 @@ static struct nvme_function {
 	{"reset",	reset,		RESET_USAGE},
 	{"logpage",	logpage,	LOGPAGE_USAGE},
 	{"firmware",	firmware,	FIRMWARE_USAGE},
+	{"power",	power,		POWER_USAGE},
 	{NULL,		NULL,		NULL},
 };
 

Modified: projects/release-pkg/sbin/nvmecontrol/nvmecontrol.h
==============================================================================
--- projects/release-pkg/sbin/nvmecontrol/nvmecontrol.h	Tue Feb  2 22:26:49 2016	(r295171)
+++ projects/release-pkg/sbin/nvmecontrol/nvmecontrol.h	Tue Feb  2 22:27:48 2016	(r295172)
@@ -55,12 +55,16 @@
 #define FIRMWARE_USAGE							       \
 "       nvmecontrol firmware [-s slot] [-f path_to_firmware] [-a] <controller id>\n"
 
+#define POWER_USAGE							       \
+"       nvmecontrol power [-l] [-p new-state [-w workload-hint]] <controller id>\n"
+
 void devlist(int argc, char *argv[]);
 void identify(int argc, char *argv[]);
 void perftest(int argc, char *argv[]);
 void reset(int argc, char *argv[]);
 void logpage(int argc, char *argv[]);
 void firmware(int argc, char *argv[]);
+void power(int argc, char *argv[]);
 
 int open_dev(const char *str, int *fd, int show_error, int exit_on_error);
 void parse_ns_str(const char *ns_str, char *ctrlr_str, int *nsid);

Copied: projects/release-pkg/sbin/nvmecontrol/power.c (from r295171, head/sbin/nvmecontrol/power.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/sbin/nvmecontrol/power.c	Tue Feb  2 22:27:48 2016	(r295172, copy of r295171, head/sbin/nvmecontrol/power.c)
@@ -0,0 +1,185 @@
+/*-
+ * Copyright (c) 2016 Netflix, Inc
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

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

From owner-svn-src-projects@freebsd.org  Tue Feb  2 23:23:39 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 513B9A994D3
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 23:23:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20823156A;
 Tue,  2 Feb 2016 23:23:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12NNcF6005154;
 Tue, 2 Feb 2016 23:23:38 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12NNcOe005153;
 Tue, 2 Feb 2016 23:23:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602022323.u12NNcOe005153@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 2 Feb 2016 23:23:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295175 - projects/release-pkg/usr.bin/vi/catalog
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 23:23:39 -0000

Author: gjb
Date: Tue Feb  2 23:23:37 2016
New Revision: 295175
URL: https://svnweb.freebsd.org/changeset/base/295175

Log:
  Fix build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/usr.bin/vi/catalog/Makefile

Modified: projects/release-pkg/usr.bin/vi/catalog/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/vi/catalog/Makefile	Tue Feb  2 22:55:03 2016	(r295174)
+++ projects/release-pkg/usr.bin/vi/catalog/Makefile	Tue Feb  2 23:23:37 2016	(r295175)
@@ -7,8 +7,9 @@ PACKAGE=vi
 V=	${.CURDIR}/../../../contrib/nvi
 
 FILESGROUPS+=VICAT
-VICAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
+CAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
 	uk_UA.KOI8-U zh_CN.GB2312
+VICAT=		${CAT}
 VICATDIR=	${FILESDIR}
 VICATPACKAGE=	${PACKAGE}
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 00:34:31 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F418A9A03F
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 00:34:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B8B0D7D;
 Wed,  3 Feb 2016 00:34:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u130YURM027783;
 Wed, 3 Feb 2016 00:34:30 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u130YNLV027713;
 Wed, 3 Feb 2016 00:34:23 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602030034.u130YNLV027713@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 00:34:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295179 - in projects/release-pkg:
 lib/libc/tests/gen/execve tests/etc tests/etc/rc.d tests/sys tests/sys/acl
 tests/sys/aio tests/sys/fifo tests/sys/file tests/sys/geom
 tests/sys/geom/c...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 00:34:31 -0000

Author: gjb
Date: Wed Feb  3 00:34:23 2016
New Revision: 295179
URL: https://svnweb.freebsd.org/changeset/base/295179

Log:
  More 'tests' package fixes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/libc/tests/gen/execve/Makefile
  projects/release-pkg/tests/etc/Makefile
  projects/release-pkg/tests/etc/rc.d/Makefile
  projects/release-pkg/tests/sys/Makefile
  projects/release-pkg/tests/sys/acl/Makefile
  projects/release-pkg/tests/sys/aio/Makefile
  projects/release-pkg/tests/sys/fifo/Makefile
  projects/release-pkg/tests/sys/file/Makefile
  projects/release-pkg/tests/sys/geom/Makefile
  projects/release-pkg/tests/sys/geom/class/Makefile
  projects/release-pkg/tests/sys/kern/Makefile
  projects/release-pkg/tests/sys/kern/acct/Makefile
  projects/release-pkg/tests/sys/kern/execve/Makefile
  projects/release-pkg/tests/sys/kern/pipe/Makefile
  projects/release-pkg/tests/sys/kqueue/Makefile
  projects/release-pkg/tests/sys/mac/Makefile
  projects/release-pkg/tests/sys/mac/bsdextended/Makefile
  projects/release-pkg/tests/sys/mac/portacl/Makefile
  projects/release-pkg/tests/sys/mqueue/Makefile
  projects/release-pkg/tests/sys/netinet/Makefile
  projects/release-pkg/tests/sys/opencrypto/Makefile
  projects/release-pkg/tests/sys/pjdfstest/Makefile
  projects/release-pkg/tests/sys/pjdfstest/pjdfstest/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/Makefile
  projects/release-pkg/tests/sys/posixshm/Makefile
  projects/release-pkg/tests/sys/vfs/Makefile
  projects/release-pkg/tests/sys/vm/Makefile
  projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
  projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
  projects/release-pkg/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
  projects/release-pkg/usr.bin/bmake/tests/basic/t0/Makefile
  projects/release-pkg/usr.bin/bmake/tests/basic/t1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/basic/t2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/basic/t3/Makefile
  projects/release-pkg/usr.bin/bmake/tests/execution/ellipsis/Makefile
  projects/release-pkg/usr.bin/bmake/tests/execution/empty/Makefile
  projects/release-pkg/usr.bin/bmake/tests/execution/joberr/Makefile
  projects/release-pkg/usr.bin/bmake/tests/execution/plus/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/builtin/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/meta/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/path/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/path_select/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/replace/Makefile
  projects/release-pkg/usr.bin/bmake/tests/shell/select/Makefile
  projects/release-pkg/usr.bin/bmake/tests/suffixes/basic/Makefile
  projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/syntax/directive-t0/Makefile
  projects/release-pkg/usr.bin/bmake/tests/syntax/enl/Makefile
  projects/release-pkg/usr.bin/bmake/tests/syntax/funny-targets/Makefile
  projects/release-pkg/usr.bin/bmake/tests/syntax/semi/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/Makefile
  projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
  projects/release-pkg/usr.bin/bmake/tests/variables/modifier_M/Makefile
  projects/release-pkg/usr.bin/bmake/tests/variables/modifier_t/Makefile
  projects/release-pkg/usr.bin/bmake/tests/variables/opt_V/Makefile
  projects/release-pkg/usr.bin/bmake/tests/variables/t0/Makefile

Modified: projects/release-pkg/lib/libc/tests/gen/execve/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/execve/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/lib/libc/tests/gen/execve/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	execve_test
 
 .include "../../Makefile.netbsd-tests"

Modified: projects/release-pkg/tests/etc/Makefile
==============================================================================
--- projects/release-pkg/tests/etc/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/etc/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 TESTSDIR=	${TESTSBASE}/etc
 
 .PATH:		${SRCTOP}/tests

Modified: projects/release-pkg/tests/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/tests/etc/rc.d/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/etc/rc.d/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/etc/rc.d
 
 ATF_TESTS_SH+=	routing_test

Modified: projects/release-pkg/tests/sys/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -2,6 +2,9 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR= ${TESTSBASE}/sys
 
 TESTS_SUBDIRS+=		acl

Modified: projects/release-pkg/tests/sys/acl/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/acl/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/acl/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/acl
 
 BINDIR=		${TESTSDIR}

Modified: projects/release-pkg/tests/sys/aio/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/aio/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/aio/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/aio
 
 PLAIN_TESTS_C+=	aio_kqueue_test

Modified: projects/release-pkg/tests/sys/fifo/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/fifo/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/fifo/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/fifo
 
 PLAIN_TESTS_C+=	fifo_create

Modified: projects/release-pkg/tests/sys/file/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/file/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/file/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/file
 
 BINDIR=		${TESTSDIR}

Modified: projects/release-pkg/tests/sys/geom/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/geom/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom
 
 TESTS_SUBDIRS+=	class

Modified: projects/release-pkg/tests/sys/geom/class/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/geom/class/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class
 
 TESTS_SUBDIRS+=	concat

Modified: projects/release-pkg/tests/sys/kern/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/kern/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/kern/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/kernel
 
 TESTSDIR=	${TESTSBASE}/sys/kern

Modified: projects/release-pkg/tests/sys/kern/acct/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/kern/acct/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/kern/acct/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/acct
 
 ATF_TESTS_C=	acct_test

Modified: projects/release-pkg/tests/sys/kern/execve/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/kern/execve/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/kern/execve/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/execve
 
 BINDIR=		${TESTSDIR}

Modified: projects/release-pkg/tests/sys/kern/pipe/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/kern/pipe/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/kern/pipe/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/pipe
 
 PLAIN_TESTS_C+= big_pipe_test

Modified: projects/release-pkg/tests/sys/kqueue/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/kqueue/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/kqueue/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -6,6 +6,9 @@
 # libkqueue and test suite by Mark Heily <mark@heily.com>
 #
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TAP_TESTS_SH=	kqueue_test
 
 TESTSDIR=	${TESTSBASE}/sys/kqueue

Modified: projects/release-pkg/tests/sys/mac/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/mac/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/mac/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac
 
 TESTS_SUBDIRS+=	bsdextended

Modified: projects/release-pkg/tests/sys/mac/bsdextended/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/mac/bsdextended/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/mac/bsdextended/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac/bsdextended
 
 TAP_TESTS_C+=	ugidfw_test

Modified: projects/release-pkg/tests/sys/mac/portacl/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/mac/portacl/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/mac/portacl/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac/portacl
 BINDIR=		${TESTSDIR}
 

Modified: projects/release-pkg/tests/sys/mqueue/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/mqueue/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/mqueue/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mqueue
 
 ATF_TESTS_SH=	mqueue_test

Modified: projects/release-pkg/tests/sys/netinet/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/netinet/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/netinet/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/netinet
 BINDIR=		${TESTSDIR}
 

Modified: projects/release-pkg/tests/sys/opencrypto/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/opencrypto/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/opencrypto/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/opencrypto
 BINDIR=		${TESTSDIR}
 

Modified: projects/release-pkg/tests/sys/pjdfstest/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/pjdfstest/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 SUBDIR+=	pjdfstest
 SUBDIR+=	tests
 SUBDIR_PARALLEL=

Modified: projects/release-pkg/tests/sys/pjdfstest/pjdfstest/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/pjdfstest/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/pjdfstest/pjdfstest/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TOP=		${.CURDIR:H:H:H:H}
 
 .PATH: ${TOP}/contrib/pjdfstest

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 PJDFSTEST_SRCDIR=	${SRCTOP}/contrib/pjdfstest
 
 TESTSDIR=	${TESTSBASE}/sys/pjdfstest

Modified: projects/release-pkg/tests/sys/posixshm/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/posixshm/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/posixshm/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/posixshm
 
 ATF_TESTS_C+=	posixshm_test

Modified: projects/release-pkg/tests/sys/vfs/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/vfs/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/vfs/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=		${TESTSBASE}/sys/vfs
 
 PLAIN_TESTS_SH+=	trailing_slash

Modified: projects/release-pkg/tests/sys/vm/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/vm/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/tests/sys/vm/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/vm
 
 ATF_TESTS_C+=	mmap_test

Modified: projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/basic/t0/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/basic/t0/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/basic/t0/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/basic/t1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/basic/t1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/basic/t1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/basic/t2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/basic/t2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/basic/t2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/basic/t3/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/basic/t3/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/basic/t3/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/execution/ellipsis/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/execution/ellipsis/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/execution/ellipsis/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/execution/empty/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/execution/empty/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/execution/empty/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/execution/joberr/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/execution/joberr/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/execution/joberr/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/execution/plus/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/execution/plus/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/execution/plus/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/builtin/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/builtin/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/builtin/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/meta/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/meta/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/meta/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/path/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/path/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/path/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/path_select/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/path_select/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/path_select/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/replace/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/replace/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/replace/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/shell/select/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/shell/select/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/shell/select/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/suffixes/basic/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/suffixes/basic/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/suffixes/basic/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/suffixes/src_wild2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/syntax/directive-t0/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/syntax/directive-t0/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/syntax/directive-t0/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/syntax/enl/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/syntax/enl/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/syntax/enl/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/syntax/funny-targets/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/syntax/funny-targets/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/syntax/funny-targets/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/syntax/semi/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/syntax/semi/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/syntax/semi/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/mk/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t0/mk/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/mk/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t1/mk/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2

Modified: projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/mk/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/sysmk/t2/mk/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}

Modified: projects/release-pkg/usr.bin/bmake/tests/variables/modifier_M/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/variables/modifier_M/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/variables/modifier_M/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/variables/modifier_t/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/variables/modifier_t/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/variables/modifier_t/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/variables/opt_V/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/variables/opt_V/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/variables/opt_V/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test

Modified: projects/release-pkg/usr.bin/bmake/tests/variables/t0/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/bmake/tests/variables/t0/Makefile	Tue Feb  2 23:54:07 2016	(r295178)
+++ projects/release-pkg/usr.bin/bmake/tests/variables/t0/Makefile	Wed Feb  3 00:34:23 2016	(r295179)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test

From owner-svn-src-projects@freebsd.org  Wed Feb  3 01:08:53 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 057B1A9AD30
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 01:08:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9111E2;
 Wed,  3 Feb 2016 01:08:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1318pSI036842;
 Wed, 3 Feb 2016 01:08:51 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1318pP7036841;
 Wed, 3 Feb 2016 01:08:51 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602030108.u1318pP7036841@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 01:08:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295181 -
 projects/release-pkg/lib/libc/tests/gen/posix_spawn
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 01:08:53 -0000

Author: gjb
Date: Wed Feb  3 01:08:51 2016
New Revision: 295181
URL: https://svnweb.freebsd.org/changeset/base/295181

Log:
  Fix another 'tests' packaging error.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile

Modified: projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile	Wed Feb  3 00:51:38 2016	(r295180)
+++ projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile	Wed Feb  3 01:08:51 2016	(r295181)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 BINDIR=		${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=	fileactions_test

From owner-svn-src-projects@freebsd.org  Wed Feb  3 01:22:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AFEDA992D5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 01:22:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3DF54DB2;
 Wed,  3 Feb 2016 01:22:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u131M3K2042596;
 Wed, 3 Feb 2016 01:22:03 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u131M37C042594;
 Wed, 3 Feb 2016 01:22:03 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602030122.u131M37C042594@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 01:22:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295182 - in projects/release-pkg/lib:
 libthr/tests/dlopen/dso tests
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 01:22:04 -0000

Author: gjb
Date: Wed Feb  3 01:22:02 2016
New Revision: 295182
URL: https://svnweb.freebsd.org/changeset/base/295182

Log:
  More 'tests' bug fixes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/libthr/tests/dlopen/dso/Makefile
  projects/release-pkg/lib/tests/Makefile

Modified: projects/release-pkg/lib/libthr/tests/dlopen/dso/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/tests/dlopen/dso/Makefile	Wed Feb  3 01:08:51 2016	(r295181)
+++ projects/release-pkg/lib/libthr/tests/dlopen/dso/Makefile	Wed Feb  3 01:22:02 2016	(r295182)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso
 

Modified: projects/release-pkg/lib/tests/Makefile
==============================================================================
--- projects/release-pkg/lib/tests/Makefile	Wed Feb  3 01:08:51 2016	(r295181)
+++ projects/release-pkg/lib/tests/Makefile	Wed Feb  3 01:22:02 2016	(r295182)
@@ -3,6 +3,10 @@
 .include <bsd.own.mk>
 
 PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 02:02:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCF44A9A13C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 02:02:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B4B79DD5;
 Wed,  3 Feb 2016 02:02:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13222gb054612;
 Wed, 3 Feb 2016 02:02:02 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u132215W054601;
 Wed, 3 Feb 2016 02:02:01 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602030202.u132215W054601@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:02:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295189 - in projects/release-pkg: . lib/libc/nls
 lib/libdevctl sys/powerpc/mpc85xx sys/powerpc/powerpc
 usr.sbin/bsdconfig/share usr.sbin/devctl usr.sbin/sysrc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:02:04 -0000

Author: gjb
Date: Wed Feb  3 02:02:01 2016
New Revision: 295189
URL: https://svnweb.freebsd.org/changeset/base/295189

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1
  projects/release-pkg/lib/libc/nls/msgcat.c
  projects/release-pkg/lib/libdevctl/devctl.3
  projects/release-pkg/sys/powerpc/mpc85xx/lbc.c
  projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c
  projects/release-pkg/sys/powerpc/powerpc/sigcode32.S
  projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr
  projects/release-pkg/usr.sbin/devctl/devctl.8
  projects/release-pkg/usr.sbin/sysrc/sysrc
  projects/release-pkg/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/lib/libc/   (props changed)
  projects/release-pkg/sys/   (props changed)

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/Makefile.inc1	Wed Feb  3 02:02:01 2016	(r295189)
@@ -1125,7 +1125,9 @@ distrib-dirs: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
-distribution: distrib-dirs .MAKE .PHONY
+distribution: .MAKE .PHONY
+	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig

Modified: projects/release-pkg/lib/libc/nls/msgcat.c
==============================================================================
--- projects/release-pkg/lib/libc/nls/msgcat.c	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/lib/libc/nls/msgcat.c	Wed Feb  3 02:02:01 2016	(r295189)
@@ -325,6 +325,21 @@ notfound:
 	return ((char *)s);
 }
 
+static void
+catfree(struct catentry *np)
+{
+
+	if (np->catd != NULL && np->catd != NLERR) {
+		munmap(np->catd->__data, (size_t)np->catd->__size);
+		free(np->catd);
+	}
+	SLIST_REMOVE(&cache, np, catentry, list);
+	free(np->name);
+	free(np->path);
+	free(np->lang);
+	free(np);
+}
+
 int
 catclose(nl_catd catd)
 {
@@ -341,15 +356,8 @@ catclose(nl_catd catd)
 	SLIST_FOREACH(np, &cache, list) {
 		if (catd == np->catd) {
 			np->refcount--;
-			if (np->refcount == 0) {
-				munmap(catd->__data, (size_t)catd->__size);
-				free(catd);
-				SLIST_REMOVE(&cache, np, catentry, list);
-				free(np->name);
-				free(np->path);
-				free(np->lang);
-				free(np);
-			}
+			if (np->refcount == 0)
+				catfree(np);
 			break;
 		}
 	}

Modified: projects/release-pkg/lib/libdevctl/devctl.3
==============================================================================
--- projects/release-pkg/lib/libdevctl/devctl.3	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/lib/libdevctl/devctl.3	Wed Feb  3 02:02:01 2016	(r295189)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 26, 2014
+.Dd February 2, 2016
 .Dt DEVCTL 3
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nm devctl_disable ,
 .Nm devctl_enable ,
 .Nm devctl_resume ,
+.Nm devctl_set_driver ,
 .Nm devctl_suspend
 .Nd device control library
 .Sh LIBRARY
@@ -52,9 +53,9 @@
 .Ft int
 .Fn devctl_resume "const char *device"
 .Ft int
-.Fn devctl_suspend "const char *device"
-.Ft int
 .Fn devctl_set_driver "const char *device" "const char *driver" "bool force"
+.Ft int
+.Fn devctl_suspend "const char *device"
 .Sh DESCRIPTION
 The
 .Nm
@@ -287,7 +288,7 @@ The new device driver failed to attach.
 The
 .Nm
 library first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
 .Sh BUGS
 If a device is suspended individually via
 .Fn devctl_suspend

Modified: projects/release-pkg/sys/powerpc/mpc85xx/lbc.c
==============================================================================
--- projects/release-pkg/sys/powerpc/mpc85xx/lbc.c	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/sys/powerpc/mpc85xx/lbc.c	Wed Feb  3 02:02:01 2016	(r295189)
@@ -113,7 +113,8 @@ static driver_t lbc_driver = {
 
 devclass_t lbc_devclass;
 
-DRIVER_MODULE(lbc, ofwbus, lbc_driver, lbc_devclass, 0, 0);
+EARLY_DRIVER_MODULE(lbc, ofwbus, lbc_driver, lbc_devclass,
+    0, 0, BUS_PASS_BUS);
 
 /*
  * Calculate address mask used by OR(n) registers. Use memory region size to

Modified: projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c
==============================================================================
--- projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c	Wed Feb  3 02:02:01 2016	(r295189)
@@ -219,10 +219,10 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, 
 	 */
 	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
 	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		usfp = (void *)((uintptr_t)td->td_sigstk.ss_sp +
-		   td->td_sigstk.ss_size - rndfsize);
+		usfp = (void *)(((uintptr_t)td->td_sigstk.ss_sp +
+		   td->td_sigstk.ss_size - rndfsize) & ~0xFul);
 	} else {
-		usfp = (void *)(tf->fixreg[1] - rndfsize);
+		usfp = (void *)((tf->fixreg[1] - rndfsize) & ~0xFul);
 	}
 
 	/*

Modified: projects/release-pkg/sys/powerpc/powerpc/sigcode32.S
==============================================================================
--- projects/release-pkg/sys/powerpc/powerpc/sigcode32.S	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/sys/powerpc/powerpc/sigcode32.S	Wed Feb  3 02:02:01 2016	(r295189)
@@ -45,9 +45,9 @@
  */
 	.globl	CNAME(sigcode32),CNAME(szsigcode32)
 CNAME(sigcode32):
-	addi	1,1,-20			/* reserved space for callee */
+	addi	1,1,-32			/* reserved space for callee */
 	blrl
-	addi	3,1,20+SF_UC		/* restore sp, and get &frame->sf_uc */
+	addi	3,1,32+SF_UC		/* restore sp, and get &frame->sf_uc */
 	li	0,SYS_sigreturn
 	sc				/* sigreturn(scp) */
 	li	0,SYS_exit

Modified: projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr
==============================================================================
--- projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/usr.sbin/bsdconfig/share/strings.subr	Wed Feb  3 02:02:01 2016	(r295189)
@@ -154,20 +154,25 @@ f_substr()
 # Similar to sprintf(3), write a string into $var_to_set using printf(1) syntax
 # (`$format [$arguments ...]').
 #
-f_sprintf()
-{
-	local __var_to_set="$1"
-	shift 1 # var_to_set
-
-	case "$BASH_VERSION" in
-	3.1*|4.*)
-		local __tmp
+case "$BASH_VERSION" in
+3.1*|4.*)
+	f_sprintf()
+	{
+		local __var_to_set="$1" __tmp
+		shift 1 # var_to_set
 		printf -v __tmp "$@"
 		eval "$__var_to_set"=\"\${__tmp%\$NL}\"
-		;;
-	*) eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
-	esac
-}
+	}
+	;;
+*)
+	# NB: On FreeBSD, sh(1) runs this faster than bash(1) runs the above
+	f_sprintf()
+	{
+		local __var_to_set="$1"
+		shift 1 # var_to_set
+		eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
+	}
+esac
 
 # f_vsprintf $var_to_set $format $format_args
 #

Modified: projects/release-pkg/usr.sbin/devctl/devctl.8
==============================================================================
--- projects/release-pkg/usr.sbin/devctl/devctl.8	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/usr.sbin/devctl/devctl.8	Wed Feb  3 02:02:01 2016	(r295189)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 5, 2015
+.Dd February 2, 2016
 .Dt DEVCTL 8
 .Os
 .Sh NAME
@@ -134,4 +134,4 @@ the device will not be changed.
 The
 .Nm
 utility first appeared in
-.Fx 11.0 .
+.Fx 10.3 .

Modified: projects/release-pkg/usr.sbin/sysrc/sysrc
==============================================================================
--- projects/release-pkg/usr.sbin/sysrc/sysrc	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/usr.sbin/sysrc/sysrc	Wed Feb  3 02:02:01 2016	(r295189)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2010-2015 Devin Teske
+# Copyright (c) 2010-2016 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 #
 # Version information
 #
-SYSRC_VERSION="7.0 Sep-13,2015"
+SYSRC_VERSION="7.1 Feb-2,2016"
 
 #
 # Options
@@ -595,7 +595,7 @@ fi
 if [ "$SHOW_ALL" ]; then
 	#
 	# Get a list of variables that are currently set in the rc.conf(5)
-	# files (included `/etc/defaults/rc.conf') by performing a call to
+	# files (including `/etc/defaults/rc.conf') by performing a call to
 	# source_rc_confs() in a clean environment.
 	#
 	( # Operate in a sub-shell to protect the parent environment

Modified: projects/release-pkg/usr.sbin/sysrc/sysrc.8
==============================================================================
--- projects/release-pkg/usr.sbin/sysrc/sysrc.8	Wed Feb  3 02:00:20 2016	(r295188)
+++ projects/release-pkg/usr.sbin/sysrc/sysrc.8	Wed Feb  3 02:02:01 2016	(r295189)
@@ -255,7 +255,7 @@ When using the
 .Ql key+=value
 syntax to add items to existing values,
 the first character of the value is taken as the delimiter separating items
-.Pq usually Qo (space) Qc or Qo , Qc .
+.Pq usually Qo " " Qc or Qo , Qc .
 For example, in the following statement:
 .Bl -item -offset indent
 .It
@@ -316,7 +316,7 @@ When using the
 .Ql key-=value
 syntax to remove items from existing values,
 the first character of the value is taken as the delimiter separating items
-.Pq usually Qo \  Qc or Qo , Qc .
+.Pq usually Qo " " Qc or Qo , Qc .
 For example, in the following statement:
 .Pp
 .Dl Nm cloned_interfaces-=" gif0"

From owner-svn-src-projects@freebsd.org  Wed Feb  3 11:49:56 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FACCA9A922
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 11:49:56 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABED21F67;
 Wed,  3 Feb 2016 11:49:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13Bnsds025315;
 Wed, 3 Feb 2016 11:49:54 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13BnqhW025292;
 Wed, 3 Feb 2016 11:49:52 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201602031149.u13BnqhW025292@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 3 Feb 2016 11:49:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295205 - in projects/vnet: . bin/csh bin/setfacl bin/sh
 bin/sh/tests/builtins bin/test cddl/contrib/opensolaris/cmd/zfs
 cddl/contrib/opensolaris/lib/libzfs/common cddl/lib contrib/bsnm...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 11:49:56 -0000

Author: bz
Date: Wed Feb  3 11:49:51 2016
New Revision: 295205
URL: https://svnweb.freebsd.org/changeset/base/295205

Log:
  MfH @r295202
  
  Expect to see panics in routing code at least now.

Added:
  projects/vnet/bin/sh/tests/builtins/local6.0
     - copied unchanged from r295202, head/bin/sh/tests/builtins/local6.0
  projects/vnet/bin/sh/tests/builtins/local7.0
     - copied unchanged from r295202, head/bin/sh/tests/builtins/local7.0
  projects/vnet/contrib/gcc/config/riscv64/
     - copied from r295202, head/contrib/gcc/config/riscv64/
  projects/vnet/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
     - copied unchanged from r295202, head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
  projects/vnet/crypto/openssl/util/pod2mantest
     - copied unchanged from r295202, head/crypto/openssl/util/pod2mantest
  projects/vnet/etc/periodic/daily/480.leapfile-ntpd
     - copied unchanged from r295202, head/etc/periodic/daily/480.leapfile-ntpd
  projects/vnet/lib/libc/gen/recvmmsg.c
     - copied unchanged from r295202, head/lib/libc/gen/recvmmsg.c
  projects/vnet/lib/libc/gen/sendmmsg.c
     - copied unchanged from r295202, head/lib/libc/gen/sendmmsg.c
  projects/vnet/lib/libc/tests/gen/dlopen_empty_test.c
     - copied unchanged from r295202, head/lib/libc/tests/gen/dlopen_empty_test.c
  projects/vnet/lib/libsysdecode/syscallnames.c
     - copied unchanged from r295202, head/lib/libsysdecode/syscallnames.c
  projects/vnet/lib/libsysdecode/sysdecode_syscallnames.3
     - copied unchanged from r295202, head/lib/libsysdecode/sysdecode_syscallnames.3
  projects/vnet/lib/libthr/arch/riscv/include/
     - copied from r295202, head/lib/libthr/arch/riscv/include/
  projects/vnet/lib/libthread_db/arch/riscv/
     - copied from r295202, head/lib/libthread_db/arch/riscv/
  projects/vnet/lib/msun/riscv/fenv.c
     - copied unchanged from r295202, head/lib/msun/riscv/fenv.c
  projects/vnet/sbin/nvmecontrol/power.c
     - copied unchanged from r295202, head/sbin/nvmecontrol/power.c
  projects/vnet/secure/lib/libcrypto/opensslconf-riscv.h
     - copied unchanged from r295202, head/secure/lib/libcrypto/opensslconf-riscv.h
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
     - copied unchanged from r295202, head/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
  projects/vnet/share/vt/fonts/gallant.hex
     - copied unchanged from r295202, head/share/vt/fonts/gallant.hex
  projects/vnet/sys/arm/allwinner/allwinner_machdep.c
     - copied unchanged from r295202, head/sys/arm/allwinner/allwinner_machdep.c
  projects/vnet/sys/arm/allwinner/allwinner_machdep.h
     - copied unchanged from r295202, head/sys/arm/allwinner/allwinner_machdep.h
  projects/vnet/sys/arm/arm/debug_monitor.c
     - copied unchanged from r295202, head/sys/arm/arm/debug_monitor.c
  projects/vnet/sys/arm/arm/swtch-v4.S
     - copied unchanged from r295202, head/sys/arm/arm/swtch-v4.S
  projects/vnet/sys/arm/arm/swtch-v6.S
     - copied unchanged from r295202, head/sys/arm/arm/swtch-v6.S
  projects/vnet/sys/arm/include/debug_monitor.h
     - copied unchanged from r295202, head/sys/arm/include/debug_monitor.h
  projects/vnet/sys/arm/xscale/i8134x/i80321_timer.c
     - copied unchanged from r295202, head/sys/arm/xscale/i8134x/i80321_timer.c
  projects/vnet/sys/arm/xscale/i8134x/i80321_wdog.c
     - copied unchanged from r295202, head/sys/arm/xscale/i8134x/i80321_wdog.c
  projects/vnet/sys/arm/xscale/i8134x/i80321reg.h
     - copied unchanged from r295202, head/sys/arm/xscale/i8134x/i80321reg.h
  projects/vnet/sys/arm/xscale/i8134x/i80321var.h
     - copied unchanged from r295202, head/sys/arm/xscale/i8134x/i80321var.h
  projects/vnet/sys/arm64/arm64/disassem.c
     - copied unchanged from r295202, head/sys/arm64/arm64/disassem.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_fdt.c
     - copied unchanged from r295202, head/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/vnet/sys/arm64/include/disassem.h
     - copied unchanged from r295202, head/sys/arm64/include/disassem.h
  projects/vnet/sys/boot/common/paths.h
     - copied unchanged from r295202, head/sys/boot/common/paths.h
  projects/vnet/sys/boot/common/rbx.h
     - copied unchanged from r295202, head/sys/boot/common/rbx.h
  projects/vnet/sys/boot/fdt/dts/riscv/
     - copied from r295202, head/sys/boot/fdt/dts/riscv/
  projects/vnet/sys/boot/ficl/riscv/
     - copied from r295202, head/sys/boot/ficl/riscv/
  projects/vnet/sys/conf/Makefile.riscv
     - copied unchanged from r295202, head/sys/conf/Makefile.riscv
  projects/vnet/sys/conf/files.riscv
     - copied unchanged from r295202, head/sys/conf/files.riscv
  projects/vnet/sys/conf/ldscript.riscv
     - copied unchanged from r295202, head/sys/conf/ldscript.riscv
  projects/vnet/sys/conf/options.riscv
     - copied unchanged from r295202, head/sys/conf/options.riscv
  projects/vnet/sys/contrib/alpine-hal/al_hal_iofic.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_iofic.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_serdes.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_serdes.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_serdes.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_serdes.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_serdes_internal_regs.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_serdes_internal_regs.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_serdes_regs.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_serdes_regs.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_config.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_config.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_config.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_config.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_debug.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_debug.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_debug.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_debug.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_iofic.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_iofic.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_iofic.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_iofic.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_iofic_regs.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_iofic_regs.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_main.c
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_main.c
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_regs.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_regs.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_regs_m2s.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_regs_m2s.h
  projects/vnet/sys/contrib/alpine-hal/al_hal_udma_regs_s2m.h
     - copied unchanged from r295202, head/sys/contrib/alpine-hal/al_hal_udma_regs_s2m.h
  projects/vnet/sys/contrib/alpine-hal/eth/
     - copied from r295202, head/sys/contrib/alpine-hal/eth/
  projects/vnet/sys/dev/extres/
     - copied from r295202, head/sys/dev/extres/
  projects/vnet/sys/dev/hwpmc/hwpmc_riscv.h
     - copied unchanged from r295202, head/sys/dev/hwpmc/hwpmc_riscv.h
  projects/vnet/sys/dev/vnic/mrml_bridge.c
     - copied unchanged from r295202, head/sys/dev/vnic/mrml_bridge.c
  projects/vnet/sys/net/route_var.h
     - copied unchanged from r295202, head/sys/net/route_var.h
  projects/vnet/sys/netinet/cc/cc.h
     - copied unchanged from r295202, head/sys/netinet/cc/cc.h
  projects/vnet/sys/riscv/conf/
     - copied from r295202, head/sys/riscv/conf/
  projects/vnet/sys/riscv/htif/
     - copied from r295202, head/sys/riscv/htif/
  projects/vnet/sys/riscv/riscv/
     - copied from r295202, head/sys/riscv/riscv/
  projects/vnet/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
     - copied unchanged from r295202, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
     - copied unchanged from r295202, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
  projects/vnet/usr.bin/xlint/arch/riscv/
     - copied from r295202, head/usr.bin/xlint/arch/riscv/
Replaced:
  projects/vnet/sys/arm/arm/pmap-v6.c
     - copied unchanged from r295202, head/sys/arm/arm/pmap-v6.c
Deleted:
  projects/vnet/contrib/libucl/tests/.gitignore
  projects/vnet/contrib/libxo/.gitignore
  projects/vnet/contrib/unbound/.gitignore
  projects/vnet/share/vt/fonts/gallant.fnt.uu
  projects/vnet/sys/arm/allwinner/a10_machdep.c
  projects/vnet/sys/arm/arm/cpufunc_asm_arm10.S
  projects/vnet/sys/arm/arm/pmap-v6-new.c
  projects/vnet/sys/arm/xscale/i80321/
  projects/vnet/sys/boot/i386/common/rbx.h
  projects/vnet/sys/netinet/tcp_cc.h
Modified:
  projects/vnet/Makefile
  projects/vnet/Makefile.inc1
  projects/vnet/UPDATING
  projects/vnet/bin/csh/iconv_stub.c
  projects/vnet/bin/setfacl/setfacl.1
  projects/vnet/bin/sh/cd.c
  projects/vnet/bin/sh/expand.c
  projects/vnet/bin/sh/redir.c
  projects/vnet/bin/sh/sh.1
  projects/vnet/bin/sh/tests/builtins/Makefile
  projects/vnet/bin/sh/var.c
  projects/vnet/bin/test/test.c
  projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
  projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/vnet/cddl/lib/Makefile
  projects/vnet/contrib/bsnmp/snmp_mibII/mibII.c
  projects/vnet/contrib/bsnmp/snmp_mibII/mibII_tcp.c
  projects/vnet/contrib/compiler-rt/lib/builtins/int_lib.h
  projects/vnet/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
  projects/vnet/contrib/elftoolchain/libelf/_libelf_config.h
  projects/vnet/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
  projects/vnet/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
  projects/vnet/contrib/llvm/projects/libunwind/include/libunwind.h
  projects/vnet/contrib/llvm/projects/libunwind/src/Registers.hpp
  projects/vnet/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
  projects/vnet/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
  projects/vnet/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
  projects/vnet/contrib/llvm/projects/libunwind/src/config.h
  projects/vnet/contrib/llvm/projects/libunwind/src/libunwind.cpp
  projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
  projects/vnet/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
  projects/vnet/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/vnet/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
  projects/vnet/contrib/ofed/librdmacm/examples/build/mckey/Makefile
  projects/vnet/contrib/ofed/librdmacm/examples/build/rping/Makefile
  projects/vnet/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
  projects/vnet/contrib/openresolv/Makefile
  projects/vnet/contrib/openresolv/resolvconf.8.in
  projects/vnet/contrib/openresolv/resolvconf.conf.5.in
  projects/vnet/contrib/openresolv/resolvconf.in
  projects/vnet/contrib/openresolv/unbound.in
  projects/vnet/contrib/smbfs/smbutil/print.c
  projects/vnet/crypto/openssh/FREEBSD-upgrade
  projects/vnet/crypto/openssh/servconf.c
  projects/vnet/crypto/openssh/sshd_config
  projects/vnet/crypto/openssh/sshd_config.5
  projects/vnet/crypto/openssl/ACKNOWLEDGMENTS
  projects/vnet/crypto/openssl/CHANGES
  projects/vnet/crypto/openssl/Configure
  projects/vnet/crypto/openssl/INSTALL
  projects/vnet/crypto/openssl/LICENSE
  projects/vnet/crypto/openssl/Makefile
  projects/vnet/crypto/openssl/Makefile.org
  projects/vnet/crypto/openssl/NEWS
  projects/vnet/crypto/openssl/README
  projects/vnet/crypto/openssl/apps/engine.c
  projects/vnet/crypto/openssl/apps/ocsp.c
  projects/vnet/crypto/openssl/apps/pkcs12.c
  projects/vnet/crypto/openssl/apps/pkeyutl.c
  projects/vnet/crypto/openssl/apps/s_client.c
  projects/vnet/crypto/openssl/apps/s_server.c
  projects/vnet/crypto/openssl/apps/speed.c
  projects/vnet/crypto/openssl/apps/x509.c
  projects/vnet/crypto/openssl/crypto/aes/aes.h
  projects/vnet/crypto/openssl/crypto/aes/aes_cbc.c
  projects/vnet/crypto/openssl/crypto/aes/aes_cfb.c
  projects/vnet/crypto/openssl/crypto/aes/aes_core.c
  projects/vnet/crypto/openssl/crypto/aes/aes_ctr.c
  projects/vnet/crypto/openssl/crypto/aes/aes_ecb.c
  projects/vnet/crypto/openssl/crypto/aes/aes_ige.c
  projects/vnet/crypto/openssl/crypto/aes/aes_locl.h
  projects/vnet/crypto/openssl/crypto/aes/aes_misc.c
  projects/vnet/crypto/openssl/crypto/aes/aes_ofb.c
  projects/vnet/crypto/openssl/crypto/aes/aes_x86core.c
  projects/vnet/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
  projects/vnet/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
  projects/vnet/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
  projects/vnet/crypto/openssl/crypto/bio/bio.h
  projects/vnet/crypto/openssl/crypto/bio/bss_bio.c
  projects/vnet/crypto/openssl/crypto/bio/bss_conn.c
  projects/vnet/crypto/openssl/crypto/bio/bss_dgram.c
  projects/vnet/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl
  projects/vnet/crypto/openssl/crypto/bn/asm/x86_64-mont.pl
  projects/vnet/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
  projects/vnet/crypto/openssl/crypto/bn/bn_exp.c
  projects/vnet/crypto/openssl/crypto/bn/exptest.c
  projects/vnet/crypto/openssl/crypto/camellia/camellia.c
  projects/vnet/crypto/openssl/crypto/camellia/camellia.h
  projects/vnet/crypto/openssl/crypto/camellia/cmll_cbc.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_cfb.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_ctr.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_ecb.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_locl.h
  projects/vnet/crypto/openssl/crypto/camellia/cmll_misc.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_ofb.c
  projects/vnet/crypto/openssl/crypto/camellia/cmll_utl.c
  projects/vnet/crypto/openssl/crypto/des/des_old.c
  projects/vnet/crypto/openssl/crypto/des/des_old.h
  projects/vnet/crypto/openssl/crypto/des/des_old2.c
  projects/vnet/crypto/openssl/crypto/dh/dh.h
  projects/vnet/crypto/openssl/crypto/dh/dh_check.c
  projects/vnet/crypto/openssl/crypto/dh/dhtest.c
  projects/vnet/crypto/openssl/crypto/dsa/dsa_ossl.c
  projects/vnet/crypto/openssl/crypto/dso/dso.h
  projects/vnet/crypto/openssl/crypto/dso/dso_dl.c
  projects/vnet/crypto/openssl/crypto/dso/dso_dlfcn.c
  projects/vnet/crypto/openssl/crypto/dso/dso_lib.c
  projects/vnet/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
  projects/vnet/crypto/openssl/crypto/ec/ec2_smpl.c
  projects/vnet/crypto/openssl/crypto/ec/ec_key.c
  projects/vnet/crypto/openssl/crypto/ec/ecp_nistz256_table.c
  projects/vnet/crypto/openssl/crypto/ec/ectest.c
  projects/vnet/crypto/openssl/crypto/engine/eng_all.c
  projects/vnet/crypto/openssl/crypto/evp/e_camellia.c
  projects/vnet/crypto/openssl/crypto/evp/e_old.c
  projects/vnet/crypto/openssl/crypto/evp/e_seed.c
  projects/vnet/crypto/openssl/crypto/mem_clr.c
  projects/vnet/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
  projects/vnet/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl
  projects/vnet/crypto/openssl/crypto/o_dir.c
  projects/vnet/crypto/openssl/crypto/o_dir.h
  projects/vnet/crypto/openssl/crypto/o_dir_test.c
  projects/vnet/crypto/openssl/crypto/o_str.c
  projects/vnet/crypto/openssl/crypto/o_str.h
  projects/vnet/crypto/openssl/crypto/o_time.c
  projects/vnet/crypto/openssl/crypto/o_time.h
  projects/vnet/crypto/openssl/crypto/opensslv.h
  projects/vnet/crypto/openssl/crypto/rc4/rc4_utl.c
  projects/vnet/crypto/openssl/crypto/rsa/rsa_chk.c
  projects/vnet/crypto/openssl/crypto/rsa/rsa_sign.c
  projects/vnet/crypto/openssl/crypto/seed/seed_cbc.c
  projects/vnet/crypto/openssl/crypto/seed/seed_cfb.c
  projects/vnet/crypto/openssl/crypto/seed/seed_ecb.c
  projects/vnet/crypto/openssl/crypto/seed/seed_ofb.c
  projects/vnet/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
  projects/vnet/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl
  projects/vnet/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
  projects/vnet/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl
  projects/vnet/crypto/openssl/crypto/sha/sha1test.c
  projects/vnet/crypto/openssl/crypto/store/store.h
  projects/vnet/crypto/openssl/crypto/store/str_lib.c
  projects/vnet/crypto/openssl/crypto/store/str_locl.h
  projects/vnet/crypto/openssl/crypto/store/str_mem.c
  projects/vnet/crypto/openssl/crypto/store/str_meth.c
  projects/vnet/crypto/openssl/crypto/ts/ts_rsp_verify.c
  projects/vnet/crypto/openssl/crypto/ui/ui.h
  projects/vnet/crypto/openssl/crypto/ui/ui_compat.c
  projects/vnet/crypto/openssl/crypto/ui/ui_compat.h
  projects/vnet/crypto/openssl/crypto/ui/ui_lib.c
  projects/vnet/crypto/openssl/crypto/ui/ui_locl.h
  projects/vnet/crypto/openssl/crypto/ui/ui_openssl.c
  projects/vnet/crypto/openssl/crypto/ui/ui_util.c
  projects/vnet/crypto/openssl/crypto/x509/x509_vfy.c
  projects/vnet/crypto/openssl/crypto/x509/x509_vfy.h
  projects/vnet/crypto/openssl/crypto/x509/x509_vpm.c
  projects/vnet/crypto/openssl/crypto/x509v3/v3_pci.c
  projects/vnet/crypto/openssl/crypto/x509v3/v3_pcia.c
  projects/vnet/crypto/openssl/crypto/x509v3/v3_utl.c
  projects/vnet/crypto/openssl/crypto/x509v3/v3nametest.c
  projects/vnet/crypto/openssl/doc/apps/s_time.pod
  projects/vnet/crypto/openssl/doc/crypto/BIO_s_connect.pod
  projects/vnet/crypto/openssl/doc/ssl/SSL_CTX_set1_verify_cert_store.pod
  projects/vnet/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
  projects/vnet/crypto/openssl/engines/e_chil.c
  projects/vnet/crypto/openssl/ssl/d1_both.c
  projects/vnet/crypto/openssl/ssl/kssl.c
  projects/vnet/crypto/openssl/ssl/kssl.h
  projects/vnet/crypto/openssl/ssl/kssl_lcl.h
  projects/vnet/crypto/openssl/ssl/s2_srvr.c
  projects/vnet/crypto/openssl/ssl/s3_clnt.c
  projects/vnet/crypto/openssl/ssl/s3_lib.c
  projects/vnet/crypto/openssl/ssl/s3_srvr.c
  projects/vnet/crypto/openssl/ssl/ssl.h
  projects/vnet/crypto/openssl/ssl/ssl_err.c
  projects/vnet/crypto/openssl/ssl/ssl_lib.c
  projects/vnet/crypto/openssl/ssl/ssl_sess.c
  projects/vnet/crypto/openssl/ssl/t1_enc.c
  projects/vnet/crypto/openssl/ssl/t1_lib.c
  projects/vnet/crypto/openssl/util/domd
  projects/vnet/crypto/openssl/util/pl/VC-32.pl
  projects/vnet/etc/defaults/periodic.conf
  projects/vnet/etc/defaults/rc.conf
  projects/vnet/etc/group
  projects/vnet/etc/master.passwd
  projects/vnet/etc/ntp.conf
  projects/vnet/etc/periodic/daily/Makefile
  projects/vnet/etc/periodic/security/security.functions
  projects/vnet/etc/rc.d/jail
  projects/vnet/etc/rc.d/ntpd
  projects/vnet/gnu/lib/libgcc/Makefile
  projects/vnet/gnu/lib/libreadline/readline/Makefile
  projects/vnet/lib/Makefile
  projects/vnet/lib/libbluetooth/bluetooth.h
  projects/vnet/lib/libc/Makefile
  projects/vnet/lib/libc/db/hash/hash.h
  projects/vnet/lib/libc/db/hash/hash_buf.c
  projects/vnet/lib/libc/gen/Makefile.inc
  projects/vnet/lib/libc/gen/readpassphrase.c
  projects/vnet/lib/libc/include/namespace.h
  projects/vnet/lib/libc/include/un-namespace.h
  projects/vnet/lib/libc/net/Makefile.inc
  projects/vnet/lib/libc/net/sctp_sys_calls.c
  projects/vnet/lib/libc/nls/msgcat.c
  projects/vnet/lib/libc/string/strtok.3
  projects/vnet/lib/libc/sys/Symbol.map
  projects/vnet/lib/libc/sys/recv.2
  projects/vnet/lib/libc/sys/revoke.2
  projects/vnet/lib/libc/sys/send.2
  projects/vnet/lib/libc/tests/gen/Makefile
  projects/vnet/lib/libdevctl/devctl.3
  projects/vnet/lib/libdevinfo/devinfo.3
  projects/vnet/lib/libdevinfo/devinfo.h
  projects/vnet/lib/libdpv/dialog_util.c
  projects/vnet/lib/libdpv/dialog_util.h
  projects/vnet/lib/libdpv/dpv.3
  projects/vnet/lib/libdpv/dpv.c
  projects/vnet/lib/libdpv/dpv.h
  projects/vnet/lib/libdpv/dpv_private.h
  projects/vnet/lib/libelftc/Makefile
  projects/vnet/lib/libproc/proc_bkpt.c
  projects/vnet/lib/libproc/proc_regs.c
  projects/vnet/lib/libsysdecode/Makefile
  projects/vnet/lib/libsysdecode/sysdecode.3
  projects/vnet/lib/libsysdecode/sysdecode.h
  projects/vnet/libexec/atrun/atrun.c
  projects/vnet/libexec/rtld-elf/map_object.c
  projects/vnet/libexec/rtld-elf/riscv/rtld_machdep.h
  projects/vnet/libexec/rtld-elf/rtld.c
  projects/vnet/sbin/ggate/ggated/Makefile
  projects/vnet/sbin/ggate/ggated/ggated.8
  projects/vnet/sbin/ggate/ggated/ggated.c
  projects/vnet/sbin/ifconfig/iflagg.c
  projects/vnet/sbin/kldstat/Makefile
  projects/vnet/sbin/kldstat/kldstat.8
  projects/vnet/sbin/kldstat/kldstat.c
  projects/vnet/sbin/nvmecontrol/Makefile
  projects/vnet/sbin/nvmecontrol/nvmecontrol.8
  projects/vnet/sbin/nvmecontrol/nvmecontrol.c
  projects/vnet/sbin/nvmecontrol/nvmecontrol.h
  projects/vnet/sbin/pfctl/pf_print_state.c
  projects/vnet/sbin/rcorder/rcorder.c
  projects/vnet/sbin/swapon/swapon.c
  projects/vnet/secure/lib/libcrypto/Makefile.inc
  projects/vnet/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/vnet/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/vnet/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/vnet/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/vnet/secure/lib/libcrypto/man/ASN1_TIME_set.3
  projects/vnet/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/vnet/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_md.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_null.3
  projects/vnet/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/vnet/secure/lib/libcrypto/man/BIO_find_type.3
  projects/vnet/secure/lib/libcrypto/man/BIO_new.3
  projects/vnet/secure/lib/libcrypto/man/BIO_new_CMS.3
  projects/vnet/secure/lib/libcrypto/man/BIO_push.3
  projects/vnet/secure/lib/libcrypto/man/BIO_read.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_file.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_null.3
  projects/vnet/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/vnet/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/vnet/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/vnet/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/vnet/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/vnet/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/vnet/secure/lib/libcrypto/man/BN_add.3
  projects/vnet/secure/lib/libcrypto/man/BN_add_word.3
  projects/vnet/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/vnet/secure/lib/libcrypto/man/BN_cmp.3
  projects/vnet/secure/lib/libcrypto/man/BN_copy.3
  projects/vnet/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/vnet/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/vnet/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/vnet/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/vnet/secure/lib/libcrypto/man/BN_new.3
  projects/vnet/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/vnet/secure/lib/libcrypto/man/BN_rand.3
  projects/vnet/secure/lib/libcrypto/man/BN_set_bit.3
  projects/vnet/secure/lib/libcrypto/man/BN_swap.3
  projects/vnet/secure/lib/libcrypto/man/BN_zero.3
  projects/vnet/secure/lib/libcrypto/man/CMS_add0_cert.3
  projects/vnet/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  projects/vnet/secure/lib/libcrypto/man/CMS_add1_signer.3
  projects/vnet/secure/lib/libcrypto/man/CMS_compress.3
  projects/vnet/secure/lib/libcrypto/man/CMS_decrypt.3
  projects/vnet/secure/lib/libcrypto/man/CMS_encrypt.3
  projects/vnet/secure/lib/libcrypto/man/CMS_final.3
  projects/vnet/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  projects/vnet/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  projects/vnet/secure/lib/libcrypto/man/CMS_get0_type.3
  projects/vnet/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  projects/vnet/secure/lib/libcrypto/man/CMS_sign.3
  projects/vnet/secure/lib/libcrypto/man/CMS_sign_receipt.3
  projects/vnet/secure/lib/libcrypto/man/CMS_uncompress.3
  projects/vnet/secure/lib/libcrypto/man/CMS_verify.3
  projects/vnet/secure/lib/libcrypto/man/CMS_verify_receipt.3
  projects/vnet/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/vnet/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/vnet/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/vnet/secure/lib/libcrypto/man/DH_generate_key.3
  projects/vnet/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/vnet/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/vnet/secure/lib/libcrypto/man/DH_new.3
  projects/vnet/secure/lib/libcrypto/man/DH_set_method.3
  projects/vnet/secure/lib/libcrypto/man/DH_size.3
  projects/vnet/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/vnet/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/vnet/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/vnet/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/vnet/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/vnet/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/vnet/secure/lib/libcrypto/man/DSA_new.3
  projects/vnet/secure/lib/libcrypto/man/DSA_set_method.3
  projects/vnet/secure/lib/libcrypto/man/DSA_sign.3
  projects/vnet/secure/lib/libcrypto/man/DSA_size.3
  projects/vnet/secure/lib/libcrypto/man/EC_GFp_simple_method.3
  projects/vnet/secure/lib/libcrypto/man/EC_GROUP_copy.3
  projects/vnet/secure/lib/libcrypto/man/EC_GROUP_new.3
  projects/vnet/secure/lib/libcrypto/man/EC_KEY_new.3
  projects/vnet/secure/lib/libcrypto/man/EC_POINT_add.3
  projects/vnet/secure/lib/libcrypto/man/EC_POINT_new.3
  projects/vnet/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/vnet/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/vnet/secure/lib/libcrypto/man/ERR_error_string.3
  projects/vnet/secure/lib/libcrypto/man/ERR_get_error.3
  projects/vnet/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/vnet/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/vnet/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/vnet/secure/lib/libcrypto/man/ERR_put_error.3
  projects/vnet/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/vnet/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/vnet/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/vnet/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  projects/vnet/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  projects/vnet/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/vnet/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/vnet/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3
  projects/vnet/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/vnet/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/vnet/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  projects/vnet/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  projects/vnet/secure/lib/libcrypto/man/PKCS12_create.3
  projects/vnet/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/vnet/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/vnet/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/vnet/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/vnet/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  projects/vnet/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/vnet/secure/lib/libcrypto/man/RAND_add.3
  projects/vnet/secure/lib/libcrypto/man/RAND_bytes.3
  projects/vnet/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/vnet/secure/lib/libcrypto/man/RAND_egd.3
  projects/vnet/secure/lib/libcrypto/man/RAND_load_file.3
  projects/vnet/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/vnet/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/vnet/secure/lib/libcrypto/man/RSA_check_key.3
  projects/vnet/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/vnet/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/vnet/secure/lib/libcrypto/man/RSA_new.3
  projects/vnet/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/vnet/secure/lib/libcrypto/man/RSA_print.3
  projects/vnet/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/vnet/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/vnet/secure/lib/libcrypto/man/RSA_set_method.3
  projects/vnet/secure/lib/libcrypto/man/RSA_sign.3
  projects/vnet/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/vnet/secure/lib/libcrypto/man/RSA_size.3
  projects/vnet/secure/lib/libcrypto/man/SMIME_read_CMS.3
  projects/vnet/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/vnet/secure/lib/libcrypto/man/SMIME_write_CMS.3
  projects/vnet/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/vnet/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/vnet/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/vnet/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/vnet/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/vnet/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  projects/vnet/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  projects/vnet/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  projects/vnet/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  projects/vnet/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  projects/vnet/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  projects/vnet/secure/lib/libcrypto/man/X509_check_host.3
  projects/vnet/secure/lib/libcrypto/man/X509_new.3
  projects/vnet/secure/lib/libcrypto/man/X509_verify_cert.3
  projects/vnet/secure/lib/libcrypto/man/bio.3
  projects/vnet/secure/lib/libcrypto/man/blowfish.3
  projects/vnet/secure/lib/libcrypto/man/bn.3
  projects/vnet/secure/lib/libcrypto/man/bn_internal.3
  projects/vnet/secure/lib/libcrypto/man/buffer.3
  projects/vnet/secure/lib/libcrypto/man/crypto.3
  projects/vnet/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/vnet/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3
  projects/vnet/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/vnet/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/vnet/secure/lib/libcrypto/man/d2i_ECPKParameters.3
  projects/vnet/secure/lib/libcrypto/man/d2i_ECPrivateKey.3
  projects/vnet/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/vnet/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/vnet/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/vnet/secure/lib/libcrypto/man/des.3
  projects/vnet/secure/lib/libcrypto/man/dh.3
  projects/vnet/secure/lib/libcrypto/man/dsa.3
  projects/vnet/secure/lib/libcrypto/man/ec.3
  projects/vnet/secure/lib/libcrypto/man/ecdsa.3
  projects/vnet/secure/lib/libcrypto/man/engine.3
  projects/vnet/secure/lib/libcrypto/man/err.3
  projects/vnet/secure/lib/libcrypto/man/evp.3
  projects/vnet/secure/lib/libcrypto/man/hmac.3
  projects/vnet/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  projects/vnet/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  projects/vnet/secure/lib/libcrypto/man/lh_stats.3
  projects/vnet/secure/lib/libcrypto/man/lhash.3
  projects/vnet/secure/lib/libcrypto/man/md5.3
  projects/vnet/secure/lib/libcrypto/man/mdc2.3
  projects/vnet/secure/lib/libcrypto/man/pem.3
  projects/vnet/secure/lib/libcrypto/man/rand.3
  projects/vnet/secure/lib/libcrypto/man/rc4.3
  projects/vnet/secure/lib/libcrypto/man/ripemd.3
  projects/vnet/secure/lib/libcrypto/man/rsa.3
  projects/vnet/secure/lib/libcrypto/man/sha.3
  projects/vnet/secure/lib/libcrypto/man/threads.3
  projects/vnet/secure/lib/libcrypto/man/ui.3
  projects/vnet/secure/lib/libcrypto/man/ui_compat.3
  projects/vnet/secure/lib/libcrypto/man/x509.3
  projects/vnet/secure/lib/libssl/Makefile.man
  projects/vnet/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/vnet/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_CTX_new.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_cmd.3
  projects/vnet/secure/lib/libssl/man/SSL_CONF_cmd_argv.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_free.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_get0_param.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_new.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set1_curves.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  projects/vnet/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
  projects/vnet/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/vnet/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/vnet/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/vnet/secure/lib/libssl/man/SSL_accept.3
  projects/vnet/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/vnet/secure/lib/libssl/man/SSL_check_chain.3
  projects/vnet/secure/lib/libssl/man/SSL_clear.3
  projects/vnet/secure/lib/libssl/man/SSL_connect.3
  projects/vnet/secure/lib/libssl/man/SSL_do_handshake.3
  projects/vnet/secure/lib/libssl/man/SSL_free.3
  projects/vnet/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/vnet/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/vnet/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/vnet/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/vnet/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/vnet/secure/lib/libssl/man/SSL_get_error.3
  projects/vnet/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/vnet/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/vnet/secure/lib/libssl/man/SSL_get_fd.3
  projects/vnet/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/vnet/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/vnet/secure/lib/libssl/man/SSL_get_psk_identity.3
  projects/vnet/secure/lib/libssl/man/SSL_get_rbio.3
  projects/vnet/secure/lib/libssl/man/SSL_get_session.3
  projects/vnet/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/vnet/secure/lib/libssl/man/SSL_get_version.3
  projects/vnet/secure/lib/libssl/man/SSL_library_init.3
  projects/vnet/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/vnet/secure/lib/libssl/man/SSL_new.3
  projects/vnet/secure/lib/libssl/man/SSL_pending.3
  projects/vnet/secure/lib/libssl/man/SSL_read.3
  projects/vnet/secure/lib/libssl/man/SSL_rstate_string.3
  projects/vnet/secure/lib/libssl/man/SSL_session_reused.3
  projects/vnet/secure/lib/libssl/man/SSL_set_bio.3
  projects/vnet/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/vnet/secure/lib/libssl/man/SSL_set_fd.3
  projects/vnet/secure/lib/libssl/man/SSL_set_session.3
  projects/vnet/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/vnet/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/vnet/secure/lib/libssl/man/SSL_shutdown.3
  projects/vnet/secure/lib/libssl/man/SSL_state_string.3
  projects/vnet/secure/lib/libssl/man/SSL_want.3
  projects/vnet/secure/lib/libssl/man/SSL_write.3
  projects/vnet/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/vnet/secure/lib/libssl/man/ssl.3
  projects/vnet/secure/usr.bin/openssl/man/CA.pl.1
  projects/vnet/secure/usr.bin/openssl/man/asn1parse.1
  projects/vnet/secure/usr.bin/openssl/man/c_rehash.1
  projects/vnet/secure/usr.bin/openssl/man/ca.1
  projects/vnet/secure/usr.bin/openssl/man/ciphers.1
  projects/vnet/secure/usr.bin/openssl/man/cms.1
  projects/vnet/secure/usr.bin/openssl/man/crl.1
  projects/vnet/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/vnet/secure/usr.bin/openssl/man/dgst.1
  projects/vnet/secure/usr.bin/openssl/man/dhparam.1
  projects/vnet/secure/usr.bin/openssl/man/dsa.1
  projects/vnet/secure/usr.bin/openssl/man/dsaparam.1
  projects/vnet/secure/usr.bin/openssl/man/ec.1
  projects/vnet/secure/usr.bin/openssl/man/ecparam.1
  projects/vnet/secure/usr.bin/openssl/man/enc.1
  projects/vnet/secure/usr.bin/openssl/man/errstr.1
  projects/vnet/secure/usr.bin/openssl/man/gendsa.1
  projects/vnet/secure/usr.bin/openssl/man/genpkey.1
  projects/vnet/secure/usr.bin/openssl/man/genrsa.1
  projects/vnet/secure/usr.bin/openssl/man/nseq.1
  projects/vnet/secure/usr.bin/openssl/man/ocsp.1
  projects/vnet/secure/usr.bin/openssl/man/openssl.1
  projects/vnet/secure/usr.bin/openssl/man/passwd.1
  projects/vnet/secure/usr.bin/openssl/man/pkcs12.1
  projects/vnet/secure/usr.bin/openssl/man/pkcs7.1
  projects/vnet/secure/usr.bin/openssl/man/pkcs8.1
  projects/vnet/secure/usr.bin/openssl/man/pkey.1
  projects/vnet/secure/usr.bin/openssl/man/pkeyparam.1
  projects/vnet/secure/usr.bin/openssl/man/pkeyutl.1
  projects/vnet/secure/usr.bin/openssl/man/rand.1
  projects/vnet/secure/usr.bin/openssl/man/req.1
  projects/vnet/secure/usr.bin/openssl/man/rsa.1
  projects/vnet/secure/usr.bin/openssl/man/rsautl.1
  projects/vnet/secure/usr.bin/openssl/man/s_client.1
  projects/vnet/secure/usr.bin/openssl/man/s_server.1
  projects/vnet/secure/usr.bin/openssl/man/s_time.1
  projects/vnet/secure/usr.bin/openssl/man/sess_id.1
  projects/vnet/secure/usr.bin/openssl/man/smime.1
  projects/vnet/secure/usr.bin/openssl/man/speed.1
  projects/vnet/secure/usr.bin/openssl/man/spkac.1
  projects/vnet/secure/usr.bin/openssl/man/ts.1
  projects/vnet/secure/usr.bin/openssl/man/tsget.1
  projects/vnet/secure/usr.bin/openssl/man/verify.1
  projects/vnet/secure/usr.bin/openssl/man/version.1
  projects/vnet/secure/usr.bin/openssl/man/x509.1
  projects/vnet/secure/usr.bin/openssl/man/x509v3_config.1
  projects/vnet/share/dtrace/watch_kill
  projects/vnet/share/man/man4/filemon.4
  projects/vnet/share/man/man4/lagg.4
  projects/vnet/share/man/man4/nvd.4
  projects/vnet/share/man/man5/ext2fs.5
  projects/vnet/share/man/man9/bus_adjust_resource.9
  projects/vnet/share/man/man9/bus_alloc_resource.9
  projects/vnet/share/man/man9/bus_get_resource.9
  projects/vnet/share/man/man9/bus_set_resource.9
  projects/vnet/share/man/man9/hashinit.9
  projects/vnet/share/man/man9/mod_cc.9
  projects/vnet/share/man/man9/rman.9
  projects/vnet/share/misc/committers-src.dot
  projects/vnet/share/mk/auto.obj.mk
  projects/vnet/share/mk/bsd.dep.mk
  projects/vnet/share/mk/bsd.progs.mk
  projects/vnet/share/mk/gendirdeps.mk
  projects/vnet/share/mk/host-target.mk
  projects/vnet/share/mk/meta.subdir.mk
  projects/vnet/sys/amd64/amd64/machdep.c
  projects/vnet/sys/amd64/ia32/ia32_signal.c
  projects/vnet/sys/amd64/linux/linux.h
  projects/vnet/sys/amd64/linux/linux_machdep.c
  projects/vnet/sys/amd64/linux/linux_sysvec.c
  projects/vnet/sys/amd64/linux32/linux32_sysvec.c
  projects/vnet/sys/arm/allwinner/a10_clk.c
  projects/vnet/sys/arm/allwinner/a10_clk.h
  projects/vnet/sys/arm/allwinner/a10_common.c
  projects/vnet/sys/arm/allwinner/files.allwinner
  projects/vnet/sys/arm/annapurna/alpine/alpine_machdep.c
  projects/vnet/sys/arm/arm/cpufunc.c
  projects/vnet/sys/arm/arm/cpufunc_asm.S
  projects/vnet/sys/arm/arm/cpufunc_asm_arm11.S
  projects/vnet/sys/arm/arm/cpufunc_asm_arm11x6.S
  projects/vnet/sys/arm/arm/cpufunc_asm_armv4.S
  projects/vnet/sys/arm/arm/cpufunc_asm_fa526.S
  projects/vnet/sys/arm/arm/db_interface.c
  projects/vnet/sys/arm/arm/db_trace.c
  projects/vnet/sys/arm/arm/devmap.c
  projects/vnet/sys/arm/arm/elf_machdep.c
  projects/vnet/sys/arm/arm/elf_trampoline.c
  projects/vnet/sys/arm/arm/genassym.c
  projects/vnet/sys/arm/arm/locore-v6.S
  projects/vnet/sys/arm/arm/machdep.c
  projects/vnet/sys/arm/arm/mem.c
  projects/vnet/sys/arm/arm/minidump_machdep.c
  projects/vnet/sys/arm/arm/mp_machdep.c
  projects/vnet/sys/arm/arm/nexus.c
  projects/vnet/sys/arm/arm/physmem.c
  projects/vnet/sys/arm/arm/pmap.c
  projects/vnet/sys/arm/arm/swtch.S
  projects/vnet/sys/arm/arm/trap-v6.c
  projects/vnet/sys/arm/at91/at91.c
  projects/vnet/sys/arm/cavium/cns11xx/econa.c
  projects/vnet/sys/arm/conf/A20
  projects/vnet/sys/arm/conf/CUBIEBOARD
  projects/vnet/sys/arm/conf/NOTES
  projects/vnet/sys/arm/conf/std.armv6
  projects/vnet/sys/arm/freescale/vybrid/vf_ehci.c
  projects/vnet/sys/arm/include/cpu-v6.h
  projects/vnet/sys/arm/include/cpuconf.h
  projects/vnet/sys/arm/include/cpufunc.h
  projects/vnet/sys/arm/include/db_machdep.h
  projects/vnet/sys/arm/include/kdb.h
  projects/vnet/sys/arm/include/machdep.h
  projects/vnet/sys/arm/include/ofw_machdep.h
  projects/vnet/sys/arm/include/param.h
  projects/vnet/sys/arm/include/pcpu.h
  projects/vnet/sys/arm/include/physmem.h
  projects/vnet/sys/arm/include/pmap-v6.h
  projects/vnet/sys/arm/include/pmap.h
  projects/vnet/sys/arm/include/pte.h
  projects/vnet/sys/arm/include/reg.h
  projects/vnet/sys/arm/include/sf_buf.h
  projects/vnet/sys/arm/include/smp.h
  projects/vnet/sys/arm/include/sysreg.h
  projects/vnet/sys/arm/include/vm.h
  projects/vnet/sys/arm/mv/armadaxp/armadaxp.c
  projects/vnet/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/vnet/sys/arm/mv/mv_common.c
  projects/vnet/sys/arm/mv/mv_localbus.c
  projects/vnet/sys/arm/mv/mv_machdep.c
  projects/vnet/sys/arm/mv/mv_pci.c
  projects/vnet/sys/arm/mv/orion/db88f5xxx.c
  projects/vnet/sys/arm/ti/omap4/pandaboard/pandaboard.c
  projects/vnet/sys/arm/ti/ti_cpuid.c
  projects/vnet/sys/arm/versatile/versatile_machdep.c
  projects/vnet/sys/arm/versatile/versatile_pci.c
  projects/vnet/sys/arm/xilinx/zy7_ehci.c
  projects/vnet/sys/arm/xscale/i8134x/crb_machdep.c
  projects/vnet/sys/arm/xscale/i8134x/files.i81342
  projects/vnet/sys/arm/xscale/i8134x/i81342.c
  projects/vnet/sys/arm/xscale/i8134x/i81342_pci.c
  projects/vnet/sys/arm/xscale/i8134x/obio.c
  projects/vnet/sys/arm/xscale/ixp425/avila_ata.c
  projects/vnet/sys/arm/xscale/ixp425/ixp425.c
  projects/vnet/sys/arm/xscale/ixp425/ixp425_pci.c
  projects/vnet/sys/arm/xscale/pxa/pxa_obio.c
  projects/vnet/sys/arm/xscale/pxa/pxa_smi.c
  projects/vnet/sys/arm64/arm64/copystr.c
  projects/vnet/sys/arm64/arm64/db_disasm.c
  projects/vnet/sys/arm64/arm64/genassym.c
  projects/vnet/sys/arm64/arm64/gic.c
  projects/vnet/sys/arm64/arm64/gic.h
  projects/vnet/sys/arm64/arm64/gic_fdt.c
  projects/vnet/sys/arm64/arm64/gic_v3.c
  projects/vnet/sys/arm64/arm64/gic_v3_fdt.c
  projects/vnet/sys/arm64/arm64/gic_v3_its.c
  projects/vnet/sys/arm64/arm64/intr_machdep.c
  projects/vnet/sys/arm64/arm64/locore.S
  projects/vnet/sys/arm64/arm64/machdep.c
  projects/vnet/sys/arm64/arm64/mp_machdep.c
  projects/vnet/sys/arm64/arm64/nexus.c
  projects/vnet/sys/arm64/arm64/pmap.c
  projects/vnet/sys/arm64/arm64/swtch.S
  projects/vnet/sys/arm64/arm64/trap.c
  projects/vnet/sys/arm64/arm64/vm_machdep.c
  projects/vnet/sys/arm64/cavium/thunder_pcie.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_common.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_common.h
  projects/vnet/sys/arm64/cavium/thunder_pcie_pem.c
  projects/vnet/sys/arm64/include/armreg.h
  projects/vnet/sys/arm64/include/pcb.h
  projects/vnet/sys/arm64/include/pmap.h
  projects/vnet/sys/boot/arm/at91/boot2/boot2.c
  projects/vnet/sys/boot/arm/ixp425/boot2/boot2.c
  projects/vnet/sys/boot/efi/boot1/boot1.c
  projects/vnet/sys/boot/efi/libefi/efinet.c
  projects/vnet/sys/boot/efi/libefi/libefi.c
  projects/vnet/sys/boot/efi/loader/main.c
  projects/vnet/sys/boot/ficl/i386/sysdep.c
  projects/vnet/sys/boot/i386/boot2/boot2.c
  projects/vnet/sys/boot/i386/gptboot/gptboot.c
  projects/vnet/sys/boot/i386/zfsboot/zfsboot.c
  projects/vnet/sys/boot/mips/beri/boot2/boot2.c
  projects/vnet/sys/boot/pc98/boot2/boot2.c
  projects/vnet/sys/boot/powerpc/boot1.chrp/boot1.c
  projects/vnet/sys/boot/sparc64/boot1/boot1.c
  projects/vnet/sys/boot/usb/tools/Makefile
  projects/vnet/sys/cam/scsi/scsi_pass.c
  projects/vnet/sys/cam/scsi/scsi_sa.c
  projects/vnet/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/vnet/sys/compat/linuxkpi/common/include/asm/atomic.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/bitops.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/clocksource.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/completion.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/etherdevice.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/gfp.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/if_vlan.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/kernel.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/list.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/netdevice.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/notifier.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/pci.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/rcupdate.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/uaccess.h
  projects/vnet/sys/conf/Makefile.arm
  projects/vnet/sys/conf/NOTES
  projects/vnet/sys/conf/files
  projects/vnet/sys/conf/files.arm
  projects/vnet/sys/conf/files.arm64
  projects/vnet/sys/conf/kern.mk
  projects/vnet/sys/conf/kern.post.mk
  projects/vnet/sys/conf/kern.pre.mk
  projects/vnet/sys/conf/options
  projects/vnet/sys/conf/options.arm
  projects/vnet/sys/conf/options.mips
  projects/vnet/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/vnet/sys/dev/acpica/acpi.c
  projects/vnet/sys/dev/acpica/acpi_hpet.c
  projects/vnet/sys/dev/acpica/acpi_pcib_acpi.c
  projects/vnet/sys/dev/acpica/acpi_resource.c
  projects/vnet/sys/dev/acpica/acpi_timer.c
  projects/vnet/sys/dev/acpica/acpivar.h
  projects/vnet/sys/dev/advansys/adv_isa.c
  projects/vnet/sys/dev/ahci/ahci.c
  projects/vnet/sys/dev/ahci/ahci.h
  projects/vnet/sys/dev/ata/ata-cbus.c
  projects/vnet/sys/dev/ata/ata-isa.c
  projects/vnet/sys/dev/ata/ata-pci.c
  projects/vnet/sys/dev/ata/ata-pci.h
  projects/vnet/sys/dev/atkbdc/atkbdc_ebus.c
  projects/vnet/sys/dev/atkbdc/atkbdc_isa.c
  projects/vnet/sys/dev/atkbdc/atkbdc_subr.c
  projects/vnet/sys/dev/bwn/if_bwn.c
  projects/vnet/sys/dev/cs/if_cs.c
  projects/vnet/sys/dev/ctau/if_ct.c
  projects/vnet/sys/dev/cx/if_cx.c
  projects/vnet/sys/dev/cxgb/cxgb_osdep.h
  projects/vnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h
  projects/vnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/vnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h
  projects/vnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  projects/vnet/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/vnet/sys/dev/cxgb/ulp/tom/cxgb_listen.c
  projects/vnet/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/vnet/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
  projects/vnet/sys/dev/cxgbe/iw_cxgbe/provider.c
  projects/vnet/sys/dev/cxgbe/tom/t4_connect.c
  projects/vnet/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/vnet/sys/dev/cxgbe/tom/t4_listen.c
  projects/vnet/sys/dev/cxgbe/tom/t4_tom.c
  projects/vnet/sys/dev/e1000/if_em.c
  projects/vnet/sys/dev/ed/if_ed.c
  projects/vnet/sys/dev/ed/if_ed_3c503.c
  projects/vnet/sys/dev/ed/if_ed_cbus.c
  projects/vnet/sys/dev/ed/if_ed_hpp.c
  projects/vnet/sys/dev/ed/if_ed_wd80x3.c
  projects/vnet/sys/dev/eisa/eisaconf.c
  projects/vnet/sys/dev/ep/if_ep.c
  projects/vnet/sys/dev/fdt/simplebus.c
  projects/vnet/sys/dev/fe/if_fe.c
  projects/vnet/sys/dev/fe/if_fe_cbus.c
  projects/vnet/sys/dev/fe/if_fe_isa.c
  projects/vnet/sys/dev/filemon/filemon.c
  projects/vnet/sys/dev/filemon/filemon_wrapper.c
  projects/vnet/sys/dev/fxp/if_fxp.c
  projects/vnet/sys/dev/gpio/gpiobus.c
  projects/vnet/sys/dev/hyperv/include/hyperv.h
  projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/vnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/vnet/sys/dev/hyperv/netvsc/hv_rndis.h
  projects/vnet/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/vnet/sys/dev/hyperv/netvsc/hv_rndis_filter.h
  projects/vnet/sys/dev/hyperv/vmbus/hv_channel.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_connection.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  projects/vnet/sys/dev/iicbus/iic.c
  projects/vnet/sys/dev/iscsi_initiator/isc_cam.c
  projects/vnet/sys/dev/iscsi_initiator/isc_sm.c
  projects/vnet/sys/dev/iscsi_initiator/isc_soc.c
  projects/vnet/sys/dev/iscsi_initiator/isc_subr.c
  projects/vnet/sys/dev/iscsi_initiator/iscsi_subr.c
  projects/vnet/sys/dev/ixgbe/if_ix.c
  projects/vnet/sys/dev/ixgbe/ixgbe.h
  projects/vnet/sys/dev/ixgbe/ixgbe_common.c
  projects/vnet/sys/dev/ixgbe/ixgbe_osdep.h
  projects/vnet/sys/dev/ixgbe/ixgbe_phy.c
  projects/vnet/sys/dev/ixgbe/ixgbe_type.h
  projects/vnet/sys/dev/ixgbe/ixgbe_x540.c
  projects/vnet/sys/dev/ixgbe/ixgbe_x550.c
  projects/vnet/sys/dev/ixl/if_ixl.c
  projects/vnet/sys/dev/le/lance.c
  projects/vnet/sys/dev/malo/if_malo.c
  projects/vnet/sys/dev/mca/mca_bus.c
  projects/vnet/sys/dev/md/md.c
  projects/vnet/sys/dev/mps/mps_mapping.c
  projects/vnet/sys/dev/mps/mps_sas.c
  projects/vnet/sys/dev/mvs/mvs_pci.c
  projects/vnet/sys/dev/mvs/mvs_soc.c
  projects/vnet/sys/dev/ncv/ncr53c500_pccard.c
  projects/vnet/sys/dev/netmap/netmap_offloadings.c
  projects/vnet/sys/dev/nsp/nsp_pccard.c
  projects/vnet/sys/dev/nvd/nvd.c
  projects/vnet/sys/dev/nvme/nvme.h
  projects/vnet/sys/dev/oce/oce_if.h
  projects/vnet/sys/dev/ofw/ofw_subr.c
  projects/vnet/sys/dev/ofw/ofwbus.c
  projects/vnet/sys/dev/ofw/openfirm.c
  projects/vnet/sys/dev/otus/if_otus.c
  projects/vnet/sys/dev/pccard/pccard.c
  projects/vnet/sys/dev/pccard/pccardvarp.h
  projects/vnet/sys/dev/pccbb/pccbb.c
  projects/vnet/sys/dev/pccbb/pccbb_pci.c
  projects/vnet/sys/dev/pccbb/pccbbvar.h
  projects/vnet/sys/dev/pcf/pcf_isa.c
  projects/vnet/sys/dev/pci/hostb_pci.c
  projects/vnet/sys/dev/pci/isa_pci.c
  projects/vnet/sys/dev/pci/pci.c
  projects/vnet/sys/dev/pci/pci_host_generic.c
  projects/vnet/sys/dev/pci/pci_iov.c
  projects/vnet/sys/dev/pci/pci_pci.c
  projects/vnet/sys/dev/pci/pci_private.h
  projects/vnet/sys/dev/pci/pci_subr.c
  projects/vnet/sys/dev/pci/pcib_private.h
  projects/vnet/sys/dev/pci/pcivar.h
  projects/vnet/sys/dev/pci/vga_pci.c
  projects/vnet/sys/dev/ppc/ppc.c
  projects/vnet/sys/dev/ppc/ppcvar.h
  projects/vnet/sys/dev/pty/pty.c
  projects/vnet/sys/dev/puc/puc.c
  projects/vnet/sys/dev/puc/puc_bfe.h
  projects/vnet/sys/dev/qlxgbe/ql_fw.c
  projects/vnet/sys/dev/qlxgbe/ql_ver.h
  projects/vnet/sys/dev/quicc/quicc_bfe.h
  projects/vnet/sys/dev/quicc/quicc_core.c
  projects/vnet/sys/dev/rtwn/if_rtwn.c
  projects/vnet/sys/dev/rtwn/if_rtwnreg.h
  projects/vnet/sys/dev/scc/scc_bfe.h
  projects/vnet/sys/dev/scc/scc_core.c
  projects/vnet/sys/dev/sfxge/sfxge.h
  projects/vnet/sys/dev/sfxge/sfxge_rx.c
  projects/vnet/sys/dev/sfxge/sfxge_tx.c
  projects/vnet/sys/dev/siba/siba.c
  projects/vnet/sys/dev/siba/siba_bwn.c
  projects/vnet/sys/dev/siba/siba_pcib.c
  projects/vnet/sys/dev/siis/siis.c
  projects/vnet/sys/dev/sn/if_sn.c
  projects/vnet/sys/dev/snc/if_snc_cbus.c
  projects/vnet/sys/dev/sound/isa/gusc.c
  projects/vnet/sys/dev/sound/isa/sbc.c
  projects/vnet/sys/dev/sound/pci/csa.c
  projects/vnet/sys/dev/sound/pci/fm801.c
  projects/vnet/sys/dev/sound/pci/hdspe.h
  projects/vnet/sys/dev/sound/pci/vibes.c
  projects/vnet/sys/dev/stg/tmc18c30_subr.c
  projects/vnet/sys/dev/tx/if_tx.c
  projects/vnet/sys/dev/uart/uart_tty.c
  projects/vnet/sys/dev/usb/controller/ehci.c
  projects/vnet/sys/dev/usb/controller/ehci.h
  projects/vnet/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/vnet/sys/dev/usb/controller/ehci_mv.c
  projects/vnet/sys/dev/usb/controller/ehcireg.h
  projects/vnet/sys/dev/usb/wlan/if_rsu.c
  projects/vnet/sys/dev/vnic/thunder_bgx.c
  projects/vnet/sys/dev/vnic/thunder_bgx_fdt.c
  projects/vnet/sys/dev/vnic/thunder_bgx_var.h
  projects/vnet/sys/dev/vnic/thunder_mdio_fdt.c
  projects/vnet/sys/dev/vnic/thunder_mdio_var.h
  projects/vnet/sys/dev/wi/if_wi.c
  projects/vnet/sys/dev/wi/if_wi_pci.c
  projects/vnet/sys/dev/wl/if_wl.c
  projects/vnet/sys/dev/xe/if_xe.c
  projects/vnet/sys/dev/xl/if_xl.c
  projects/vnet/sys/fs/devfs/devfs_devs.c
  projects/vnet/sys/fs/ext2fs/ext2_alloc.c
  projects/vnet/sys/fs/ext2fs/ext2_dinode.h
  projects/vnet/sys/fs/ext2fs/ext2_htree.c
  projects/vnet/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/vnet/sys/fs/ext2fs/ext2_lookup.c
  projects/vnet/sys/fs/ext2fs/inode.h
  projects/vnet/sys/geom/geom_flashmap.c
  projects/vnet/sys/i386/i386/machdep.c
  projects/vnet/sys/i386/linux/linux_sysvec.c
  projects/vnet/sys/i386/svr4/svr4_machdep.c
  projects/vnet/sys/isa/isa_common.c
  projects/vnet/sys/isa/isa_common.h
  projects/vnet/sys/kern/bus_if.m
  projects/vnet/sys/kern/kern_event.c
  projects/vnet/sys/kern/kern_ktr.c
  projects/vnet/sys/kern/kern_ktrace.c
  projects/vnet/sys/kern/kern_rctl.c
  projects/vnet/sys/kern/kern_sysctl.c
  projects/vnet/sys/kern/subr_bus.c
  projects/vnet/sys/kern/subr_mchain.c
  projects/vnet/sys/kern/subr_rman.c
  projects/vnet/sys/kern/tty.c
  projects/vnet/sys/kern/tty_ttydisc.c
  projects/vnet/sys/kern/uipc_debug.c
  projects/vnet/sys/kern/uipc_sockbuf.c
  projects/vnet/sys/kern/uipc_socket.c
  projects/vnet/sys/kern/vfs_aio.c
  projects/vnet/sys/kern/vfs_bio.c
  projects/vnet/sys/kern/vfs_cluster.c
  projects/vnet/sys/kern/vfs_export.c
  projects/vnet/sys/kern/vfs_vnops.c
  projects/vnet/sys/kgssapi/krb5/kcrypto_aes.c
  projects/vnet/sys/mips/adm5120/admpci.c
  projects/vnet/sys/mips/adm5120/obio.c
  projects/vnet/sys/mips/alchemy/obio.c
  projects/vnet/sys/mips/atheros/apb.c
  projects/vnet/sys/mips/atheros/ar71xx_ehci.c
  projects/vnet/sys/mips/atheros/ar71xx_pci.c
  projects/vnet/sys/mips/atheros/ar724x_pci.c
  projects/vnet/sys/mips/atheros/qca955x_pci.c
  projects/vnet/sys/mips/beri/beri_simplebus.c
  projects/vnet/sys/mips/cavium/ciu.c
  projects/vnet/sys/mips/cavium/obio.c
  projects/vnet/sys/mips/cavium/octopci.c
  projects/vnet/sys/mips/conf/AR933X_BASE
  projects/vnet/sys/mips/conf/AR934X_BASE
  projects/vnet/sys/mips/conf/QCA955X_BASE
  projects/vnet/sys/mips/idt/idtpci.c
  projects/vnet/sys/mips/idt/obio.c
  projects/vnet/sys/mips/include/asm.h
  projects/vnet/sys/mips/include/cpufunc.h
  projects/vnet/sys/mips/include/cpuregs.h
  projects/vnet/sys/mips/malta/gt.c
  projects/vnet/sys/mips/malta/gt_pci.c
  projects/vnet/sys/mips/malta/obio.c
  projects/vnet/sys/mips/mips/cpu.c
  projects/vnet/sys/mips/mips/exception.S
  projects/vnet/sys/mips/mips/freebsd32_machdep.c
  projects/vnet/sys/mips/mips/nexus.c
  projects/vnet/sys/mips/mips/pm_machdep.c
  projects/vnet/sys/mips/mips/vm_machdep.c
  projects/vnet/sys/mips/nlm/xlp_simplebus.c
  projects/vnet/sys/mips/rmi/iodi.c
  projects/vnet/sys/mips/rmi/xlr_pci.c
  projects/vnet/sys/mips/rt305x/obio.c
  projects/vnet/sys/mips/rt305x/rt305x_gpio.c
  projects/vnet/sys/mips/rt305x/rt305x_pci.c
  projects/vnet/sys/mips/rt305x/std.rt305x
  projects/vnet/sys/mips/sentry5/obio.c
  projects/vnet/sys/mips/sibyte/sb_zbbus.c
  projects/vnet/sys/mips/sibyte/sb_zbpci.c
  projects/vnet/sys/modules/filemon/Makefile
  projects/vnet/sys/net/bridgestp.c
  projects/vnet/sys/net/if_epair.c
  projects/vnet/sys/net/if_lagg.c
  projects/vnet/sys/net/if_lagg.h
  projects/vnet/sys/net/if_mib.c
  projects/vnet/sys/net/netisr.c
  projects/vnet/sys/net/pfvar.h
  projects/vnet/sys/net/radix.c
  projects/vnet/sys/net/radix.h
  projects/vnet/sys/net/radix_mpath.c
  projects/vnet/sys/net/radix_mpath.h
  projects/vnet/sys/net/route.c
  projects/vnet/sys/net/route.h
  projects/vnet/sys/net/rtsock.c
  projects/vnet/sys/net/vnet.c
  projects/vnet/sys/net/vnet.h
  projects/vnet/sys/net80211/ieee80211.c
  projects/vnet/sys/net80211/ieee80211_acl.c
  projects/vnet/sys/net80211/ieee80211_action.c
  projects/vnet/sys/net80211/ieee80211_ageq.c
  projects/vnet/sys/net80211/ieee80211_amrr.c
  projects/vnet/sys/net80211/ieee80211_crypto_none.c
  projects/vnet/sys/net80211/ieee80211_ddb.c
  projects/vnet/sys/net80211/ieee80211_freebsd.c
  projects/vnet/sys/net80211/ieee80211_ht.c
  projects/vnet/sys/net80211/ieee80211_ioctl.c
  projects/vnet/sys/net80211/ieee80211_output.c
  projects/vnet/sys/net80211/ieee80211_power.c
  projects/vnet/sys/net80211/ieee80211_proto.c
  projects/vnet/sys/net80211/ieee80211_scan.c
  projects/vnet/sys/net80211/ieee80211_scan_sta.c
  projects/vnet/sys/net80211/ieee80211_scan_sw.c
  projects/vnet/sys/net80211/ieee80211_xauth.c
  projects/vnet/sys/netgraph/netflow/netflow.c
  projects/vnet/sys/netgraph/netflow/netflow_v9.c
  projects/vnet/sys/netgraph/netflow/ng_netflow.c
  projects/vnet/sys/netgraph/ng_base.c
  projects/vnet/sys/netinet/cc/cc.c
  projects/vnet/sys/netinet/cc/cc_cdg.c
  projects/vnet/sys/netinet/cc/cc_chd.c
  projects/vnet/sys/netinet/cc/cc_cubic.c
  projects/vnet/sys/netinet/cc/cc_dctcp.c
  projects/vnet/sys/netinet/cc/cc_hd.c
  projects/vnet/sys/netinet/cc/cc_htcp.c
  projects/vnet/sys/netinet/cc/cc_newreno.c
  projects/vnet/sys/netinet/cc/cc_vegas.c
  projects/vnet/sys/netinet/in_fib.c
  projects/vnet/sys/netinet/in_proto.c
  projects/vnet/sys/netinet/in_rmx.c
  projects/vnet/sys/netinet/in_var.h
  projects/vnet/sys/netinet/sctp_input.c
  projects/vnet/sys/netinet/sctp_output.c
  projects/vnet/sys/netinet/sctp_output.h
  projects/vnet/sys/netinet/sctp_pcb.c
  projects/vnet/sys/netinet/sctp_sysctl.c
  projects/vnet/sys/netinet/sctp_uio.h
  projects/vnet/sys/netinet/sctp_var.h
  projects/vnet/sys/netinet/tcp_input.c
  projects/vnet/sys/netinet/tcp_lro.c
  projects/vnet/sys/netinet/tcp_offload.c
  projects/vnet/sys/netinet/tcp_output.c
  projects/vnet/sys/netinet/tcp_stacks/fastpath.c
  projects/vnet/sys/netinet/tcp_subr.c
  projects/vnet/sys/netinet/tcp_syncache.c
  projects/vnet/sys/netinet/tcp_syncache.h
  projects/vnet/sys/netinet/tcp_timer.c
  projects/vnet/sys/netinet/tcp_timer.h
  projects/vnet/sys/netinet/tcp_timewait.c
  projects/vnet/sys/netinet/tcp_usrreq.c
  projects/vnet/sys/netinet/tcp_var.h
  projects/vnet/sys/netinet/toecore.c
  projects/vnet/sys/netinet6/in6_fib.c
  projects/vnet/sys/netinet6/in6_proto.c
  projects/vnet/sys/netinet6/in6_rmx.c
  projects/vnet/sys/netinet6/nd6_rtr.c
  projects/vnet/sys/netinet6/send.c
  projects/vnet/sys/netipsec/ipsec_mbuf.c
  projects/vnet/sys/netipsec/key_debug.c
  projects/vnet/sys/netpfil/ipfw/dn_heap.c
  projects/vnet/sys/netpfil/ipfw/dn_sched_fifo.c
  projects/vnet/sys/netpfil/ipfw/dn_sched_qfq.c
  projects/vnet/sys/netpfil/ipfw/dn_sched_rr.c
  projects/vnet/sys/netpfil/ipfw/ip_fw_log.c
  projects/vnet/sys/netpfil/ipfw/ip_fw_table_algo.c
  projects/vnet/sys/netpfil/ipfw/test/Makefile
  projects/vnet/sys/netpfil/ipfw/test/dn_test.h
  projects/vnet/sys/netpfil/ipfw/test/main.c
  projects/vnet/sys/netpfil/ipfw/test/mylist.h
  projects/vnet/sys/netpfil/ipfw/test/test_dn_sched.c
  projects/vnet/sys/netpfil/pf/pf_table.c
  projects/vnet/sys/nfs/bootp_subr.c
  projects/vnet/sys/ofed/drivers/infiniband/core/cma.c
  projects/vnet/sys/ofed/drivers/infiniband/core/iwcm.c
  projects/vnet/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/vnet/sys/ofed/include/rdma/iw_cm.h
  projects/vnet/sys/ofed/include/rdma/rdma_cm.h
  projects/vnet/sys/pc98/pc98/canbus.c
  projects/vnet/sys/powerpc/booke/pmap.c
  projects/vnet/sys/powerpc/fpu/fpu_emu.c
  projects/vnet/sys/powerpc/fpu/fpu_emu.h
  projects/vnet/sys/powerpc/fpu/fpu_extern.h
  projects/vnet/sys/powerpc/include/reg.h
  projects/vnet/sys/powerpc/mpc85xx/lbc.c
  projects/vnet/sys/powerpc/ofw/ofw_pci.c
  projects/vnet/sys/powerpc/powermac/macgpio.c
  projects/vnet/sys/powerpc/powermac/macio.c
  projects/vnet/sys/powerpc/powermac/uninorth.c
  projects/vnet/sys/powerpc/powerpc/exec_machdep.c
  projects/vnet/sys/powerpc/powerpc/nexus.c
  projects/vnet/sys/powerpc/powerpc/sigcode32.S
  projects/vnet/sys/powerpc/ps3/ehci_ps3.c
  projects/vnet/sys/powerpc/psim/ata_iobus.c
  projects/vnet/sys/powerpc/psim/iobus.c
  projects/vnet/sys/rpc/replay.c
  projects/vnet/sys/sparc64/central/central.c
  projects/vnet/sys/sparc64/ebus/ebus.c
  projects/vnet/sys/sparc64/fhc/fhc.c
  projects/vnet/sys/sparc64/isa/isa.c
  projects/vnet/sys/sparc64/pci/apb.c
  projects/vnet/sys/sparc64/pci/fire.c
  projects/vnet/sys/sparc64/pci/ofw_pci.c
  projects/vnet/sys/sparc64/pci/psycho.c
  projects/vnet/sys/sparc64/pci/sbbc.c
  projects/vnet/sys/sparc64/pci/schizo.c
  projects/vnet/sys/sparc64/sbus/sbus.c
  projects/vnet/sys/sparc64/sparc64/machdep.c
  projects/vnet/sys/sparc64/sparc64/nexus.c
  projects/vnet/sys/sparc64/sparc64/upa.c
  projects/vnet/sys/sys/_types.h
  projects/vnet/sys/sys/bus.h
  projects/vnet/sys/sys/cdefs.h
  projects/vnet/sys/sys/elf_common.h
  projects/vnet/sys/sys/event.h
  projects/vnet/sys/sys/kerneldump.h
  projects/vnet/sys/sys/param.h
  projects/vnet/sys/sys/rman.h
  projects/vnet/sys/sys/signal.h
  projects/vnet/sys/sys/socket.h
  projects/vnet/sys/sys/socketvar.h
  projects/vnet/sys/sys/ttydevsw.h
  projects/vnet/sys/sys/types.h
  projects/vnet/sys/tools/embed_mfs.sh
  projects/vnet/sys/ufs/ffs/ffs_extern.h
  projects/vnet/sys/ufs/ffs/ffs_inode.c
  projects/vnet/sys/ufs/ffs/ffs_vfsops.c
  projects/vnet/sys/vm/vm_map.c
  projects/vnet/sys/x86/include/legacyvar.h
  projects/vnet/sys/x86/include/pci_cfgreg.h
  projects/vnet/sys/x86/isa/atrtc.c
  projects/vnet/sys/x86/isa/clock.c
  projects/vnet/sys/x86/isa/isa.c
  projects/vnet/sys/x86/pci/pci_bus.c
  projects/vnet/sys/x86/pci/qpi.c
  projects/vnet/sys/x86/x86/mptable_pci.c
  projects/vnet/sys/x86/x86/nexus.c
  projects/vnet/tests/sys/geom/class/gate/1_test.sh
  projects/vnet/tests/sys/kqueue/common.h
  projects/vnet/tests/sys/kqueue/main.c
  projects/vnet/tests/sys/kqueue/proc.c
  projects/vnet/tools/regression/sockets/unix_cmsg/unix_cmsg.c
  projects/vnet/tools/regression/sockets/zerosend/zerosend.c
  projects/vnet/tools/tools/ath/ath_ee_v4k_print/v4k.c
  projects/vnet/tools/tools/nanobsd/defaults.sh
  projects/vnet/tools/tools/nanobsd/embedded/README
  projects/vnet/tools/tools/nanobsd/embedded/common
  projects/vnet/tools/tools/nanobsd/embedded/qemu-amd64.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-i386.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-mips.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-mips64.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
  projects/vnet/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
  projects/vnet/usr.bin/Makefile
  projects/vnet/usr.bin/dpv/dpv.1
  projects/vnet/usr.bin/dpv/dpv.c
  projects/vnet/usr.bin/elfdump/elfdump.c
  projects/vnet/usr.bin/kdump/Makefile
  projects/vnet/usr.bin/kdump/kdump.c
  projects/vnet/usr.bin/ldd/ldd.c
  projects/vnet/usr.bin/netstat/inet.c
  projects/vnet/usr.bin/netstat/sctp.c
  projects/vnet/usr.bin/netstat/unix.c
  projects/vnet/usr.bin/systat/netstat.c
  projects/vnet/usr.bin/truss/Makefile
  projects/vnet/usr.bin/truss/aarch64-cloudabi64.c
  projects/vnet/usr.bin/truss/aarch64-freebsd.c
  projects/vnet/usr.bin/truss/amd64-cloudabi64.c
  projects/vnet/usr.bin/truss/amd64-freebsd.c
  projects/vnet/usr.bin/truss/amd64-freebsd32.c
  projects/vnet/usr.bin/truss/amd64-linux32.c
  projects/vnet/usr.bin/truss/arm-freebsd.c
  projects/vnet/usr.bin/truss/i386-freebsd.c
  projects/vnet/usr.bin/truss/i386-linux.c
  projects/vnet/usr.bin/truss/main.c
  projects/vnet/usr.bin/truss/mips-freebsd.c
  projects/vnet/usr.bin/truss/powerpc-freebsd.c
  projects/vnet/usr.bin/truss/powerpc64-freebsd.c
  projects/vnet/usr.bin/truss/powerpc64-freebsd32.c
  projects/vnet/usr.bin/truss/setup.c
  projects/vnet/usr.bin/truss/sparc64-freebsd.c
  projects/vnet/usr.bin/truss/truss.h
  projects/vnet/usr.bin/whois/whois.1
  projects/vnet/usr.bin/whois/whois.c
  projects/vnet/usr.bin/xlint/lint1/param.h
  projects/vnet/usr.sbin/Makefile
  projects/vnet/usr.sbin/autofs/automount.c
  projects/vnet/usr.sbin/autofs/automountd.c
  projects/vnet/usr.sbin/autofs/autounmountd.c
  projects/vnet/usr.sbin/autofs/common.c
  projects/vnet/usr.sbin/autofs/defined.c
  projects/vnet/usr.sbin/bhyve/block_if.c
  projects/vnet/usr.sbin/bhyve/pci_ahci.c
  projects/vnet/usr.sbin/bsdconfig/bsdconfig
  projects/vnet/usr.sbin/bsdconfig/include/messages.subr
  projects/vnet/usr.sbin/bsdconfig/networking/share/media.subr
  projects/vnet/usr.sbin/bsdconfig/networking/share/resolv.subr
  projects/vnet/usr.sbin/bsdconfig/share/common.subr
  projects/vnet/usr.sbin/bsdconfig/share/device.subr
  projects/vnet/usr.sbin/bsdconfig/share/packages/index.subr
  projects/vnet/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
  projects/vnet/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/vnet/usr.sbin/bsdconfig/share/strings.subr
  projects/vnet/usr.sbin/bsdinstall/scripts/zfsboot
  projects/vnet/usr.sbin/devctl/devctl.8
  projects/vnet/usr.sbin/iscsid/iscsid.c
  projects/vnet/usr.sbin/iscsid/pdu.c
  projects/vnet/usr.sbin/makefs/tests/Makefile
  projects/vnet/usr.sbin/syslogd/syslogd.c
  projects/vnet/usr.sbin/sysrc/sysrc
  projects/vnet/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/vnet/   (props changed)
  projects/vnet/cddl/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/vnet/contrib/compiler-rt/   (props changed)
  projects/vnet/contrib/elftoolchain/   (props changed)
  projects/vnet/contrib/gcc/   (props changed)
  projects/vnet/contrib/libucl/   (props changed)
  projects/vnet/contrib/llvm/   (props changed)
  projects/vnet/contrib/llvm/projects/libunwind/   (props changed)
  projects/vnet/contrib/openresolv/   (props changed)
  projects/vnet/contrib/unbound/   (props changed)
  projects/vnet/crypto/openssh/   (props changed)
  projects/vnet/crypto/openssl/   (props changed)
  projects/vnet/gnu/lib/   (props changed)
  projects/vnet/lib/libc/   (props changed)
  projects/vnet/sbin/   (props changed)
  projects/vnet/share/   (props changed)
  projects/vnet/share/man/man4/   (props changed)
  projects/vnet/sys/   (props changed)
  projects/vnet/sys/boot/   (props changed)
  projects/vnet/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/vnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/sys/conf/   (props changed)
  projects/vnet/sys/contrib/ipfilter/   (props changed)
  projects/vnet/sys/dev/hyperv/   (props changed)
  projects/vnet/usr.sbin/bhyve/   (props changed)

Modified: projects/vnet/Makefile
==============================================================================
--- projects/vnet/Makefile	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/Makefile	Wed Feb  3 11:49:51 2016	(r295205)
@@ -136,6 +136,7 @@ TGTS+=	${BITGTS}
 .ORDER: buildworld installworld
 .ORDER: buildworld distributeworld
 .ORDER: buildworld buildkernel
+.ORDER: installworld distribution
 .ORDER: buildkernel installkernel
 .ORDER: buildkernel installkernel.debug
 .ORDER: buildkernel reinstallkernel
@@ -328,7 +329,7 @@ bmake: .PHONY
 		${MMAKE} all; \
 		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
-tinderbox toolchains kernel-toolchains: upgrade_checks
+tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
 
 tinderbox:
 	@cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
@@ -339,6 +340,12 @@ toolchains:
 kernel-toolchains:
 	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
 
+kernels:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe
+
+worlds:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
+
 #
 # universe
 #

Modified: projects/vnet/Makefile.inc1
==============================================================================
--- projects/vnet/Makefile.inc1	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/Makefile.inc1	Wed Feb  3 11:49:51 2016	(r295205)
@@ -72,7 +72,7 @@ SRCDIR?=	${.CURDIR}
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
-.if make(install*)
+.if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
@@ -127,7 +127,7 @@ SUBDIR+=	${_DIR}
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
-.if make(install*)
+.if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc

Modified: projects/vnet/UPDATING
==============================================================================
--- projects/vnet/UPDATING	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/UPDATING	Wed Feb  3 11:49:51 2016	(r295205)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160129:
+	Building ZFS pools on top of zvols is prohibited by default.  That
+	feature has never worked safely; it's always been prone to deadlocks.
+	Using a zvol as the backing store for a VM guest's virtual disk will
+	still work, even if the guest is using ZFS.  Legacy behavior can be
+	restored by setting vfs.zfs.vol.recursive=1.
+
 20160119:
 	The NONE and HPN patches has been removed from OpenSSH.  They are
 	still available in the security/openssh-portable port.

Modified: projects/vnet/bin/csh/iconv_stub.c
==============================================================================
--- projects/vnet/bin/csh/iconv_stub.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/csh/iconv_stub.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);
 

Modified: projects/vnet/bin/setfacl/setfacl.1
==============================================================================
--- projects/vnet/bin/setfacl/setfacl.1	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/setfacl/setfacl.1	Wed Feb  3 11:49:51 2016	(r295205)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 4, 2015
+.Dd January 23, 2016
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -62,8 +62,9 @@ starting at position
 counting from zero.
 This option is only applicable to NFSv4 ACLs.
 .It Fl b
-Remove all ACL entries except for the three required entries
-(POSIX.1e ACLs) or six "canonical" entries (NFSv4 ACLs).
+Remove all ACL entries except for the ones synthesized
+from the file mode - the three mandatory entries in case
+of POSIX.1e ACL.
 If the POSIX.1e ACL contains a
 .Dq Li mask
 entry, the permissions of the

Modified: projects/vnet/bin/sh/cd.c
==============================================================================
--- projects/vnet/bin/sh/cd.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/cd.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -68,15 +68,13 @@ __FBSDID("$FreeBSD$");
 static int cdlogical(char *);
 static int cdphysical(char *);
 static int docd(char *, int, int);
-static char *getcomponent(void);
+static char *getcomponent(char **);
 static char *findcwd(char *);
 static void updatepwd(char *);
 static char *getpwd(void);
 static char *getpwd2(void);
 
 static char *curdir = NULL;	/* current working directory */
-static char *prevdir;		/* previous working directory */
-static char *cdcomppath;
 
 int
 cdcmd(int argc __unused, char **argv __unused)
@@ -112,11 +110,10 @@ cdcmd(int argc __unused, char **argv __u
 	if (*dest == '\0')
 		dest = ".";
 	if (dest[0] == '-' && dest[1] == '\0') {
-		dest = prevdir ? prevdir : curdir;
-		if (dest)
-			print = 1;
-		else
-			dest = ".";
+		dest = bltinlookup("OLDPWD", 1);
+		if (dest == NULL)
+			error("OLDPWD not set");
+		print = 1;
 	}
 	if (dest[0] == '/' ||
 	    (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) ||
@@ -179,6 +176,7 @@ cdlogical(char *dest)
 	char *p;
 	char *q;
 	char *component;
+	char *path;
 	struct stat statb;
 	int first;
 	int badstat;
@@ -189,14 +187,14 @@ cdlogical(char *dest)
 	 *  next time we get the value of the current directory.
 	 */
 	badstat = 0;
-	cdcomppath = stsavestr(dest);
+	path = stsavestr(dest);
 	STARTSTACKSTR(p);
 	if (*dest == '/') {
 		STPUTC('/', p);
-		cdcomppath++;
+		path++;
 	}
 	first = 1;
-	while ((q = getcomponent()) != NULL) {
+	while ((q = getcomponent(&path)) != NULL) {
 		if (q[0] == '\0' || (q[0] == '.' && q[1] == '\0'))
 			continue;
 		if (! first)
@@ -245,25 +243,25 @@ cdphysical(char *dest)
 }
 
 /*
- * Get the next component of the path name pointed to by cdcomppath.
- * This routine overwrites the string pointed to by cdcomppath.
+ * Get the next component of the path name pointed to by *path.
+ * This routine overwrites *path and the string pointed to by it.
  */
 static char *
-getcomponent(void)
+getcomponent(char **path)
 {
 	char *p;
 	char *start;
 
-	if ((p = cdcomppath) == NULL)
+	if ((p = *path) == NULL)
 		return NULL;
-	start = cdcomppath;
+	start = *path;
 	while (*p != '/' && *p != '\0')
 		p++;
 	if (*p == '\0') {
-		cdcomppath = NULL;
+		*path = NULL;
 	} else {
 		*p++ = '\0';
-		cdcomppath = p;
+		*path = p;
 	}
 	return start;
 }
@@ -274,6 +272,7 @@ findcwd(char *dir)
 {
 	char *new;
 	char *p;
+	char *path;
 
 	/*
 	 * If our argument is NULL, we don't know the current directory
@@ -282,14 +281,14 @@ findcwd(char *dir)
 	 */
 	if (dir == NULL || curdir == NULL)
 		return getpwd2();
-	cdcomppath = stsavestr(dir);
+	path = stsavestr(dir);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		STPUTS(curdir, new);
 		if (STTOPC(new) == '/')
 			STUNPUTC(new);
 	}
-	while ((p = getcomponent()) != NULL) {
+	while ((p = getcomponent(&path)) != NULL) {
 		if (equal(p, "..")) {
 			while (new > stackblock() && (STUNPUTC(new), *new) != '/');
 		} else if (*p != '\0' && ! equal(p, ".")) {
@@ -311,14 +310,15 @@ findcwd(char *dir)
 static void
 updatepwd(char *dir)
 {
+	char *prevdir;
+
 	hashcd();				/* update command hash table */
 
-	if (prevdir)
-		ckfree(prevdir);
+	setvar("PWD", dir, VEXPORT);
+	setvar("OLDPWD", curdir, VEXPORT);
 	prevdir = curdir;
 	curdir = dir ? savestr(dir) : NULL;
-	setvar("PWD", curdir, VEXPORT);
-	setvar("OLDPWD", prevdir, VEXPORT);
+	ckfree(prevdir);
 }
 
 int

Modified: projects/vnet/bin/sh/expand.c
==============================================================================
--- projects/vnet/bin/sh/expand.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/expand.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -91,13 +91,13 @@ struct worddest {
 static char *expdest;			/* output of current string */
 static struct nodelist *argbackq;	/* list of back quote expressions */
 
-static char *argstr(char *, int, struct worddest *);
-static char *exptilde(char *, int);
-static char *expari(char *, int, struct worddest *);
+static const char *argstr(const char *, int, struct worddest *);
+static const char *exptilde(const char *, int);
+static const char *expari(const char *, int, struct worddest *);
 static void expbackq(union node *, int, int, struct worddest *);
-static void subevalvar_trim(char *, int, int, int);
-static int subevalvar_misc(char *, const char *, int, int, int);
-static char *evalvar(char *, int, struct worddest *);
+static void subevalvar_trim(const char *, int, int, int);
+static int subevalvar_misc(const char *, const char *, int, int, int);
+static const char *evalvar(const char *, int, struct worddest *);
 static int varisset(const char *, int);
 static void strtodest(const char *, int, int, int, struct worddest *);
 static void reprocess(int, int, int, int, struct worddest *);
@@ -262,8 +262,8 @@ expandarg(union node *arg, struct arglis
  *
  * If EXP_SPLIT is set, dst receives any complete words produced.
  */
-static char *
-argstr(char *p, int flag, struct worddest *dst)
+static const char *
+argstr(const char *p, int flag, struct worddest *dst)
 {
 	char c;
 	int quotes = flag & (EXP_GLOB | EXP_CASE);	/* do CTLESC */
@@ -352,12 +352,15 @@ argstr(char *p, int flag, struct worddes
  * Perform tilde expansion, placing the result in the stack string and
  * returning the next position in the input string to process.
  */
-static char *
-exptilde(char *p, int flag)
+static const char *
+exptilde(const char *p, int flag)
 {
-	char c, *startp = p;
+	char c;
+	const char *startp = p;
+	const char *user;
 	struct passwd *pw;
 	char *home;
+	int len;
 
 	for (;;) {
 		c = *p;
@@ -377,14 +380,17 @@ exptilde(char *p, int flag)
 		case '\0':
 		case '/':
 		case CTLENDVAR:
-			*p = '\0';
-			if (*(startp+1) == '\0') {
+			len = p - startp - 1;
+			STPUTBIN(startp + 1, len, expdest);
+			STACKSTRNUL(expdest);
+			user = expdest - len;
+			if (*user == '\0') {
 				home = lookupvar("HOME");
 			} else {
-				pw = getpwnam(startp+1);
+				pw = getpwnam(user);
 				home = pw != NULL ? pw->pw_dir : NULL;
 			}
-			*p = c;
+			STADJUST(-len, expdest);
 			if (home == NULL || *home == '\0')
 				return (startp);
 			strtodest(home, flag, VSNORMAL, 1, NULL);
@@ -398,8 +404,8 @@ exptilde(char *p, int flag)
 /*
  * Expand arithmetic expression.
  */
-static char *
-expari(char *p, int flag, struct worddest *dst)
+static const char *
+expari(const char *p, int flag, struct worddest *dst)
 {
 	char *q, *start;
 	arith_t result;
@@ -532,7 +538,7 @@ recordleft(const char *str, const char *
 }
 
 static void
-subevalvar_trim(char *p, int strloc, int subtype, int startloc)
+subevalvar_trim(const char *p, int strloc, int subtype, int startloc)
 {
 	char *startp;
 	char *loc = NULL;
@@ -606,7 +612,7 @@ subevalvar_trim(char *p, int strloc, int
 
 
 static int
-subevalvar_misc(char *p, const char *var, int subtype, int startloc,
+subevalvar_misc(const char *p, const char *var, int subtype, int startloc,
   int varflags)
 {
 	char *startp;
@@ -645,12 +651,12 @@ subevalvar_misc(char *p, const char *var
  * input string.
  */
 
-static char *
-evalvar(char *p, int flag, struct worddest *dst)
+static const char *
+evalvar(const char *p, int flag, struct worddest *dst)
 {
 	int subtype;
 	int varflags;
-	char *var;
+	const char *var;
 	const char *val;
 	int patloc;
 	int c;

Modified: projects/vnet/bin/sh/redir.c
==============================================================================
--- projects/vnet/bin/sh/redir.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/redir.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -70,6 +70,7 @@ struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
 	int fd0_redirected;
+	unsigned int empty_redirs;
 };
 
 
@@ -82,6 +83,9 @@ static struct redirtab *redirlist;
 */
 static int fd0_redirected = 0;
 
+/* Number of redirtabs that have not been allocated. */
+static unsigned int empty_redirs = 0;
+
 static void openredirect(union node *, char[10 ]);
 static int openhere(union node *);
 
@@ -115,12 +119,17 @@ redirect(union node *redir, int flags)
 		memory[i] = 0;
 	memory[1] = flags & REDIR_BACKQ;
 	if (flags & REDIR_PUSH) {
-		sv = ckmalloc(sizeof (struct redirtab));
-		for (i = 0 ; i < 10 ; i++)
-			sv->renamed[i] = EMPTY;
-		sv->fd0_redirected = fd0_redirected;
-		sv->next = redirlist;
-		redirlist = sv;
+		empty_redirs++;
+		if (redir != NULL) {
+			sv = ckmalloc(sizeof (struct redirtab));
+			for (i = 0 ; i < 10 ; i++)
+				sv->renamed[i] = EMPTY;
+			sv->fd0_redirected = fd0_redirected;
+			sv->empty_redirs = empty_redirs - 1;
+			sv->next = redirlist;
+			redirlist = sv;
+			empty_redirs = 0;
+		}
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
@@ -303,6 +312,12 @@ popredir(void)
 	struct redirtab *rp = redirlist;
 	int i;
 
+	INTOFF;
+	if (empty_redirs > 0) {
+		empty_redirs--;
+		INTON;
+		return;
+	}
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
 			if (rp->renamed[i] >= 0) {
@@ -313,8 +328,8 @@ popredir(void)
 			}
 		}
 	}
-	INTOFF;
 	fd0_redirected = rp->fd0_redirected;
+	empty_redirs = rp->empty_redirs;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;

Modified: projects/vnet/bin/sh/sh.1
==============================================================================
--- projects/vnet/bin/sh/sh.1	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/sh.1	Wed Feb  3 11:49:51 2016	(r295205)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2015
+.Dd January 30, 2016
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1952,13 +1952,20 @@ Execute the specified built-in command,
 This is useful when the user wishes to override a shell function
 with the same name as a built-in command.
 .It Ic cd Oo Fl L | P Oc Oo Fl e Oc Op Ar directory
+.It Ic cd Fl
 Switch to the specified
 .Ar directory ,
-or to the directory specified in the
+to the directory specified in the
 .Va HOME
 environment variable if no
 .Ar directory
-is specified.
+is specified or
+to the directory specified in the
+.Va OLDPWD
+environment variable if
+.Ar directory
+is
+.Fl .
 If
 .Ar directory
 does not begin with
@@ -1982,10 +1989,12 @@ the
 .Ic cd
 command will print out the name of the directory
 that it actually switched to
-if this is different from the name that the user gave.
-These may be different either because the
+if the
 .Va CDPATH
-mechanism was used or because a symbolic link was crossed.
+mechanism was used or if
+.Ar directory
+was
+.Fl .
 .Pp
 If the
 .Fl P
@@ -2774,6 +2783,10 @@ Initialization file for interactive shel
 Locale settings.
 These are inherited by children of the shell,
 and is used in a limited manner by the shell itself.
+.It Ev OLDPWD
+The previous current directory.
+This is used and updated by
+.Ic cd .
 .It Ev PWD
 An absolute pathname for the current directory,
 possibly containing symbolic links.

Modified: projects/vnet/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/vnet/bin/sh/tests/builtins/Makefile	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/tests/builtins/Makefile	Wed Feb  3 11:49:51 2016	(r295205)
@@ -112,6 +112,8 @@ FILES+=		local2.0
 FILES+=		local3.0
 FILES+=		local4.0
 FILES+=		local5.0
+FILES+=		local6.0
+FILES+=		local7.0
 .if ${MK_NLS} != "no"
 FILES+=		locale1.0
 .endif

Copied: projects/vnet/bin/sh/tests/builtins/local6.0 (from r295202, head/bin/sh/tests/builtins/local6.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/builtins/local6.0	Wed Feb  3 11:49:51 2016	(r295205, copy of r295202, head/bin/sh/tests/builtins/local6.0)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+f() {
+	local x
+	readonly x=2
+}
+x=3
+f
+x=4
+[ "$x" = 4 ]

Copied: projects/vnet/bin/sh/tests/builtins/local7.0 (from r295202, head/bin/sh/tests/builtins/local7.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/builtins/local7.0	Wed Feb  3 11:49:51 2016	(r295205, copy of r295202, head/bin/sh/tests/builtins/local7.0)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+f() {
+	local x
+	readonly x=2
+}
+unset x
+f
+x=4
+[ "$x" = 4 ]

Modified: projects/vnet/bin/sh/var.c
==============================================================================
--- projects/vnet/bin/sh/var.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/sh/var.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -802,6 +802,7 @@ poplocalvars(void)
 			ckfree(lvp->text);
 			optschanged();
 		} else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
+			vp->flags &= ~VREADONLY;
 			(void)unsetvar(vp->text);
 		} else {
 			islocalevar = (vp->flags | lvp->flags) & VEXPORT &&

Modified: projects/vnet/bin/test/test.c
==============================================================================
--- projects/vnet/bin/test/test.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/bin/test/test.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -120,51 +120,53 @@ enum token {
 
 #define TOKEN_TYPE(token) ((token) & 0xff00)
 
-static struct t_op {
-	char op_text[4];
+static const struct t_op {
+	char op_text[2];
 	short op_num;
-} const ops [] = {
-	{"-r",	FILRD},
-	{"-w",	FILWR},
-	{"-x",	FILEX},
-	{"-e",	FILEXIST},
-	{"-f",	FILREG},
-	{"-d",	FILDIR},
-	{"-c",	FILCDEV},
-	{"-b",	FILBDEV},
-	{"-p",	FILFIFO},
-	{"-u",	FILSUID},
-	{"-g",	FILSGID},
-	{"-k",	FILSTCK},
-	{"-s",	FILGZ},
-	{"-t",	FILTT},
-	{"-z",	STREZ},
-	{"-n",	STRNZ},
-	{"-h",	FILSYM},		/* for backwards compat */
-	{"-O",	FILUID},
-	{"-G",	FILGID},
-	{"-L",	FILSYM},
-	{"-S",	FILSOCK},
+} ops1[] = {
 	{"=",	STREQ},
-	{"==",	STREQ},
-	{"!=",	STRNE},
 	{"<",	STRLT},
 	{">",	STRGT},
-	{"-eq",	INTEQ},
-	{"-ne",	INTNE},
-	{"-ge",	INTGE},
-	{"-gt",	INTGT},
-	{"-le",	INTLE},
-	{"-lt",	INTLT},
-	{"-nt",	FILNT},
-	{"-ot",	FILOT},
-	{"-ef",	FILEQ},
 	{"!",	UNOT},
-	{"-a",	BAND},
-	{"-o",	BOR},
 	{"(",	LPAREN},
 	{")",	RPAREN},
-	{"",	0}
+}, opsm1[] = {
+	{"r",	FILRD},
+	{"w",	FILWR},
+	{"x",	FILEX},
+	{"e",	FILEXIST},
+	{"f",	FILREG},
+	{"d",	FILDIR},
+	{"c",	FILCDEV},
+	{"b",	FILBDEV},
+	{"p",	FILFIFO},
+	{"u",	FILSUID},
+	{"g",	FILSGID},
+	{"k",	FILSTCK},
+	{"s",	FILGZ},
+	{"t",	FILTT},
+	{"z",	STREZ},
+	{"n",	STRNZ},
+	{"h",	FILSYM},		/* for backwards compat */
+	{"O",	FILUID},
+	{"G",	FILGID},
+	{"L",	FILSYM},
+	{"S",	FILSOCK},
+	{"a",	BAND},
+	{"o",	BOR},
+}, ops2[] = {
+	{"==",	STREQ},
+	{"!=",	STRNE},
+}, opsm2[] = {
+	{"eq",	INTEQ},
+	{"ne",	INTNE},
+	{"ge",	INTGE},
+	{"gt",	INTGT},
+	{"le",	INTLE},
+	{"lt",	INTLT},
+	{"nt",	FILNT},
+	{"ot",	FILOT},
+	{"ef",	FILEQ},
 };
 
 static int nargc;
@@ -416,35 +418,71 @@ filstat(char *nm, enum token mode)
 	}
 }
 
-static enum token
-t_lex(char *s)
+static int
+find_op_1char(const struct t_op *op, const struct t_op *end, const char *s)
 {
-	struct t_op const *op = ops;
+	char c;
 
-	if (s == 0) {
-		return EOI;
+	c = s[0];
+	while (op != end) {
+		if (c == *op->op_text)
+			return op->op_num;
+		op++;
 	}
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0) {
-			if (((TOKEN_TYPE(op->op_num) == UNOP ||
-			    TOKEN_TYPE(op->op_num) == BUNOP)
-						&& isunopoperand()) ||
-			    (op->op_num == LPAREN && islparenoperand()) ||
-			    (op->op_num == RPAREN && isrparenoperand()))
-				break;
+	return OPERAND;
+}
+
+static int
+find_op_2char(const struct t_op *op, const struct t_op *end, const char *s)
+{
+	while (op != end) {
+		if (s[0] == op->op_text[0] && s[1] == op->op_text[1])
 			return op->op_num;
-		}
 		op++;
 	}
 	return OPERAND;
 }
 
 static int
+find_op(const char *s)
+{
+	if (s[0] == '\0')
+		return OPERAND;
+	else if (s[1] == '\0')
+		return find_op_1char(ops1, (&ops1)[1], s);
+	else if (s[2] == '\0')
+		return s[0] == '-' ? find_op_1char(opsm1, (&opsm1)[1], s + 1) :
+		    find_op_2char(ops2, (&ops2)[1], s);
+	else if (s[3] == '\0')
+		return s[0] == '-' ? find_op_2char(opsm2, (&opsm2)[1], s + 1) :
+		    OPERAND;
+	else
+		return OPERAND;
+}
+
+static enum token
+t_lex(char *s)
+{
+	int num;
+
+	if (s == 0) {
+		return EOI;
+	}
+	num = find_op(s);
+	if (((TOKEN_TYPE(num) == UNOP || TOKEN_TYPE(num) == BUNOP)
+				&& isunopoperand()) ||
+	    (num == LPAREN && islparenoperand()) ||
+	    (num == RPAREN && isrparenoperand()))
+		return OPERAND;
+	return num;
+}
+
+static int
 isunopoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
 	char *t;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -452,20 +490,16 @@ isunopoperand(void)
 	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 TOKEN_TYPE(op->op_num) == BINOP &&
-			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP &&
+	    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 }
 
 static int
 islparenoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -474,12 +508,8 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0)
-			return TOKEN_TYPE(op->op_num) == BINOP;
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP;
 }
 
 static int

Modified: projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Feb  3 11:49:51 2016	(r295205)
@@ -2841,8 +2841,11 @@ Do not actually receive the stream. This
 option to verify the name the receive operation would use.
 .It Fl o Sy origin Ns = Ns Ar snapshot
 Forces the stream to be received as a clone of the given snapshot.
-This is only valid if the stream is an incremental stream whose source
-is the same as the provided origin.
+If the stream is a full send stream, this will create the filesystem
+described by the stream as a clone of the specified snapshot. Which
+snapshot was specified will not affect the success or failure of the
+receive, as long as the snapshot does exist.  If the stream is an
+incremental send stream, all the normal verification will be performed.
 .It Fl F
 Force a rollback of the file system to the most recent snapshot before
 performing the receive operation. If receiving an incremental replication

Modified: projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -26,6 +26,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2015 by Syneto S.R.L. All rights reserved.
  */
 
 /*
@@ -246,8 +247,9 @@ zpool_get_features(zpool_handle_t *zhp)
 		config = zpool_get_config(zhp, NULL);
 	}
 
-	verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
-	    &features) == 0);
+	if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
+	    &features) != 0)
+		return (NULL);
 
 	return (features);
 }

Modified: projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -26,6 +26,7 @@
  * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
+ * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  */
 
 #include <assert.h>
@@ -67,7 +68,7 @@ extern void zfs_setprop_error(libzfs_han
 
 static int zfs_receive_impl(libzfs_handle_t *, const char *, const char *,
     recvflags_t *, int, const char *, nvlist_t *, avl_tree_t *, char **, int,
-    uint64_t *);
+    uint64_t *, const char *);
 static int guid_to_name(libzfs_handle_t *, const char *,
     uint64_t, boolean_t, char *);
 
@@ -2602,6 +2603,7 @@ zfs_receive_package(libzfs_handle_t *hdl
 	nvlist_t *stream_nv = NULL;
 	avl_tree_t *stream_avl = NULL;
 	char *fromsnap = NULL;
+	char *sendsnap = NULL;
 	char *cp;
 	char tofs[ZFS_MAXNAMELEN];
 	char sendfs[ZFS_MAXNAMELEN];
@@ -2750,8 +2752,16 @@ zfs_receive_package(libzfs_handle_t *hdl
 	 */
 	(void) strlcpy(sendfs, drr->drr_u.drr_begin.drr_toname,
 	    ZFS_MAXNAMELEN);
-	if ((cp = strchr(sendfs, '@')) != NULL)
+	if ((cp = strchr(sendfs, '@')) != NULL) {
 		*cp = '\0';
+		/*
+		 * Find the "sendsnap", the final snapshot in a replication
+		 * stream.  zfs_receive_one() handles certain errors
+		 * differently, depending on if the contained stream is the
+		 * last one or not.
+		 */
+		sendsnap = (cp + 1);
+	}
 
 	/* Finally, receive each contained stream */
 	do {
@@ -2764,7 +2774,7 @@ zfs_receive_package(libzfs_handle_t *hdl
 		 */
 		error = zfs_receive_impl(hdl, destname, NULL, flags, fd,
 		    sendfs, stream_nv, stream_avl, top_zfs, cleanup_fd,
-		    action_handlep);
+		    action_handlep, sendsnap);
 		if (error == ENODATA) {
 			error = 0;
 			break;
@@ -2930,7 +2940,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
     const char *originsnap, recvflags_t *flags, dmu_replay_record_t *drr,
     dmu_replay_record_t *drr_noswap, const char *sendfs, nvlist_t *stream_nv,
     avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
-    uint64_t *action_handlep)
+    uint64_t *action_handlep, const char *finalsnap)
 {
 	zfs_cmd_t zc = { 0 };
 	time_t begin_time;
@@ -2947,6 +2957,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 	nvlist_t *snapprops_nvlist = NULL;
 	zprop_errflags_t prop_errflags;
 	boolean_t recursive;
+	char *snapname = NULL;
 
 	begin_time = time(NULL);
 
@@ -2957,7 +2968,6 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 	    ENOENT);
 
 	if (stream_avl != NULL) {
-		char *snapname;
 		nvlist_t *fs = fsavl_find(stream_avl, drrb->drr_toguid,
 		    &snapname);
 		nvlist_t *props;
@@ -3313,7 +3323,21 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 			    ZPROP_N_MORE_ERRORS) == 0) {
 				trunc_prop_errs(intval);
 				break;
-			} else {
+			} else if (snapname == NULL || finalsnap == NULL ||
+			    strcmp(finalsnap, snapname) == 0 ||
+			    strcmp(nvpair_name(prop_err),
+			    zfs_prop_to_name(ZFS_PROP_REFQUOTA)) != 0) {
+				/*
+				 * Skip the special case of, for example,
+				 * "refquota", errors on intermediate
+				 * snapshots leading up to a final one.
+				 * That's why we have all of the checks above.
+				 *
+				 * See zfs_ioctl.c's extract_delay_props() for
+				 * a list of props which can fail on
+				 * intermediate snapshots, but shouldn't
+				 * affect the overall receive.
+				 */
 				(void) snprintf(tbuf, sizeof (tbuf),
 				    dgettext(TEXT_DOMAIN,
 				    "cannot receive %s property on %s"),
@@ -3498,7 +3522,7 @@ static int
 zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,
     const char *originsnap, recvflags_t *flags, int infd, const char *sendfs,
     nvlist_t *stream_nv, avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
-    uint64_t *action_handlep)
+    uint64_t *action_handlep, const char *finalsnap)
 {
 	int err;
 	dmu_replay_record_t drr, drr_noswap;
@@ -3594,10 +3618,11 @@ zfs_receive_impl(libzfs_handle_t *hdl, c
 			if ((cp = strchr(nonpackage_sendfs, '@')) != NULL)
 				*cp = '\0';
 			sendfs = nonpackage_sendfs;
+			VERIFY(finalsnap == NULL);
 		}
 		return (zfs_receive_one(hdl, infd, tosnap, originsnap, flags,
 		    &drr, &drr_noswap, sendfs, stream_nv, stream_avl, top_zfs,
-		    cleanup_fd, action_handlep));
+		    cleanup_fd, action_handlep, finalsnap));
 	} else {
 		assert(DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
 		    DMU_COMPOUNDSTREAM);
@@ -3632,7 +3657,7 @@ zfs_receive(libzfs_handle_t *hdl, const 
 	VERIFY(cleanup_fd >= 0);
 
 	err = zfs_receive_impl(hdl, tosnap, originsnap, flags, infd, NULL, NULL,
-	    stream_avl, &top_zfs, cleanup_fd, &action_handle);
+	    stream_avl, &top_zfs, cleanup_fd, &action_handle, NULL);
 
 	VERIFY(0 == close(cleanup_fd));
 

Modified: projects/vnet/cddl/lib/Makefile
==============================================================================
--- projects/vnet/cddl/lib/Makefile	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/cddl/lib/Makefile	Wed Feb  3 11:49:51 2016	(r295205)
@@ -26,7 +26,7 @@ _libzpool=	libzpool
 .endif
 .endif
 
-.if ${MACHINE_CPUARCH} != "sparc64"
+.if ${MACHINE_CPUARCH} != "sparc64" && ${MACHINE_CPUARCH} != "riscv"
 _drti=		drti
 _libdtrace=	libdtrace
 .endif

Modified: projects/vnet/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- projects/vnet/contrib/bsnmp/snmp_mibII/mibII.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/contrib/bsnmp/snmp_mibII/mibII.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -982,7 +982,7 @@ handle_rtmsg(struct rt_msghdr *rtm)
 {
 	struct sockaddr *addrs[RTAX_MAX];
 	struct if_msghdr *ifm;
-	struct ifa_msghdr ifam;
+	struct ifa_msghdr ifam, *ifamp;
 	struct ifma_msghdr *ifmam;
 #ifdef RTM_IFANNOUNCE
 	struct if_announcemsghdr *ifan;
@@ -1002,8 +1002,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 	switch (rtm->rtm_type) {
 
 	  case RTM_NEWADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL)
 			break;
 
@@ -1029,8 +1030,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		break;
 
 	  case RTM_DELADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL)
 			break;
 

Modified: projects/vnet/contrib/bsnmp/snmp_mibII/mibII_tcp.c
==============================================================================
--- projects/vnet/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Wed Feb  3 11:44:43 2016	(r295204)
+++ projects/vnet/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Wed Feb  3 11:49:51 2016	(r295205)
@@ -45,10 +45,10 @@ struct tcp_index {
 };
 
 static uint64_t tcp_tick;
+static uint64_t tcp_stats_tick;
 static struct tcpstat tcpstat;
 static struct xinpgen *xinpgen;
 static size_t xinpgen_len;
-static u_int tcp_count;
 static u_int tcp_total;
 
 static u_int oidnum;
@@ -64,13 +64,9 @@ tcp_compare(const void *p1, const void *
 }
 
 static int
-fetch_tcp(void)
+fetch_tcp_stats(void)
 {
 	size_t len;
-	struct xinpgen *ptr;

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

From owner-svn-src-projects@freebsd.org  Wed Feb  3 18:07:00 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97F35A97C0A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 18:07:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B55698F;
 Wed,  3 Feb 2016 18:07:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13I6xAg036889;
 Wed, 3 Feb 2016 18:06:59 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13I6w3u036882;
 Wed, 3 Feb 2016 18:06:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602031806.u13I6w3u036882@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 18:06:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295215 - in projects/release-pkg/bin/sh/tests: builtins
 errors execution expansion parameters parser set-e
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 18:07:00 -0000

Author: gjb
Date: Wed Feb  3 18:06:58 2016
New Revision: 295215
URL: https://svnweb.freebsd.org/changeset/base/295215

Log:
  Fix build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/bin/sh/tests/builtins/Makefile
  projects/release-pkg/bin/sh/tests/errors/Makefile
  projects/release-pkg/bin/sh/tests/execution/Makefile
  projects/release-pkg/bin/sh/tests/expansion/Makefile
  projects/release-pkg/bin/sh/tests/parameters/Makefile
  projects/release-pkg/bin/sh/tests/parser/Makefile
  projects/release-pkg/bin/sh/tests/set-e/Makefile

Modified: projects/release-pkg/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/builtins/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/builtins/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -4,7 +4,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/errors/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/errors/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/errors/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/execution/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/execution/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/execution/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/expansion/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/expansion/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/parameters/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parameters/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/parameters/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

Modified: projects/release-pkg/bin/sh/tests/set-e/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/set-e/Makefile	Wed Feb  3 17:00:19 2016	(r295214)
+++ projects/release-pkg/bin/sh/tests/set-e/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
@@ -2,7 +2,6 @@
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
-TESTS=		${FILESDIR}/${FILES}
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 19:08:51 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C566A9A355
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 19:08:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0405DEEE;
 Wed,  3 Feb 2016 19:08:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13J8oBm055115;
 Wed, 3 Feb 2016 19:08:50 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13J8j2v055071;
 Wed, 3 Feb 2016 19:08:45 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602031908.u13J8j2v055071@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 19:08:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295216 - in projects/release-pkg: bin/tests cddl/tests
 gnu/tests gnu/usr.bin/diff/tests lib/atf/libatf-c++/tests/detail
 lib/atf/libatf-c/tests/detail lib/libc/tests/sys libexec/atf/atf...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 19:08:51 -0000

Author: gjb
Date: Wed Feb  3 19:08:45 2016
New Revision: 295216
URL: https://svnweb.freebsd.org/changeset/base/295216

Log:
  More 'tests' packaging fixes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/bin/tests/Makefile
  projects/release-pkg/cddl/tests/Makefile
  projects/release-pkg/gnu/tests/Makefile
  projects/release-pkg/gnu/usr.bin/diff/tests/Makefile
  projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile
  projects/release-pkg/lib/atf/libatf-c/tests/detail/Makefile
  projects/release-pkg/lib/libc/tests/sys/Makefile
  projects/release-pkg/libexec/atf/atf-check/tests/Makefile
  projects/release-pkg/libexec/atf/atf-sh/tests/Makefile
  projects/release-pkg/libexec/tests/Makefile
  projects/release-pkg/sbin/tests/Makefile
  projects/release-pkg/secure/tests/Makefile
  projects/release-pkg/share/examples/tests/tests/atf/Makefile
  projects/release-pkg/share/tests/Makefile
  projects/release-pkg/tests/Makefile
  projects/release-pkg/tests/sys/geom/class/concat/Makefile
  projects/release-pkg/tests/sys/geom/class/eli/Makefile
  projects/release-pkg/tests/sys/geom/class/gate/Makefile
  projects/release-pkg/tests/sys/geom/class/mirror/Makefile
  projects/release-pkg/tests/sys/geom/class/nop/Makefile
  projects/release-pkg/tests/sys/geom/class/raid3/Makefile
  projects/release-pkg/tests/sys/geom/class/shsec/Makefile
  projects/release-pkg/tests/sys/geom/class/stripe/Makefile
  projects/release-pkg/tests/sys/geom/class/uzip/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/chflags/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/chmod/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/chown/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/ftruncate/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/granular/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/link/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/mkdir/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/mkfifo/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/mknod/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/open/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/rename/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/rmdir/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/symlink/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/truncate/Makefile
  projects/release-pkg/tests/sys/pjdfstest/tests/unlink/Makefile
  projects/release-pkg/usr.bin/tests/Makefile
  projects/release-pkg/usr.bin/yacc/tests/Makefile
  projects/release-pkg/usr.sbin/tests/Makefile

Modified: projects/release-pkg/bin/tests/Makefile
==============================================================================
--- projects/release-pkg/bin/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/bin/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/cddl/tests/Makefile
==============================================================================
--- projects/release-pkg/cddl/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/cddl/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/gnu/tests/Makefile
==============================================================================
--- projects/release-pkg/gnu/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/gnu/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/gnu/usr.bin/diff/tests/Makefile
==============================================================================
--- projects/release-pkg/gnu/usr.bin/diff/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/gnu/usr.bin/diff/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.bin/diff
 
 NETBSD_ATF_TESTS_SH=	diff_test

Modified: projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/lib/atf/libatf-c++/tests/detail/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -3,6 +3,8 @@
 .include <bsd.init.mk>
 
 PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/atf/libatf-c/tests/detail/Makefile
==============================================================================
--- projects/release-pkg/lib/atf/libatf-c/tests/detail/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/lib/atf/libatf-c/tests/detail/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail
 
 ATF=		${SRCTOP}/contrib/atf

Modified: projects/release-pkg/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/sys/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/lib/libc/tests/sys/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -72,13 +72,15 @@ WARNS?=			3
 WARNS?=			4
 .endif
 
-FILESGROUPS=		FILES truncate_test_FILES
+FILESGROUPS+=		FILES truncate_test_FILES
 
 truncate_test_FILES=	truncate_test.root_owned
 truncate_test_FILESDIR=	${TESTSDIR}
 truncate_test_FILESMODE= 0600
 truncate_test_FILESOWNER= root
 truncate_test_FILESGRP= wheel
+truncate_test_FILESPACKAGE=	${PACKAGE}
+FILESPACKAGE=		${PACKAGE}
 
 CLEANFILES=	truncate_test.root_owned
 truncate_test.root_owned:

Modified: projects/release-pkg/libexec/atf/atf-check/tests/Makefile
==============================================================================
--- projects/release-pkg/libexec/atf/atf-check/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/libexec/atf/atf-check/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,10 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 

Modified: projects/release-pkg/libexec/atf/atf-sh/tests/Makefile
==============================================================================
--- projects/release-pkg/libexec/atf/atf-sh/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/libexec/atf/atf-sh/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 

Modified: projects/release-pkg/libexec/tests/Makefile
==============================================================================
--- projects/release-pkg/libexec/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/libexec/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TEST+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/sbin/tests/Makefile
==============================================================================
--- projects/release-pkg/sbin/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/sbin/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/secure/tests/Makefile
==============================================================================
--- projects/release-pkg/secure/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/secure/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/share/examples/tests/tests/atf/Makefile
==============================================================================
--- projects/release-pkg/share/examples/tests/tests/atf/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/share/examples/tests/tests/atf/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 # Directory into which the Kyuafile provided by this directory will be
 # installed.
 #

Modified: projects/release-pkg/share/tests/Makefile
==============================================================================
--- projects/release-pkg/share/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/share/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
 TESTSDIR=	${TESTSBASE}/share
 
 .PATH:		${SRCTOP}/tests

Modified: projects/release-pkg/tests/Makefile
==============================================================================
--- projects/release-pkg/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -5,6 +5,7 @@
 PACKAGE= tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
 
 SUBDIR+= etc
 SUBDIR+= sys

Modified: projects/release-pkg/tests/sys/geom/class/concat/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/concat/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/concat/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/eli/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/eli/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/eli/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+= attach_d_test
 TAP_TESTS_SH+= configure_b_B_test

Modified: projects/release-pkg/tests/sys/geom/class/gate/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/gate/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/gate/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/mirror/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/mirror/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/mirror/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/nop/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/nop/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/nop/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/raid3/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/raid3/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/raid3/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/shsec/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/shsec/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/shsec/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/stripe/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/stripe/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/stripe/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test

Modified: projects/release-pkg/tests/sys/geom/class/uzip/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/uzip/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/geom/class/uzip/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -4,7 +4,11 @@
 # Regression test for geom_uzip.
 #
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}
 
 IMAGE=		1.img
 ZIMAGE=		${IMAGE}.uzip

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/chflags/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/chflags/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/chflags/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/chmod/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/chmod/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/chmod/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/chown/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/chown/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/chown/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/ftruncate/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/ftruncate/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/ftruncate/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/granular/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/granular/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/granular/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/link/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/link/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/link/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/mkdir/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/mkdir/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/mkdir/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/mkfifo/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/mkfifo/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/mkfifo/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/mknod/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/mknod/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/mknod/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/open/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/open/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/open/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/rename/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/rename/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/rename/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/rmdir/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/rmdir/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/rmdir/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/symlink/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/symlink/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/symlink/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/truncate/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/truncate/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/truncate/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/tests/sys/pjdfstest/tests/unlink/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/pjdfstest/tests/unlink/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/tests/sys/pjdfstest/tests/unlink/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02

Modified: projects/release-pkg/usr.bin/tests/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/usr.bin/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: projects/release-pkg/usr.bin/yacc/tests/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/yacc/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/usr.bin/yacc/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -5,6 +5,7 @@
 PACKAGE=	tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
+PACKAGE=	tests
 
 TEST_DIR=	${SRCTOP}/contrib/byacc/test
 
@@ -21,7 +22,10 @@ SCRIPTSDIR=	${TESTSDIR}
 
 CLEANFILES=	run_test
 
-FILESGROUPS=	FILES FILEStest FILEStest_yacc
+FILESGROUPS+=	FILES FILEStest FILEStest_yacc
+FILESPACKAGE=	${PACKAGE}
+FILEStestPACKAGE=${PACKAGE}
+FILEStest_yaccPACKAGE=${PACKAGE}
 
 FILEStestDIR=	${TESTSDIR}
 

Modified: projects/release-pkg/usr.sbin/tests/Makefile
==============================================================================
--- projects/release-pkg/usr.sbin/tests/Makefile	Wed Feb  3 18:06:58 2016	(r295215)
+++ projects/release-pkg/usr.sbin/tests/Makefile	Wed Feb  3 19:08:45 2016	(r295216)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 20:55:09 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8553A9A489
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 20:55:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A26501371;
 Wed,  3 Feb 2016 20:55:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13Kt8k5089090;
 Wed, 3 Feb 2016 20:55:08 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13Kt8V3089088;
 Wed, 3 Feb 2016 20:55:08 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602032055.u13Kt8V3089088@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 20:55:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295219 - in projects/release-pkg: lib/libc/tests/tls/dso
 tests/sys/geom/class/uzip
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 20:55:09 -0000

Author: gjb
Date: Wed Feb  3 20:55:08 2016
New Revision: 295219
URL: https://svnweb.freebsd.org/changeset/base/295219

Log:
  Final pass through to fix 'tests' packaging.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/libc/tests/tls/dso/Makefile
  projects/release-pkg/tests/sys/geom/class/uzip/Makefile

Modified: projects/release-pkg/lib/libc/tests/tls/dso/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/tls/dso/Makefile	Wed Feb  3 20:39:52 2016	(r295218)
+++ projects/release-pkg/lib/libc/tests/tls/dso/Makefile	Wed Feb  3 20:55:08 2016	(r295219)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE= tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 

Modified: projects/release-pkg/tests/sys/geom/class/uzip/Makefile
==============================================================================
--- projects/release-pkg/tests/sys/geom/class/uzip/Makefile	Wed Feb  3 20:39:52 2016	(r295218)
+++ projects/release-pkg/tests/sys/geom/class/uzip/Makefile	Wed Feb  3 20:55:08 2016	(r295219)
@@ -8,7 +8,6 @@ PACKAGE=	tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 IMAGE=		1.img
 ZIMAGE=		${IMAGE}.uzip
@@ -33,9 +32,11 @@ FILESNAME_conf.sh=	conf.sh
 FILES+=		${UZIMAGE}
 FILESDIR=	${TESTSDIR}
 
-FILESGROUPS=	FILES etalon
+FILESGROUPS+=	FILES etalon
 etalon+=	etalon/etalon.txt
 etalonDIR=	${TESTSDIR}/etalon
+FILESPACKAGE=	${PACKAGE}
+etalonPACKAGE=	${PACKAGE}
 
 TAP_TESTS_SH+=	1_test
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 21:56:53 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2CF14A9A1CC
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 21:56:53 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE3321C70;
 Wed,  3 Feb 2016 21:56:52 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13LupdE007395;
 Wed, 3 Feb 2016 21:56:51 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13Lupe6007392;
 Wed, 3 Feb 2016 21:56:51 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201602032156.u13Lupe6007392@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 3 Feb 2016 21:56:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295220 - in projects/vnet/sys: net netinet netinet6
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 21:56:53 -0000

Author: bz
Date: Wed Feb  3 21:56:51 2016
New Revision: 295220
URL: https://svnweb.freebsd.org/changeset/base/295220

Log:
  Code duplication but rib_head is special.  Not found an easy way to go
  back and harmize the use cases among RIB, IPFW, PF yet but it's also not
  the scope of this work.   Prevents instant panics on teardown and frees
  the FIB bits again.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/net/route.c
  projects/vnet/sys/netinet/in_rmx.c
  projects/vnet/sys/netinet6/in6_rmx.c

Modified: projects/vnet/sys/net/route.c
==============================================================================
--- projects/vnet/sys/net/route.c	Wed Feb  3 20:55:08 2016	(r295219)
+++ projects/vnet/sys/net/route.c	Wed Feb  3 21:56:51 2016	(r295220)
@@ -353,10 +353,24 @@ rt_table_init(int offset)
 	return (rh);
 }
 
+static int
+rt_freeentry(struct radix_node *rn, void *arg)
+{
+	struct radix_head * const rnh = arg;
+	struct radix_node *x;
+
+	x = (struct radix_node *)rn_delete(rn + 2, NULL, rnh);
+	if (x != NULL)
+		R_Free(x);
+	return (0);
+}
+
 void
 rt_table_destroy(struct rib_head *rh)
 {
 
+	rn_walktree(&rh->rmhead.head, rt_freeentry, &rh->rmhead.head);
+
 	/* Assume table is already empty */
 	rw_destroy(&rh->rib_lock);
 	free(rh, M_RTABLE);

Modified: projects/vnet/sys/netinet/in_rmx.c
==============================================================================
--- projects/vnet/sys/netinet/in_rmx.c	Wed Feb  3 20:55:08 2016	(r295219)
+++ projects/vnet/sys/netinet/in_rmx.c	Wed Feb  3 21:56:51 2016	(r295220)
@@ -133,7 +133,8 @@ int
 in_detachhead(void **head, int off)
 {
 
-	return (rn_detachhead(head));
+	rt_table_destroy((struct rib_head *)(*head));
+	return (1);
 }
 #endif
 

Modified: projects/vnet/sys/netinet6/in6_rmx.c
==============================================================================
--- projects/vnet/sys/netinet6/in6_rmx.c	Wed Feb  3 20:55:08 2016	(r295219)
+++ projects/vnet/sys/netinet6/in6_rmx.c	Wed Feb  3 21:56:51 2016	(r295220)
@@ -237,7 +237,9 @@ in6_detachhead(void **head, int off)
 {
 
 	callout_drain(&V_rtq_mtutimer);
-	return (rn_detachhead(head));
+	rt_table_destroy((struct rib_head *)(*head));
+
+	return (1);
 }
 #endif
 

From owner-svn-src-projects@freebsd.org  Wed Feb  3 23:42:07 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1181A9A1B3
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  3 Feb 2016 23:42:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F3781D7B;
 Wed,  3 Feb 2016 23:42:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13Ng6wT038554;
 Wed, 3 Feb 2016 23:42:06 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13NfwV2038469;
 Wed, 3 Feb 2016 23:41:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602032341.u13NfwV2038469@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Feb 2016 23:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295225 - projects/release-pkg/release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 23:42:08 -0000

Author: gjb
Date: Wed Feb  3 23:41:58 2016
New Revision: 295225
URL: https://svnweb.freebsd.org/changeset/base/295225

Log:
  Initial commit to add dependencies.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/release/packages/acct-debug.ucl
  projects/release-pkg/release/packages/acct.ucl
  projects/release-pkg/release/packages/acpi-debug.ucl
  projects/release-pkg/release/packages/acpi.ucl
  projects/release-pkg/release/packages/amd-debug.ucl
  projects/release-pkg/release/packages/amd.ucl
  projects/release-pkg/release/packages/apm-debug.ucl
  projects/release-pkg/release/packages/apm.ucl
  projects/release-pkg/release/packages/at-debug.ucl
  projects/release-pkg/release/packages/at.ucl
  projects/release-pkg/release/packages/autofs-debug.ucl
  projects/release-pkg/release/packages/autofs.ucl
  projects/release-pkg/release/packages/bhyve-debug.ucl
  projects/release-pkg/release/packages/bhyve.ucl
  projects/release-pkg/release/packages/binutils-debug.ucl
  projects/release-pkg/release/packages/binutils.ucl
  projects/release-pkg/release/packages/bsdinstall-debug.ucl
  projects/release-pkg/release/packages/bsdinstall.ucl
  projects/release-pkg/release/packages/bsnmp-debug.ucl
  projects/release-pkg/release/packages/bsnmp-development.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-development.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl
  projects/release-pkg/release/packages/bsnmp-lib32.ucl
  projects/release-pkg/release/packages/bsnmp-profile.ucl
  projects/release-pkg/release/packages/bsnmp.ucl
  projects/release-pkg/release/packages/clang-debug.ucl
  projects/release-pkg/release/packages/clang.ucl
  projects/release-pkg/release/packages/debug.ucl
  projects/release-pkg/release/packages/development.ucl
  projects/release-pkg/release/packages/dma-debug.ucl
  projects/release-pkg/release/packages/dma.ucl
  projects/release-pkg/release/packages/ee-debug.ucl
  projects/release-pkg/release/packages/ee.ucl
  projects/release-pkg/release/packages/gdb-debug.ucl
  projects/release-pkg/release/packages/gdb.ucl
  projects/release-pkg/release/packages/groff-debug.ucl
  projects/release-pkg/release/packages/groff.ucl
  projects/release-pkg/release/packages/jail-debug.ucl
  projects/release-pkg/release/packages/jail-development.ucl
  projects/release-pkg/release/packages/jail-lib32-debug.ucl
  projects/release-pkg/release/packages/jail-lib32-development.ucl
  projects/release-pkg/release/packages/jail-lib32-profile.ucl
  projects/release-pkg/release/packages/jail-lib32.ucl
  projects/release-pkg/release/packages/jail-profile.ucl
  projects/release-pkg/release/packages/jail.ucl
  projects/release-pkg/release/packages/lib32-debug.ucl
  projects/release-pkg/release/packages/lib32-development.ucl
  projects/release-pkg/release/packages/lib32-profile.ucl
  projects/release-pkg/release/packages/lib32.ucl
  projects/release-pkg/release/packages/profile.ucl
  projects/release-pkg/release/packages/rcmds-debug.ucl
  projects/release-pkg/release/packages/rcmds.ucl
  projects/release-pkg/release/packages/runtime-manuals.ucl
  projects/release-pkg/release/packages/runtime.ucl
  projects/release-pkg/release/packages/ssh-debug.ucl
  projects/release-pkg/release/packages/ssh-development.ucl
  projects/release-pkg/release/packages/ssh-lib32-debug.ucl
  projects/release-pkg/release/packages/ssh-lib32-development.ucl
  projects/release-pkg/release/packages/ssh-lib32-profile.ucl
  projects/release-pkg/release/packages/ssh-lib32.ucl
  projects/release-pkg/release/packages/ssh-profile.ucl
  projects/release-pkg/release/packages/ssh.ucl
  projects/release-pkg/release/packages/svn-debug.ucl
  projects/release-pkg/release/packages/svn.ucl
  projects/release-pkg/release/packages/syscons.ucl
  projects/release-pkg/release/packages/tests-debug.ucl
  projects/release-pkg/release/packages/tests-development.ucl
  projects/release-pkg/release/packages/tests-profile.ucl
  projects/release-pkg/release/packages/tests.ucl
  projects/release-pkg/release/packages/unbound-debug.ucl
  projects/release-pkg/release/packages/unbound-development.ucl
  projects/release-pkg/release/packages/unbound-lib32-debug.ucl
  projects/release-pkg/release/packages/unbound-lib32-development.ucl
  projects/release-pkg/release/packages/unbound-lib32-profile.ucl
  projects/release-pkg/release/packages/unbound-lib32.ucl
  projects/release-pkg/release/packages/unbound-profile.ucl
  projects/release-pkg/release/packages/unbound.ucl
  projects/release-pkg/release/packages/vi-debug.ucl
  projects/release-pkg/release/packages/vi.ucl

Modified: projects/release-pkg/release/packages/acct-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/acct-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/acct-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-acct: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/acct.ucl
==============================================================================
--- projects/release-pkg/release/packages/acct.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/acct.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/acpi-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/acpi-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/acpi-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-acpi: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/acpi.ucl
==============================================================================
--- projects/release-pkg/release/packages/acpi.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/acpi.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/amd-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/amd-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/amd-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-amd: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/amd.ucl
==============================================================================
--- projects/release-pkg/release/packages/amd.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/amd.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/apm-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/apm-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/apm-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-apm: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/apm.ucl
==============================================================================
--- projects/release-pkg/release/packages/apm.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/apm.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/at-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/at-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/at-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-at: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/at.ucl
==============================================================================
--- projects/release-pkg/release/packages/at.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/at.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/autofs-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/autofs-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/autofs-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-autofs: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/autofs.ucl
==============================================================================
--- projects/release-pkg/release/packages/autofs.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/autofs.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bhyve-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/bhyve-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bhyve-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -13,3 +13,10 @@ bhyve, the "BSD hypervisor" is a hypervi
 FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
 VirtIO network and storage drivers
 EOD
+deps: {
+    FreeBSD-bhyve: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bhyve.ucl
==============================================================================
--- projects/release-pkg/release/packages/bhyve.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bhyve.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -13,3 +13,10 @@ bhyve, the "BSD hypervisor" is a hypervi
 FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
 VirtIO network and storage drivers
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/binutils-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/binutils-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/binutils-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-binutils: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/binutils.ucl
==============================================================================
--- projects/release-pkg/release/packages/binutils.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/binutils.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsdinstall-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsdinstall-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsdinstall-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsdinstall: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsdinstall.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsdinstall.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsdinstall.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-lib32-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-lib32-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-lib32-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-lib32.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-lib32.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-bsnmp: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/bsnmp.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/bsnmp.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/clang-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/clang-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/clang-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-clang: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/clang.ucl
==============================================================================
--- projects/release-pkg/release/packages/clang.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/clang.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/development.ucl
==============================================================================
--- projects/release-pkg/release/packages/development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/dma-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/dma-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/dma-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
 home and office use.
 EOD
+deps: {
+    FreeBSD-dma: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/dma.ucl
==============================================================================
--- projects/release-pkg/release/packages/dma.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/dma.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
 home and office use.
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ee-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/ee-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ee-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ee: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ee.ucl
==============================================================================
--- projects/release-pkg/release/packages/ee.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ee.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/gdb-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/gdb-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/gdb-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-gdb: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/gdb.ucl
==============================================================================
--- projects/release-pkg/release/packages/gdb.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/gdb.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/groff-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/groff-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/groff-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-groff: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/groff.ucl
==============================================================================
--- projects/release-pkg/release/packages/groff.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/groff.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-lib32-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-lib32-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-lib32-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-lib32-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-lib32-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-lib32-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-lib32-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-lib32-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-lib32-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-lib32.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-lib32.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-jail: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/jail.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/jail.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/lib32-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/lib32-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/lib32-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/lib32-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/lib32-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/lib32-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/lib32.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/rcmds-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/rcmds-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/rcmds-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-rcmds: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/rcmds.ucl
==============================================================================
--- projects/release-pkg/release/packages/rcmds.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/rcmds.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/runtime-manuals.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime-manuals.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/runtime-manuals.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/runtime.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -17,3 +17,10 @@ scripts: {
 	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 EOD
 }
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-lib32-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-lib32-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-lib32-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-lib32-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-lib32-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-lib32-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-lib32-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-lib32-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-lib32-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-lib32.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-lib32.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-ssh: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/ssh.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/ssh.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/svn-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/svn-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/svn-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ APACHE20 ]
 desc = <<EOD
 Lite version of the Subversion version control system
 EOD
+deps: {
+    FreeBSD-svn: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/svn.ucl
==============================================================================
--- projects/release-pkg/release/packages/svn.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/svn.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ APACHE20 ]
 desc = <<EOD
 Lite version of the Subversion version control system
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/syscons.ucl
==============================================================================
--- projects/release-pkg/release/packages/syscons.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/syscons.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 syscons(4) support files such as keyboard maps, fonts and screen output maps.
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/tests-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/tests-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-tests: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/tests-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/tests-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-tests: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/tests-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/tests-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-tests: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/tests.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/tests.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -11,3 +11,10 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-lib32-debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-lib32-debug.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-lib32-debug.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-lib32-development.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-lib32-development.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-lib32-development.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-lib32-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-lib32-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-lib32-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound-lib32: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-lib32.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-lib32.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-runtime: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: projects/release-pkg/release/packages/unbound-profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound-profile.ucl	Wed Feb  3 23:37:24 2016	(r295224)
+++ projects/release-pkg/release/packages/unbound-profile.ucl	Wed Feb  3 23:41:58 2016	(r295225)
@@ -12,3 +12,10 @@ desc = <<EOD
 Unbound is a recursive-only caching DNS server which can perform DNSSEC
 validation of results
 EOD
+deps: {
+    FreeBSD-unbound: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}

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

From owner-svn-src-projects@freebsd.org  Thu Feb  4 15:32:08 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72004A99F5F
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 15:32:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 022B31A5;
 Thu,  4 Feb 2016 15:32:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14FW7L3022238;
 Thu, 4 Feb 2016 15:32:07 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14FW3un022204;
 Thu, 4 Feb 2016 15:32:03 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602041532.u14FW3un022204@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 15:32:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295262 - in projects/release-pkg: . release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 15:32:08 -0000

Author: gjb
Date: Thu Feb  4 15:32:03 2016
New Revision: 295262
URL: https://svnweb.freebsd.org/changeset/base/295262

Log:
  Rework the way <packagename>.ucl files are generated.
  One of the major pain points with how this was implemented
  is the requirement of in-tree, hard-coded <name>.ucl, as
  well as <name>-<suffix>.ucl where <suffix> can be lib32,
  profile, development, debug, or any combination of the four.
  
  This created significant overhead when adding new packages
  and any of the files in any of the combinations were missing.
  
  Instead of test(1)-ing if the <packagename>.ucl file exists,
  hand off to a script to figure out what the final ucl file
  name should be before invoking pkg(8).
  
  The default behavior is 'template.ucl' is used as a fallback.
  
  This affects only the userland packages, as the kernel code
  is already smart enough to handle these variations.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/Makefile.package   (contents, props changed)
  projects/release-pkg/release/packages/generate-ucl.sh   (contents, props changed)
  projects/release-pkg/release/packages/template.ucl
Deleted:
  projects/release-pkg/release/packages/acct-debug.ucl
  projects/release-pkg/release/packages/acpi-debug.ucl
  projects/release-pkg/release/packages/amd-debug.ucl
  projects/release-pkg/release/packages/apm-debug.ucl
  projects/release-pkg/release/packages/at-debug.ucl
  projects/release-pkg/release/packages/autofs-debug.ucl
  projects/release-pkg/release/packages/bhyve-debug.ucl
  projects/release-pkg/release/packages/binutils-debug.ucl
  projects/release-pkg/release/packages/bsdinstall-debug.ucl
  projects/release-pkg/release/packages/bsnmp-debug.ucl
  projects/release-pkg/release/packages/bsnmp-development.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-development.ucl
  projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl
  projects/release-pkg/release/packages/bsnmp-lib32.ucl
  projects/release-pkg/release/packages/bsnmp-profile.ucl
  projects/release-pkg/release/packages/clang-debug.ucl
  projects/release-pkg/release/packages/dma-debug.ucl
  projects/release-pkg/release/packages/ee-debug.ucl
  projects/release-pkg/release/packages/gdb-debug.ucl
  projects/release-pkg/release/packages/groff-debug.ucl
  projects/release-pkg/release/packages/jail-debug.ucl
  projects/release-pkg/release/packages/jail-development.ucl
  projects/release-pkg/release/packages/jail-lib32-debug.ucl
  projects/release-pkg/release/packages/jail-lib32-development.ucl
  projects/release-pkg/release/packages/jail-lib32-profile.ucl
  projects/release-pkg/release/packages/jail-lib32.ucl
  projects/release-pkg/release/packages/jail-profile.ucl
  projects/release-pkg/release/packages/lib32-debug.ucl
  projects/release-pkg/release/packages/lib32-development.ucl
  projects/release-pkg/release/packages/lib32-profile.ucl
  projects/release-pkg/release/packages/rcmds-debug.ucl
  projects/release-pkg/release/packages/ssh-debug.ucl
  projects/release-pkg/release/packages/ssh-development.ucl
  projects/release-pkg/release/packages/ssh-lib32-debug.ucl
  projects/release-pkg/release/packages/ssh-lib32-development.ucl
  projects/release-pkg/release/packages/ssh-lib32-profile.ucl
  projects/release-pkg/release/packages/ssh-lib32.ucl
  projects/release-pkg/release/packages/ssh-profile.ucl
  projects/release-pkg/release/packages/svn-debug.ucl
  projects/release-pkg/release/packages/tests-debug.ucl
  projects/release-pkg/release/packages/tests-development.ucl
  projects/release-pkg/release/packages/tests-profile.ucl
  projects/release-pkg/release/packages/unbound-debug.ucl
  projects/release-pkg/release/packages/unbound-development.ucl
  projects/release-pkg/release/packages/unbound-lib32-debug.ucl
  projects/release-pkg/release/packages/unbound-lib32-development.ucl
  projects/release-pkg/release/packages/unbound-lib32-profile.ucl
  projects/release-pkg/release/packages/unbound-lib32.ucl
  projects/release-pkg/release/packages/unbound-profile.ucl
  projects/release-pkg/release/packages/vi-debug.ucl
Modified:
  projects/release-pkg/Makefile.inc1
  projects/release-pkg/release/packages/acct.ucl
  projects/release-pkg/release/packages/acpi.ucl
  projects/release-pkg/release/packages/amd.ucl
  projects/release-pkg/release/packages/apm.ucl
  projects/release-pkg/release/packages/at.ucl
  projects/release-pkg/release/packages/autofs.ucl
  projects/release-pkg/release/packages/bhyve.ucl
  projects/release-pkg/release/packages/binutils.ucl
  projects/release-pkg/release/packages/bsdinstall.ucl
  projects/release-pkg/release/packages/bsnmp.ucl
  projects/release-pkg/release/packages/clang.ucl
  projects/release-pkg/release/packages/debug.ucl
  projects/release-pkg/release/packages/development.ucl
  projects/release-pkg/release/packages/dma.ucl
  projects/release-pkg/release/packages/ee.ucl
  projects/release-pkg/release/packages/gdb.ucl
  projects/release-pkg/release/packages/groff.ucl
  projects/release-pkg/release/packages/jail.ucl
  projects/release-pkg/release/packages/lib32.ucl
  projects/release-pkg/release/packages/profile.ucl
  projects/release-pkg/release/packages/rcmds.ucl
  projects/release-pkg/release/packages/runtime-manuals.ucl
  projects/release-pkg/release/packages/runtime.ucl
  projects/release-pkg/release/packages/ssh.ucl
  projects/release-pkg/release/packages/svn.ucl
  projects/release-pkg/release/packages/syscons.ucl
  projects/release-pkg/release/packages/tests.ucl
  projects/release-pkg/release/packages/unbound.ucl
  projects/release-pkg/release/packages/vi.ucl

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/Makefile.inc1	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1393,22 +1393,13 @@ create-world-packages:	_pkgbootstrap
 		${DESTDIR}/METALOG
 	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
-		test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \
-			( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \
+		pkgname=$${plist%.plist} ; \
+		sh ${SRCDIR}/release/packages/generate-ucl.sh -o $${pkgname} \
+			-s ${SRCDIR} -u ${DESTDIR}/$${pkgname}.ucl ; \
 	done
-	@cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
-	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
-	for plist in ${DESTDIR}/*.plist; do \
+	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
-		sed -e "s/%VERSION%/${PKG_VERSION}/" \
-			-e "s/%PKGNAME%/$${pkgname}/" \
-			-e "s/%COMMENT%/Generic comment for $${pkgname}/" \
-			-e "s/%DESC%/Generic description for $${pkgname}/" \
-			-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-			-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
-			${SRCDIR}/release/packages/$${pkgname}.ucl \
-			> ${DESTDIR}/$${pkgname}.ucl ; \
 		awk -F\" ' \
 			/^name/ { printf("===> Creating %s-", $$2); next } \
 			/^version/ { print $$2; next } \

Added: projects/release-pkg/release/packages/Makefile.package
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/Makefile.package	Thu Feb  4 15:32:03 2016	(r295262)
@@ -0,0 +1,67 @@
+#
+# $FreeBSD$
+#
+
+acct_DESC= 		Accounting Utilties
+acpi_DESC= 		ACPI Utilities
+amd_DESC= 		AMD Utilities
+apm_DESC= 		APM Utilities
+at_DESC= 		AT Utilities
+autofs_DESC= 		Autofs Utilities
+bhyve_DESC= 		Bhyve Utilities
+binutils_DESC= 		Binutils
+bsdinstall_DESC= 	BSDInstall Utilities
+bsnmp_DESC= 		BSNMP Utilities
+clang_DESC= 		Clang Utilities
+docs_DESC= 		Documentation
+dma_DESC= 		DMA Mail Agent Utilities
+ee_DESC= 		Easy Editor Utilities
+gdb_DESC= 		GDB Utilities
+groff_DESC= 		Groff Utilities
+jail_DESC= 		Jail Utilities
+kernel_DESC= 		FreeBSD Kernel
+rcmds_DESC= 		Remote Command Utilities
+manuals_DESC= 		Manual Pages
+ssh_DESC= 		Secure Shell Utilities
+svn_DESC= 		Subversion Version Conrol System
+syscons_DESC= 		Syscons Console
+tests_DESC= 		Test Suite
+unbound_DESC= 		Unbound DNS Resolver
+vi_DESC= 		Vi Editor
+debug_DESC= 		FreeBSD Base System (Debugging Symbols)
+development_DESC= 	FreeBSD Base System (Development Files)
+lib32_DESC= 		FreeBSD Base System (32-bit Libraries)
+profile_DESC= 		FreeBSD Base System (Profiling Libraries)
+runtime_DESC= 		FreeBSD Base System
+
+acct_COMMENT= 		Accounting Utilties
+acpi_COMMENT= 		ACPI Utilities
+amd_COMMENT= 		AMD Utilities
+apm_COMMENT= 		APM Utilities
+at_COMMENT= 		AT Utilities
+autofs_COMMENT= 	Autofs Utilities
+bhyve_COMMENT= 		Bhyve Utilities
+binutils_COMMENT= 	Binutils
+bsdinstall_COMMENT= 	BSDInstall Utilities
+bsnmp_COMMENT= 		BSNMP Utilities
+clang_COMMENT= 		Clang Utilities
+docs_COMMENT= 		Documentation
+dma_COMMENT= 		DMA Mail Agent Utilities
+ee_COMMENT= 		Easy Editor Utilities
+gdb_COMMENT= 		GDB Utilities
+groff_COMMENT= 		Groff Utilities
+jail_COMMENT= 		Jail Utilities
+kernel_COMMENT= 	FreeBSD Kernel
+rcmds_COMMENT= 		Remote Command Utilities
+manuals_COMMENT= 	Manual Pages
+ssh_COMMENT= 		Secure Shell Utilities
+svn_COMMENT= 		Subversion Version Conrol System
+syscons_COMMENT= 	Syscons Console
+tests_COMMENT= 		Test Suite
+unbound_COMMENT= 	Unbound DNS Resolver
+vi_COMMENT= 		Vi Editor
+debug_COMMENT= 		FreeBSD Base System (Debugging Symbols)
+development_COMMENT= 	FreeBSD Base System (Development Files)
+lib32_COMMENT= 		FreeBSD Base System (32-bit Libraries)
+profile_COMMENT= 	FreeBSD Base System (Profiling Libraries)
+runtime_COMMENT= 	FreeBSD Base System

Modified: projects/release-pkg/release/packages/acct.ucl
==============================================================================
--- projects/release-pkg/release/packages/acct.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/acct.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Accounting Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/acpi.ucl
==============================================================================
--- projects/release-pkg/release/packages/acpi.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/acpi.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ACPI tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/amd.ucl
==============================================================================
--- projects/release-pkg/release/packages/amd.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/amd.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "BSD 4.4 Automounter"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/apm.ucl
==============================================================================
--- projects/release-pkg/release/packages/apm.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/apm.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Advanced Power Management Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/at.ucl
==============================================================================
--- projects/release-pkg/release/packages/at.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/at.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "at(1) and related utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/autofs.ucl
==============================================================================
--- projects/release-pkg/release/packages/autofs.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/autofs.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Autofs(5) Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/bhyve.ucl
==============================================================================
--- projects/release-pkg/release/packages/bhyve.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/bhyve.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "The BSD Hypervisor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,12 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on
-FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
-VirtIO network and storage drivers
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/binutils.ucl
==============================================================================
--- projects/release-pkg/release/packages/binutils.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/binutils.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU binutils"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/bsdinstall.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsdinstall.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/bsdinstall.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Installer"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/bsnmp.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/bsnmp.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "SNMP daemon and userland tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/clang.ucl
==============================================================================
--- projects/release-pkg/release/packages/clang.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/clang.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Clang compiler tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/debug.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/debug.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "%COMMENT% (debugging symbols)"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/development.ucl
==============================================================================
--- projects/release-pkg/release/packages/development.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/development.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/dma.ucl
==============================================================================
--- projects/release-pkg/release/packages/dma.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/dma.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "DragonFly Mail Agent"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
-home and office use.
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/ee.ucl
==============================================================================
--- projects/release-pkg/release/packages/ee.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/ee.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ee(1) Utility"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/gdb.ucl
==============================================================================
--- projects/release-pkg/release/packages/gdb.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/gdb.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU gdb"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Added: projects/release-pkg/release/packages/generate-ucl.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/generate-ucl.sh	Thu Feb  4 15:32:03 2016	(r295262)
@@ -0,0 +1,138 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+main() {
+	desc=
+	comment=
+	debug=
+	uclsource=
+	while getopts "do:s:u:" arg; do
+		case ${arg} in
+		d)
+			debug=1
+			;;
+		o)
+			outname="${OPTARG}"
+			origname="${OPTARG}"
+			;;
+		s)
+			srctree="${OPTARG}"
+			;;
+		u)
+			uclfile="${OPTARG}"
+			;;
+		*)
+			echo "Unknown argument"
+			;;
+		esac
+	done
+
+	shift $(( ${OPTIND} - 1 ))
+
+	outname="$(echo ${outname} | tr '-' '_')"
+
+	case "${outname}" in
+		*_lib32_development)
+			outname="${outname%%_lib32_development}"
+			_descr="32-bit Libraries, Development Files"
+			pkgdeps="${outname}"
+			;;
+		*_lib32_debug)
+			outname="${outname%%_lib32_debug}"
+			_descr="32-bit Libraries, Debugging Symbols"
+			pkgdeps="${outname}"
+			;;
+		*_lib32_profile)
+			outname="${outname%%_lib32_profile}"
+			_descr="32-bit Libraries, Profiling"
+			pkgdeps="${outname}"
+			;;
+		*_lib32)
+			outname="${outname%%_lib32}"
+			_descr="32-bit Libraries"
+			pkgdeps="${outname}"
+			;;
+		*_development)
+			outname="${outname%%_development}"
+			_descr="Development Files"
+			pkgdeps="${outname}"
+			;;
+		*_profile)
+			outname="${outname%%_profile}"
+			_descr="Profiling Libraries"
+			pkgdeps="${outname}"
+			;;
+		*_debug)
+			outname="${outname%%_debug}"
+			_descr="Debugging Symbols"
+			pkgdeps="${outname}"
+			;;
+		*_manuals)
+			outname="${origname}"
+			pkgdeps="runtime"
+			;;
+		runtime)
+			outname="runtime"
+			uclfile="${uclfile}"
+			;;
+		${origname})
+			pkgdeps="runtime"
+			;;
+		debug|development|lib32|profile)
+			uclfile="${outname##*}${uclfile}"
+			;;
+		*)
+			uclfile="${outname##*}${origname}"
+			outname="${outname##*}${origname}"
+			;;
+	esac
+
+	outname="${outname%%_*}"
+
+	desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)"
+	comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)"
+
+	uclsource="${srctree}/release/packages/${outname}.ucl"
+	if [ ! -e "${uclsource}" ]; then
+		uclsource="${srctree}/release/packages/template.ucl"
+	fi
+
+	if [ ! -z "${debug}" ]; then
+		echo ""
+		echo "==============================================================="
+		echo "DEBUG:"
+		echo "_descr=${_descr}"
+		echo "outname=${outname}"
+		echo "origname=${origname}"
+		echo "srctree=${srctree}"
+		echo "uclfile=${uclfile}"
+		echo "desc=${desc}"
+		echo "comment=${comment}"
+		echo "cp ${uclsource} -> ${uclfile}"
+		echo "==============================================================="
+		echo ""
+		echo ""
+		echo ""
+	fi
+
+	[ -z "${comment}" ] && comment="${outname} package"
+	[ ! -z "${_descr}" ] && comment="${comment} (${_descr})"
+	[ -z "${desc}" ] && desc="${outname} package"
+
+	cp "${uclsource}" "${uclfile}"
+	cap_arg="$(make -C ${srctree}/etc -VCAP_MKDB_ENDIAN)"
+	pwd_arg="$(make -C ${srctree}/etc -VPWD_MKDB_ENDIAN)"
+	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
+		-e "s/%PKGNAME%/${origname}/" \
+		-e "s/%COMMENT%/${comment}/" \
+		-e "s/%DESC%/${desc}/" \
+		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
+		-e "s/%PWD_MKDB_ENDIAN%/${pwd_arg}/g" \
+		-e "s/%PKGDEPS%/${pkgdeps}/" \
+		${uclfile}
+	return 0
+}
+
+main "${@}"

Modified: projects/release-pkg/release/packages/groff.ucl
==============================================================================
--- projects/release-pkg/release/packages/groff.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/groff.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU groff"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/jail.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/jail.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Jail utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/lib32.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "32-bit libraries"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/profile.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/profile.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/rcmds.ucl
==============================================================================
--- projects/release-pkg/release/packages/rcmds.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/rcmds.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Remote Command Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/runtime-manuals.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime-manuals.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/runtime-manuals.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "FreeBSD runtime manual pages"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -17,10 +17,3 @@ scripts: {
 	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 EOD
 }
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

Modified: projects/release-pkg/release/packages/ssh.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/ssh.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Secure SHell"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/svn.ucl
==============================================================================
--- projects/release-pkg/release/packages/svn.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/svn.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Version control system"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ APACHE20 ]
 desc = <<EOD
-Lite version of the Subversion version control system
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/syscons.ucl
==============================================================================
--- projects/release-pkg/release/packages/syscons.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/syscons.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "syscons(4) support files"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-syscons(4) support files such as keyboard maps, fonts and screen output maps.
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Added: projects/release-pkg/release/packages/template.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/template.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/release/packages/tests.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/tests.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/unbound.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/unbound.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD4CLAUSE ]
 desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

Modified: projects/release-pkg/release/packages/vi.ucl
==============================================================================
--- projects/release-pkg/release/packages/vi.ucl	Thu Feb  4 15:21:01 2016	(r295261)
+++ projects/release-pkg/release/packages/vi.ucl	Thu Feb  4 15:32:03 2016	(r295262)
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Vi Editor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

From owner-svn-src-projects@freebsd.org  Thu Feb  4 15:36:59 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 814D3A9B1C0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 15:36:59 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: from mail-lf0-x230.google.com (mail-lf0-x230.google.com
 [IPv6:2a00:1450:4010:c07::230])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0620DA47;
 Thu,  4 Feb 2016 15:36:59 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: by mail-lf0-x230.google.com with SMTP id l143so38670259lfe.2;
 Thu, 04 Feb 2016 07:36:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=73J7rDuhvOC5r1DJG9JhjtgC/ExUF+u6zeMwZeIqOfY=;
 b=iYsrMvxNZlx8cXhCC08EV33rJsaupADxVde3AVwbasQ0MGhrxErcGPKL8UA02jr0Ne
 XWyBRh1Y89tnh0JTCMH5wK6LrG2hC6n4YYd6WX/JHsmQhgD4OlWqfihy1R+72W91eqW8
 0fChSrABgG2swNQmve58GyDAx5ZRMdbXnSZ2+rMO68Zvq3upWhtHezvIiq6UOPtOaLLB
 ye3T40jkwE5/KgL2AtdHk7vO3MyR79ojQ4P75vVPM79PYJsCTlt2hYXT/ZYcvL4E6ODw
 9wJGSjAtHZECqWZiN7x2n7TBDr4AUloYKYC08hrLUaQIbr4guclJDGgoSfAIZmzlSzy9
 on4Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:sender:date:from:to:cc:subject:message-id
 :references:mime-version:content-type:content-disposition
 :in-reply-to:user-agent;
 bh=73J7rDuhvOC5r1DJG9JhjtgC/ExUF+u6zeMwZeIqOfY=;
 b=B3uWk12UCCiJlvgW5fFG22zMBJ0M1RKpAvbg3891bMEYlAkxniDwodaIZq6nMvIxn3
 TzhmvefubToAuSRSA8kG3c1Sjxc7cNr/cnHVZNQbVsLcvSL2bt8Vzu27r16GEyBzVqnk
 1hwysA761D1E1hVjl97xf639tJS+D143RW7uNtDnox2VGvAkAw4fpvxsRY4seqzHElyT
 tGKuZhnMUi9cHAlMJmVeKER7qBIJ6SdycokAaPDslrdHVRXvVHSSeUEUIIYorcfFGgdl
 gZs2GgzWTlElAFyCFQ5GCSf1KDHx/JLiHuvjbNVR1OEBSzmJveTbmdHz8KCjQicPFT1I
 A7xw==
X-Gm-Message-State: AG10YOQ0Un/uoSOjMjVfkK+S2z9WnaFYoPfkqD7ELfEJ/x0N3sw04s1Cwi2oYuynSlRP0A==
X-Received: by 10.25.89.73 with SMTP id n70mr3778043lfb.40.1454600210483;
 Thu, 04 Feb 2016 07:36:50 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
 by smtp.gmail.com with ESMTPSA id m64sm1600034lfd.32.2016.02.04.07.36.48
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Thu, 04 Feb 2016 07:36:48 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Thu, 4 Feb 2016 16:36:46 +0100
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Glen Barber <gjb@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: Re: svn commit: r295262 - in projects/release-pkg: . release/packages
Message-ID: <20160204153645.GB79872@ivaldir.etoilebsd.net>
References: <201602041532.u14FW3un022204@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="NDin8bjvE/0mNLFQ"
Content-Disposition: inline
In-Reply-To: <201602041532.u14FW3un022204@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 15:36:59 -0000


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

On Thu, Feb 04, 2016 at 03:32:03PM +0000, Glen Barber wrote:
> Author: gjb
> Date: Thu Feb  4 15:32:03 2016
> New Revision: 295262
> URL: https://svnweb.freebsd.org/changeset/base/295262
>=20
> Log:
>   Rework the way <packagename>.ucl files are generated.
>   One of the major pain points with how this was implemented
>   is the requirement of in-tree, hard-coded <name>.ucl, as
>   well as <name>-<suffix>.ucl where <suffix> can be lib32,
>   profile, development, debug, or any combination of the four.
>  =20
>   This created significant overhead when adding new packages
>   and any of the files in any of the combinations were missing.
>  =20
>   Instead of test(1)-ing if the <packagename>.ucl file exists,
>   hand off to a script to figure out what the final ucl file
>   name should be before invoking pkg(8).
>  =20
>   The default behavior is 'template.ucl' is used as a fallback.
>  =20
>   This affects only the userland packages, as the kernel code
>   is already smart enough to handle these variations.
>  =20
Nice I wanted to do that since the beginning, but I was too lazy to do it!

Thank you!
Bapt

--NDin8bjvE/0mNLFQ
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWs3ANAAoJEGOJi9zxtz5aEgYQAMwjq9YG/SEDvhe2Hly8Ubf5
M2PqULdhU2Bad7K3c2ePxtbPN2HJTIEa1V/GiDPmCyN9PtBA7xuyrSfEH2kfKTnd
yEqWiVMOhcXVjh1z/9xodG0z12FXifSxI5G8MdO5f52JtX9AUfbp5ziCNFAdBE/w
060fNBe8eelF5w55tXSAi/XJdOG0ZJEy+5DfFABK9wv1CPnlIC25lWTmczygUs+W
gW0ge7ek9PBkTJKS7qUNakt6FCGBoVLvJ3JyDgk7q4xWnZ7CzEYhpaUhpcWWVYaf
hcB2exAXNaDWliPI15e7az2DY42K80Xsp+PH3y8bnUTsz6ZQi5dyU5yIeeA7vZT4
k9COimjSGn5blhs6d5CYM4RiZDIP5SftHhFEKI/gHgcmF/vWbiqdNhSMEZTKoP2u
E8dN4qkbMGdyJxjJd/suA29xBHd5jRyLVQECVWXXu4/6UR37AvOeV3FBRwp1dXNB
KWnZnz95RE3NKY9w97om99X8VuwUSUMmefoeiiUjUhoO9sCAGh4F7t8l6gJYA7m9
Ib2lnOb1sNNsjrofrArPufrw50B2MSO65FgujiuRxJ6hedAm1IfiZCIjUd6X1fl/
eYb6cPjoDtVfp9uudJJJFcvrQbo+6pm56AuZCsJ9EBoDxZM8sYtJ58+gi+cFE7Zo
l/2nrxiEI4TcNUzvpfzv
=JuGi
-----END PGP SIGNATURE-----

--NDin8bjvE/0mNLFQ--

From owner-svn-src-projects@freebsd.org  Thu Feb  4 15:41:05 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21C6CA9B593
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 15:41:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9D71DBA;
 Thu,  4 Feb 2016 15:41:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14Ff3pC022623;
 Thu, 4 Feb 2016 15:41:03 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14Ff0QV022590;
 Thu, 4 Feb 2016 15:41:00 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602041541.u14Ff0QV022590@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 15:41:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295263 - projects/release-pkg/release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 15:41:05 -0000

Author: gjb
Date: Thu Feb  4 15:41:00 2016
New Revision: 295263
URL: https://svnweb.freebsd.org/changeset/base/295263

Log:
  Add FreeBSD RCSID header and svn:keyword property.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/release/packages/acct.ucl   (contents, props changed)
  projects/release-pkg/release/packages/acpi.ucl   (contents, props changed)
  projects/release-pkg/release/packages/amd.ucl   (contents, props changed)
  projects/release-pkg/release/packages/apm.ucl   (contents, props changed)
  projects/release-pkg/release/packages/at.ucl   (contents, props changed)
  projects/release-pkg/release/packages/autofs.ucl   (contents, props changed)
  projects/release-pkg/release/packages/bhyve.ucl   (contents, props changed)
  projects/release-pkg/release/packages/binutils.ucl   (contents, props changed)
  projects/release-pkg/release/packages/bsdinstall.ucl   (contents, props changed)
  projects/release-pkg/release/packages/bsnmp.ucl   (contents, props changed)
  projects/release-pkg/release/packages/clang.ucl   (contents, props changed)
  projects/release-pkg/release/packages/debug.ucl   (contents, props changed)
  projects/release-pkg/release/packages/development.ucl   (contents, props changed)
  projects/release-pkg/release/packages/dma.ucl   (contents, props changed)
  projects/release-pkg/release/packages/docs.ucl   (contents, props changed)
  projects/release-pkg/release/packages/ee.ucl   (contents, props changed)
  projects/release-pkg/release/packages/gdb.ucl   (contents, props changed)
  projects/release-pkg/release/packages/groff.ucl   (contents, props changed)
  projects/release-pkg/release/packages/jail.ucl   (contents, props changed)
  projects/release-pkg/release/packages/kernel.ucl   (contents, props changed)
  projects/release-pkg/release/packages/lib32.ucl   (contents, props changed)
  projects/release-pkg/release/packages/profile.ucl   (contents, props changed)
  projects/release-pkg/release/packages/rcmds.ucl   (contents, props changed)
  projects/release-pkg/release/packages/runtime-manuals.ucl   (contents, props changed)
  projects/release-pkg/release/packages/runtime.ucl   (contents, props changed)
  projects/release-pkg/release/packages/ssh.ucl   (contents, props changed)
  projects/release-pkg/release/packages/svn.ucl   (contents, props changed)
  projects/release-pkg/release/packages/syscons.ucl   (contents, props changed)
  projects/release-pkg/release/packages/template.ucl   (contents, props changed)
  projects/release-pkg/release/packages/tests.ucl   (contents, props changed)
  projects/release-pkg/release/packages/unbound.ucl   (contents, props changed)
  projects/release-pkg/release/packages/vi.ucl   (contents, props changed)

Modified: projects/release-pkg/release/packages/acct.ucl
==============================================================================
--- projects/release-pkg/release/packages/acct.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/acct.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/acpi.ucl
==============================================================================
--- projects/release-pkg/release/packages/acpi.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/acpi.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/amd.ucl
==============================================================================
--- projects/release-pkg/release/packages/amd.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/amd.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/apm.ucl
==============================================================================
--- projects/release-pkg/release/packages/apm.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/apm.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/at.ucl
==============================================================================
--- projects/release-pkg/release/packages/at.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/at.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/autofs.ucl
==============================================================================
--- projects/release-pkg/release/packages/autofs.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/autofs.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/bhyve.ucl
==============================================================================
--- projects/release-pkg/release/packages/bhyve.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/bhyve.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/binutils.ucl
==============================================================================
--- projects/release-pkg/release/packages/binutils.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/binutils.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/bsdinstall.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsdinstall.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/bsdinstall.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/bsnmp.ucl
==============================================================================
--- projects/release-pkg/release/packages/bsnmp.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/bsnmp.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/clang.ucl
==============================================================================
--- projects/release-pkg/release/packages/clang.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/clang.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/debug.ucl
==============================================================================
--- projects/release-pkg/release/packages/debug.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/debug.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/development.ucl
==============================================================================
--- projects/release-pkg/release/packages/development.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/development.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/dma.ucl
==============================================================================
--- projects/release-pkg/release/packages/dma.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/dma.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/docs.ucl
==============================================================================
--- projects/release-pkg/release/packages/docs.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/docs.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/ee.ucl
==============================================================================
--- projects/release-pkg/release/packages/ee.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/ee.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/gdb.ucl
==============================================================================
--- projects/release-pkg/release/packages/gdb.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/gdb.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/groff.ucl
==============================================================================
--- projects/release-pkg/release/packages/groff.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/groff.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/jail.ucl
==============================================================================
--- projects/release-pkg/release/packages/jail.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/jail.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/kernel.ucl
==============================================================================
--- projects/release-pkg/release/packages/kernel.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/kernel.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/lib32.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/profile.ucl
==============================================================================
--- projects/release-pkg/release/packages/profile.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/profile.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/rcmds.ucl
==============================================================================
--- projects/release-pkg/release/packages/rcmds.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/rcmds.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/runtime-manuals.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime-manuals.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/runtime-manuals.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/ssh.ucl
==============================================================================
--- projects/release-pkg/release/packages/ssh.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/ssh.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/svn.ucl
==============================================================================
--- projects/release-pkg/release/packages/svn.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/svn.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/syscons.ucl
==============================================================================
--- projects/release-pkg/release/packages/syscons.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/syscons.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/template.ucl
==============================================================================
--- projects/release-pkg/release/packages/template.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/template.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/tests.ucl
==============================================================================
--- projects/release-pkg/release/packages/tests.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/tests.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/unbound.ucl
==============================================================================
--- projects/release-pkg/release/packages/unbound.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/unbound.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

Modified: projects/release-pkg/release/packages/vi.ucl
==============================================================================
--- projects/release-pkg/release/packages/vi.ucl	Thu Feb  4 15:32:03 2016	(r295262)
+++ projects/release-pkg/release/packages/vi.ucl	Thu Feb  4 15:41:00 2016	(r295263)
@@ -1,3 +1,7 @@
+#
+# $FreeBSD$
+#
+
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"

From owner-svn-src-projects@freebsd.org  Thu Feb  4 16:38:25 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6321A9B268
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 16:38:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9731C1E3;
 Thu,  4 Feb 2016 16:38:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14GcORX040820;
 Thu, 4 Feb 2016 16:38:24 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14GcOpN040819;
 Thu, 4 Feb 2016 16:38:24 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602041638.u14GcOpN040819@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 16:38:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295266 - projects/release-pkg/release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 16:38:25 -0000

Author: gjb
Date: Thu Feb  4 16:38:24 2016
New Revision: 295266
URL: https://svnweb.freebsd.org/changeset/base/295266

Log:
  Fix typo: s/Conrol/Control/
  
  Submitted by:	kib
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/release/packages/Makefile.package

Modified: projects/release-pkg/release/packages/Makefile.package
==============================================================================
--- projects/release-pkg/release/packages/Makefile.package	Thu Feb  4 16:32:21 2016	(r295265)
+++ projects/release-pkg/release/packages/Makefile.package	Thu Feb  4 16:38:24 2016	(r295266)
@@ -23,7 +23,7 @@ kernel_DESC= 		FreeBSD Kernel
 rcmds_DESC= 		Remote Command Utilities
 manuals_DESC= 		Manual Pages
 ssh_DESC= 		Secure Shell Utilities
-svn_DESC= 		Subversion Version Conrol System
+svn_DESC= 		Subversion Version Control System
 syscons_DESC= 		Syscons Console
 tests_DESC= 		Test Suite
 unbound_DESC= 		Unbound DNS Resolver
@@ -55,7 +55,7 @@ kernel_COMMENT= 	FreeBSD Kernel
 rcmds_COMMENT= 		Remote Command Utilities
 manuals_COMMENT= 	Manual Pages
 ssh_COMMENT= 		Secure Shell Utilities
-svn_COMMENT= 		Subversion Version Conrol System
+svn_COMMENT= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 tests_COMMENT= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver

From owner-svn-src-projects@freebsd.org  Thu Feb  4 17:03:13 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B52D6A9C050
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 17:03:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 871341AA1;
 Thu,  4 Feb 2016 17:03:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14H3Cdo049868;
 Thu, 4 Feb 2016 17:03:12 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14H3CFM049867;
 Thu, 4 Feb 2016 17:03:12 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602041703.u14H3CFM049867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 17:03:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295268 - projects/release-pkg/lib
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 17:03:13 -0000

Author: gjb
Date: Thu Feb  4 17:03:12 2016
New Revision: 295268
URL: https://svnweb.freebsd.org/changeset/base/295268

Log:
  Remove duplicate line, likely result of a mismerge.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/Makefile

Modified: projects/release-pkg/lib/Makefile
==============================================================================
--- projects/release-pkg/lib/Makefile	Thu Feb  4 17:01:38 2016	(r295267)
+++ projects/release-pkg/lib/Makefile	Thu Feb  4 17:03:12 2016	(r295268)
@@ -151,7 +151,6 @@ SUBDIR_DEPEND_libradius= libmd
 SUBDIR_DEPEND_libsmb= libkiconv
 SUBDIR_DEPEND_libstdc++:= msun
 SUBDIR_DEPEND_libtacplus= libmd
-SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
 SUBDIR_DEPEND_liblzma= ${_libthr}

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:16:47 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27BCFA9C268
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:16:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4094326;
 Thu,  4 Feb 2016 21:16:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14LGkLA026354;
 Thu, 4 Feb 2016 21:16:46 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14LGZJT026253;
 Thu, 4 Feb 2016 21:16:35 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602042116.u14LGZJT026253@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 21:16:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295278 - in projects/release-pkg/lib: lib80211
 libarchive libauditd libbegemot libblocksruntime libbluetooth libbsdstat
 libbsm libbz2 libc libc++ libcalendar libcam libcapsicum libcasp...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:16:47 -0000

Author: gjb
Date: Thu Feb  4 21:16:35 2016
New Revision: 295278
URL: https://svnweb.freebsd.org/changeset/base/295278

Log:
  First pass through library packaging.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/lib80211/Makefile
  projects/release-pkg/lib/libarchive/Makefile
  projects/release-pkg/lib/libauditd/Makefile
  projects/release-pkg/lib/libbegemot/Makefile
  projects/release-pkg/lib/libblocksruntime/Makefile
  projects/release-pkg/lib/libbluetooth/Makefile
  projects/release-pkg/lib/libbsdstat/Makefile
  projects/release-pkg/lib/libbsm/Makefile
  projects/release-pkg/lib/libbz2/Makefile
  projects/release-pkg/lib/libc++/Makefile
  projects/release-pkg/lib/libc/Makefile
  projects/release-pkg/lib/libcalendar/Makefile
  projects/release-pkg/lib/libcam/Makefile
  projects/release-pkg/lib/libcapsicum/Makefile
  projects/release-pkg/lib/libcasper/Makefile
  projects/release-pkg/lib/libcom_err/Makefile
  projects/release-pkg/lib/libcompat/Makefile
  projects/release-pkg/lib/libcompiler_rt/Makefile
  projects/release-pkg/lib/libcrypt/Makefile
  projects/release-pkg/lib/libcuse/Makefile
  projects/release-pkg/lib/libcxxrt/Makefile
  projects/release-pkg/lib/libdevctl/Makefile
  projects/release-pkg/lib/libdevinfo/Makefile
  projects/release-pkg/lib/libdevstat/Makefile
  projects/release-pkg/lib/libdpv/Makefile
  projects/release-pkg/lib/libdwarf/Makefile
  projects/release-pkg/lib/libedit/Makefile
  projects/release-pkg/lib/libefi/Makefile
  projects/release-pkg/lib/libelf/Makefile
  projects/release-pkg/lib/libelftc/Makefile
  projects/release-pkg/lib/libevent/Makefile
  projects/release-pkg/lib/libexecinfo/Makefile
  projects/release-pkg/lib/libexpat/Makefile
  projects/release-pkg/lib/libfetch/Makefile
  projects/release-pkg/lib/libfigpar/Makefile
  projects/release-pkg/lib/libgeom/Makefile
  projects/release-pkg/lib/libgpio/Makefile
  projects/release-pkg/lib/libgssapi/Makefile
  projects/release-pkg/lib/libipsec/Makefile
  projects/release-pkg/lib/libjail/Makefile
  projects/release-pkg/lib/libkiconv/Makefile
  projects/release-pkg/lib/libkvm/Makefile
  projects/release-pkg/lib/libldns/Makefile
  projects/release-pkg/lib/liblzma/Makefile
  projects/release-pkg/lib/libmagic/Makefile
  projects/release-pkg/lib/libmd/Makefile
  projects/release-pkg/lib/libmemstat/Makefile
  projects/release-pkg/lib/libmilter/Makefile
  projects/release-pkg/lib/libmp/Makefile
  projects/release-pkg/lib/libmt/Makefile
  projects/release-pkg/lib/libnandfs/Makefile
  projects/release-pkg/lib/libnetbsd/Makefile
  projects/release-pkg/lib/libnetgraph/Makefile
  projects/release-pkg/lib/libngatm/Makefile
  projects/release-pkg/lib/libnv/Makefile
  projects/release-pkg/lib/libopenbsd/Makefile
  projects/release-pkg/lib/libopie/Makefile
  projects/release-pkg/lib/libpcap/Makefile
  projects/release-pkg/lib/libpjdlog/Makefile
  projects/release-pkg/lib/libpmc/Makefile
  projects/release-pkg/lib/libproc/Makefile
  projects/release-pkg/lib/libprocstat/Makefile
  projects/release-pkg/lib/libradius/Makefile
  projects/release-pkg/lib/librpcsec_gss/Makefile
  projects/release-pkg/lib/librpcsvc/Makefile
  projects/release-pkg/lib/librt/Makefile
  projects/release-pkg/lib/librtld_db/Makefile
  projects/release-pkg/lib/libsbuf/Makefile
  projects/release-pkg/lib/libsdp/Makefile
  projects/release-pkg/lib/libsm/Makefile
  projects/release-pkg/lib/libsmb/Makefile
  projects/release-pkg/lib/libsmdb/Makefile
  projects/release-pkg/lib/libsmutil/Makefile
  projects/release-pkg/lib/libsqlite3/Makefile
  projects/release-pkg/lib/libstand/Makefile
  projects/release-pkg/lib/libstdbuf/Makefile
  projects/release-pkg/lib/libstdthreads/Makefile
  projects/release-pkg/lib/libsysdecode/Makefile
  projects/release-pkg/lib/libtacplus/Makefile
  projects/release-pkg/lib/libtelnet/Makefile
  projects/release-pkg/lib/libthr/Makefile
  projects/release-pkg/lib/libthread_db/Makefile
  projects/release-pkg/lib/libucl/Makefile
  projects/release-pkg/lib/libufs/Makefile
  projects/release-pkg/lib/libugidfw/Makefile
  projects/release-pkg/lib/libulog/Makefile
  projects/release-pkg/lib/libunbound/Makefile
  projects/release-pkg/lib/libusb/Makefile
  projects/release-pkg/lib/libusbhid/Makefile
  projects/release-pkg/lib/libutil/Makefile
  projects/release-pkg/lib/libvgl/Makefile
  projects/release-pkg/lib/libvmmapi/Makefile
  projects/release-pkg/lib/libwrap/Makefile
  projects/release-pkg/lib/libxo/Makefile
  projects/release-pkg/lib/liby/Makefile
  projects/release-pkg/lib/libypclnt/Makefile
  projects/release-pkg/lib/libz/Makefile
  projects/release-pkg/lib/msun/Makefile

Modified: projects/release-pkg/lib/lib80211/Makefile
==============================================================================
--- projects/release-pkg/lib/lib80211/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/lib80211/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	80211
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1

Modified: projects/release-pkg/lib/libarchive/Makefile
==============================================================================
--- projects/release-pkg/lib/libarchive/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libarchive/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 _LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
 
 LIB=	archive

Modified: projects/release-pkg/lib/libauditd/Makefile
==============================================================================
--- projects/release-pkg/lib/libauditd/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libauditd/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=lib${LIB}
 OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
 _LIBAUDITDDIR=		${OPENBSMDIR}/libauditd
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm

Modified: projects/release-pkg/lib/libbegemot/Makefile
==============================================================================
--- projects/release-pkg/lib/libbegemot/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libbegemot/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 
+PACKAGE=lib${LIB}
 .PATH: ${LIBBEGEMOT_DIR}
 
 LIB=	begemot

Modified: projects/release-pkg/lib/libblocksruntime/Makefile
==============================================================================
--- projects/release-pkg/lib/libblocksruntime/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libblocksruntime/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB:tl}
 LIB=	BlocksRuntime
 SHLIB_MAJOR=0
 CFLAGS+=-I${.CURDIR}

Modified: projects/release-pkg/lib/libbluetooth/Makefile
==============================================================================
--- projects/release-pkg/lib/libbluetooth/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libbluetooth/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=		bluetooth
 MAN=		bluetooth.3
 

Modified: projects/release-pkg/lib/libbsdstat/Makefile
==============================================================================
--- projects/release-pkg/lib/libbsdstat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libbsdstat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=	bsdstat
 SHLIB_MAJOR=	1
 PRIVATELIB=

Modified: projects/release-pkg/lib/libbsm/Makefile
==============================================================================
--- projects/release-pkg/lib/libbsm/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libbsm/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=	lib${LIB}
 OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm
 

Modified: projects/release-pkg/lib/libbz2/Makefile
==============================================================================
--- projects/release-pkg/lib/libbz2/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libbz2/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 

Modified: projects/release-pkg/lib/libc++/Makefile
==============================================================================
--- projects/release-pkg/lib/libc++/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libc++/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	lib${LIB}
 _LIBCXXRTDIR=	${.CURDIR}/../../contrib/libcxxrt
 HDRDIR=		${.CURDIR}/../../contrib/libc++/include
 SRCDIR=		${.CURDIR}/../../contrib/libc++/src

Modified: projects/release-pkg/lib/libc/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libc/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libcalendar/Makefile
==============================================================================
--- projects/release-pkg/lib/libcalendar/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcalendar/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=	calendar
 
 SRCS=	calendar.c easter.c

Modified: projects/release-pkg/lib/libcam/Makefile
==============================================================================
--- projects/release-pkg/lib/libcam/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcam/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=		cam
 SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \

Modified: projects/release-pkg/lib/libcapsicum/Makefile
==============================================================================
--- projects/release-pkg/lib/libcapsicum/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcapsicum/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=	capsicum
 
 SHLIB_MAJOR=	0

Modified: projects/release-pkg/lib/libcasper/Makefile
==============================================================================
--- projects/release-pkg/lib/libcasper/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcasper/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	lib${LIB}
 LIB=	casper
 
 SHLIB_MAJOR=	0

Modified: projects/release-pkg/lib/libcom_err/Makefile
==============================================================================
--- projects/release-pkg/lib/libcom_err/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcom_err/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h

Modified: projects/release-pkg/lib/libcompat/Makefile
==============================================================================
--- projects/release-pkg/lib/libcompat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcompat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	compat
 CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
 NO_PIC=

Modified: projects/release-pkg/lib/libcompiler_rt/Makefile
==============================================================================
--- projects/release-pkg/lib/libcompiler_rt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcompiler_rt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	compiler_rt
 NO_PIC=
 WARNS?=	2

Modified: projects/release-pkg/lib/libcrypt/Makefile
==============================================================================
--- projects/release-pkg/lib/libcrypt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcrypt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libcuse/Makefile
==============================================================================
--- projects/release-pkg/lib/libcuse/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcuse/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -24,6 +24,7 @@
 # SUCH DAMAGE.
 #
 
+PACKAGE=lib${LIB}
 LIB=		cuse
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0

Modified: projects/release-pkg/lib/libcxxrt/Makefile
==============================================================================
--- projects/release-pkg/lib/libcxxrt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libcxxrt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SRCDIR=		${.CURDIR}/../../contrib/libcxxrt
 
 SHLIB_MAJOR=	1

Modified: projects/release-pkg/lib/libdevctl/Makefile
==============================================================================
--- projects/release-pkg/lib/libdevctl/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libdevctl/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	devctl
 SRCS=	devctl.c
 INCS=	devctl.h

Modified: projects/release-pkg/lib/libdevinfo/Makefile
==============================================================================
--- projects/release-pkg/lib/libdevinfo/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libdevinfo/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	devinfo
 SRCS=	devinfo.c
 INCS=	devinfo.h

Modified: projects/release-pkg/lib/libdevstat/Makefile
==============================================================================
--- projects/release-pkg/lib/libdevstat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libdevstat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.

Modified: projects/release-pkg/lib/libdpv/Makefile
==============================================================================
--- projects/release-pkg/lib/libdpv/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libdpv/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		dpv
 SHLIB_MAJOR=	1
 INCS=		dpv.h

Modified: projects/release-pkg/lib/libdwarf/Makefile
==============================================================================
--- projects/release-pkg/lib/libdwarf/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libdwarf/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 TOP=	${.CURDIR}/../../contrib/elftoolchain
 SRCDIR=	${TOP}/libdwarf
 

Modified: projects/release-pkg/lib/libedit/Makefile
==============================================================================
--- projects/release-pkg/lib/libedit/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libedit/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	edit
 SHLIB_MAJOR=	7
 SHLIBDIR?= /lib

Modified: projects/release-pkg/lib/libefi/Makefile
==============================================================================
--- projects/release-pkg/lib/libefi/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libefi/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 LIB=	efi
 SHLIB_MAJOR= 1
 

Modified: projects/release-pkg/lib/libelf/Makefile
==============================================================================
--- projects/release-pkg/lib/libelf/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libelf/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <bsd.own.mk>

Modified: projects/release-pkg/lib/libelftc/Makefile
==============================================================================
--- projects/release-pkg/lib/libelftc/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libelftc/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 INTERNALLIB=
 
 ELFTCDIR=	${.CURDIR}/../../contrib/elftoolchain

Modified: projects/release-pkg/lib/libevent/Makefile
==============================================================================
--- projects/release-pkg/lib/libevent/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libevent/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 .PATH:	${.CURDIR}/../../contrib/pf/libevent
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libexecinfo/Makefile
==============================================================================
--- projects/release-pkg/lib/libexecinfo/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libexecinfo/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIBEXECINFO=	${.CURDIR}/../../contrib/libexecinfo
 
 LIB=		execinfo

Modified: projects/release-pkg/lib/libexpat/Makefile
==============================================================================
--- projects/release-pkg/lib/libexpat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libexpat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml

Modified: projects/release-pkg/lib/libfetch/Makefile
==============================================================================
--- projects/release-pkg/lib/libfetch/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libfetch/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=		fetch
 CFLAGS+=	-I.
 SRCS=		fetch.c common.c ftp.c http.c file.c \

Modified: projects/release-pkg/lib/libfigpar/Makefile
==============================================================================
--- projects/release-pkg/lib/libfigpar/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libfigpar/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		figpar
 SHLIB_MAJOR=	0
 INCS=		figpar.h string_m.h

Modified: projects/release-pkg/lib/libgeom/Makefile
==============================================================================
--- projects/release-pkg/lib/libgeom/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libgeom/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	geom
 SHLIBDIR?= /lib
 SRCS+=	geom_getxml.c

Modified: projects/release-pkg/lib/libgpio/Makefile
==============================================================================
--- projects/release-pkg/lib/libgpio/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libgpio/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	gpio
 SHLIB_MAJOR= 0
 

Modified: projects/release-pkg/lib/libgssapi/Makefile
==============================================================================
--- projects/release-pkg/lib/libgssapi/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libgssapi/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		gssapi
 SHLIB_MAJOR=	10
 VERSION_DEF=	${.CURDIR}/../libc/Versions.def

Modified: projects/release-pkg/lib/libipsec/Makefile
==============================================================================
--- projects/release-pkg/lib/libipsec/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libipsec/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -27,6 +27,7 @@
 #
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libjail/Makefile
==============================================================================
--- projects/release-pkg/lib/libjail/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libjail/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	jail
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1

Modified: projects/release-pkg/lib/libkiconv/Makefile
==============================================================================
--- projects/release-pkg/lib/libkiconv/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libkiconv/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -4,6 +4,7 @@ SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=		kiconv
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c

Modified: projects/release-pkg/lib/libkvm/Makefile
==============================================================================
--- projects/release-pkg/lib/libkvm/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libkvm/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	kvm
 
 SHLIBDIR?= /lib

Modified: projects/release-pkg/lib/libldns/Makefile
==============================================================================
--- projects/release-pkg/lib/libldns/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libldns/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -3,6 +3,7 @@
 # Vendor sources and generated files
 LDNSDIR = ${.CURDIR}/../../contrib/ldns
 
+PACKAGE=lib${LIB}
 .PATH: ${LDNSDIR} ${LDNSDIR}/compat
 
 LIB=	ldns

Modified: projects/release-pkg/lib/liblzma/Makefile
==============================================================================
--- projects/release-pkg/lib/liblzma/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/liblzma/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		lzma
 LZMADIR=	${.CURDIR}/../../contrib/xz/src/liblzma
 

Modified: projects/release-pkg/lib/libmagic/Makefile
==============================================================================
--- projects/release-pkg/lib/libmagic/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmagic/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
 
+PACKAGE=lib${LIB}
 CONTRDIR=	${.CURDIR}/../../contrib/file
 .PATH: ${CONTRDIR}/src
 .PATH: ${CONTRDIR}/doc

Modified: projects/release-pkg/lib/libmd/Makefile
==============================================================================
--- projects/release-pkg/lib/libmd/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmd/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	md
 SHLIB_MAJOR= 6
 SHLIBDIR?= /lib

Modified: projects/release-pkg/lib/libmemstat/Makefile
==============================================================================
--- projects/release-pkg/lib/libmemstat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmemstat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 WARNS?=		3
 LIB=		memstat
 SHLIB_MAJOR=	3

Modified: projects/release-pkg/lib/libmilter/Makefile
==============================================================================
--- projects/release-pkg/lib/libmilter/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmilter/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
 

Modified: projects/release-pkg/lib/libmp/Makefile
==============================================================================
--- projects/release-pkg/lib/libmp/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmp/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=		mp
 SHLIB_MAJOR=	7
 LIBADD=		crypto

Modified: projects/release-pkg/lib/libmt/Makefile
==============================================================================
--- projects/release-pkg/lib/libmt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libmt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		mt
 SHLIBDIR?=	/lib
 SRCS=		mtlib.c

Modified: projects/release-pkg/lib/libnandfs/Makefile
==============================================================================
--- projects/release-pkg/lib/libnandfs/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libnandfs/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	nandfs
 SRCS+=	nandfs.c
 INCS=	libnandfs.h

Modified: projects/release-pkg/lib/libnetbsd/Makefile
==============================================================================
--- projects/release-pkg/lib/libnetbsd/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libnetbsd/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 LIB=	netbsd
 
 CFLAGS+=	-I${.CURDIR}

Modified: projects/release-pkg/lib/libnetgraph/Makefile
==============================================================================
--- projects/release-pkg/lib/libnetgraph/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libnetgraph/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
+PACKAGE=lib${LIB}
 LIB=		netgraph
 WARNS?=		3
 MAN=		netgraph.3

Modified: projects/release-pkg/lib/libngatm/Makefile
==============================================================================
--- projects/release-pkg/lib/libngatm/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libngatm/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
+PACKAGE=lib${LIB}
 LIB=	ngatm
 SHLIB_MAJOR= 4
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3

Modified: projects/release-pkg/lib/libnv/Makefile
==============================================================================
--- projects/release-pkg/lib/libnv/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libnv/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libopenbsd/Makefile
==============================================================================
--- projects/release-pkg/lib/libopenbsd/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libopenbsd/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	openbsd
 SRCS=	getdtablecount.c \
 	imsg-buffer.c \

Modified: projects/release-pkg/lib/libopie/Makefile
==============================================================================
--- projects/release-pkg/lib/libopie/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libopie/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 #
 # $FreeBSD$
 #
+PACKAGE=lib${LIB}
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
 SHLIB_MAJOR=    8

Modified: projects/release-pkg/lib/libpcap/Makefile
==============================================================================
--- projects/release-pkg/lib/libpcap/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libpcap/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -5,6 +5,7 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	pcap
 SRCS=	grammar.y tokdefs.h version.h pcap-bpf.c \
 	pcap-netmap.c \

Modified: projects/release-pkg/lib/libpjdlog/Makefile
==============================================================================
--- projects/release-pkg/lib/libpjdlog/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libpjdlog/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <bsd.own.mk>

Modified: projects/release-pkg/lib/libpmc/Makefile
==============================================================================
--- projects/release-pkg/lib/libpmc/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libpmc/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	pmc
 
 SRCS=	libpmc.c pmclog.c

Modified: projects/release-pkg/lib/libproc/Makefile
==============================================================================
--- projects/release-pkg/lib/libproc/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libproc/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	proc
 
 SRCS=	proc_bkpt.c		\

Modified: projects/release-pkg/lib/libprocstat/Makefile
==============================================================================
--- projects/release-pkg/lib/libprocstat/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libprocstat/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	procstat
 
 SRCS=	cd9660.c	\

Modified: projects/release-pkg/lib/libradius/Makefile
==============================================================================
--- projects/release-pkg/lib/libradius/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libradius/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -26,6 +26,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h

Modified: projects/release-pkg/lib/librpcsec_gss/Makefile
==============================================================================
--- projects/release-pkg/lib/librpcsec_gss/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/librpcsec_gss/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	rpcsec_gss
 SHLIB_MAJOR= 1
 SRCS+=	rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \

Modified: projects/release-pkg/lib/librpcsvc/Makefile
==============================================================================
--- projects/release-pkg/lib/librpcsvc/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/librpcsvc/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -5,6 +5,7 @@
 
 .PATH: ${.CURDIR}/../../include/rpcsvc
 
+PACKAGE=lib${LIB}
 LIB=    rpcsvc
 
 RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \

Modified: projects/release-pkg/lib/librt/Makefile
==============================================================================
--- projects/release-pkg/lib/librt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/librt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}

Modified: projects/release-pkg/lib/librtld_db/Makefile
==============================================================================
--- projects/release-pkg/lib/librtld_db/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/librtld_db/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 LIB=		rtld_db
 SHLIB_MAJOR= 	2
 MAN=		librtld_db.3

Modified: projects/release-pkg/lib/libsbuf/Makefile
==============================================================================
--- projects/release-pkg/lib/libsbuf/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsbuf/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		sbuf
 SHLIBDIR?= 	/lib
 SRCS=		subr_prf.c subr_sbuf.c

Modified: projects/release-pkg/lib/libsdp/Makefile
==============================================================================
--- projects/release-pkg/lib/libsdp/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsdp/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.2 2003/09/07 20:34:19 max Exp $
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		sdp
 MAN=		sdp.3
 

Modified: projects/release-pkg/lib/libsm/Makefile
==============================================================================
--- projects/release-pkg/lib/libsm/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsm/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
 

Modified: projects/release-pkg/lib/libsmb/Makefile
==============================================================================
--- projects/release-pkg/lib/libsmb/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsmb/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 

Modified: projects/release-pkg/lib/libsmdb/Makefile
==============================================================================
--- projects/release-pkg/lib/libsmdb/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsmdb/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb
 

Modified: projects/release-pkg/lib/libsmutil/Makefile
==============================================================================
--- projects/release-pkg/lib/libsmutil/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsmutil/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmutil
 

Modified: projects/release-pkg/lib/libsqlite3/Makefile
==============================================================================
--- projects/release-pkg/lib/libsqlite3/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsqlite3/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 PRIVATELIB=	yes
 LIB=	sqlite3
 SHLIB_MAJOR?=	0

Modified: projects/release-pkg/lib/libstand/Makefile
==============================================================================
--- projects/release-pkg/lib/libstand/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libstand/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -6,6 +6,7 @@
 #   quite large.
 #
 
+PACKAGE=lib${LIB}
 MK_PROFILE=	no
 MK_SSP=		no
 

Modified: projects/release-pkg/lib/libstdbuf/Makefile
==============================================================================
--- projects/release-pkg/lib/libstdbuf/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libstdbuf/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=lib${LIB}
 LIB=		stdbuf
 SRCS=		stdbuf.c
 SHLIB_MAJOR=	1

Modified: projects/release-pkg/lib/libstdthreads/Makefile
==============================================================================
--- projects/release-pkg/lib/libstdthreads/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libstdthreads/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	stdthreads
 SHLIB_MAJOR= 0
 

Modified: projects/release-pkg/lib/libsysdecode/Makefile
==============================================================================
--- projects/release-pkg/lib/libsysdecode/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libsysdecode/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	sysdecode
 
 SRCS=	ioctl.c syscallnames.c utrace.c

Modified: projects/release-pkg/lib/libtacplus/Makefile
==============================================================================
--- projects/release-pkg/lib/libtacplus/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libtacplus/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -24,6 +24,7 @@
 #
 #	$FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		tacplus
 SRCS=		taclib.c
 INCS=		taclib.h

Modified: projects/release-pkg/lib/libtelnet/Makefile
==============================================================================
--- projects/release-pkg/lib/libtelnet/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libtelnet/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 TELNETDIR=	${.CURDIR}/../../contrib/telnet
 .PATH:		${TELNETDIR}/libtelnet
 

Modified: projects/release-pkg/lib/libthr/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libthr/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -8,6 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
+PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libthread_db/Makefile
==============================================================================
--- projects/release-pkg/lib/libthread_db/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libthread_db/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR}/arch/${MACHINE_CPUARCH}
 
+PACKAGE=lib${LIB}
 LIB=	thread_db
 SHLIB_MAJOR= 3
 SRCS=	thread_db.c

Modified: projects/release-pkg/lib/libucl/Makefile
==============================================================================
--- projects/release-pkg/lib/libucl/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libucl/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 
 LIBUCL=	${.CURDIR}/../../contrib/libucl
 
+PACKAGE=lib${LIB}
 LIB=		ucl
 PRIVATELIB=	true
 SHLIB_MAJOR=	1

Modified: projects/release-pkg/lib/libufs/Makefile
==============================================================================
--- projects/release-pkg/lib/libufs/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libufs/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	6

Modified: projects/release-pkg/lib/libugidfw/Makefile
==============================================================================
--- projects/release-pkg/lib/libugidfw/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libugidfw/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=		ugidfw
 SHLIB_MAJOR=	5	
 SRCS=		ugidfw.c

Modified: projects/release-pkg/lib/libulog/Makefile
==============================================================================
--- projects/release-pkg/lib/libulog/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libulog/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?=/lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libunbound/Makefile
==============================================================================
--- projects/release-pkg/lib/libunbound/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libunbound/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 # Vendor sources and generated files
 LDNSDIR= ${.CURDIR}/../../contrib/ldns
 UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound

Modified: projects/release-pkg/lib/libusb/Makefile
==============================================================================
--- projects/release-pkg/lib/libusb/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libusb/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -4,6 +4,7 @@
 # Makefile for the FreeBSD specific LibUSB 2.0
 #
 
+PACKAGE=lib${LIB}
 LIB=		usb
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	0

Modified: projects/release-pkg/lib/libusbhid/Makefile
==============================================================================
--- projects/release-pkg/lib/libusbhid/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libusbhid/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
 #	$FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	usbhid
 MAN=	usbhid.3
 

Modified: projects/release-pkg/lib/libutil/Makefile
==============================================================================
--- projects/release-pkg/lib/libutil/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libutil/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 #	$FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libvgl/Makefile
==============================================================================
--- projects/release-pkg/lib/libvgl/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libvgl/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,4 +1,5 @@
 # $FreeBSD$
+PACKAGE=lib${LIB}
 LIB=	vgl
 SHLIB_MAJOR= 6
 CFLAGS+=-Wall -I${.CURDIR}

Modified: projects/release-pkg/lib/libvmmapi/Makefile
==============================================================================
--- projects/release-pkg/lib/libvmmapi/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libvmmapi/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	vmmapi
 SRCS=	vmmapi.c vmmapi_freebsd.c
 INCS=	vmmapi.h

Modified: projects/release-pkg/lib/libwrap/Makefile
==============================================================================
--- projects/release-pkg/lib/libwrap/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libwrap/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -4,6 +4,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=lib${LIB}
 LIB=	wrap
 SHLIB_MAJOR= 6
 INCS=	tcpd.h

Modified: projects/release-pkg/lib/libxo/Makefile
==============================================================================
--- projects/release-pkg/lib/libxo/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libxo/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 SHLIBDIR?=      /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/liby/Makefile
==============================================================================
--- projects/release-pkg/lib/liby/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/liby/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	y
 SRCS=	main.c yyerror.c
 NO_PIC=

Modified: projects/release-pkg/lib/libypclnt/Makefile
==============================================================================
--- projects/release-pkg/lib/libypclnt/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libypclnt/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 LIB=	ypclnt
 SHLIB_MAJOR= 4
 SRCS=	ypclnt_connect.c \

Modified: projects/release-pkg/lib/libz/Makefile
==============================================================================
--- projects/release-pkg/lib/libz/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/libz/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 #
 
+PACKAGE=lib${LIB}
 LIB=		z
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6

Modified: projects/release-pkg/lib/msun/Makefile
==============================================================================
--- projects/release-pkg/lib/msun/Makefile	Thu Feb  4 20:55:49 2016	(r295277)
+++ projects/release-pkg/lib/msun/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
@@ -12,6 +12,7 @@
 #
 #
 
+PACKAGE=lib${LIB}
 .if ${MACHINE_CPUARCH} == "i386"
 ARCH_SUBDIR= i387
 .else

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:17:17 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56A45A9C2A6
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:17:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 280C764A;
 Thu,  4 Feb 2016 21:17:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14LHGXp026418;
 Thu, 4 Feb 2016 21:17:16 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14LHGoa026416;
 Thu, 4 Feb 2016 21:17:16 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602042117.u14LHGoa026416@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 21:17:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295279 - in projects/release-pkg: etc/rc.d sbin/casperd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:17:17 -0000

Author: gjb
Date: Thu Feb  4 21:17:15 2016
New Revision: 295279
URL: https://svnweb.freebsd.org/changeset/base/295279

Log:
  Create a 'casper' package.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/etc/rc.d/Makefile
  projects/release-pkg/sbin/casperd/Makefile

Modified: projects/release-pkg/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/etc/rc.d/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
+++ projects/release-pkg/etc/rc.d/Makefile	Thu Feb  4 21:17:15 2016	(r295279)
@@ -24,7 +24,6 @@ FILES=	DAEMON \
 	${_bluetooth} \
 	bridge \
 	${_bthidd} \
-	${_casperd} \
 	cleanvar \
 	cleartmp \
 	cron \
@@ -198,8 +197,12 @@ BSNMPMODE=	${BINMODE}
 BSNMPPACKAGE=	bsnmp
 
 .if ${MK_CASPER} != "no"
-_casperd=	casperd
+FILESGROUPS+=	CASPER
+CASPER+=	casperd
 .endif
+CASPERDIR=	/etc/rc.d
+CASPERMODE=	${BINMODE}
+CASPERPACKAGE=	casper
 
 .if ${MK_CCD} != "no"
 FILES+=		ccd

Modified: projects/release-pkg/sbin/casperd/Makefile
==============================================================================
--- projects/release-pkg/sbin/casperd/Makefile	Thu Feb  4 21:16:35 2016	(r295278)
+++ projects/release-pkg/sbin/casperd/Makefile	Thu Feb  4 21:17:15 2016	(r295279)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=casper
 PROG=	casperd
 
 SRCS=	casperd.c zygote.c

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:20:28 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D30FA9C369
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:20:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 672C87C7;
 Thu,  4 Feb 2016 21:20:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14LKRS4026576;
 Thu, 4 Feb 2016 21:20:27 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14LKQ2b026571;
 Thu, 4 Feb 2016 21:20:26 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602042120.u14LKQ2b026571@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 21:20:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295280 - projects/release-pkg/release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:20:28 -0000

Author: gjb
Date: Thu Feb  4 21:20:26 2016
New Revision: 295280
URL: https://svnweb.freebsd.org/changeset/base/295280

Log:
  Add package files for libc, libedit, librtld_db, and libthr.
  
  libedit is needed for sh(1), which if updated before runtime,
  can cause undesirable behavior.
  
  For the rest, the installation order needs to be:
  
   1) librtld
   2) libc
   3) libthr
  
  The dependency listing and shilbs_required entries ensure this
  behavior.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/libc.ucl   (contents, props changed)
  projects/release-pkg/release/packages/libedit.ucl   (contents, props changed)
  projects/release-pkg/release/packages/librtld_db.ucl   (contents, props changed)
  projects/release-pkg/release/packages/libthr.ucl   (contents, props changed)
Modified:
  projects/release-pkg/release/packages/runtime.ucl

Added: projects/release-pkg/release/packages/libc.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/libc.ucl	Thu Feb  4 21:20:26 2016	(r295280)
@@ -0,0 +1,26 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+shlibs_required: [
+    "librtld_db.so.2"
+]
+deps: {
+    "FreeBSD-librtld_db": {
+        origin: "base"
+        version: "%VERSION%"
+    }
+}

Added: projects/release-pkg/release/packages/libedit.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/libedit.ucl	Thu Feb  4 21:20:26 2016	(r295280)
@@ -0,0 +1,26 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+shlibs_required: [
+    "libthr.so.3"
+]
+deps: {
+    "FreeBSD-libthr": {
+        origin: "base"
+        version: "%VERSION%"
+    }
+}

Added: projects/release-pkg/release/packages/librtld_db.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/librtld_db.ucl	Thu Feb  4 21:20:26 2016	(r295280)
@@ -0,0 +1,21 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+shlibs_provided: [
+    "librtld_db.so.2"
+]
+

Added: projects/release-pkg/release/packages/libthr.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/libthr.ucl	Thu Feb  4 21:20:26 2016	(r295280)
@@ -0,0 +1,26 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+shlibs_required: [
+    "libc.so.7"
+]
+deps: {
+    "FreeBSD-libc": {
+        origin: "base"
+        version: "%VERSION%"
+    }
+}

Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 21:17:15 2016	(r295279)
+++ projects/release-pkg/release/packages/runtime.ucl	Thu Feb  4 21:20:26 2016	(r295280)
@@ -21,3 +21,10 @@ scripts: {
 	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 EOD
 }
+deps: {
+    # For sh(1).
+    "FreeBSD-libedit": {
+        origin: "base"
+        version: "%VERSION%"
+    }
+}

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:27:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E219AA9C531
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:27:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9A145CE3;
 Thu,  4 Feb 2016 21:27:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14LR3sE029485;
 Thu, 4 Feb 2016 21:27:03 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14LR3G0029481;
 Thu, 4 Feb 2016 21:27:03 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602042127.u14LR3G0029481@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 21:27:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295281 - projects/release-pkg/release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:27:05 -0000

Author: gjb
Date: Thu Feb  4 21:27:03 2016
New Revision: 295281
URL: https://svnweb.freebsd.org/changeset/base/295281

Log:
  Mark shlibs_required/shlibs_provided lines as temporary, following
  brief discussion with bapt.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/release/packages/libc.ucl
  projects/release-pkg/release/packages/libedit.ucl
  projects/release-pkg/release/packages/librtld_db.ucl
  projects/release-pkg/release/packages/libthr.ucl

Modified: projects/release-pkg/release/packages/libc.ucl
==============================================================================
--- projects/release-pkg/release/packages/libc.ucl	Thu Feb  4 21:20:26 2016	(r295280)
+++ projects/release-pkg/release/packages/libc.ucl	Thu Feb  4 21:27:03 2016	(r295281)
@@ -15,6 +15,7 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+# XXX: Temporary.
 shlibs_required: [
     "librtld_db.so.2"
 ]

Modified: projects/release-pkg/release/packages/libedit.ucl
==============================================================================
--- projects/release-pkg/release/packages/libedit.ucl	Thu Feb  4 21:20:26 2016	(r295280)
+++ projects/release-pkg/release/packages/libedit.ucl	Thu Feb  4 21:27:03 2016	(r295281)
@@ -15,6 +15,7 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+# XXX: Temporary.
 shlibs_required: [
     "libthr.so.3"
 ]

Modified: projects/release-pkg/release/packages/librtld_db.ucl
==============================================================================
--- projects/release-pkg/release/packages/librtld_db.ucl	Thu Feb  4 21:20:26 2016	(r295280)
+++ projects/release-pkg/release/packages/librtld_db.ucl	Thu Feb  4 21:27:03 2016	(r295281)
@@ -15,6 +15,7 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+# XXX: Temporary.
 shlibs_provided: [
     "librtld_db.so.2"
 ]

Modified: projects/release-pkg/release/packages/libthr.ucl
==============================================================================
--- projects/release-pkg/release/packages/libthr.ucl	Thu Feb  4 21:20:26 2016	(r295280)
+++ projects/release-pkg/release/packages/libthr.ucl	Thu Feb  4 21:27:03 2016	(r295281)
@@ -15,6 +15,7 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+# XXX: Temporary.
 shlibs_required: [
     "libc.so.7"
 ]

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:32:03 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6405A9C719
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:32:03 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C5A6D10AC;
 Thu,  4 Feb 2016 21:32:03 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from zeppelin.tachypleus.net
 (airbears2-136-152-142-125.airbears2.berkeley.edu [136.152.142.125])
 (authenticated bits=0)
 by d.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id u14LVtkr024158
 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
 Thu, 4 Feb 2016 13:31:55 -0800
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
To: Glen Barber <gjb@freebsd.org>, src-committers@freebsd.org,
 svn-src-projects@freebsd.org
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <56B3C34B.1080501@freebsd.org>
Date: Thu, 4 Feb 2016 13:31:55 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <201602042120.u14LKQ2b026571@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Sonic-CAuth: UmFuZG9tSVbii87k34t5A1Vr3K+pT6Hj9Bq2DkZT3lThJ/YQtIaUr9aWc/1/oF3uTYlUJu4bh168lgK+fjIsRu9WbE/e2eZrq3TfT3by9tg=
X-Sonic-ID: C;EKG4tobL5RGUQnFkAoajKQ== M;lp/ttobL5RGUQnFkAoajKQ==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:32:03 -0000



On 02/04/16 13:20, Glen Barber wrote:
> Author: gjb
> Date: Thu Feb  4 21:20:26 2016
> New Revision: 295280
> URL: https://svnweb.freebsd.org/changeset/base/295280
>
> Log:
>    Add package files for libc, libedit, librtld_db, and libthr.
>    
>    libedit is needed for sh(1), which if updated before runtime,
>    can cause undesirable behavior.
>    
>    For the rest, the installation order needs to be:
>    
>     1) librtld
>     2) libc
>     3) libthr
>    
>    The dependency listing and shilbs_required entries ensure this
>    behavior.

Are we really planning to split up the system at this level of 
granularity? That seems like a huge regression from one of the main 
selling points of FreeBSD: that it is *not* split up at this level and 
forms a unified system.
-Nathan

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:36:31 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B29EA9C838
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:36:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CDDC13A1;
 Thu,  4 Feb 2016 21:36:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from FreeBSD.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by freefall.freebsd.org (Postfix) with ESMTP id E9D1D19C3;
 Thu,  4 Feb 2016 21:36:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Date: Thu, 4 Feb 2016 21:36:29 +0000
From: Glen Barber <gjb@FreeBSD.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
Message-ID: <20160204213629.GA74312@FreeBSD.org>
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="WIyZ46R2i8wDzkSu"
Content-Disposition: inline
In-Reply-To: <56B3C34B.1080501@freebsd.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:36:31 -0000


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

On Thu, Feb 04, 2016 at 01:31:55PM -0800, Nathan Whitehorn wrote:
>=20
>=20
> On 02/04/16 13:20, Glen Barber wrote:
> >Author: gjb
> >Date: Thu Feb  4 21:20:26 2016
> >New Revision: 295280
> >URL: https://svnweb.freebsd.org/changeset/base/295280
> >
> >Log:
> >   Add package files for libc, libedit, librtld_db, and libthr.
> >   libedit is needed for sh(1), which if updated before runtime,
> >   can cause undesirable behavior.
> >   For the rest, the installation order needs to be:
> >    1) librtld
> >    2) libc
> >    3) libthr
> >   The dependency listing and shilbs_required entries ensure this
> >   behavior.
>=20
> Are we really planning to split up the system at this level of granularit=
y?
> That seems like a huge regression from one of the main selling points of
> FreeBSD: that it is *not* split up at this level and forms a unified syst=
em.

Initially, the plan was to avoid this level of granularity unless where
needed.  Consider the case of jail(8), where having a libjail package
makes sense - otherwise libjail.so* is installed regardless.

For this specific commit, however, the ordering must be as described
above.

That said, I'm still looking through the library dependency chains, to
eliminate things everything requires (such as libc.so.7).  However, by
not having this level of granularity, the side effect is significantly
larger individual packages, and as a result, larger downloads for SAs
and ENs.

Glen


--WIyZ46R2i8wDzkSu
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWs8RZAAoJEAMUWKVHj+KTXcYP/Rx3rfdNONDN7lfNARatpP0y
np/bATU/3QGRTJ+ounTVVi3j2KgtmXfauQI3aPaIwGX4KEII/B5kFc87QZxK8wJo
UIYVh58+ezVid5opy5Z5Da0iA1NbnPeqleAgyr+bh9tlYNnlzgnZiOjzbZq6dosJ
wTZDjIH0XbYh5OP8U72qR2RTD9Qlb2euBr86zzsbaIGztkg2QivxPEmyqcfki21V
82N91EBSrAkTiBfKMFPjH1VhMXrgZlYqua9iLJkvEOyA4Q6zObA6SAM1vCqR4KNM
vvvMm7hj8COmMwHsaIoykDuVuoSR6bt0PWZ9usD4i3Y5PiXjdfnZnUp2SIB7NB3A
WTlZMDMdOqBIyJRekRZlTJ57s0mDUIGHNBlnNmCjxpJTuxbGDRkPbJRB3fykzrRT
dKPvweIlHYcse1QJpq74nD85j6IRCRsTPeb4DEp8OrOdBkFHOdCK4q9cALSAhrl+
kD6+xL2OOzl3eWXh7hAVhNbWsrQdPLww2ItdpHy8v45kwnHHvxTSqTzj1rP32Xgi
OtowmtK4BazWlHXFCWVb6VrUCmpnSdF8W+Yf6ZHPpqgCIpgxgPB3vbq2y5aHqb5S
uS5TyrfiXVAlAqT3sAjYBY6CIFCTE1GApm/S1gDzxDd2STxKStkx/avXo0ysc3q/
C4RSc2EQC6dDVme+r2+z
=1wBj
-----END PGP SIGNATURE-----

--WIyZ46R2i8wDzkSu--

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:47:05 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1F79A9CCA6
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:47:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id DFC05F5;
 Thu,  4 Feb 2016 21:47:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
 by freefall.freebsd.org (Postfix) with ESMTP id D858F11C7;
 Thu,  4 Feb 2016 21:47:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
 by mail.xzibition.com (Postfix) with ESMTP id 88AF31981E;
 Thu,  4 Feb 2016 21:47:05 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
 by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
 port 10026)
 with LMTP id yL_p5KtNkgf5; Thu,  4 Feb 2016 21:47:03 +0000 (UTC)
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com CB15B19816
To: Nathan Whitehorn <nwhitehorn@freebsd.org>, Glen Barber <gjb@freebsd.org>, 
 src-committers@freebsd.org, svn-src-projects@freebsd.org
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF;
 url=http://www.shatow.net/bryan/bryan2.asc
Organization: FreeBSD
Message-ID: <56B3C6E4.60907@FreeBSD.org>
Date: Thu, 4 Feb 2016 13:47:16 -0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.1
MIME-Version: 1.0
In-Reply-To: <56B3C34B.1080501@freebsd.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="W9hdjoaxOiFHdgNmmWxufgbOwcbHM1oPW"
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:47:06 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--W9hdjoaxOiFHdgNmmWxufgbOwcbHM1oPW
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 2/4/2016 1:31 PM, Nathan Whitehorn wrote:
>=20
>=20
> On 02/04/16 13:20, Glen Barber wrote:
>> Author: gjb
>> Date: Thu Feb  4 21:20:26 2016
>> New Revision: 295280
>> URL: https://svnweb.freebsd.org/changeset/base/295280
>>
>> Log:
>>    Add package files for libc, libedit, librtld_db, and libthr.
>>       libedit is needed for sh(1), which if updated before runtime,
>>    can cause undesirable behavior.
>>       For the rest, the installation order needs to be:
>>        1) librtld
>>     2) libc
>>     3) libthr
>>       The dependency listing and shilbs_required entries ensure this
>>    behavior.
>=20
> Are we really planning to split up the system at this level of
> granularity? That seems like a huge regression from one of the main
> selling points of FreeBSD: that it is *not* split up at this level and
> forms a unified system.
> -Nathan
>=20

You are jumping to conclusions. Splitting how files are *tracked in
metadata* changes nothing about what we are delivering in a release.

What level does freebsd-update track the system? It seems it is per-file.=


This constant idea that splitting files in metadata is bad is hindering
progress greatly.

--=20
Regards,
Bryan Drewery


--W9hdjoaxOiFHdgNmmWxufgbOwcbHM1oPW
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBAgAGBQJWs8bkAAoJEDXXcbtuRpfPe0AH/3zQlhCisXX6cboLjW/HUDXy
7JXOfJxCXq7I3j/QqqzKFYEYhFlGpCPPbIUXgI71Aoxm01MvH7ocMQhKj6v2gEbh
vWMd/PK5YHzyWV5oipxGuqCIjkgGImoMlYsHolz+edNGIR8NnyPASsSGZgduJa+C
uHBfvBLzg9hDHmeELvw+h43rJHWVf3l/QKaxWUcEII51tL0uOkic+aOx10CFtD9Y
/AoE+vtAkho18O3HwTPhUBMa3gv1LEfr5qawjynwUCLiEYeyI9B2wknxG1OYe6Vy
bLs2gk0N/7Bon3C0IYz8TxOu3IpyS0K/SbiCB+nsdZphwHOz9vpPLRkmL+OCdCk=
=O/YS
-----END PGP SIGNATURE-----

--W9hdjoaxOiFHdgNmmWxufgbOwcbHM1oPW--

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:50:15 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB737A9CD54
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:50:15 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id B13083A5;
 Thu,  4 Feb 2016 21:50:15 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
 by freefall.freebsd.org (Postfix) with ESMTP id A9B3213F6;
 Thu,  4 Feb 2016 21:50:15 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
 by mail.xzibition.com (Postfix) with ESMTP id 662A31983A;
 Thu,  4 Feb 2016 21:50:15 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
 by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
 port 10026)
 with LMTP id aQZZsYJ_SP9l; Thu,  4 Feb 2016 21:50:12 +0000 (UTC)
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 91ACC19830
To: Nathan Whitehorn <nwhitehorn@freebsd.org>, Glen Barber <gjb@freebsd.org>, 
 src-committers@freebsd.org, svn-src-projects@freebsd.org
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF;
 url=http://www.shatow.net/bryan/bryan2.asc
Organization: FreeBSD
Message-ID: <56B3C7A3.5000502@FreeBSD.org>
Date: Thu, 4 Feb 2016 13:50:27 -0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.1
MIME-Version: 1.0
In-Reply-To: <56B3C6E4.60907@FreeBSD.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="1pwoScjd2OowVGUX0tRAodKkfbua1QufK"
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:50:16 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--1pwoScjd2OowVGUX0tRAodKkfbua1QufK
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 2/4/2016 1:47 PM, Bryan Drewery wrote:
> On 2/4/2016 1:31 PM, Nathan Whitehorn wrote:
>>
>>
>> On 02/04/16 13:20, Glen Barber wrote:
>>> Author: gjb
>>> Date: Thu Feb  4 21:20:26 2016
>>> New Revision: 295280
>>> URL: https://svnweb.freebsd.org/changeset/base/295280
>>>
>>> Log:
>>>    Add package files for libc, libedit, librtld_db, and libthr.
>>>       libedit is needed for sh(1), which if updated before runtime,
>>>    can cause undesirable behavior.
>>>       For the rest, the installation order needs to be:
>>>        1) librtld
>>>     2) libc
>>>     3) libthr
>>>       The dependency listing and shilbs_required entries ensure this
>>>    behavior.
>>
>> Are we really planning to split up the system at this level of
>> granularity? That seems like a huge regression from one of the main
>> selling points of FreeBSD: that it is *not* split up at this level and=

>> forms a unified system.
>> -Nathan
>>
>=20
> You are jumping to conclusions. Splitting how files are *tracked in
> metadata* changes nothing about what we are delivering in a release.
>=20
> What level does freebsd-update track the system? It seems it is per-fil=
e.
>=20
> This constant idea that splitting files in metadata is bad is hindering=

> progress greatly.
>=20

Also, pkg has no binary diff packages. The plan to release 11 with
packages is moving forward. Do we really want a multi-gigabyte world
package being downloaded so we can modify a security bug in
/etc/rc.d/jail? It makes no sense.

This commit in particular is wrong in that it does not go *far enough*.
Everything installed needs to be handled by dependency ordering.

The resistance to doing this correctly needs to just stop or we're going
to end up with a completely broken system.

--=20
Regards,
Bryan Drewery


--1pwoScjd2OowVGUX0tRAodKkfbua1QufK
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBAgAGBQJWs8ejAAoJEDXXcbtuRpfPM8cIAKk0SRNNBnjXd9r4RxiE216b
+/HywpNWewcz6D8hmnIhMlsbnF1jcgfCNfXqFmefD/qGPFAhxkqJChO0vunjtDdt
XM2yGAaum8icyDV1jXInFgC2wI0PtKIq8egN7GwrVtW9lbNoUrA2P+6x+EWBR4gQ
kAdt6V9bMOjFyuB6uPWNnlNO0HNIk2E8Vr6uYzYZ7ks/DhBBtUch0YwYwoH9sYZX
OlgToQLvWDCzxfvcsHv5lIdv2qRj+Hkp+OdFPjg7UsTdsdbYrky9ifkoRMo5hgkq
71eKbxSO8luTaAYoPETHL2ZjvohYU5Q/S6dkiq6zZuytX9YLUFPF4+Da/7LUGB4=
=t0Ja
-----END PGP SIGNATURE-----

--1pwoScjd2OowVGUX0tRAodKkfbua1QufK--

From owner-svn-src-projects@freebsd.org  Thu Feb  4 21:53:06 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBD12A9CEC7
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  4 Feb 2016 21:53:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id D07CEADF;
 Thu,  4 Feb 2016 21:53:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from FreeBSD.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by freefall.freebsd.org (Postfix) with ESMTP id 382D5171E;
 Thu,  4 Feb 2016 21:53:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Date: Thu, 4 Feb 2016 21:53:03 +0000
From: Glen Barber <gjb@FreeBSD.org>
To: Bryan Drewery <bdrewery@FreeBSD.org>
Cc: Nathan Whitehorn <nwhitehorn@freebsd.org>, src-committers@freebsd.org,
 svn-src-projects@freebsd.org
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
Message-ID: <20160204215303.GA13799@FreeBSD.org>
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi"
Content-Disposition: inline
In-Reply-To: <56B3C7A3.5000502@FreeBSD.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 21:53:06 -0000


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

On Thu, Feb 04, 2016 at 01:50:27PM -0800, Bryan Drewery wrote:
> On 2/4/2016 1:47 PM, Bryan Drewery wrote:
> > On 2/4/2016 1:31 PM, Nathan Whitehorn wrote:
> >> On 02/04/16 13:20, Glen Barber wrote:
> >>> Author: gjb
> >>> Date: Thu Feb  4 21:20:26 2016
> >>> New Revision: 295280
> >>> URL: https://svnweb.freebsd.org/changeset/base/295280
> >>>
> >>> Log:
> >>>    Add package files for libc, libedit, librtld_db, and libthr.
> >>>       libedit is needed for sh(1), which if updated before runtime,
> >>>    can cause undesirable behavior.
> >>>       For the rest, the installation order needs to be:
> >>>        1) librtld
> >>>     2) libc
> >>>     3) libthr
> >>>       The dependency listing and shilbs_required entries ensure this
> >>>    behavior.
> >>
> >> Are we really planning to split up the system at this level of
> >> granularity? That seems like a huge regression from one of the main
> >> selling points of FreeBSD: that it is *not* split up at this level and
> >> forms a unified system.
> >> -Nathan
> >>
> >=20
> > You are jumping to conclusions. Splitting how files are *tracked in
> > metadata* changes nothing about what we are delivering in a release.
> >=20
> > What level does freebsd-update track the system? It seems it is per-fil=
e.
> >=20
> > This constant idea that splitting files in metadata is bad is hindering
> > progress greatly.
> >=20
>=20
> Also, pkg has no binary diff packages. The plan to release 11 with
> packages is moving forward. Do we really want a multi-gigabyte world
> package being downloaded so we can modify a security bug in
> /etc/rc.d/jail? It makes no sense.
>=20
> This commit in particular is wrong in that it does not go *far enough*.
> Everything installed needs to be handled by dependency ordering.
>=20
> The resistance to doing this correctly needs to just stop or we're going
> to end up with a completely broken system.
>=20

Or, the alternative outcome, 11.0-RELEASE ships without packaged base.

Glen


--Qxx1br4bt0+wmkIi
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWs8g/AAoJEAMUWKVHj+KT24AP/0ADPQnb1FFXXDHWVaHkjzTC
ZYD8KOeEyGzQPpMDqieRhHYhswlZAXbsekn7Q/bqC7ZReonKmuUOYKmUyEx2FBnZ
hypbSK0a6sAmMntOrohUOGyFnLE3ZFze6gtchGUm5EMVXFhmqm322GZRsiKu3Oie
G5JlYNKj0n9W0lkqSmysQPEfnPl5iNi5w4RuWEMDDDtuK0TGelg9msp70Xi7GsHN
rPuCWdssQ469wBdJ/Dvt/oEeGj70Ity+bMpibs2Vfl8HNlKbDnXylRRvJKlcX5SY
xIHRlYC94ZhZweV9GzO/bWGpp7pS990/VGOujO/O6HKRwXqlwNegwYTAlfhyWBAn
FzropeihdA4wLrB3huaajNInpGNOy/22fmUsPNpIdIIopHj+TrjOh2cACys/LL3m
qOOFPxzw9repXr2zRpVdiVJ6THj5Mc7pDr5wqqR8zRp0z6AzzShCcMGS7kXslBdq
BXsfCNMmIHHh2kVCs91l4U86j6Nodf9kpkRtJVwdwAbZGksJ192slQ2A9l4CBiuh
fBDkKpkuS8Ke7Gmzbt77vXnTtUqAGq07X4qpbhupR0hEDXhQuwGOXpvuXK7yOwk6
/5jSksy8xEJ6r4f00zkczGYkCBbN9O3JzPk/MLdvLnXXBK50W+LrEKUjMq8reoiX
BC9ZlUnT+ZgI/wmgxCyb
=STqo
-----END PGP SIGNATURE-----

--Qxx1br4bt0+wmkIi--

From owner-svn-src-projects@freebsd.org  Fri Feb  5 00:41:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00D61A9C9EF
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 00:41:04 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9E55F88;
 Fri,  5 Feb 2016 00:41:00 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from aurora.physics.berkeley.edu (aurora.physics.berkeley.edu
 [128.32.117.67]) (authenticated bits=0)
 by d.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id u150etYq019357
 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
 Thu, 4 Feb 2016 16:40:58 -0800
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
To: Bryan Drewery <bdrewery@FreeBSD.org>, Glen Barber <gjb@FreeBSD.org>,
 src-committers@FreeBSD.org, svn-src-projects@FreeBSD.org
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <56B3EF97.9040205@freebsd.org>
Date: Thu, 4 Feb 2016 16:40:55 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <56B3C7A3.5000502@FreeBSD.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Sonic-CAuth: UmFuZG9tSVbXvHtKEgcTR1N0GpCWnLoNpO4rQaUXh+aWlwiPaq+u+ByoNU3Yf28q3BqToJ+h3/cmJC7mKOqOqBwATvbsPet9qYgQ4b0+66g=
X-Sonic-ID: C;UEIZHqHL5RG7hnFkAoajKQ== M;5OV7H6HL5RG7hnFkAoajKQ==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 00:41:04 -0000



On 02/04/16 13:50, Bryan Drewery wrote:
> On 2/4/2016 1:47 PM, Bryan Drewery wrote:
>> On 2/4/2016 1:31 PM, Nathan Whitehorn wrote:
>>>
>>> On 02/04/16 13:20, Glen Barber wrote:
>>>> Author: gjb
>>>> Date: Thu Feb  4 21:20:26 2016
>>>> New Revision: 295280
>>>> URL: https://svnweb.freebsd.org/changeset/base/295280
>>>>
>>>> Log:
>>>>     Add package files for libc, libedit, librtld_db, and libthr.
>>>>        libedit is needed for sh(1), which if updated before runtime,
>>>>     can cause undesirable behavior.
>>>>        For the rest, the installation order needs to be:
>>>>         1) librtld
>>>>      2) libc
>>>>      3) libthr
>>>>        The dependency listing and shilbs_required entries ensure this
>>>>     behavior.
>>> Are we really planning to split up the system at this level of
>>> granularity? That seems like a huge regression from one of the main
>>> selling points of FreeBSD: that it is *not* split up at this level and
>>> forms a unified system.
>>> -Nathan
>>>
>> You are jumping to conclusions. Splitting how files are *tracked in
>> metadata* changes nothing about what we are delivering in a release.
>>
>> What level does freebsd-update track the system? It seems it is per-file.
>>
>> This constant idea that splitting files in metadata is bad is hindering
>> progress greatly.
>>
> Also, pkg has no binary diff packages. The plan to release 11 with
> packages is moving forward. Do we really want a multi-gigabyte world
> package being downloaded so we can modify a security bug in
> /etc/rc.d/jail? It makes no sense.
>
> This commit in particular is wrong in that it does not go *far enough*.
> Everything installed needs to be handled by dependency ordering.
>
> The resistance to doing this correctly needs to just stop or we're going
> to end up with a completely broken system.
>

My question, which you did not quite answer, was in how many packages 
the FreeBSD base system will be delivered. I didn't have any 
conclusions, since I don't know anything about what is happening. 
However the metadata is organized is fine, though I do worry that this 
level of per-library/-binary/-whatever manual dependency tracking may 
quickly become stale and will raise the barrier to adding new libraries.

But that doesn't really matter. The general worry, which has been 
expressed by others and never to my knowledge addressed, is that:
1) Splitting the base system into 1000 packages will make it easier to 
not have some of those packages. This would destroy one of the absolute 
best things about the operating system: that "FreeBSD 10.2" is a 
coherent thing and all of the tools that make it up can be relied on to 
exist. The earlier version of "packaging base" that I heard about would 
have a handful (maybe 5 or 6) packages similar to the granularity that 
the installer and freebsd-update use, which is an easy enough thing to 
handful.
2) Having that split makes it easier to have mismatched versions. This 
is a problem I have encountered often on Linux distributions that blend 
third- and first-party software or have the 1000-package base system 
concept and that I encounter all the time with ports. Having a reliable, 
monolithic base system that is guaranteed to be internally consistent is 
*tremendously* valuable.

Would it be possible to have some summary of what the plan for 
"packaging base" actually is? I'm sure these are things that have been 
thought about, but it's been difficult for me at least to follow what is 
going on. Just some kind of white paper would be really helpful, or, at 
the very least, a few paragraphs in the quarterly status report to give 
a view from 10k feet.
-Nathan

From owner-svn-src-projects@freebsd.org  Fri Feb  5 00:43:43 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 741A2A9CB3B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 00:43:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2D5E812A6;
 Fri,  5 Feb 2016 00:43:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u150hgqg089426;
 Fri, 5 Feb 2016 00:43:42 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u150hg4n089425;
 Fri, 5 Feb 2016 00:43:42 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602050043.u150hg4n089425@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 00:43:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295290 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 00:43:43 -0000

Author: gjb
Date: Fri Feb  5 00:43:42 2016
New Revision: 295290
URL: https://svnweb.freebsd.org/changeset/base/295290

Log:
  Silence a few command lines.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Fri Feb  5 00:14:24 2016	(r295289)
+++ projects/release-pkg/Makefile.inc1	Fri Feb  5 00:43:42 2016	(r295290)
@@ -1286,7 +1286,7 @@ distributekernel distributekernel.debug:
 .endif
 	mkdir -p ${DESTDIR}/${DISTDIR}
 .if defined(NO_ROOT)
-	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
+	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
@@ -1294,14 +1294,14 @@ distributekernel distributekernel.debug:
 	    DESTDIR=${INSTALL_DDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
-	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
+	@sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
-	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
+	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
@@ -1310,7 +1310,7 @@ distributekernel distributekernel.debug:
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
-	sed -e "s|^./kernel.${_kernel}|.|" \
+	@sed -e "s|^./kernel.${_kernel}|.|" \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif

From owner-svn-src-projects@freebsd.org  Fri Feb  5 00:51:16 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F051A9CDAD
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 00:51:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 10D8515C1;
 Fri,  5 Feb 2016 00:51:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from FreeBSD.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by freefall.freebsd.org (Postfix) with ESMTP id 665581929;
 Fri,  5 Feb 2016 00:51:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Date: Fri, 5 Feb 2016 00:51:13 +0000
From: Glen Barber <gjb@FreeBSD.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: Bryan Drewery <bdrewery@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-projects@FreeBSD.org
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
Message-ID: <20160205005113.GD13799@FreeBSD.org>
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org> <56B3EF97.9040205@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="d01dLTUuW90fS44H"
Content-Disposition: inline
In-Reply-To: <56B3EF97.9040205@freebsd.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 00:51:16 -0000


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

On Thu, Feb 04, 2016 at 04:40:55PM -0800, Nathan Whitehorn wrote:
> >>>Are we really planning to split up the system at this level of
> >>>granularity? That seems like a huge regression from one of the main
> >>>selling points of FreeBSD: that it is *not* split up at this level and
> >>>forms a unified system.
> >>>-Nathan
> >>>
> >>You are jumping to conclusions. Splitting how files are *tracked in
> >>metadata* changes nothing about what we are delivering in a release.
> >>
> >>What level does freebsd-update track the system? It seems it is per-fil=
e.
> >>
> >>This constant idea that splitting files in metadata is bad is hindering
> >>progress greatly.
> >>
> >Also, pkg has no binary diff packages. The plan to release 11 with
> >packages is moving forward. Do we really want a multi-gigabyte world
> >package being downloaded so we can modify a security bug in
> >/etc/rc.d/jail? It makes no sense.
> >
> >This commit in particular is wrong in that it does not go *far enough*.
> >Everything installed needs to be handled by dependency ordering.
> >
> >The resistance to doing this correctly needs to just stop or we're going
> >to end up with a completely broken system.
> >
>=20
> My question, which you did not quite answer, was in how many packages the
> FreeBSD base system will be delivered. I didn't have any conclusions, sin=
ce
> I don't know anything about what is happening. However the metadata is
> organized is fine, though I do worry that this level of
> per-library/-binary/-whatever manual dependency tracking may quickly beco=
me
> stale and will raise the barrier to adding new libraries.
>=20
> But that doesn't really matter. The general worry, which has been express=
ed
> by others and never to my knowledge addressed, is that:
> 1) Splitting the base system into 1000 packages will make it easier to not
> have some of those packages. This would destroy one of the absolute best
> things about the operating system: that "FreeBSD 10.2" is a coherent thing
> and all of the tools that make it up can be relied on to exist. The earli=
er
> version of "packaging base" that I heard about would have a handful (mayb=
e 5
> or 6) packages similar to the granularity that the installer and
> freebsd-update use, which is an easy enough thing to handful.

Splitting the base system into packages reinstates granular installation
ability, which was present in 8.x and prior releases.  Based on many
reactions to this, a 'feature' not a 'bug.'

> 2) Having that split makes it easier to have mismatched versions. This is=
 a
> problem I have encountered often on Linux distributions that blend third-
> and first-party software or have the 1000-package base system concept and
> that I encounter all the time with ports. Having a reliable, monolithic b=
ase
> system that is guaranteed to be internally consistent is *tremendously*
> valuable.
>=20

This is why the work is being done in a *project* branch, not head.

> Would it be possible to have some summary of what the plan for "packaging
> base" actually is? I'm sure these are things that have been thought about,
> but it's been difficult for me at least to follow what is going on. Just
> some kind of white paper would be really helpful, or, at the very least, a
> few paragraphs in the quarterly status report to give a view from 10k fee=
t.

This, honestly, has been asked repeatedly, and provided answers.  Both
to PDFs of talks, URLs to talks being recorded, etc.

Here's the bigger problem, from my view, as things stand now: there was
no mystery that packaged base system was going to be targeted for
11.0-RELEASE.  Progress slowed for a while, and has since resumed.  Now,
that it has been stated that it is *required* for 11.0-RELEASE, people
are pointing out problems or requesting things for items noted in both,
the PDFs and URLs mentioned above, and nitpicking on things that either
are not relevant (meaning, does not exist) or things that we know will
be required for this to work.

This is a project branch.  I'm making an omelet, and all of the commits
until this is merged back to head are sacrificial eggs, no matter what
the end result of what 11.0-RELEASE looks like.

Glen


--d01dLTUuW90fS44H
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWs/IBAAoJEAMUWKVHj+KTwdQP/R2+ihMkfA311fyuIRyPeKqS
NdkWK+BvB9AV1csGdbCT0kU9PEWceiq88UF/CZ25LYbCXtg8XBc36JjddhBccFzs
xz3WTVsGrt+U7ktwlTecDQNIi3Zrn+TYxK3C1Ic2bKDbAVcHf6mrXWaZ9cpAOtiO
3lczZQtUHukwphtxIN/mqCKI1ti2TwSdH7JnWcfdTY4eunZoHTQedZLGUdwa4fpw
rBQiK6enHaV56VpwdbKSIUbeKYBHw2Bj42+XrhnJ6mDg4zZP+AYAo7OUgOFwUoGq
BVpq15rv3RA9pA0pN4J1mCseiNsvG/dpNfgkiabZun74cSD0ccySVCERLQ1qexx3
Ep38mYPgGZq0IKVa3znsYDq2cqFO68/XFP2V1yFhZuoA4od6cypAQ66Elph2DiMt
aPdzMAskH7lbg2rRsWKJeytH30JYQaq73fqXqezpQZT/Z7IGQTdVefYgM38s6kiw
f6DCYH4D7BsE4IniZE3bWV3FReve5u8HBvBtxjYcx4OUKF97i1BzVS9Gmy2v9oeN
j+eoftZwPr/zjRa4cEnS9zz49qG0hRFwVxruznjT8mn518qNal/qITu4E7JtohiQ
o2kKSyjFRi+XjtKvmF+0su24vslR/QOoBvfLxnvUhKnji57YrNd2JEV4+TF9kGB5
w1HoUw3um4jy6qvM2xG/
=FymZ
-----END PGP SIGNATURE-----

--d01dLTUuW90fS44H--

From owner-svn-src-projects@freebsd.org  Fri Feb  5 01:03:40 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03752A9D34A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 01:03:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C6A36119;
 Fri,  5 Feb 2016 01:03:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1513csi095154;
 Fri, 5 Feb 2016 01:03:38 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1513cJC095152;
 Fri, 5 Feb 2016 01:03:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602050103.u1513cJC095152@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 01:03:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295291 - in projects/release-pkg/lib: libalias/libalias
 libpam/libpam
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 01:03:40 -0000

Author: gjb
Date: Fri Feb  5 01:03:38 2016
New Revision: 295291
URL: https://svnweb.freebsd.org/changeset/base/295291

Log:
  Update libalias and libpam packaged files.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/libalias/libalias/Makefile
  projects/release-pkg/lib/libpam/libpam/Makefile

Modified: projects/release-pkg/lib/libalias/libalias/Makefile
==============================================================================
--- projects/release-pkg/lib/libalias/libalias/Makefile	Fri Feb  5 00:43:42 2016	(r295290)
+++ projects/release-pkg/lib/libalias/libalias/Makefile	Fri Feb  5 01:03:38 2016	(r295291)
@@ -2,6 +2,7 @@
 
 .PATH: ${.CURDIR}/../../../sys/netinet/libalias
 
+PACKAGE=lib${LIB}
 LIB=	alias
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 7

Modified: projects/release-pkg/lib/libpam/libpam/Makefile
==============================================================================
--- projects/release-pkg/lib/libpam/libpam/Makefile	Fri Feb  5 00:43:42 2016	(r295290)
+++ projects/release-pkg/lib/libpam/libpam/Makefile	Fri Feb  5 01:03:38 2016	(r295291)
@@ -35,6 +35,7 @@
 #
 # $FreeBSD$
 
+PACKAGE=lib${LIB}
 OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
 

From owner-svn-src-projects@freebsd.org  Fri Feb  5 01:17:37 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9CDBA9D868
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 01:17:37 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A8A1CC46;
 Fri,  5 Feb 2016 01:17:37 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from aurora.physics.berkeley.edu (aurora.physics.berkeley.edu
 [128.32.117.67]) (authenticated bits=0)
 by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id u1516gKY019087
 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
 Thu, 4 Feb 2016 17:06:42 -0800
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
To: Glen Barber <gjb@FreeBSD.org>
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org> <56B3EF97.9040205@freebsd.org>
 <20160205005113.GD13799@FreeBSD.org>
Cc: Bryan Drewery <bdrewery@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-projects@FreeBSD.org
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <56B3F5A2.7070600@freebsd.org>
Date: Thu, 4 Feb 2016 17:06:42 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <20160205005113.GD13799@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-Sonic-CAuth: UmFuZG9tSVZiF4vwppS+RkfNa9HMMOoIqnMpwKo08xlmCIAmSqwnG1GK9vBHc8ec9TbR70vlTkOhqGCuY7ZVe93aIt4cKtUJXed2J1sUv7Q=
X-Sonic-ID: C;OPDCt6TL5RGiEsEl14k5kQ== M;xtwVuKTL5RGiEsEl14k5kQ==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 01:17:37 -0000



On 02/04/16 16:51, Glen Barber wrote:
> On Thu, Feb 04, 2016 at 04:40:55PM -0800, Nathan Whitehorn wrote:
>>>>> Are we really planning to split up the system at this level of
>>>>> granularity? That seems like a huge regression from one of the main
>>>>> selling points of FreeBSD: that it is *not* split up at this level and
>>>>> forms a unified system.
>>>>> -Nathan
>>>>>
>>>> You are jumping to conclusions. Splitting how files are *tracked in
>>>> metadata* changes nothing about what we are delivering in a release.
>>>>
>>>> What level does freebsd-update track the system? It seems it is per-file.
>>>>
>>>> This constant idea that splitting files in metadata is bad is hindering
>>>> progress greatly.
>>>>
>>> Also, pkg has no binary diff packages. The plan to release 11 with
>>> packages is moving forward. Do we really want a multi-gigabyte world
>>> package being downloaded so we can modify a security bug in
>>> /etc/rc.d/jail? It makes no sense.
>>>
>>> This commit in particular is wrong in that it does not go *far enough*.
>>> Everything installed needs to be handled by dependency ordering.
>>>
>>> The resistance to doing this correctly needs to just stop or we're going
>>> to end up with a completely broken system.
>>>
>> My question, which you did not quite answer, was in how many packages the
>> FreeBSD base system will be delivered. I didn't have any conclusions, since
>> I don't know anything about what is happening. However the metadata is
>> organized is fine, though I do worry that this level of
>> per-library/-binary/-whatever manual dependency tracking may quickly become
>> stale and will raise the barrier to adding new libraries.
>>
>> But that doesn't really matter. The general worry, which has been expressed
>> by others and never to my knowledge addressed, is that:
>> 1) Splitting the base system into 1000 packages will make it easier to not
>> have some of those packages. This would destroy one of the absolute best
>> things about the operating system: that "FreeBSD 10.2" is a coherent thing
>> and all of the tools that make it up can be relied on to exist. The earlier
>> version of "packaging base" that I heard about would have a handful (maybe 5
>> or 6) packages similar to the granularity that the installer and
>> freebsd-update use, which is an easy enough thing to handful.
> Splitting the base system into packages reinstates granular installation
> ability, which was present in 8.x and prior releases.  Based on many
> reactions to this, a 'feature' not a 'bug.'

I was just wondering about the granularity of it. We didn't have "libc" 
as its own thing then.

>> 2) Having that split makes it easier to have mismatched versions. This is a
>> problem I have encountered often on Linux distributions that blend third-
>> and first-party software or have the 1000-package base system concept and
>> that I encounter all the time with ports. Having a reliable, monolithic base
>> system that is guaranteed to be internally consistent is *tremendously*
>> valuable.
>>
> This is why the work is being done in a *project* branch, not head.

Which is fine and a good use of project branches.

>
>> Would it be possible to have some summary of what the plan for "packaging
>> base" actually is? I'm sure these are things that have been thought about,
>> but it's been difficult for me at least to follow what is going on. Just
>> some kind of white paper would be really helpful, or, at the very least, a
>> few paragraphs in the quarterly status report to give a view from 10k feet.
> This, honestly, has been asked repeatedly, and provided answers.  Both
> to PDFs of talks, URLs to talks being recorded, etc.
>
> Here's the bigger problem, from my view, as things stand now: there was
> no mystery that packaged base system was going to be targeted for
> 11.0-RELEASE.  Progress slowed for a while, and has since resumed.  Now,
> that it has been stated that it is *required* for 11.0-RELEASE, people
> are pointing out problems or requesting things for items noted in both,
> the PDFs and URLs mentioned above, and nitpicking on things that either
> are not relevant (meaning, does not exist) or things that we know will
> be required for this to work.
>
> This is a project branch.  I'm making an omelet, and all of the commits
> until this is merged back to head are sacrificial eggs, no matter what
> the end result of what 11.0-RELEASE looks like.
>
> Glen
>

Maybe I missed them? The talks I've seen (e.g. 
https://www.bsdcan.org/2015/schedule/events/563.en.html) describe some 
technical problems, the idea that pkg is nicer than freebsd-update (true 
enough), and that having some more granularity (bind and sendmail 
separated out, for instance) in installation would be a good thing. That 
all sounds perfectly reasonable and good, but is also pretty nebulous.

It would be good have something a little more detailed on what a 
packaged base system actually looks like: what kinds of things would 
constitute a package? are those packages (e.g. for sendmail) 
interchangeable with ones from ports? would the pkg tool be imported 
into base? will all the versions of packages be locked together? is the 
idea to have buildworld/installworld generate packages now? is it just 
equivalent to replacing tar and freebsd-update with pkg?

Some unified few-page white paper that goes through all of that would be 
really appreciated. If I'm asking questions here, it's only because I 
don't know what the overall plan is and don't have anywhere else to ask. 
Especially for something that is going to be a requirement for 11.x, it 
would be good to know what it is that we are actually requiring. Please 
don't take any of this as criticism -- I realize you are very busy 
writing code and that the plan is adapting to code realities as you go 
-- but it would be helpful for the rest of us to know where you are 
planning to go with the branch.
-Nathan

From owner-svn-src-projects@freebsd.org  Fri Feb  5 01:30:42 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB558A9DD35
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 01:30:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 9283B132F;
 Fri,  5 Feb 2016 01:30:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from FreeBSD.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by freefall.freebsd.org (Postfix) with ESMTP id E304315C7;
 Fri,  5 Feb 2016 01:30:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Date: Fri, 5 Feb 2016 01:30:40 +0000
From: Glen Barber <gjb@FreeBSD.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: Bryan Drewery <bdrewery@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-projects@FreeBSD.org
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
Message-ID: <20160205013040.GG13799@FreeBSD.org>
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org> <56B3EF97.9040205@freebsd.org>
 <20160205005113.GD13799@FreeBSD.org> <56B3F5A2.7070600@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="w/VI3ydZO+RcZ3Ux"
Content-Disposition: inline
In-Reply-To: <56B3F5A2.7070600@freebsd.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 01:30:42 -0000


--w/VI3ydZO+RcZ3Ux
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 04, 2016 at 05:06:42PM -0800, Nathan Whitehorn wrote:
> On 02/04/16 16:51, Glen Barber wrote:
> >On Thu, Feb 04, 2016 at 04:40:55PM -0800, Nathan Whitehorn wrote:
> >>>>>Are we really planning to split up the system at this level of
> >>>>>granularity? That seems like a huge regression from one of the main
> >>>>>selling points of FreeBSD: that it is *not* split up at this level a=
nd
> >>>>>forms a unified system.
> >>>>>-Nathan
> >>>>>
> >>>>You are jumping to conclusions. Splitting how files are *tracked in
> >>>>metadata* changes nothing about what we are delivering in a release.
> >>>>
> >>>>What level does freebsd-update track the system? It seems it is per-f=
ile.
> >>>>
> >>>>This constant idea that splitting files in metadata is bad is hinderi=
ng
> >>>>progress greatly.
> >>>>
> >>>Also, pkg has no binary diff packages. The plan to release 11 with
> >>>packages is moving forward. Do we really want a multi-gigabyte world
> >>>package being downloaded so we can modify a security bug in
> >>>/etc/rc.d/jail? It makes no sense.
> >>>
> >>>This commit in particular is wrong in that it does not go *far enough*.
> >>>Everything installed needs to be handled by dependency ordering.
> >>>
> >>>The resistance to doing this correctly needs to just stop or we're goi=
ng
> >>>to end up with a completely broken system.
> >>>
> >>My question, which you did not quite answer, was in how many packages t=
he
> >>FreeBSD base system will be delivered. I didn't have any conclusions, s=
ince
> >>I don't know anything about what is happening. However the metadata is
> >>organized is fine, though I do worry that this level of
> >>per-library/-binary/-whatever manual dependency tracking may quickly be=
come
> >>stale and will raise the barrier to adding new libraries.
> >>
> >>But that doesn't really matter. The general worry, which has been expre=
ssed
> >>by others and never to my knowledge addressed, is that:
> >>1) Splitting the base system into 1000 packages will make it easier to =
not
> >>have some of those packages. This would destroy one of the absolute best
> >>things about the operating system: that "FreeBSD 10.2" is a coherent th=
ing
> >>and all of the tools that make it up can be relied on to exist. The ear=
lier
> >>version of "packaging base" that I heard about would have a handful (ma=
ybe 5
> >>or 6) packages similar to the granularity that the installer and
> >>freebsd-update use, which is an easy enough thing to handful.
> >Splitting the base system into packages reinstates granular installation
> >ability, which was present in 8.x and prior releases.  Based on many
> >reactions to this, a 'feature' not a 'bug.'
>=20
> I was just wondering about the granularity of it. We didn't have "libc" as
> its own thing then.
>=20
> >>2) Having that split makes it easier to have mismatched versions. This =
is a
> >>problem I have encountered often on Linux distributions that blend thir=
d-
> >>and first-party software or have the 1000-package base system concept a=
nd
> >>that I encounter all the time with ports. Having a reliable, monolithic=
 base
> >>system that is guaranteed to be internally consistent is *tremendously*
> >>valuable.
> >>
> >This is why the work is being done in a *project* branch, not head.
>=20
> Which is fine and a good use of project branches.
>=20
> >
> >>Would it be possible to have some summary of what the plan for "packagi=
ng
> >>base" actually is? I'm sure these are things that have been thought abo=
ut,
> >>but it's been difficult for me at least to follow what is going on. Just
> >>some kind of white paper would be really helpful, or, at the very least=
, a
> >>few paragraphs in the quarterly status report to give a view from 10k f=
eet.
> >This, honestly, has been asked repeatedly, and provided answers.  Both
> >to PDFs of talks, URLs to talks being recorded, etc.
> >
> >Here's the bigger problem, from my view, as things stand now: there was
> >no mystery that packaged base system was going to be targeted for
> >11.0-RELEASE.  Progress slowed for a while, and has since resumed.  Now,
> >that it has been stated that it is *required* for 11.0-RELEASE, people
> >are pointing out problems or requesting things for items noted in both,
> >the PDFs and URLs mentioned above, and nitpicking on things that either
> >are not relevant (meaning, does not exist) or things that we know will
> >be required for this to work.
> >
> >This is a project branch.  I'm making an omelet, and all of the commits
> >until this is merged back to head are sacrificial eggs, no matter what
> >the end result of what 11.0-RELEASE looks like.
> >
> >Glen
> >
>=20
> Maybe I missed them? The talks I've seen (e.g.
> https://www.bsdcan.org/2015/schedule/events/563.en.html) describe some
> technical problems, the idea that pkg is nicer than freebsd-update (true
> enough), and that having some more granularity (bind and sendmail separat=
ed
> out, for instance) in installation would be a good thing. That all sounds
> perfectly reasonable and good, but is also pretty nebulous.
>=20
> It would be good have something a little more detailed on what a packaged
> base system actually looks like: what kinds of things would constitute a
> package?

Short answer: A set of binaries and libraries upon which the binaries
require to run.

> are those packages (e.g. for sendmail) interchangeable with ones
> from ports?

Separate package repositories.  Separate package naming scheme.
Completely independent.

> would the pkg tool be imported into base?

No.

> will all the versions of packages be locked together?

No more than is in place now.  If library Z is updated to address
a vulnerability, and packages X and Y depend on Z, then X and Y will
be updated.

> is the idea to have buildworld/installworld generate packages now?

No.  I've made it very clear this is *not* the goal, nor even part of
the end result.

> is it just equivalent to replacing tar and freebsd-update with pkg?
>=20

"Just equivalent" is a bit of a stretch for an understatement, but sure.

> Some unified few-page white paper that goes through all of that would be
> really appreciated. If I'm asking questions here, it's only because I don=
't
> know what the overall plan is and don't have anywhere else to ask.
> Especially for something that is going to be a requirement for 11.x, it
> would be good to know what it is that we are actually requiring. Please
> don't take any of this as criticism -- I realize you are very busy writing
> code and that the plan is adapting to code realities as you go -- but it
> would be helpful for the rest of us to know where you are planning to go
> with the branch.

The end goal is still to be determined.  Again, eggs and omelets.  As
I have been able to spend more time focusing on this branch, more issues
have become obvious, and many changes committed to address the issues
(clearly some commits are not things people want to see).

The single-sentence white-paper is this:

This is still a work in progress, but the end goal is a consistent,
cohesive, and reliable set of packages that one can update and install
on the fly, providing granularity within FreeBSD, while ensuring future
SAs and ENs are addressable in a similar, sane manner.

Glen


--w/VI3ydZO+RcZ3Ux
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWs/tAAAoJEAMUWKVHj+KT068QAI5e+0moPyH+A10ZDE9xBQtz
EhBHpfGRVhaZkRaoVbp6I1QqG55cX3qOzo9pRN6wjzX4FcoP1jxKrBwzWNTXoGX6
QUykh8o746w+LfizWRI15/QP6ZqFw4Reo6md9qE6M2AdvoyUXPNljTkLjAsxiZlU
Q+kE5oWmP5uLjjEYC06oY9Q81PBi/ARUJc+6sqwLl3OYx3VQFuDWQfyW80LYmKGb
dYk58f7mFuzR0BPJAFMchDuEf6V3tmOQ33O/z3tretl5xy83yxq+kM6c+S2LCU6M
Qk8eWcq9lB3PIDmGWypVV1LWIUc49wiy2/70p+prvlGzwMPbt6O7w49jZvR/Rced
iZGSZV5JOtaOXC7/zhAAve9hZAAQfX+y4ypDa/xxFA/Ul0bnhbk5Nq7IVFO0P4ni
YE8YCCbdNCWVAVsZwl0elhMNUiku//zXPYWKyUihrixqnKYWWvgRArFdMOn3n9jb
W0LrvBcMk3qMx/QWmm3sZTAhlseu23Jf05viHdu673xh8jU5stz1Id0pJigw6ZZ9
LXhFp1V8iVBexov90vOoOc7UhjNoaGoYy98Ey58SklCY7/rx8GkHXjhBs6xSjWtc
dQoYvwyanSQrqSTpp1qYCgVv5qe6qcm5jX6W5iEkJQVBpHZp9u3tq0o0QsSpCgVX
WWr5S8z7bpuy5q5PkzO3
=dBvA
-----END PGP SIGNATURE-----

--w/VI3ydZO+RcZ3Ux--

From owner-svn-src-projects@freebsd.org  Fri Feb  5 02:29:43 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DDE3A9CF26
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 02:29:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B640E63;
 Fri,  5 Feb 2016 02:29:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u152Tfju019139;
 Fri, 5 Feb 2016 02:29:41 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u152TfhA019138;
 Fri, 5 Feb 2016 02:29:41 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602050229.u152TfhA019138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 02:29:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295292 - projects/release-pkg/libexec/rtld-elf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 02:29:43 -0000

Author: gjb
Date: Fri Feb  5 02:29:41 2016
New Revision: 295292
URL: https://svnweb.freebsd.org/changeset/base/295292

Log:
  Include ld-elf.so and ld-elf32.so in the librtld_db
  package.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/libexec/rtld-elf/Makefile

Modified: projects/release-pkg/libexec/rtld-elf/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/Makefile	Fri Feb  5 01:03:38 2016	(r295291)
+++ projects/release-pkg/libexec/rtld-elf/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
@@ -5,6 +5,7 @@
 # make DEBUG_FLAGS=-g DEBUG=-DDEBUG MK_TESTS=no all
 
 .include <src.opts.mk>
+PACKAGE=	librtld_db
 MK_SSP=		no
 
 PROG?=		ld-elf.so.1

From owner-svn-src-projects@freebsd.org  Fri Feb  5 02:51:47 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97F69A9D4A6
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 02:51:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 58CC01797;
 Fri,  5 Feb 2016 02:51:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u152pkun025519;
 Fri, 5 Feb 2016 02:51:46 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u152pjcL025513;
 Fri, 5 Feb 2016 02:51:45 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602050251.u152pjcL025513@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 02:51:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295293 - in projects/release-pkg/libexec/casper: . dns
 grp pwd random sysctl
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 02:51:47 -0000

Author: gjb
Date: Fri Feb  5 02:51:45 2016
New Revision: 295293
URL: https://svnweb.freebsd.org/changeset/base/295293

Log:
  Capture a few stragglers that should be in the casper package.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/libexec/casper/Makefile
  projects/release-pkg/libexec/casper/dns/Makefile
  projects/release-pkg/libexec/casper/grp/Makefile
  projects/release-pkg/libexec/casper/pwd/Makefile
  projects/release-pkg/libexec/casper/random/Makefile
  projects/release-pkg/libexec/casper/sysctl/Makefile

Modified: projects/release-pkg/libexec/casper/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=casper
 SUBDIR=	dns
 SUBDIR+=grp
 SUBDIR+=pwd

Modified: projects/release-pkg/libexec/casper/dns/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/dns/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/dns/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
 
+PACKAGE=casper
 PROG=	dns
 
 SRCS=	dns.c

Modified: projects/release-pkg/libexec/casper/grp/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/grp/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/grp/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
 
+PACKAGE=casper
 PROG=	grp
 
 SRCS=	grp.c

Modified: projects/release-pkg/libexec/casper/pwd/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/pwd/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/pwd/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
 
+PACKAGE=casper
 PROG=	pwd
 
 SRCS=	pwd.c

Modified: projects/release-pkg/libexec/casper/random/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/random/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/random/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
 
+PACKAGE=casper
 PROG=	random
 
 SRCS=	random.c

Modified: projects/release-pkg/libexec/casper/sysctl/Makefile
==============================================================================
--- projects/release-pkg/libexec/casper/sysctl/Makefile	Fri Feb  5 02:29:41 2016	(r295292)
+++ projects/release-pkg/libexec/casper/sysctl/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
@@ -2,6 +2,7 @@
 
 .PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
 
+PACKAGE=casper
 PROG=	sysctl
 
 SRCS=	sysctl.c

From owner-svn-src-projects@freebsd.org  Fri Feb  5 03:20:28 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8AF7A9DE39
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 03:20:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA4D88D5;
 Fri,  5 Feb 2016 03:20:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u153KRX3034075;
 Fri, 5 Feb 2016 03:20:27 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u153KRpS034072;
 Fri, 5 Feb 2016 03:20:27 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602050320.u153KRpS034072@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 03:20:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295294 - in projects/release-pkg/libexec: atrun rlogind
 rshd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 03:20:29 -0000

Author: gjb
Date: Fri Feb  5 03:20:27 2016
New Revision: 295294
URL: https://svnweb.freebsd.org/changeset/base/295294

Log:
  Add missing files to 'at' and 'rcmds' packages.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/libexec/atrun/Makefile
  projects/release-pkg/libexec/rlogind/Makefile
  projects/release-pkg/libexec/rshd/Makefile

Modified: projects/release-pkg/libexec/atrun/Makefile
==============================================================================
--- projects/release-pkg/libexec/atrun/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
+++ projects/release-pkg/libexec/atrun/Makefile	Fri Feb  5 03:20:27 2016	(r295294)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=at
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
 .include "${MAINSRC}/Makefile.inc"

Modified: projects/release-pkg/libexec/rlogind/Makefile
==============================================================================
--- projects/release-pkg/libexec/rlogind/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
+++ projects/release-pkg/libexec/rlogind/Makefile	Fri Feb  5 03:20:27 2016	(r295294)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=rcmds
 PROG=	rlogind
 MAN=	rlogind.8
 PACKAGE=rcmds

Modified: projects/release-pkg/libexec/rshd/Makefile
==============================================================================
--- projects/release-pkg/libexec/rshd/Makefile	Fri Feb  5 02:51:45 2016	(r295293)
+++ projects/release-pkg/libexec/rshd/Makefile	Fri Feb  5 03:20:27 2016	(r295294)
@@ -1,6 +1,7 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+PACKAGE=rcmds
 PROG=	rshd
 MAN=	rshd.8
 

From owner-svn-src-projects@freebsd.org  Fri Feb  5 09:58:31 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07826A77703
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 09:58:31 +0000 (UTC)
 (envelope-from bu7cher@yandex.ru)
Received: from forward19p.cmail.yandex.net (forward19p.cmail.yandex.net
 [IPv6:2a02:6b8:0:1465::aa])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "forwards.mail.yandex.net", Issuer "Yandex CA" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B6EEF1182;
 Fri,  5 Feb 2016 09:58:30 +0000 (UTC)
 (envelope-from bu7cher@yandex.ru)
Received: from smtp18.mail.yandex.net (smtp18.mail.yandex.net
 [IPv6:2a02:6b8:0:1402::119])
 by forward19p.cmail.yandex.net (Yandex) with ESMTP id 2466221993;
 Fri,  5 Feb 2016 12:58:26 +0300 (MSK)
Received: from smtp18.mail.yandex.net (localhost [127.0.0.1])
 by smtp18.mail.yandex.net (Yandex) with ESMTP id 0A3C418A0585;
 Fri,  5 Feb 2016 12:58:22 +0300 (MSK)
Received: by smtp18.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id
 3zypW71Uev-wMEaBVnl; Fri,  5 Feb 2016 12:58:22 +0300
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client certificate not present)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1454666302; bh=XOF+u6D7WpG1yT1HLrAiDN22FPHMPJ58mdVs/5sVOGM=;
 h=Subject:To:References:From:Message-ID:Date:User-Agent:
 MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding;
 b=QELcPx7pDL4ps/qcLNq7YNICs+svUhifJiUL20Mr0aywQbY00vSLKzJ/M5PvIli83
 xGZOiW9vXLopK6L3KrouaXa1Ug3ddBonehHGDynzeXII/ruaTYdTo9tweN0wpbH1zU
 dtgo5ufmCVJfpkASveB1zkSmrPUwyxdJWA9mpqVQ=
Authentication-Results: smtp18.mail.yandex.net; dkim=pass header.i=@yandex.ru
X-Yandex-ForeignMX: US
X-Yandex-Suid-Status: 1 0,1 0,1 0,1 0,1 0
Subject: Re: svn commit: r295280 - projects/release-pkg/release/packages
To: Bryan Drewery <bdrewery@FreeBSD.org>,
 Nathan Whitehorn <nwhitehorn@freebsd.org>, Glen Barber <gjb@freebsd.org>,
 src-committers@freebsd.org, svn-src-projects@freebsd.org
References: <201602042120.u14LKQ2b026571@repo.freebsd.org>
 <56B3C34B.1080501@freebsd.org> <56B3C6E4.60907@FreeBSD.org>
 <56B3C7A3.5000502@FreeBSD.org>
From: "Andrey V. Elsukov" <bu7cher@yandex.ru>
Message-ID: <56B47206.60407@yandex.ru>
Date: Fri, 5 Feb 2016 12:57:26 +0300
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <56B3C7A3.5000502@FreeBSD.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 09:58:31 -0000

On 05.02.16 00:50, Bryan Drewery wrote:
> Also, pkg has no binary diff packages. The plan to release 11 with
> packages is moving forward. Do we really want a multi-gigabyte world
> package being downloaded so we can modify a security bug in
> /etc/rc.d/jail? It makes no sense.

Actually, the size of freebsd11-base package is only 65Mbytes.

-- 
WBR, Andrey V. Elsukov

From owner-svn-src-projects@freebsd.org  Fri Feb  5 21:01:11 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7632A9CE35
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  5 Feb 2016 21:01:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF04A3DF;
 Fri,  5 Feb 2016 21:01:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15L19f3056959;
 Fri, 5 Feb 2016 21:01:09 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15L18h3056948;
 Fri, 5 Feb 2016 21:01:08 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201602052101.u15L18h3056948@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 5 Feb 2016 21:01:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295337 - in projects/release-pkg: gnu/lib/libgcc
 lib/libc lib/libc++ lib/libcxxrt lib/libedit lib/libthr lib/msun
 lib/ncurses/ncurses libexec/rtld-elf release/packages
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 21:01:11 -0000

Author: gjb
Date: Fri Feb  5 21:01:08 2016
New Revision: 295337
URL: https://svnweb.freebsd.org/changeset/base/295337

Log:
  Remove libc, librtld_db, libthr packages, and further increase
  the constraints on what needs to be installed in a specific to
  maintain consistency during upgrades.
  
  Create a new clibs package containing libraries that are needed
  as a bare minimum for consistency.
  
  With much help and input from:	kib
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/packages/clibs.ucl   (contents, props changed)
Deleted:
  projects/release-pkg/release/packages/libc.ucl
  projects/release-pkg/release/packages/libedit.ucl
  projects/release-pkg/release/packages/librtld_db.ucl
  projects/release-pkg/release/packages/libthr.ucl
Modified:
  projects/release-pkg/gnu/lib/libgcc/Makefile
  projects/release-pkg/lib/libc++/Makefile
  projects/release-pkg/lib/libc/Makefile
  projects/release-pkg/lib/libcxxrt/Makefile
  projects/release-pkg/lib/libedit/Makefile
  projects/release-pkg/lib/libthr/Makefile
  projects/release-pkg/lib/msun/Makefile
  projects/release-pkg/lib/ncurses/ncurses/Makefile
  projects/release-pkg/libexec/rtld-elf/Makefile
  projects/release-pkg/release/packages/runtime.ucl

Modified: projects/release-pkg/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/release-pkg/gnu/lib/libgcc/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/gnu/lib/libgcc/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	clibs
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 COMPILERRTDIR=	${.CURDIR}/../../../contrib/compiler-rt

Modified: projects/release-pkg/lib/libc++/Makefile
==============================================================================
--- projects/release-pkg/lib/libc++/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/libc++/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-PACKAGE=	lib${LIB}
+PACKAGE=	clibs
 _LIBCXXRTDIR=	${.CURDIR}/../../contrib/libcxxrt
 HDRDIR=		${.CURDIR}/../../contrib/libc++/include
 SRCDIR=		${.CURDIR}/../../contrib/libc++/src

Modified: projects/release-pkg/lib/libc/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/libc/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
+PACKAGE=	clibs
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/libcxxrt/Makefile
==============================================================================
--- projects/release-pkg/lib/libcxxrt/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/libcxxrt/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	clibs
 SRCDIR=		${.CURDIR}/../../contrib/libcxxrt
 
 SHLIB_MAJOR=	1

Modified: projects/release-pkg/lib/libedit/Makefile
==============================================================================
--- projects/release-pkg/lib/libedit/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/libedit/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -2,7 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=clibs
 LIB=	edit
 SHLIB_MAJOR=	7
 SHLIBDIR?= /lib

Modified: projects/release-pkg/lib/libthr/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/libthr/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -8,7 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
-PACKAGE=lib${LIB}
+PACKAGE=	clibs
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>

Modified: projects/release-pkg/lib/msun/Makefile
==============================================================================
--- projects/release-pkg/lib/msun/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/msun/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -12,7 +12,7 @@
 #
 #
 
-PACKAGE=lib${LIB}
+PACKAGE=	clibs
 .if ${MACHINE_CPUARCH} == "i386"
 ARCH_SUBDIR= i387
 .else

Modified: projects/release-pkg/lib/ncurses/ncurses/Makefile
==============================================================================
--- projects/release-pkg/lib/ncurses/ncurses/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/lib/ncurses/ncurses/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	clibs
 SHLIBDIR?=	/lib
 
 .if !defined(ENABLE_WIDEC)

Modified: projects/release-pkg/libexec/rtld-elf/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/Makefile	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/libexec/rtld-elf/Makefile	Fri Feb  5 21:01:08 2016	(r295337)
@@ -5,10 +5,13 @@
 # make DEBUG_FLAGS=-g DEBUG=-DDEBUG MK_TESTS=no all
 
 .include <src.opts.mk>
-PACKAGE=	librtld_db
+PACKAGE=	clibs
 MK_SSP=		no
 
 PROG?=		ld-elf.so.1
+.if (${PROG:M*ld-elf32*} != "")
+TAGS+=		lib32
+.endif
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c rtld_printf.c map_object.c \
 		malloc.c xmalloc.c debug.c libmap.c

Added: projects/release-pkg/release/packages/clibs.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/clibs.ucl	Fri Feb  5 21:01:08 2016	(r295337)
@@ -0,0 +1,17 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD

Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl	Fri Feb  5 20:57:21 2016	(r295336)
+++ projects/release-pkg/release/packages/runtime.ucl	Fri Feb  5 21:01:08 2016	(r295337)
@@ -22,8 +22,7 @@ scripts: {
 EOD
 }
 deps: {
-    # For sh(1).
-    "FreeBSD-libedit": {
+    "FreeBSD-clibs": {
         origin: "base"
         version: "%VERSION%"
     }

From owner-svn-src-projects@freebsd.org  Sat Feb  6 13:39:24 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FDA8A9E197
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat,  6 Feb 2016 13:39:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFB0217C0;
 Sat,  6 Feb 2016 13:39:23 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16DdNub047254;
 Sat, 6 Feb 2016 13:39:23 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16DdKAN047230;
 Sat, 6 Feb 2016 13:39:20 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602061339.u16DdKAN047230@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 6 Feb 2016 13:39:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295349 - in projects/clang380-import:
 contrib/compiler-rt/include/sanitizer contrib/compiler-rt/lib/asan
 contrib/compiler-rt/lib/asan/scripts contrib/compiler-rt/lib/asan/tests
 contrib...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2016 13:39:24 -0000

Author: dim
Date: Sat Feb  6 13:39:20 2016
New Revision: 295349
URL: https://svnweb.freebsd.org/changeset/base/295349

Log:
  Merge compiler-rt release_38 branch r258968.
  
  Note that there is still a problem on amd64, causing SIGBUS in the early
  startup of Address Sanitizer.  This is being investigated.

Added:
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_cdcmp.S
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmpeq_check_nan.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_cdcmpeq_check_nan.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_cfcmp.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_cfcmp.S
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_cfcmpeq_check_nan.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_cfcmpeq_check_nan.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_drsub.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_drsub.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/arm/aeabi_frsub.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/arm/aeabi_frsub.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/divtc3.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/divtc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/emutls.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/emutls.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/i386/chkstk2.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/i386/chkstk2.S
  projects/clang380-import/contrib/compiler-rt/lib/builtins/x86_64/chkstk2.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/builtins/x86_64/chkstk2.S
  projects/clang380-import/contrib/compiler-rt/lib/cfi/
     - copied from r295050, vendor/compiler-rt/dist/lib/cfi/
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/dfsan_platform.h
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/dfsan/dfsan_platform.h
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfData.inc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/InstrProfData.inc
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/InstrProfilingPlatformLinux.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingPort.h
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/InstrProfilingPort.h
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingValue.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/InstrProfilingValue.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingWriter.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/InstrProfilingWriter.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/WindowsMMap.c
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/WindowsMMap.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/WindowsMMap.h
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/profile/WindowsMMap.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_nolibc.cc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/sanitizer_common/sanitizer_common_nolibc.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_malloc_mac.inc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/sanitizer_common/sanitizer_malloc_mac.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_interceptors_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_libdispatch_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_malloc_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_posix.cc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_platform_posix.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_ppc_regs.h
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_ppc_regs.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_rtl_aarch64.S
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_ppc64.S
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/tsan/rtl/tsan_rtl_ppc64.S
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_checks.inc
     - copied unchanged from r295050, vendor/compiler-rt/dist/lib/ubsan/ubsan_checks.inc
  projects/clang380-import/lib/libclang_rt/asan_dynamic/
  projects/clang380-import/lib/libclang_rt/asan_dynamic/Makefile   (contents, props changed)
Deleted:
  projects/clang380-import/contrib/compiler-rt/lib/asan/scripts/
  projects/clang380-import/contrib/compiler-rt/lib/asan/tests/
  projects/clang380-import/contrib/compiler-rt/lib/cfi/CMakeLists.txt
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/scripts/
  projects/clang380-import/contrib/compiler-rt/lib/msan/tests/
  projects/clang380-import/contrib/compiler-rt/lib/safestack/CMakeLists.txt
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_process_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/scripts/
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/tests/
  projects/clang380-import/contrib/compiler-rt/lib/tsan/analyze_libtsan.sh
  projects/clang380-import/contrib/compiler-rt/lib/tsan/check_analyze.sh
  projects/clang380-import/contrib/compiler-rt/lib/tsan/check_cmake.sh
  projects/clang380-import/contrib/compiler-rt/lib/tsan/check_memcpy.sh
  projects/clang380-import/contrib/compiler-rt/lib/tsan/go/build.bat
  projects/clang380-import/contrib/compiler-rt/lib/tsan/go/buildgo.sh
  projects/clang380-import/contrib/compiler-rt/lib/tsan/tests/
Modified:
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/asan_interface.h
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/common_interface_defs.h
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/coverage_interface.h
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/dfsan_interface.h
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/lsan_interface.h
  projects/clang380-import/contrib/compiler-rt/include/sanitizer/msan_interface.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/README.txt
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_activation.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_debugging.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_fake_stack.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_globals.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_init_version.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interface_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_malloc_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_malloc_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_mapping.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_new_delete.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_poisoning.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_posix.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_report.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_report.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_rtl.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_stack.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_thread.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_thread.h
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_win.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_win_dll_thunk.cc
  projects/clang380-import/contrib/compiler-rt/lib/asan/asan_win_dynamic_runtime_thunk.cc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/README.txt
  projects/clang380-import/contrib/compiler-rt/lib/builtins/assembly.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_flag_clear.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_flag_clear_explicit.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_flag_test_and_set.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_flag_test_and_set_explicit.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_signal_fence.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/atomic_thread_fence.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/comparedf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/comparesf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/comparetf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/divdc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/divsc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/divxc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/enable_execute_stack.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/extendhfsf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fixunsdfdi.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fixunssfdi.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/floatdidf.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/floatditf.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/floatsitf.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/floatundidf.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_add_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_extend.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_extend_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_fixint_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_fixuint_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_lib.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_mul_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_trunc.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/fp_trunc_impl.inc
  projects/clang380-import/contrib/compiler-rt/lib/builtins/gcc_personality_v0.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/i386/chkstk.S
  projects/clang380-import/contrib/compiler-rt/lib/builtins/int_lib.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/int_math.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/int_types.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/int_util.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/int_util.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/muldc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/mulsc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/mulxc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/ppc/DD.h
  projects/clang380-import/contrib/compiler-rt/lib/builtins/ppc/divtc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/ppc/multc3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/subdf3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/subsf3.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/truncdfhf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/truncsfhf2.c
  projects/clang380-import/contrib/compiler-rt/lib/builtins/x86_64/chkstk.S
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/dfsan.cc
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/dfsan.h
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/dfsan_custom.cc
  projects/clang380-import/contrib/compiler-rt/lib/dfsan/done_abilist.txt
  projects/clang380-import/contrib/compiler-rt/lib/interception/interception_linux.h
  projects/clang380-import/contrib/compiler-rt/lib/interception/interception_win.cc
  projects/clang380-import/contrib/compiler-rt/lib/interception/interception_win.h
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan.cc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_allocator.cc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_common.cc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_common.h
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_common_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_interceptors.cc
  projects/clang380-import/contrib/compiler-rt/lib/lsan/lsan_thread.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan.h
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_allocator.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_chained_origin_depot.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interceptors.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_interface_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_new_delete.cc
  projects/clang380-import/contrib/compiler-rt/lib/msan/msan_thread.h
  projects/clang380-import/contrib/compiler-rt/lib/profile/GCDAProfiling.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfiling.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfiling.h
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingBuffer.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingFile.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingInternal.h
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingPlatformDarwin.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingPlatformOther.c
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingRuntime.cc
  projects/clang380-import/contrib/compiler-rt/lib/profile/InstrProfilingUtil.c
  projects/clang380-import/contrib/compiler-rt/lib/safestack/safestack.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_addrhashmap.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_atomic.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_format.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector1.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector_interface.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_interface_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_lfstack.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_libignore.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_list.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_mac.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_persistent_allocator.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_posix.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_printf.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_common.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stackdepot.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stackdepot.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stackdepotbase.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_internal.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_thread_registry.h
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cc
  projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_clock.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_defs.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_dense_alloc.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_flags.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_interceptors.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_mman.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_mman.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_mutex.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_mutex.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_new_delete.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_platform.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_mac.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_platform_windows.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_report.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_mutex.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_stat.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_stat.h
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_suppressions.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_symbolize.cc
  projects/clang380-import/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_diag.cc
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_diag.h
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_flags.cc
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_flags.inc
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_handlers.cc
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_handlers.h
  projects/clang380-import/contrib/compiler-rt/lib/ubsan/ubsan_handlers_cxx.cc
  projects/clang380-import/lib/libclang_rt/Makefile
  projects/clang380-import/lib/libclang_rt/asan/Makefile
  projects/clang380-import/lib/libclang_rt/profile/Makefile
  projects/clang380-import/lib/libclang_rt/safestack/Makefile
  projects/clang380-import/lib/libclang_rt/ubsan_standalone/Makefile
  projects/clang380-import/lib/libcompiler_rt/Makefile
Directory Properties:
  projects/clang380-import/contrib/compiler-rt/   (props changed)

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/asan_interface.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/asan_interface.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/asan_interface.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -110,10 +110,6 @@ extern "C" {
   void __asan_report_error(void *pc, void *bp, void *sp,
                            void *addr, int is_write, size_t access_size);
 
-  // Sets the exit code to use when reporting an error.
-  // Returns the old value.
-  int __asan_set_error_exit_code(int exit_code);
-
   // Deprecated. Call __sanitizer_set_death_callback instead.
   void __asan_set_death_callback(void (*callback)(void));
 

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/common_interface_defs.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/common_interface_defs.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/common_interface_defs.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -105,12 +105,31 @@ extern "C" {
   int __sanitizer_verify_contiguous_container(const void *beg, const void *mid,
                                               const void *end);
 
+  // Similar to __sanitizer_verify_contiguous_container but returns the address
+  // of the first improperly poisoned byte otherwise. Returns null if the area
+  // is poisoned properly.
+  const void *__sanitizer_contiguous_container_find_bad_address(
+      const void *beg, const void *mid, const void *end);
+
   // Print the stack trace leading to this call. Useful for debugging user code.
   void __sanitizer_print_stack_trace();
 
   // Sets the callback to be called right before death on error.
   // Passing 0 will unset the callback.
   void __sanitizer_set_death_callback(void (*callback)(void));
+
+  // Interceptor hooks.
+  // Whenever a libc function interceptor is called it checks if the
+  // corresponding weak hook is defined, and it so -- calls it.
+  // The primary use case is data-flow-guided fuzzing, where the fuzzer needs
+  // to know what is being passed to libc functions, e.g. memcmp.
+  // FIXME: implement more hooks.
+  void __sanitizer_weak_hook_memcmp(void *called_pc, const void *s1,
+                                    const void *s2, size_t n, int result);
+  void __sanitizer_weak_hook_strncmp(void *called_pc, const char *s1,
+                                    const char *s2, size_t n, int result);
+  void __sanitizer_weak_hook_strcmp(void *called_pc, const char *s1,
+                                    const char *s2, int result);
 #ifdef __cplusplus
 }  // extern "C"
 #endif

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/coverage_interface.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/coverage_interface.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/coverage_interface.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -27,9 +27,11 @@ extern "C" {
   // descriptor. Returns -1 on failure, or if coverage dumping is disabled.
   // This is intended for use by sandboxing code.
   intptr_t __sanitizer_maybe_open_cov_file(const char *name);
-  // Get the number of total unique covered entities (blocks, edges, calls).
+  // Get the number of unique covered blocks (or edges).
   // This can be useful for coverage-directed in-process fuzzers.
   uintptr_t __sanitizer_get_total_unique_coverage();
+  // Get the number of unique indirect caller-callee pairs.
+  uintptr_t __sanitizer_get_total_unique_caller_callee_pairs();
 
   // Reset the basic-block (edge) coverage to the initial state.
   // Useful for in-process fuzzing to start collecting coverage from scratch.
@@ -39,6 +41,13 @@ extern "C" {
   // Some of the entries in *data will be zero.
   uintptr_t __sanitizer_get_coverage_guards(uintptr_t **data);
 
+  // Set *data to the growing buffer with covered PCs and return the size
+  // of the buffer. The entries are never zero.
+  // When only unique pcs are collected, the size is equal to
+  // __sanitizer_get_total_unique_coverage.
+  // WARNING: EXPERIMENTAL API.
+  uintptr_t __sanitizer_get_coverage_pc_buffer(uintptr_t **data);
+
   // The coverage instrumentation may optionally provide imprecise counters.
   // Rather than exposing the counter values to the user we instead map
   // the counters to a bitset.

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/dfsan_interface.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/dfsan_interface.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/dfsan_interface.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -91,16 +91,18 @@ void dfsan_set_write_callback(dfsan_writ
 /// <label> <parent label 1> <parent label 2> <label description if any>
 void dfsan_dump_labels(int fd);
 
+/// Interceptor hooks.
 /// Whenever a dfsan's custom function is called the corresponding
 /// hook is called it non-zero. The hooks should be defined by the user.
 /// The primary use case is taint-guided fuzzing, where the fuzzer
 /// needs to see the parameters of the function and the labels.
 /// FIXME: implement more hooks.
-
-/// memcmp hook.
 void dfsan_weak_hook_memcmp(void *caller_pc, const void *s1, const void *s2,
                             size_t n, dfsan_label s1_label,
                             dfsan_label s2_label, dfsan_label n_label);
+void dfsan_weak_hook_strncmp(void *caller_pc, const char *s1, const char *s2,
+                             size_t n, dfsan_label s1_label,
+                             dfsan_label s2_label, dfsan_label n_label);
 #ifdef __cplusplus
 }  // extern "C"
 

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/lsan_interface.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/lsan_interface.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/lsan_interface.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -43,7 +43,7 @@ extern "C" {
 
   // Check for leaks now. This function behaves identically to the default
   // end-of-process leak check. In particular, it will terminate the process if
-  // leaks are found and the exit_code flag is non-zero.
+  // leaks are found and the exitcode runtime flag is non-zero.
   // Subsequent calls to this function will have no effect and end-of-process
   // leak check will not run. Effectively, end-of-process leak check is moved to
   // the time of first invocation of this function.

Modified: projects/clang380-import/contrib/compiler-rt/include/sanitizer/msan_interface.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/include/sanitizer/msan_interface.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/include/sanitizer/msan_interface.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -61,10 +61,6 @@ extern "C" {
    * is not. */
   void __msan_check_mem_is_initialized(const volatile void *x, size_t size);
 
-  /* Set exit code when error(s) were detected.
-     Value of 0 means don't change the program exit code. */
-  void __msan_set_exit_code(int exit_code);
-
   /* For testing:
      __msan_set_expect_umr(1);
      ... some buggy code ...
@@ -92,14 +88,22 @@ extern "C" {
      Memory will be marked uninitialized, with origin at the call site. */
   void __msan_allocated_memory(const volatile void* data, size_t size);
 
+  /* Tell MSan about newly destroyed memory. Mark memory as uninitialized. */
+  void __sanitizer_dtor_callback(const volatile void* data, size_t size);
+
   /* This function may be optionally provided by user and should return
      a string containing Msan runtime options. See msan_flags.h for details. */
   const char* __msan_default_options();
 
-  /* Sets the callback to be called right before death on error.
-     Passing 0 will unset the callback. */
+  /* Deprecated. Call __sanitizer_set_death_callback instead. */
   void __msan_set_death_callback(void (*callback)(void));
 
+  /* Update shadow for the application copy of size bytes from src to dst.
+     Src and dst are application addresses. This function does not copy the
+     actual application memory, it only updates shadow and origin for such
+     copy. Source and destination regions can overlap. */
+  void __msan_copy_shadow(const volatile void *dst, const volatile void *src,
+                          size_t size);
 #ifdef __cplusplus
 }  // extern "C"
 #endif

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/README.txt
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/README.txt	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/README.txt	Sat Feb  6 13:39:20 2016	(r295349)
@@ -23,4 +23,4 @@ from the root of your CMake build tree:
 make check-asan
 
 For more instructions see:
-http://code.google.com/p/address-sanitizer/wiki/HowToBuild
+https://github.com/google/sanitizers/wiki/AddressSanitizerHowToBuild

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_activation.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_activation.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_activation.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -38,7 +38,7 @@ static struct AsanDeactivatedFlags {
 #undef ASAN_ACTIVATION_FLAG
 #undef COMMON_ACTIVATION_FLAG
 
-    RegisterIncludeFlag(parser, cf);
+    RegisterIncludeFlags(parser, cf);
   }
 
   void OverrideFromActivationFlags() {
@@ -61,11 +61,6 @@ static struct AsanDeactivatedFlags {
       parser.ParseString(env);
     }
 
-    // Override from getprop asan.options.
-    char buf[100];
-    GetExtraActivationFlags(buf, sizeof(buf));
-    parser.ParseString(buf);
-
     SetVerbosity(cf.verbosity);
 
     if (Verbosity()) ReportUnrecognizedFlags();
@@ -124,6 +119,8 @@ void AsanActivate() {
   if (!asan_is_deactivated) return;
   VReport(1, "Activating ASan\n");
 
+  UpdateProcessName();
+
   asan_deactivated_flags.OverrideFromActivationFlags();
 
   SetCanPoisonMemory(asan_deactivated_flags.poison_heap);

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -14,8 +14,8 @@
 // with ThreadSanitizer and MemorySanitizer.
 //
 //===----------------------------------------------------------------------===//
-#include "asan_allocator.h"
 
+#include "asan_allocator.h"
 #include "asan_mapping.h"
 #include "asan_poisoning.h"
 #include "asan_report.h"
@@ -541,7 +541,7 @@ struct Allocator {
       u8 chunk_state = m->chunk_state;
       if (chunk_state != CHUNK_ALLOCATED)
         ReportInvalidFree(old_ptr, chunk_state, stack);
-      CHECK_NE(REAL(memcpy), (void*)0);
+      CHECK_NE(REAL(memcpy), nullptr);
       uptr memcpy_size = Min(new_size, m->UsedSize());
       // If realloc() races with free(), we may start copying freed memory.
       // However, we will report racy double-free later anyway.
@@ -579,7 +579,7 @@ struct Allocator {
 
   // Assumes alloc_beg == allocator.GetBlockBegin(alloc_beg).
   AsanChunk *GetAsanChunk(void *alloc_beg) {
-    if (!alloc_beg) return 0;
+    if (!alloc_beg) return nullptr;
     if (!allocator.FromPrimary(alloc_beg)) {
       uptr *meta = reinterpret_cast<uptr *>(allocator.GetMetaData(alloc_beg));
       AsanChunk *m = reinterpret_cast<AsanChunk *>(meta[1]);
@@ -619,7 +619,7 @@ struct Allocator {
       // The address is in the chunk's left redzone, so maybe it is actually
       // a right buffer overflow from the other chunk to the left.
       // Search a bit to the left to see if there is another chunk.
-      AsanChunk *m2 = 0;
+      AsanChunk *m2 = nullptr;
       for (uptr l = 1; l < GetPageSizeCached(); l++) {
         m2 = GetAsanChunkByAddr(addr - l);
         if (m2 == m1) continue;  // Still the same chunk.
@@ -653,7 +653,7 @@ static AsanAllocator &get_allocator() {
 }
 
 bool AsanChunkView::IsValid() {
-  return chunk_ != 0 && chunk_->chunk_state != CHUNK_AVAILABLE;
+  return chunk_ && chunk_->chunk_state != CHUNK_AVAILABLE;
 }
 uptr AsanChunkView::Beg() { return chunk_->Beg(); }
 uptr AsanChunkView::End() { return Beg() + UsedSize(); }
@@ -723,11 +723,11 @@ void *asan_calloc(uptr nmemb, uptr size,
 }
 
 void *asan_realloc(void *p, uptr size, BufferedStackTrace *stack) {
-  if (p == 0)
+  if (!p)
     return instance.Allocate(size, 8, stack, FROM_MALLOC, true);
   if (size == 0) {
     instance.Deallocate(p, 0, stack, FROM_MALLOC);
-    return 0;
+    return nullptr;
   }
   return instance.Reallocate(p, size, stack);
 }
@@ -755,7 +755,7 @@ int asan_posix_memalign(void **memptr, u
 }
 
 uptr asan_malloc_usable_size(void *ptr, uptr pc, uptr bp) {
-  if (ptr == 0) return 0;
+  if (!ptr) return 0;
   uptr usable_size = instance.AllocationSize(reinterpret_cast<uptr>(ptr));
   if (flags()->check_malloc_usable_size && (usable_size == 0)) {
     GET_STACK_TRACE_FATAL(pc, bp);
@@ -780,7 +780,7 @@ void AsanSoftRssLimitExceededCallback(bo
   instance.allocator.SetRssLimitIsExceeded(exceeded);
 }
 
-}  // namespace __asan
+} // namespace __asan
 
 // --- Implementation of LSan-specific functions --- {{{1
 namespace __lsan {
@@ -881,7 +881,7 @@ int __sanitizer_get_ownership(const void
 }
 
 uptr __sanitizer_get_allocated_size(const void *p) {
-  if (p == 0) return 0;
+  if (!p) return 0;
   uptr ptr = reinterpret_cast<uptr>(p);
   uptr allocated_size = instance.AllocationSize(ptr);
   // Die if p is not malloced or if it is already freed.
@@ -904,5 +904,5 @@ SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_
 void __sanitizer_free_hook(void *ptr) {
   (void)ptr;
 }
-}  // extern "C"
+} // extern "C"
 #endif

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_allocator.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -114,6 +114,11 @@ struct AsanMapUnmapCallback {
 # if defined(__powerpc64__)
 const uptr kAllocatorSpace =  0xa0000000000ULL;
 const uptr kAllocatorSize  =  0x20000000000ULL;  // 2T.
+# elif defined(__aarch64__)
+// AArch64/SANITIZIER_CAN_USER_ALLOCATOR64 is only for 42-bit VMA
+// so no need to different values for different VMA.
+const uptr kAllocatorSpace =  0x10000000000ULL;
+const uptr kAllocatorSize  =  0x10000000000ULL;  // 3T.
 # else
 const uptr kAllocatorSpace = 0x600000000000ULL;
 const uptr kAllocatorSize  =  0x40000000000ULL;  // 4T.

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_debugging.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_debugging.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_debugging.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -108,14 +108,14 @@ static uptr AsanGetStack(uptr addr, uptr
   return 0;
 }
 
-}  // namespace __asan
+} // namespace __asan
 
 using namespace __asan;
 
 SANITIZER_INTERFACE_ATTRIBUTE
 const char *__asan_locate_address(uptr addr, char *name, uptr name_size,
                                   uptr *region_address, uptr *region_size) {
-  AddressDescription descr = { name, name_size, 0, 0, 0 };
+  AddressDescription descr = { name, name_size, 0, 0, nullptr };
   AsanLocateAddress(addr, &descr);
   if (region_address) *region_address = descr.region_address;
   if (region_size) *region_size = descr.region_size;

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_fake_stack.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_fake_stack.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_fake_stack.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -11,6 +11,7 @@
 //
 // FakeStack is used to detect use-after-return bugs.
 //===----------------------------------------------------------------------===//
+
 #include "asan_allocator.h"
 #include "asan_poisoning.h"
 #include "asan_thread.h"
@@ -32,7 +33,8 @@ ALWAYS_INLINE void SetShadow(uptr ptr, u
   if (class_id <= 6) {
     for (uptr i = 0; i < (1U << class_id); i++) {
       shadow[i] = magic;
-      SanitizerBreakOptimization(0);  // Make sure this does not become memset.
+      // Make sure this does not become memset.
+      SanitizerBreakOptimization(nullptr);
     }
   } else {
     // The size class is too big, it's cheaper to poison only size bytes.
@@ -80,7 +82,9 @@ void FakeStack::PoisonAll(u8 magic) {
                magic);
 }
 
+#if !defined(_MSC_VER) || defined(__clang__)
 ALWAYS_INLINE USED
+#endif
 FakeFrame *FakeStack::Allocate(uptr stack_size_log, uptr class_id,
                                uptr real_stack) {
   CHECK_LT(class_id, kNumberOfSizeClasses);
@@ -106,7 +110,7 @@ FakeFrame *FakeStack::Allocate(uptr stac
     *SavedFlagPtr(reinterpret_cast<uptr>(res), class_id) = &flags[pos];
     return res;
   }
-  return 0; // We are out of fake stack.
+  return nullptr; // We are out of fake stack.
 }
 
 uptr FakeStack::AddrIsInFakeStack(uptr ptr, uptr *frame_beg, uptr *frame_end) {
@@ -183,7 +187,7 @@ void SetTLSFakeStack(FakeStack *fs) { }
 
 static FakeStack *GetFakeStack() {
   AsanThread *t = GetCurrentThread();
-  if (!t) return 0;
+  if (!t) return nullptr;
   return t->fake_stack();
 }
 
@@ -191,7 +195,7 @@ static FakeStack *GetFakeStackFast() {
   if (FakeStack *fs = GetTLSFakeStack())
     return fs;
   if (!__asan_option_detect_stack_use_after_return)
-    return 0;
+    return nullptr;
   return GetFakeStack();
 }
 
@@ -212,7 +216,7 @@ ALWAYS_INLINE void OnFree(uptr ptr, uptr
   SetShadow(ptr, size, class_id, kMagic8);
 }
 
-}  // namespace __asan
+} // namespace __asan
 
 // ---------------------- Interface ---------------- {{{1
 using namespace __asan;
@@ -245,13 +249,13 @@ SANITIZER_INTERFACE_ATTRIBUTE
 void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
                                    void **end) {
   FakeStack *fs = reinterpret_cast<FakeStack*>(fake_stack);
-  if (!fs) return 0;
+  if (!fs) return nullptr;
   uptr frame_beg, frame_end;
   FakeFrame *frame = reinterpret_cast<FakeFrame *>(fs->AddrIsInFakeStack(
       reinterpret_cast<uptr>(addr), &frame_beg, &frame_end));
-  if (!frame) return 0;
+  if (!frame) return nullptr;
   if (frame->magic != kCurrentStackFrameMagic)
-    return 0;
+    return nullptr;
   if (beg) *beg = reinterpret_cast<void*>(frame_beg);
   if (end) *end = reinterpret_cast<void*>(frame_end);
   return reinterpret_cast<void*>(frame->real_stack);
@@ -276,4 +280,4 @@ void __asan_allocas_unpoison(uptr top, u
   REAL(memset)(reinterpret_cast<void*>(MemToShadow(top)), 0,
                (bottom - top) / SHADOW_GRANULARITY);
 }
-}  // extern "C"
+} // extern "C"

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -65,6 +65,7 @@ void InitializeFlags() {
     cf.external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH");
     cf.malloc_context_size = kDefaultMallocContextSize;
     cf.intercept_tls_get_addr = true;
+    cf.exitcode = 1;
     OverrideCommonFlags(cf);
   }
   Flags *f = flags();
@@ -115,14 +116,6 @@ void InitializeFlags() {
   ubsan_parser.ParseString(GetEnv("UBSAN_OPTIONS"));
 #endif
 
-  // Let activation flags override current settings. On Android they come
-  // from a system property. On other platforms this is no-op.
-  if (!flags()->start_deactivated) {
-    char buf[100];
-    GetExtraActivationFlags(buf, sizeof(buf));
-    asan_parser.ParseString(buf);
-  }
-
   SetVerbosity(common_flags()->verbosity);
 
   // TODO(eugenis): dump all flags at verbosity>=2?

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.inc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.inc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_flags.inc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -44,9 +44,6 @@ ASAN_FLAG(
     "to find more errors.")
 ASAN_FLAG(bool, replace_intrin, true,
           "If set, uses custom wrappers for memset/memcpy/memmove intinsics.")
-ASAN_FLAG(bool, mac_ignore_invalid_free, false,
-          "Ignore invalid free() calls to work around some bugs. Used on OS X "
-          "only.")
 ASAN_FLAG(bool, detect_stack_use_after_return, false,
           "Enables stack-use-after-return checking at run-time.")
 ASAN_FLAG(int, min_uar_stack_size_log, 16, // We can't do smaller anyway.
@@ -62,8 +59,6 @@ ASAN_FLAG(
     "bytes that will be filled with malloc_fill_byte on malloc.")
 ASAN_FLAG(int, malloc_fill_byte, 0xbe,
           "Value used to fill the newly allocated memory.")
-ASAN_FLAG(int, exitcode, ASAN_DEFAULT_FAILURE_EXITCODE,
-          "Override the program exit status if the tool found an error.")
 ASAN_FLAG(bool, allow_user_poisoning, true,
           "If set, user may manually mark memory regions as poisoned or "
           "unpoisoned.")
@@ -77,10 +72,7 @@ ASAN_FLAG(bool, check_malloc_usable_size
           "295.*.")
 ASAN_FLAG(bool, unmap_shadow_on_exit, false,
           "If set, explicitly unmaps the (huge) shadow at exit.")
-ASAN_FLAG(
-    bool, abort_on_error, false,
-    "If set, the tool calls abort() instead of _exit() after printing the "
-    "error report.")
+ASAN_FLAG(bool, protect_shadow_gap, true, "If set, mprotect the shadow gap")
 ASAN_FLAG(bool, print_stats, false,
           "Print various statistics after printing an error message or if "
           "atexit=1.")
@@ -104,8 +96,8 @@ ASAN_FLAG(bool, poison_array_cookie, tru
           "Poison (or not) the array cookie after operator new[].")
 
 // Turn off alloc/dealloc mismatch checker on Mac and Windows for now.
-// https://code.google.com/p/address-sanitizer/issues/detail?id=131
-// https://code.google.com/p/address-sanitizer/issues/detail?id=309
+// https://github.com/google/sanitizers/issues/131
+// https://github.com/google/sanitizers/issues/309
 // TODO(glider,timurrrr): Fix known issues and enable this back.
 ASAN_FLAG(bool, alloc_dealloc_mismatch,
           (SANITIZER_MAC == 0) && (SANITIZER_WINDOWS == 0),
@@ -113,9 +105,6 @@ ASAN_FLAG(bool, alloc_dealloc_mismatch,
 
 ASAN_FLAG(bool, new_delete_type_mismatch, true,
           "Report errors on mismatch betwen size of new and delete.")
-ASAN_FLAG(bool, strict_memcmp, true,
-          "If true, assume that memcmp(p1, p2, n) always reads n bytes before "
-          "comparing p1 and p2.")
 ASAN_FLAG(
     bool, strict_init_order, false,
     "If true, assume that dynamic initializers can never access globals from "
@@ -134,8 +123,8 @@ ASAN_FLAG(
     "The bigger the value the harder we try.")
 ASAN_FLAG(
     bool, detect_container_overflow, true,
-    "If true, honor the container overflow  annotations. "
-    "See https://code.google.com/p/address-sanitizer/wiki/ContainerOverflow")
+    "If true, honor the container overflow annotations. See "
+    "https://github.com/google/sanitizers/wiki/AddressSanitizerContainerOverflow")
 ASAN_FLAG(int, detect_odr_violation, 2,
           "If >=2, detect violation of One-Definition-Rule (ODR); "
           "If ==1, detect ODR-violation only if the two variables "
@@ -143,3 +132,6 @@ ASAN_FLAG(int, detect_odr_violation, 2,
 ASAN_FLAG(bool, dump_instruction_bytes, false,
           "If true, dump 16 bytes starting at the instruction that caused SEGV")
 ASAN_FLAG(const char *, suppressions, "", "Suppressions file name.")
+ASAN_FLAG(bool, halt_on_error, true,
+          "Crash the program after printing the first error report "
+          "(WARNING: USE AT YOUR OWN RISK!)")

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_globals.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_globals.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_globals.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -11,6 +11,7 @@
 //
 // Handle globals.
 //===----------------------------------------------------------------------===//
+
 #include "asan_interceptors.h"
 #include "asan_internal.h"
 #include "asan_mapping.h"
@@ -167,7 +168,7 @@ static void RegisterGlobal(const Global 
   l->next = list_of_all_globals;
   list_of_all_globals = l;
   if (g->has_dynamic_init) {
-    if (dynamic_init_globals == 0) {
+    if (!dynamic_init_globals) {
       dynamic_init_globals = new(allocator_for_globals)
           VectorOfGlobals(kDynamicInitGlobalsInitialCapacity);
     }
@@ -206,7 +207,7 @@ void StopInitOrderChecking() {
   }
 }
 
-}  // namespace __asan
+} // namespace __asan
 
 // ---------------------- Interface ---------------- {{{1
 using namespace __asan;  // NOLINT

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_init_version.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_init_version.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_init_version.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -27,8 +27,8 @@ extern "C" {
   // v3=>v4: added '__asan_global_source_location' to __asan_global.
   // v4=>v5: changed the semantics and format of __asan_stack_malloc_ and
   //         __asan_stack_free_ functions.
-  #define __asan_init __asan_init_v5
-  #define __asan_init_name "__asan_init_v5"
+  // v5=>v6: changed the name of the version check symbol
+  #define __asan_version_mismatch_check __asan_version_mismatch_check_v6
 }
 
 #endif  // ASAN_INIT_VERSION_H

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -11,8 +11,8 @@
 //
 // Intercept various libc functions.
 //===----------------------------------------------------------------------===//
-#include "asan_interceptors.h"
 
+#include "asan_interceptors.h"
 #include "asan_allocator.h"
 #include "asan_internal.h"
 #include "asan_mapping.h"
@@ -27,6 +27,12 @@
 #include "sanitizer_common/sanitizer_posix.h"
 #endif
 
+#if defined(__i386) && SANITIZER_LINUX
+#define ASAN_PTHREAD_CREATE_VERSION "GLIBC_2.1"
+#elif defined(__mips__) && SANITIZER_LINUX
+#define ASAN_PTHREAD_CREATE_VERSION "GLIBC_2.2"
+#endif
+
 namespace __asan {
 
 // Return true if we can quickly decide that the region is unpoisoned.
@@ -69,7 +75,7 @@ struct AsanInterceptorContext {
       }                                                                 \
       if (!suppressed) {                                                \
         GET_CURRENT_PC_BP_SP;                                           \
-        __asan_report_error(pc, bp, sp, __bad, isWrite, __size, 0);     \
+        ReportGenericError(pc, bp, sp, __bad, isWrite, __size, 0, false);\
       }                                                                 \
     }                                                                   \
   } while (0)
@@ -105,7 +111,7 @@ static inline bool RangesOverlap(const c
 
 static inline uptr MaybeRealStrnlen(const char *s, uptr maxlen) {
 #if ASAN_INTERCEPT_STRNLEN
-  if (REAL(strnlen) != 0) {
+  if (REAL(strnlen)) {
     return REAL(strnlen)(s, maxlen);
   }
 #endif
@@ -123,7 +129,7 @@ int OnExit() {
   return 0;
 }
 
-}  // namespace __asan
+} // namespace __asan
 
 // ---------------------- Wrappers ---------------- {{{1
 using namespace __asan;  // NOLINT
@@ -172,7 +178,7 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free,
   } while (false)
 #define COMMON_INTERCEPTOR_BLOCK_REAL(name) REAL(name)
 // Strict init-order checking is dlopen-hostile:
-// https://code.google.com/p/address-sanitizer/issues/detail?id=178
+// https://github.com/google/sanitizers/issues/178
 #define COMMON_INTERCEPTOR_ON_DLOPEN(filename, flag)                           \
   if (flags()->strict_init_order) {                                            \
     StopInitOrderChecking();                                                   \
@@ -216,7 +222,7 @@ static thread_return_t THREAD_CALLING_CO
   ThreadStartParam *param = reinterpret_cast<ThreadStartParam *>(arg);
   AsanThread *t = nullptr;
   while ((t = reinterpret_cast<AsanThread *>(
-              atomic_load(&param->t, memory_order_acquire))) == 0)
+              atomic_load(&param->t, memory_order_acquire))) == nullptr)
     internal_sched_yield();
   SetCurrentThread(t);
   return t->ThreadStart(GetTid(), &param->is_registered);
@@ -231,7 +237,7 @@ INTERCEPTOR(int, pthread_create, void *t
     StopInitOrderChecking();
   GET_STACK_TRACE_THREAD;
   int detached = 0;
-  if (attr != 0)
+  if (attr)
     REAL(pthread_attr_getdetachstate)(attr, &detached);
   ThreadStartParam param;
   atomic_store(&param.t, 0, memory_order_relaxed);
@@ -270,14 +276,14 @@ INTERCEPTOR(void*, bsd_signal, int signu
   }
   return 0;
 }
-#else
+#endif
+
 INTERCEPTOR(void*, signal, int signum, void *handler) {
   if (!IsDeadlySignal(signum) || common_flags()->allow_user_segv_handler) {
     return REAL(signal)(signum, handler);
   }
-  return 0;
+  return nullptr;
 }
-#endif
 
 INTERCEPTOR(int, sigaction, int signum, const struct sigaction *act,
                             struct sigaction *oldact) {
@@ -292,7 +298,7 @@ int real_sigaction(int signum, const voi
   return REAL(sigaction)(signum, (const struct sigaction *)act,
                          (struct sigaction *)oldact);
 }
-}  // namespace __sanitizer
+} // namespace __sanitizer
 
 #elif SANITIZER_POSIX
 // We need to have defined REAL(sigaction) on posix systems.
@@ -363,40 +369,6 @@ INTERCEPTOR(void, __cxa_throw, void *a, 
 }
 #endif
 
-static inline int CharCmp(unsigned char c1, unsigned char c2) {
-  return (c1 == c2) ? 0 : (c1 < c2) ? -1 : 1;
-}
-
-INTERCEPTOR(int, memcmp, const void *a1, const void *a2, uptr size) {
-  void *ctx;
-  ASAN_INTERCEPTOR_ENTER(ctx, memcmp);
-  if (UNLIKELY(!asan_inited)) return internal_memcmp(a1, a2, size);
-  ENSURE_ASAN_INITED();
-  if (flags()->replace_intrin) {
-    if (flags()->strict_memcmp) {
-      // Check the entire regions even if the first bytes of the buffers are
-      // different.
-      ASAN_READ_RANGE(ctx, a1, size);
-      ASAN_READ_RANGE(ctx, a2, size);
-      // Fallthrough to REAL(memcmp) below.
-    } else {
-      unsigned char c1 = 0, c2 = 0;
-      const unsigned char *s1 = (const unsigned char*)a1;
-      const unsigned char *s2 = (const unsigned char*)a2;
-      uptr i;
-      for (i = 0; i < size; i++) {
-        c1 = s1[i];
-        c2 = s2[i];
-        if (c1 != c2) break;
-      }
-      ASAN_READ_RANGE(ctx, s1, Min(i + 1, size));
-      ASAN_READ_RANGE(ctx, s2, Min(i + 1, size));
-      return CharCmp(c1, c2);
-    }
-  }
-  return REAL(memcmp(a1, a2, size));
-}
-
 // memcpy is called during __asan_init() from the internals of printf(...).
 // We do not treat memcpy with to==from as a bug.
 // See http://llvm.org/bugs/show_bug.cgi?id=11763.
@@ -743,7 +715,7 @@ INTERCEPTOR(int, __cxa_atexit, void (*fu
 #endif
   ENSURE_ASAN_INITED();
   int res = REAL(__cxa_atexit)(func, arg, dso_handle);
-  REAL(__cxa_atexit)(AtCxaAtexit, 0, 0);
+  REAL(__cxa_atexit)(AtCxaAtexit, nullptr, nullptr);
   return res;
 }
 #endif  // ASAN_INTERCEPT___CXA_ATEXIT
@@ -767,7 +739,6 @@ void InitializeAsanInterceptors() {
   InitializeCommonInterceptors();
 
   // Intercept mem* functions.
-  ASAN_INTERCEPT_FUNC(memcmp);
   ASAN_INTERCEPT_FUNC(memmove);
   ASAN_INTERCEPT_FUNC(memset);
   if (PLATFORM_HAS_DIFFERENT_MEMCPY_AND_MEMMOVE) {
@@ -806,9 +777,8 @@ void InitializeAsanInterceptors() {
   ASAN_INTERCEPT_FUNC(sigaction);
 #if SANITIZER_ANDROID
   ASAN_INTERCEPT_FUNC(bsd_signal);
-#else
-  ASAN_INTERCEPT_FUNC(signal);
 #endif
+  ASAN_INTERCEPT_FUNC(signal);
 #endif
 #if ASAN_INTERCEPT_SWAPCONTEXT
   ASAN_INTERCEPT_FUNC(swapcontext);
@@ -827,7 +797,11 @@ void InitializeAsanInterceptors() {
 
   // Intercept threading-related functions
 #if ASAN_INTERCEPT_PTHREAD_CREATE
+#if defined(ASAN_PTHREAD_CREATE_VERSION)
+  ASAN_INTERCEPT_FUNC_VER(pthread_create, ASAN_PTHREAD_CREATE_VERSION);
+#else
   ASAN_INTERCEPT_FUNC(pthread_create);
+#endif
   ASAN_INTERCEPT_FUNC(pthread_join);
 #endif
 
@@ -845,4 +819,4 @@ void InitializeAsanInterceptors() {
   VReport(1, "AddressSanitizer: libc interceptors initialized\n");
 }
 
-}  // namespace __asan
+} // namespace __asan

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interceptors.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -98,6 +98,12 @@ DECLARE_REAL(int, sigaction, int signum,
     if ((!INTERCEPT_FUNCTION(name) || !REAL(name)))                      \
       VReport(1, "AddressSanitizer: failed to intercept '" #name "'\n"); \
   } while (0)
+#define ASAN_INTERCEPT_FUNC_VER(name, ver)                                     \
+  do {                                                                         \
+    if ((!INTERCEPT_FUNCTION_VER(name, ver) || !REAL(name)))                   \
+      VReport(                                                                 \
+          1, "AddressSanitizer: failed to intercept '" #name "@@" #ver "'\n"); \
+  } while (0)
 #else
 // OS X interceptors don't need to be initialized with INTERCEPT_FUNCTION.
 #define ASAN_INTERCEPT_FUNC(name)

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interface_internal.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interface_internal.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_interface_internal.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -27,10 +27,14 @@ using __sanitizer::uptr;
 extern "C" {
   // This function should be called at the very beginning of the process,
   // before any instrumented code is executed and before any call to malloc.
-  // Please note that __asan_init is a macro that is replaced with
-  // __asan_init_vXXX at compile-time.
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_init();
 
+  // This function exists purely to get a linker/loader error when using
+  // incompatible versions of instrumentation and runtime library. Please note
+  // that __asan_version_mismatch_check is a macro that is replaced with
+  // __asan_version_mismatch_check_vXXX at compile-time.
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_version_mismatch_check();
+
   // This structure is used to describe the source location of a place where
   // global was defined.
   struct __asan_global_source_location {
@@ -131,8 +135,6 @@ extern "C" {
                            uptr addr, int is_write, uptr access_size, u32 exp);
 
   SANITIZER_INTERFACE_ATTRIBUTE
-  int __asan_set_error_exit_code(int exit_code);
-  SANITIZER_INTERFACE_ATTRIBUTE
   void __asan_set_death_callback(void (*callback)(void));
   SANITIZER_INTERFACE_ATTRIBUTE
   void __asan_set_error_report_callback(void (*callback)(const char*));
@@ -165,6 +167,19 @@ extern "C" {
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_loadN(uptr p, uptr size);
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_storeN(uptr p, uptr size);
 
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_load1_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_load2_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_load4_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_load8_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_load16_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_store1_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_store2_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_store4_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_store8_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_store16_noabort(uptr p);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_loadN_noabort(uptr p, uptr size);
+  SANITIZER_INTERFACE_ATTRIBUTE void __asan_storeN_noabort(uptr p, uptr size);
+
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_exp_load1(uptr p, u32 exp);
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_exp_load2(uptr p, u32 exp);
   SANITIZER_INTERFACE_ATTRIBUTE void __asan_exp_load4(uptr p, u32 exp);

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_internal.h
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_internal.h	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_internal.h	Sat Feb  6 13:39:20 2016	(r295349)
@@ -21,8 +21,6 @@
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "sanitizer_common/sanitizer_libc.h"
 
-#define ASAN_DEFAULT_FAILURE_EXITCODE 1
-
 #if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
 # error "The AddressSanitizer run-time should not be"
         " instrumented by AddressSanitizer"
@@ -75,12 +73,9 @@ void *AsanDoesNotSupportStaticLinkage();
 void AsanCheckDynamicRTPrereqs();
 void AsanCheckIncompatibleRT();
 
-void AsanOnSIGSEGV(int, void *siginfo, void *context);
+void AsanOnDeadlySignal(int, void *siginfo, void *context);
 
-void DisableReexec();
-void MaybeReexec();
 void ReadContextStack(void *context, uptr *stack, uptr *ssize);
-void AsanPlatformThreadInit();
 void StopInitOrderChecking();
 
 // Wrapper for TLS/TSD.

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_linux.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_linux.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_linux.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -70,14 +70,6 @@ namespace __asan {
 
 void InitializePlatformInterceptors() {}
 
-void DisableReexec() {
-  // No need to re-exec on Linux.
-}
-
-void MaybeReexec() {
-  // No need to re-exec on Linux.
-}
-
 void *AsanDoesNotSupportStaticLinkage() {
   // This will fail to link with -static.
   return &_DYNAMIC;  // defined in link.h
@@ -117,7 +109,7 @@ void AsanCheckDynamicRTPrereqs() {
     return;
 
   // Ensure that dynamic RT is the first DSO in the list
-  const char *first_dso_name = 0;
+  const char *first_dso_name = nullptr;
   dl_iterate_phdr(FindFirstDSOCallback, &first_dso_name);
   if (first_dso_name && !IsDynamicRTName(first_dso_name)) {
     Report("ASan runtime does not come first in initial library list; "
@@ -142,7 +134,8 @@ void AsanCheckIncompatibleRT() {
       // system libraries, causing crashes later in ASan initialization.
       MemoryMappingLayout proc_maps(/*cache_enabled*/true);
       char filename[128];
-      while (proc_maps.Next(0, 0, 0, filename, sizeof(filename), 0)) {
+      while (proc_maps.Next(nullptr, nullptr, nullptr, filename,
+                            sizeof(filename), nullptr)) {
         if (IsDynamicRTName(filename)) {
           Report("Your application is linked against "
                  "incompatible ASan runtimes.\n");
@@ -155,11 +148,7 @@ void AsanCheckIncompatibleRT() {
     }
   }
 }
-#endif  // SANITIZER_ANDROID
-
-void AsanPlatformThreadInit() {
-  // Nothing here for now.
-}
+#endif // SANITIZER_ANDROID
 
 #if !SANITIZER_ANDROID
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
@@ -177,6 +166,6 @@ void *AsanDlSymNext(const char *sym) {
   return dlsym(RTLD_NEXT, sym);
 }
 
-}  // namespace __asan
+} // namespace __asan
 
-#endif  // SANITIZER_FREEBSD || SANITIZER_LINUX
+#endif // SANITIZER_FREEBSD || SANITIZER_LINUX

Modified: projects/clang380-import/contrib/compiler-rt/lib/asan/asan_mac.cc
==============================================================================
--- projects/clang380-import/contrib/compiler-rt/lib/asan/asan_mac.cc	Sat Feb  6 11:16:15 2016	(r295348)
+++ projects/clang380-import/contrib/compiler-rt/lib/asan/asan_mac.cc	Sat Feb  6 13:39:20 2016	(r295349)
@@ -24,26 +24,17 @@
 #include "sanitizer_common/sanitizer_libc.h"
 #include "sanitizer_common/sanitizer_mac.h"
 
-#if !SANITIZER_IOS
-#include <crt_externs.h>  // for _NSGetArgv and _NSGetEnviron
-#else
-extern "C" {
-  extern char ***_NSGetArgv(void);
-}
-#endif
-
-#include <dlfcn.h>  // for dladdr()
+#include <fcntl.h>
+#include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
+#include <pthread.h>
+#include <stdlib.h>  // for free()
 #include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ucontext.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>  // for free()
 #include <unistd.h>
-#include <libkern/OSAtomic.h>
 
 namespace __asan {
 
@@ -52,187 +43,12 @@ void InitializePlatformInterceptors() {}
 bool PlatformHasDifferentMemcpyAndMemmove() {
   // On OS X 10.7 memcpy() and memmove() are both resolved
   // into memmove$VARIANT$sse42.
-  // See also http://code.google.com/p/address-sanitizer/issues/detail?id=34.
+  // See also https://github.com/google/sanitizers/issues/34.
   // TODO(glider): need to check dynamically that memcpy() and memmove() are
   // actually the same function.
   return GetMacosVersion() == MACOS_VERSION_SNOW_LEOPARD;
 }
 
-extern "C"
-void __asan_init();
-
-static const char kDyldInsertLibraries[] = "DYLD_INSERT_LIBRARIES";
-LowLevelAllocator allocator_for_env;
-
-// Change the value of the env var |name|, leaking the original value.
-// If |name_value| is NULL, the variable is deleted from the environment,
-// otherwise the corresponding "NAME=value" string is replaced with
-// |name_value|.
-void LeakyResetEnv(const char *name, const char *name_value) {
-  char **env = GetEnviron();
-  uptr name_len = internal_strlen(name);
-  while (*env != 0) {
-    uptr len = internal_strlen(*env);
-    if (len > name_len) {
-      const char *p = *env;
-      if (!internal_memcmp(p, name, name_len) && p[name_len] == '=') {
-        // Match.
-        if (name_value) {
-          // Replace the old value with the new one.
-          *env = const_cast<char*>(name_value);
-        } else {
-          // Shift the subsequent pointers back.
-          char **del = env;
-          do {
-            del[0] = del[1];
-          } while (*del++);
-        }
-      }
-    }
-    env++;
-  }
-}
-
-static bool reexec_disabled = false;
-
-void DisableReexec() {
-  reexec_disabled = true;
-}
-
-bool DyldNeedsEnvVariable() {
-// If running on OS X 10.11+ or iOS 9.0+, dyld will interpose even if
-// DYLD_INSERT_LIBRARIES is not set.
-
-#if SANITIZER_IOSSIM
-  // GetMacosVersion will not work for the simulator, whose kernel version
-  // is tied to the host. Use a weak linking hack for the simulator.
-  // This API was introduced in the same version of the OS as the dyld
-  // optimization.
-
-  // Check for presence of a symbol that is available on OS X 10.11+, iOS 9.0+.
-  return (dlsym(RTLD_NEXT, "mach_memory_info") == nullptr);
-#else
-  return (GetMacosVersion() <= MACOS_VERSION_YOSEMITE);
-#endif
-}
-
-void MaybeReexec() {
-  if (reexec_disabled) return;
-
-  // Make sure the dynamic ASan runtime library is preloaded so that the
-  // wrappers work. If it is not, set DYLD_INSERT_LIBRARIES and re-exec
-  // ourselves.
-  Dl_info info;
-  CHECK(dladdr((void*)((uptr)__asan_init), &info));
-  char *dyld_insert_libraries =
-      const_cast<char*>(GetEnv(kDyldInsertLibraries));
-  uptr old_env_len = dyld_insert_libraries ?
-      internal_strlen(dyld_insert_libraries) : 0;
-  uptr fname_len = internal_strlen(info.dli_fname);
-  const char *dylib_name = StripModuleName(info.dli_fname);
-  uptr dylib_name_len = internal_strlen(dylib_name);

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

From owner-svn-src-projects@freebsd.org  Sat Feb  6 14:07:22 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57521A9EE6D
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat,  6 Feb 2016 14:07:22 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C61C1972;
 Sat,  6 Feb 2016 14:07:21 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16E7Kgc056678;
 Sat, 6 Feb 2016 14:07:20 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16E7INc056654;
 Sat, 6 Feb 2016 14:07:18 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201602061407.u16E7INc056654@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 6 Feb 2016 14:07:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295351 - in projects/clang380-import: . bin/csh bin/dd
 bin/sh bin/test cddl/contrib/opensolaris/lib/libzfs/common
 contrib/bsnmp/snmp_mibII contrib/elftoolchain/readelf contrib/libucl/t...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2016 14:07:22 -0000

Author: dim
Date: Sat Feb  6 14:07:17 2016
New Revision: 295351
URL: https://svnweb.freebsd.org/changeset/base/295351

Log:
  Merge ^/head r294961 through r295350.

Added:
  projects/clang380-import/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
     - copied unchanged from r295350, head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
  projects/clang380-import/crypto/openssl/util/pod2mantest
     - copied unchanged from r295350, head/crypto/openssl/util/pod2mantest
  projects/clang380-import/lib/libc/gen/recvmmsg.c
     - copied unchanged from r295350, head/lib/libc/gen/recvmmsg.c
  projects/clang380-import/lib/libc/gen/sendmmsg.c
     - copied unchanged from r295350, head/lib/libc/gen/sendmmsg.c
  projects/clang380-import/lib/libc/tests/gen/dlopen_empty_test.c
     - copied unchanged from r295350, head/lib/libc/tests/gen/dlopen_empty_test.c
  projects/clang380-import/sbin/nvmecontrol/power.c
     - copied unchanged from r295350, head/sbin/nvmecontrol/power.c
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
     - copied unchanged from r295350, head/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
  projects/clang380-import/sys/arm/arm/swtch-v4.S
     - copied unchanged from r295350, head/sys/arm/arm/swtch-v4.S
  projects/clang380-import/sys/arm/arm/swtch-v6.S
     - copied unchanged from r295350, head/sys/arm/arm/swtch-v6.S
  projects/clang380-import/sys/arm/include/cpu-v4.h
     - copied unchanged from r295350, head/sys/arm/include/cpu-v4.h
  projects/clang380-import/sys/arm/xscale/i8134x/i80321_timer.c
     - copied unchanged from r295350, head/sys/arm/xscale/i8134x/i80321_timer.c
  projects/clang380-import/sys/arm/xscale/i8134x/i80321_wdog.c
     - copied unchanged from r295350, head/sys/arm/xscale/i8134x/i80321_wdog.c
  projects/clang380-import/sys/arm/xscale/i8134x/i80321reg.h
     - copied unchanged from r295350, head/sys/arm/xscale/i8134x/i80321reg.h
  projects/clang380-import/sys/arm/xscale/i8134x/i80321var.h
     - copied unchanged from r295350, head/sys/arm/xscale/i8134x/i80321var.h
  projects/clang380-import/sys/arm64/arm64/disassem.c
     - copied unchanged from r295350, head/sys/arm64/arm64/disassem.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_fdt.c
     - copied unchanged from r295350, head/sys/arm64/cavium/thunder_pcie_fdt.c
  projects/clang380-import/sys/arm64/include/disassem.h
     - copied unchanged from r295350, head/sys/arm64/include/disassem.h
  projects/clang380-import/sys/boot/fdt/dts/riscv/
     - copied from r295350, head/sys/boot/fdt/dts/riscv/
  projects/clang380-import/sys/boot/ficl/riscv/
     - copied from r295350, head/sys/boot/ficl/riscv/
  projects/clang380-import/sys/conf/Makefile.riscv
     - copied unchanged from r295350, head/sys/conf/Makefile.riscv
  projects/clang380-import/sys/conf/files.riscv
     - copied unchanged from r295350, head/sys/conf/files.riscv
  projects/clang380-import/sys/conf/ldscript.riscv
     - copied unchanged from r295350, head/sys/conf/ldscript.riscv
  projects/clang380-import/sys/conf/options.riscv
     - copied unchanged from r295350, head/sys/conf/options.riscv
  projects/clang380-import/sys/dev/hwpmc/hwpmc_riscv.h
     - copied unchanged from r295350, head/sys/dev/hwpmc/hwpmc_riscv.h
  projects/clang380-import/sys/dev/vnic/mrml_bridge.c
     - copied unchanged from r295350, head/sys/dev/vnic/mrml_bridge.c
  projects/clang380-import/sys/riscv/conf/
     - copied from r295350, head/sys/riscv/conf/
  projects/clang380-import/sys/riscv/htif/
     - copied from r295350, head/sys/riscv/htif/
  projects/clang380-import/sys/riscv/riscv/
     - copied from r295350, head/sys/riscv/riscv/
  projects/clang380-import/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
     - copied unchanged from r295350, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
  projects/clang380-import/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
     - copied unchanged from r295350, head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
  projects/clang380-import/usr.sbin/ctld/uclparse.c
     - copied unchanged from r295350, head/usr.sbin/ctld/uclparse.c
Replaced:
  projects/clang380-import/sys/arm/arm/pmap-v6.c
     - copied unchanged from r295350, head/sys/arm/arm/pmap-v6.c
Deleted:
  projects/clang380-import/contrib/libucl/tests/.gitignore
  projects/clang380-import/contrib/libxo/.gitignore
  projects/clang380-import/contrib/unbound/.gitignore
  projects/clang380-import/sys/arm/arm/cpufunc_asm_arm10.S
  projects/clang380-import/sys/arm/arm/pmap-v6-new.c
  projects/clang380-import/sys/arm/xscale/i80321/
Modified:
  projects/clang380-import/Makefile
  projects/clang380-import/Makefile.inc1
  projects/clang380-import/UPDATING
  projects/clang380-import/bin/csh/Makefile
  projects/clang380-import/bin/csh/iconv_stub.c
  projects/clang380-import/bin/dd/args.c
  projects/clang380-import/bin/dd/dd.1
  projects/clang380-import/bin/sh/redir.c
  projects/clang380-import/bin/sh/sh.1
  projects/clang380-import/bin/test/test.c
  projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
  projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c
  projects/clang380-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang380-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
  projects/clang380-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile
  projects/clang380-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
  projects/clang380-import/contrib/openresolv/Makefile
  projects/clang380-import/contrib/openresolv/resolvconf.8.in
  projects/clang380-import/contrib/openresolv/resolvconf.conf.5.in
  projects/clang380-import/contrib/openresolv/resolvconf.in
  projects/clang380-import/contrib/openresolv/unbound.in
  projects/clang380-import/contrib/smbfs/smbutil/print.c
  projects/clang380-import/crypto/openssh/sshd_config
  projects/clang380-import/crypto/openssh/sshd_config.5
  projects/clang380-import/crypto/openssl/ACKNOWLEDGMENTS
  projects/clang380-import/crypto/openssl/CHANGES
  projects/clang380-import/crypto/openssl/Configure
  projects/clang380-import/crypto/openssl/INSTALL
  projects/clang380-import/crypto/openssl/LICENSE
  projects/clang380-import/crypto/openssl/Makefile
  projects/clang380-import/crypto/openssl/Makefile.org
  projects/clang380-import/crypto/openssl/NEWS
  projects/clang380-import/crypto/openssl/README
  projects/clang380-import/crypto/openssl/apps/engine.c
  projects/clang380-import/crypto/openssl/apps/ocsp.c
  projects/clang380-import/crypto/openssl/apps/pkcs12.c
  projects/clang380-import/crypto/openssl/apps/pkeyutl.c
  projects/clang380-import/crypto/openssl/apps/s_client.c
  projects/clang380-import/crypto/openssl/apps/s_server.c
  projects/clang380-import/crypto/openssl/apps/speed.c
  projects/clang380-import/crypto/openssl/apps/x509.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes.h
  projects/clang380-import/crypto/openssl/crypto/aes/aes_cbc.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_cfb.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_core.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_ctr.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_ecb.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_ige.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_locl.h
  projects/clang380-import/crypto/openssl/crypto/aes/aes_misc.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_ofb.c
  projects/clang380-import/crypto/openssl/crypto/aes/aes_x86core.c
  projects/clang380-import/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/bio/bio.h
  projects/clang380-import/crypto/openssl/crypto/bio/bss_bio.c
  projects/clang380-import/crypto/openssl/crypto/bio/bss_conn.c
  projects/clang380-import/crypto/openssl/crypto/bio/bss_dgram.c
  projects/clang380-import/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/bn/asm/x86_64-mont.pl
  projects/clang380-import/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
  projects/clang380-import/crypto/openssl/crypto/bn/bn_exp.c
  projects/clang380-import/crypto/openssl/crypto/bn/exptest.c
  projects/clang380-import/crypto/openssl/crypto/camellia/camellia.c
  projects/clang380-import/crypto/openssl/crypto/camellia/camellia.h
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_cbc.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_cfb.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_ctr.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_ecb.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_locl.h
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_misc.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_ofb.c
  projects/clang380-import/crypto/openssl/crypto/camellia/cmll_utl.c
  projects/clang380-import/crypto/openssl/crypto/des/des_old.c
  projects/clang380-import/crypto/openssl/crypto/des/des_old.h
  projects/clang380-import/crypto/openssl/crypto/des/des_old2.c
  projects/clang380-import/crypto/openssl/crypto/dh/dh.h
  projects/clang380-import/crypto/openssl/crypto/dh/dh_check.c
  projects/clang380-import/crypto/openssl/crypto/dh/dhtest.c
  projects/clang380-import/crypto/openssl/crypto/dsa/dsa_ossl.c
  projects/clang380-import/crypto/openssl/crypto/dso/dso.h
  projects/clang380-import/crypto/openssl/crypto/dso/dso_dl.c
  projects/clang380-import/crypto/openssl/crypto/dso/dso_dlfcn.c
  projects/clang380-import/crypto/openssl/crypto/dso/dso_lib.c
  projects/clang380-import/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/ec/ec2_smpl.c
  projects/clang380-import/crypto/openssl/crypto/ec/ec_key.c
  projects/clang380-import/crypto/openssl/crypto/ec/ecp_nistz256_table.c
  projects/clang380-import/crypto/openssl/crypto/ec/ectest.c
  projects/clang380-import/crypto/openssl/crypto/engine/eng_all.c
  projects/clang380-import/crypto/openssl/crypto/evp/e_camellia.c
  projects/clang380-import/crypto/openssl/crypto/evp/e_old.c
  projects/clang380-import/crypto/openssl/crypto/evp/e_seed.c
  projects/clang380-import/crypto/openssl/crypto/mem_clr.c
  projects/clang380-import/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/o_dir.c
  projects/clang380-import/crypto/openssl/crypto/o_dir.h
  projects/clang380-import/crypto/openssl/crypto/o_dir_test.c
  projects/clang380-import/crypto/openssl/crypto/o_str.c
  projects/clang380-import/crypto/openssl/crypto/o_str.h
  projects/clang380-import/crypto/openssl/crypto/o_time.c
  projects/clang380-import/crypto/openssl/crypto/o_time.h
  projects/clang380-import/crypto/openssl/crypto/opensslv.h
  projects/clang380-import/crypto/openssl/crypto/rc4/rc4_utl.c
  projects/clang380-import/crypto/openssl/crypto/rsa/rsa_chk.c
  projects/clang380-import/crypto/openssl/crypto/rsa/rsa_sign.c
  projects/clang380-import/crypto/openssl/crypto/seed/seed_cbc.c
  projects/clang380-import/crypto/openssl/crypto/seed/seed_cfb.c
  projects/clang380-import/crypto/openssl/crypto/seed/seed_ecb.c
  projects/clang380-import/crypto/openssl/crypto/seed/seed_ofb.c
  projects/clang380-import/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl
  projects/clang380-import/crypto/openssl/crypto/sha/sha1test.c
  projects/clang380-import/crypto/openssl/crypto/store/store.h
  projects/clang380-import/crypto/openssl/crypto/store/str_lib.c
  projects/clang380-import/crypto/openssl/crypto/store/str_locl.h
  projects/clang380-import/crypto/openssl/crypto/store/str_mem.c
  projects/clang380-import/crypto/openssl/crypto/store/str_meth.c
  projects/clang380-import/crypto/openssl/crypto/ts/ts_rsp_verify.c
  projects/clang380-import/crypto/openssl/crypto/ui/ui.h
  projects/clang380-import/crypto/openssl/crypto/ui/ui_compat.c
  projects/clang380-import/crypto/openssl/crypto/ui/ui_compat.h
  projects/clang380-import/crypto/openssl/crypto/ui/ui_lib.c
  projects/clang380-import/crypto/openssl/crypto/ui/ui_locl.h
  projects/clang380-import/crypto/openssl/crypto/ui/ui_openssl.c
  projects/clang380-import/crypto/openssl/crypto/ui/ui_util.c
  projects/clang380-import/crypto/openssl/crypto/x509/x509_vfy.c
  projects/clang380-import/crypto/openssl/crypto/x509/x509_vfy.h
  projects/clang380-import/crypto/openssl/crypto/x509/x509_vpm.c
  projects/clang380-import/crypto/openssl/crypto/x509v3/v3_pci.c
  projects/clang380-import/crypto/openssl/crypto/x509v3/v3_pcia.c
  projects/clang380-import/crypto/openssl/crypto/x509v3/v3_utl.c
  projects/clang380-import/crypto/openssl/crypto/x509v3/v3nametest.c
  projects/clang380-import/crypto/openssl/doc/apps/s_time.pod
  projects/clang380-import/crypto/openssl/doc/crypto/BIO_s_connect.pod
  projects/clang380-import/crypto/openssl/doc/ssl/SSL_CTX_set1_verify_cert_store.pod
  projects/clang380-import/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
  projects/clang380-import/crypto/openssl/engines/e_chil.c
  projects/clang380-import/crypto/openssl/ssl/d1_both.c
  projects/clang380-import/crypto/openssl/ssl/kssl.c
  projects/clang380-import/crypto/openssl/ssl/kssl.h
  projects/clang380-import/crypto/openssl/ssl/kssl_lcl.h
  projects/clang380-import/crypto/openssl/ssl/s2_srvr.c
  projects/clang380-import/crypto/openssl/ssl/s3_clnt.c
  projects/clang380-import/crypto/openssl/ssl/s3_lib.c
  projects/clang380-import/crypto/openssl/ssl/s3_srvr.c
  projects/clang380-import/crypto/openssl/ssl/ssl.h
  projects/clang380-import/crypto/openssl/ssl/ssl_err.c
  projects/clang380-import/crypto/openssl/ssl/ssl_lib.c
  projects/clang380-import/crypto/openssl/ssl/ssl_sess.c
  projects/clang380-import/crypto/openssl/ssl/t1_enc.c
  projects/clang380-import/crypto/openssl/ssl/t1_lib.c
  projects/clang380-import/crypto/openssl/util/domd
  projects/clang380-import/crypto/openssl/util/pl/VC-32.pl
  projects/clang380-import/etc/defaults/rc.conf
  projects/clang380-import/etc/periodic/daily/800.scrub-zfs
  projects/clang380-import/etc/periodic/security/security.functions
  projects/clang380-import/etc/rc.d/jail
  projects/clang380-import/lib/libbluetooth/bluetooth.h
  projects/clang380-import/lib/libc/db/hash/hash.h
  projects/clang380-import/lib/libc/db/hash/hash_buf.c
  projects/clang380-import/lib/libc/gen/Makefile.inc
  projects/clang380-import/lib/libc/include/namespace.h
  projects/clang380-import/lib/libc/include/un-namespace.h
  projects/clang380-import/lib/libc/nls/msgcat.c
  projects/clang380-import/lib/libc/sys/Symbol.map
  projects/clang380-import/lib/libc/sys/connect.2
  projects/clang380-import/lib/libc/sys/recv.2
  projects/clang380-import/lib/libc/sys/send.2
  projects/clang380-import/lib/libc/tests/gen/Makefile
  projects/clang380-import/lib/libdevctl/devctl.3
  projects/clang380-import/lib/libmemstat/memstat_uma.c
  projects/clang380-import/lib/libsysdecode/syscallnames.c
  projects/clang380-import/lib/libsysdecode/sysdecode.3
  projects/clang380-import/lib/libsysdecode/sysdecode.h
  projects/clang380-import/libexec/atrun/atrun.c
  projects/clang380-import/libexec/rtld-elf/map_object.c
  projects/clang380-import/sbin/ggate/ggated/Makefile
  projects/clang380-import/sbin/ggate/ggated/ggated.8
  projects/clang380-import/sbin/ggate/ggated/ggated.c
  projects/clang380-import/sbin/nvmecontrol/Makefile
  projects/clang380-import/sbin/nvmecontrol/nvmecontrol.8
  projects/clang380-import/sbin/nvmecontrol/nvmecontrol.c
  projects/clang380-import/sbin/nvmecontrol/nvmecontrol.h
  projects/clang380-import/sbin/pfctl/pf_print_state.c
  projects/clang380-import/sbin/rcorder/rcorder.c
  projects/clang380-import/sbin/swapon/swapon.c
  projects/clang380-import/secure/lib/libcrypto/Makefile.inc
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_TIME_set.3
  projects/clang380-import/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_md.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_null.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_find_type.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_new.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_new_CMS.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_push.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_read.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_file.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_null.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/clang380-import/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_add.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_add_word.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_cmp.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_copy.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_new.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_rand.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_set_bit.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_swap.3
  projects/clang380-import/secure/lib/libcrypto/man/BN_zero.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_add0_cert.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_add1_signer.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_compress.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_decrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_encrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_final.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_get0_type.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_sign_receipt.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_uncompress.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_verify.3
  projects/clang380-import/secure/lib/libcrypto/man/CMS_verify_receipt.3
  projects/clang380-import/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/clang380-import/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/clang380-import/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_generate_key.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_new.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_set_method.3
  projects/clang380-import/secure/lib/libcrypto/man/DH_size.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_new.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_set_method.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/DSA_size.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_GFp_simple_method.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_GROUP_copy.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_GROUP_new.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_KEY_new.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_POINT_add.3
  projects/clang380-import/secure/lib/libcrypto/man/EC_POINT_new.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_error_string.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_get_error.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_put_error.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/clang380-import/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/clang380-import/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/clang380-import/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3
  projects/clang380-import/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/clang380-import/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/clang380-import/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  projects/clang380-import/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS12_create.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  projects/clang380-import/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_add.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_bytes.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_egd.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_load_file.3
  projects/clang380-import/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_check_key.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_new.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_print.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_set_method.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_sign.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/clang380-import/secure/lib/libcrypto/man/RSA_size.3
  projects/clang380-import/secure/lib/libcrypto/man/SMIME_read_CMS.3
  projects/clang380-import/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/clang380-import/secure/lib/libcrypto/man/SMIME_write_CMS.3
  projects/clang380-import/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_check_host.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_new.3
  projects/clang380-import/secure/lib/libcrypto/man/X509_verify_cert.3
  projects/clang380-import/secure/lib/libcrypto/man/bio.3
  projects/clang380-import/secure/lib/libcrypto/man/blowfish.3
  projects/clang380-import/secure/lib/libcrypto/man/bn.3
  projects/clang380-import/secure/lib/libcrypto/man/bn_internal.3
  projects/clang380-import/secure/lib/libcrypto/man/buffer.3
  projects/clang380-import/secure/lib/libcrypto/man/crypto.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_ECPKParameters.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_ECPrivateKey.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/clang380-import/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/clang380-import/secure/lib/libcrypto/man/des.3
  projects/clang380-import/secure/lib/libcrypto/man/dh.3
  projects/clang380-import/secure/lib/libcrypto/man/dsa.3
  projects/clang380-import/secure/lib/libcrypto/man/ec.3
  projects/clang380-import/secure/lib/libcrypto/man/ecdsa.3
  projects/clang380-import/secure/lib/libcrypto/man/engine.3
  projects/clang380-import/secure/lib/libcrypto/man/err.3
  projects/clang380-import/secure/lib/libcrypto/man/evp.3
  projects/clang380-import/secure/lib/libcrypto/man/hmac.3
  projects/clang380-import/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  projects/clang380-import/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  projects/clang380-import/secure/lib/libcrypto/man/lh_stats.3
  projects/clang380-import/secure/lib/libcrypto/man/lhash.3
  projects/clang380-import/secure/lib/libcrypto/man/md5.3
  projects/clang380-import/secure/lib/libcrypto/man/mdc2.3
  projects/clang380-import/secure/lib/libcrypto/man/pem.3
  projects/clang380-import/secure/lib/libcrypto/man/rand.3
  projects/clang380-import/secure/lib/libcrypto/man/rc4.3
  projects/clang380-import/secure/lib/libcrypto/man/ripemd.3
  projects/clang380-import/secure/lib/libcrypto/man/rsa.3
  projects/clang380-import/secure/lib/libcrypto/man/sha.3
  projects/clang380-import/secure/lib/libcrypto/man/threads.3
  projects/clang380-import/secure/lib/libcrypto/man/ui.3
  projects/clang380-import/secure/lib/libcrypto/man/ui_compat.3
  projects/clang380-import/secure/lib/libcrypto/man/x509.3
  projects/clang380-import/secure/lib/libssl/Makefile.man
  projects/clang380-import/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/clang380-import/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_CTX_new.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_cmd.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CONF_cmd_argv.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_free.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_get0_param.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_new.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set1_curves.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  projects/clang380-import/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
  projects/clang380-import/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/clang380-import/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/clang380-import/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/clang380-import/secure/lib/libssl/man/SSL_accept.3
  projects/clang380-import/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/clang380-import/secure/lib/libssl/man/SSL_check_chain.3
  projects/clang380-import/secure/lib/libssl/man/SSL_clear.3
  projects/clang380-import/secure/lib/libssl/man/SSL_connect.3
  projects/clang380-import/secure/lib/libssl/man/SSL_do_handshake.3
  projects/clang380-import/secure/lib/libssl/man/SSL_free.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_error.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_fd.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_psk_identity.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_rbio.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_session.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/clang380-import/secure/lib/libssl/man/SSL_get_version.3
  projects/clang380-import/secure/lib/libssl/man/SSL_library_init.3
  projects/clang380-import/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/clang380-import/secure/lib/libssl/man/SSL_new.3
  projects/clang380-import/secure/lib/libssl/man/SSL_pending.3
  projects/clang380-import/secure/lib/libssl/man/SSL_read.3
  projects/clang380-import/secure/lib/libssl/man/SSL_rstate_string.3
  projects/clang380-import/secure/lib/libssl/man/SSL_session_reused.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_bio.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_fd.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_session.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/clang380-import/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/clang380-import/secure/lib/libssl/man/SSL_shutdown.3
  projects/clang380-import/secure/lib/libssl/man/SSL_state_string.3
  projects/clang380-import/secure/lib/libssl/man/SSL_want.3
  projects/clang380-import/secure/lib/libssl/man/SSL_write.3
  projects/clang380-import/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/clang380-import/secure/lib/libssl/man/ssl.3
  projects/clang380-import/secure/usr.bin/openssl/man/CA.pl.1
  projects/clang380-import/secure/usr.bin/openssl/man/asn1parse.1
  projects/clang380-import/secure/usr.bin/openssl/man/c_rehash.1
  projects/clang380-import/secure/usr.bin/openssl/man/ca.1
  projects/clang380-import/secure/usr.bin/openssl/man/ciphers.1
  projects/clang380-import/secure/usr.bin/openssl/man/cms.1
  projects/clang380-import/secure/usr.bin/openssl/man/crl.1
  projects/clang380-import/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/clang380-import/secure/usr.bin/openssl/man/dgst.1
  projects/clang380-import/secure/usr.bin/openssl/man/dhparam.1
  projects/clang380-import/secure/usr.bin/openssl/man/dsa.1
  projects/clang380-import/secure/usr.bin/openssl/man/dsaparam.1
  projects/clang380-import/secure/usr.bin/openssl/man/ec.1
  projects/clang380-import/secure/usr.bin/openssl/man/ecparam.1
  projects/clang380-import/secure/usr.bin/openssl/man/enc.1
  projects/clang380-import/secure/usr.bin/openssl/man/errstr.1
  projects/clang380-import/secure/usr.bin/openssl/man/gendsa.1
  projects/clang380-import/secure/usr.bin/openssl/man/genpkey.1
  projects/clang380-import/secure/usr.bin/openssl/man/genrsa.1
  projects/clang380-import/secure/usr.bin/openssl/man/nseq.1
  projects/clang380-import/secure/usr.bin/openssl/man/ocsp.1
  projects/clang380-import/secure/usr.bin/openssl/man/openssl.1
  projects/clang380-import/secure/usr.bin/openssl/man/passwd.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkcs12.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkcs7.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkcs8.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkey.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkeyparam.1
  projects/clang380-import/secure/usr.bin/openssl/man/pkeyutl.1
  projects/clang380-import/secure/usr.bin/openssl/man/rand.1
  projects/clang380-import/secure/usr.bin/openssl/man/req.1
  projects/clang380-import/secure/usr.bin/openssl/man/rsa.1
  projects/clang380-import/secure/usr.bin/openssl/man/rsautl.1
  projects/clang380-import/secure/usr.bin/openssl/man/s_client.1
  projects/clang380-import/secure/usr.bin/openssl/man/s_server.1
  projects/clang380-import/secure/usr.bin/openssl/man/s_time.1
  projects/clang380-import/secure/usr.bin/openssl/man/sess_id.1
  projects/clang380-import/secure/usr.bin/openssl/man/smime.1
  projects/clang380-import/secure/usr.bin/openssl/man/speed.1
  projects/clang380-import/secure/usr.bin/openssl/man/spkac.1
  projects/clang380-import/secure/usr.bin/openssl/man/ts.1
  projects/clang380-import/secure/usr.bin/openssl/man/tsget.1
  projects/clang380-import/secure/usr.bin/openssl/man/verify.1
  projects/clang380-import/secure/usr.bin/openssl/man/version.1
  projects/clang380-import/secure/usr.bin/openssl/man/x509.1
  projects/clang380-import/secure/usr.bin/openssl/man/x509v3_config.1
  projects/clang380-import/share/i18n/esdb/MISC/MISC.alias
  projects/clang380-import/share/man/man4/filemon.4
  projects/clang380-import/share/man/man4/inet.4
  projects/clang380-import/share/man/man4/nvd.4
  projects/clang380-import/share/mk/bsd.dep.mk
  projects/clang380-import/share/mk/bsd.incs.mk
  projects/clang380-import/share/mk/bsd.links.mk
  projects/clang380-import/share/mk/bsd.man.mk
  projects/clang380-import/share/mk/bsd.nls.mk
  projects/clang380-import/sys/amd64/amd64/uma_machdep.c
  projects/clang380-import/sys/arm/allwinner/a20/a20_mp.c
  projects/clang380-import/sys/arm/altera/socfpga/socfpga_mp.c
  projects/clang380-import/sys/arm/amlogic/aml8726/aml8726_mp.c
  projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c
  projects/clang380-import/sys/arm/arm/cpufunc.c
  projects/clang380-import/sys/arm/arm/cpufunc_asm.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_arm11.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_arm11x6.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_arm9.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_armv4.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_armv5_ec.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_armv7.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_fa526.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_xscale.S
  projects/clang380-import/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/clang380-import/sys/arm/arm/cpuinfo.c
  projects/clang380-import/sys/arm/arm/db_interface.c
  projects/clang380-import/sys/arm/arm/debug_monitor.c
  projects/clang380-import/sys/arm/arm/devmap.c
  projects/clang380-import/sys/arm/arm/dump_machdep.c
  projects/clang380-import/sys/arm/arm/elf_machdep.c
  projects/clang380-import/sys/arm/arm/elf_trampoline.c
  projects/clang380-import/sys/arm/arm/fiq.c
  projects/clang380-import/sys/arm/arm/fusu.S
  projects/clang380-import/sys/arm/arm/genassym.c
  projects/clang380-import/sys/arm/arm/identcpu.c
  projects/clang380-import/sys/arm/arm/locore-v6.S
  projects/clang380-import/sys/arm/arm/machdep.c
  projects/clang380-import/sys/arm/arm/mem.c
  projects/clang380-import/sys/arm/arm/minidump_machdep.c
  projects/clang380-import/sys/arm/arm/mp_machdep.c
  projects/clang380-import/sys/arm/arm/pmap.c
  projects/clang380-import/sys/arm/arm/swtch.S
  projects/clang380-import/sys/arm/arm/sys_machdep.c
  projects/clang380-import/sys/arm/arm/trap-v6.c
  projects/clang380-import/sys/arm/arm/trap.c
  projects/clang380-import/sys/arm/arm/vm_machdep.c
  projects/clang380-import/sys/arm/at91/at91_machdep.c
  projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2836_mp.c
  projects/clang380-import/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/clang380-import/sys/arm/conf/NOTES
  projects/clang380-import/sys/arm/conf/std.armv6
  projects/clang380-import/sys/arm/freescale/imx/imx6_mp.c
  projects/clang380-import/sys/arm/freescale/vybrid/vf_ehci.c
  projects/clang380-import/sys/arm/include/cpu-v6.h
  projects/clang380-import/sys/arm/include/cpu.h
  projects/clang380-import/sys/arm/include/cpuconf.h
  projects/clang380-import/sys/arm/include/cpufunc.h
  projects/clang380-import/sys/arm/include/debug_monitor.h
  projects/clang380-import/sys/arm/include/kdb.h
  projects/clang380-import/sys/arm/include/machdep.h
  projects/clang380-import/sys/arm/include/param.h
  projects/clang380-import/sys/arm/include/pcpu.h
  projects/clang380-import/sys/arm/include/pmap-v6.h
  projects/clang380-import/sys/arm/include/pmap.h
  projects/clang380-import/sys/arm/include/pte.h
  projects/clang380-import/sys/arm/include/reg.h
  projects/clang380-import/sys/arm/include/sf_buf.h
  projects/clang380-import/sys/arm/include/smp.h
  projects/clang380-import/sys/arm/include/vm.h
  projects/clang380-import/sys/arm/mv/armada38x/pmsu.c
  projects/clang380-import/sys/arm/mv/armadaxp/armadaxp.c
  projects/clang380-import/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/clang380-import/sys/arm/mv/mv_common.c
  projects/clang380-import/sys/arm/mv/mv_machdep.c
  projects/clang380-import/sys/arm/mv/orion/db88f5xxx.c
  projects/clang380-import/sys/arm/rockchip/rk30xx_mp.c
  projects/clang380-import/sys/arm/samsung/exynos/exynos5_mp.c
  projects/clang380-import/sys/arm/ti/omap4/omap4_mp.c
  projects/clang380-import/sys/arm/ti/omap4/pandaboard/pandaboard.c
  projects/clang380-import/sys/arm/ti/ti_cpuid.c
  projects/clang380-import/sys/arm/versatile/versatile_machdep.c
  projects/clang380-import/sys/arm/xilinx/zy7_ehci.c
  projects/clang380-import/sys/arm/xilinx/zy7_mp.c
  projects/clang380-import/sys/arm/xscale/i8134x/crb_machdep.c
  projects/clang380-import/sys/arm/xscale/i8134x/files.i81342
  projects/clang380-import/sys/arm/xscale/ixp425/avila_machdep.c
  projects/clang380-import/sys/arm/xscale/pxa/pxa_machdep.c
  projects/clang380-import/sys/arm64/arm64/copystr.c
  projects/clang380-import/sys/arm64/arm64/db_disasm.c
  projects/clang380-import/sys/arm64/arm64/genassym.c
  projects/clang380-import/sys/arm64/arm64/gic_fdt.c
  projects/clang380-import/sys/arm64/arm64/intr_machdep.c
  projects/clang380-import/sys/arm64/arm64/locore.S
  projects/clang380-import/sys/arm64/arm64/machdep.c
  projects/clang380-import/sys/arm64/arm64/mp_machdep.c
  projects/clang380-import/sys/arm64/arm64/pmap.c
  projects/clang380-import/sys/arm64/arm64/swtch.S
  projects/clang380-import/sys/arm64/arm64/trap.c
  projects/clang380-import/sys/arm64/arm64/uma_machdep.c
  projects/clang380-import/sys/arm64/arm64/vm_machdep.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.c
  projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.h
  projects/clang380-import/sys/arm64/include/armreg.h
  projects/clang380-import/sys/arm64/include/kdb.h
  projects/clang380-import/sys/arm64/include/pcb.h
  projects/clang380-import/sys/arm64/include/pmap.h
  projects/clang380-import/sys/boot/efi/boot1/boot1.c
  projects/clang380-import/sys/boot/efi/boot1/boot_module.h
  projects/clang380-import/sys/boot/efi/boot1/ufs_module.c
  projects/clang380-import/sys/boot/efi/boot1/zfs_module.c
  projects/clang380-import/sys/boot/efi/include/efidevp.h
  projects/clang380-import/sys/boot/efi/libefi/efinet.c
  projects/clang380-import/sys/cam/ata/ata_all.c
  projects/clang380-import/sys/cam/scsi/scsi_pass.c
  projects/clang380-import/sys/cam/scsi/scsi_sa.c
  projects/clang380-import/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/clang380-import/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/clang380-import/sys/compat/cloudabi/cloudabi_proc.c
  projects/clang380-import/sys/compat/linux/linux_fork.c
  projects/clang380-import/sys/conf/Makefile.arm
  projects/clang380-import/sys/conf/NOTES
  projects/clang380-import/sys/conf/files.arm
  projects/clang380-import/sys/conf/files.arm64
  projects/clang380-import/sys/conf/kern.mk
  projects/clang380-import/sys/conf/kern.post.mk
  projects/clang380-import/sys/conf/kern.pre.mk
  projects/clang380-import/sys/conf/options
  projects/clang380-import/sys/conf/options.arm
  projects/clang380-import/sys/conf/options.mips
  projects/clang380-import/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/clang380-import/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/clang380-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  projects/clang380-import/sys/dev/ata/ata-all.c
  projects/clang380-import/sys/dev/bwn/if_bwn.c
  projects/clang380-import/sys/dev/cfi/cfi_core.c
  projects/clang380-import/sys/dev/cxgb/cxgb_sge.c
  projects/clang380-import/sys/dev/e1000/e1000_80003es2lan.c
  projects/clang380-import/sys/dev/e1000/e1000_82540.c
  projects/clang380-import/sys/dev/e1000/e1000_82541.c
  projects/clang380-import/sys/dev/e1000/e1000_82542.c
  projects/clang380-import/sys/dev/e1000/e1000_82543.c
  projects/clang380-import/sys/dev/e1000/e1000_82571.h
  projects/clang380-import/sys/dev/e1000/e1000_82575.c
  projects/clang380-import/sys/dev/e1000/e1000_82575.h
  projects/clang380-import/sys/dev/e1000/e1000_api.c
  projects/clang380-import/sys/dev/e1000/e1000_defines.h
  projects/clang380-import/sys/dev/e1000/e1000_hw.h
  projects/clang380-import/sys/dev/e1000/e1000_i210.c
  projects/clang380-import/sys/dev/e1000/e1000_ich8lan.c
  projects/clang380-import/sys/dev/e1000/e1000_ich8lan.h
  projects/clang380-import/sys/dev/e1000/e1000_mac.h
  projects/clang380-import/sys/dev/e1000/e1000_mbx.c
  projects/clang380-import/sys/dev/e1000/e1000_nvm.h
  projects/clang380-import/sys/dev/e1000/e1000_osdep.h
  projects/clang380-import/sys/dev/e1000/e1000_phy.c
  projects/clang380-import/sys/dev/e1000/e1000_regs.h
  projects/clang380-import/sys/dev/e1000/if_em.c
  projects/clang380-import/sys/dev/e1000/if_em.h
  projects/clang380-import/sys/dev/e1000/if_igb.c
  projects/clang380-import/sys/dev/ed/if_ed.c
  projects/clang380-import/sys/dev/ep/if_ep.c
  projects/clang380-import/sys/dev/fe/if_fe.c
  projects/clang380-import/sys/dev/filemon/filemon.c
  projects/clang380-import/sys/dev/filemon/filemon_wrapper.c
  projects/clang380-import/sys/dev/fxp/if_fxp.c
  projects/clang380-import/sys/dev/hyperv/include/hyperv.h
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/clang380-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_kvp.c
  projects/clang380-import/sys/dev/hyperv/utilities/hv_util.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_channel.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_connection.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_hv.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/clang380-import/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  projects/clang380-import/sys/dev/iicbus/iic.c
  projects/clang380-import/sys/dev/iscsi_initiator/isc_cam.c
  projects/clang380-import/sys/dev/iscsi_initiator/isc_sm.c
  projects/clang380-import/sys/dev/iscsi_initiator/isc_soc.c
  projects/clang380-import/sys/dev/iscsi_initiator/isc_subr.c
  projects/clang380-import/sys/dev/iscsi_initiator/iscsi_subr.c
  projects/clang380-import/sys/dev/ixgbe/if_ix.c
  projects/clang380-import/sys/dev/ixgbe/ixgbe_common.c
  projects/clang380-import/sys/dev/ixgbe/ixgbe_phy.c
  projects/clang380-import/sys/dev/ixgbe/ixgbe_type.h
  projects/clang380-import/sys/dev/ixgbe/ixgbe_x540.c
  projects/clang380-import/sys/dev/ixgbe/ixgbe_x550.c
  projects/clang380-import/sys/dev/ixl/if_ixl.c
  projects/clang380-import/sys/dev/le/lance.c
  projects/clang380-import/sys/dev/malo/if_malo.c
  projects/clang380-import/sys/dev/md/md.c
  projects/clang380-import/sys/dev/mps/mps.c
  projects/clang380-import/sys/dev/mps/mps_mapping.c
  projects/clang380-import/sys/dev/mps/mps_sas.c
  projects/clang380-import/sys/dev/mps/mpsvar.h
  projects/clang380-import/sys/dev/netmap/netmap_offloadings.c
  projects/clang380-import/sys/dev/nvd/nvd.c
  projects/clang380-import/sys/dev/nvme/nvme.h
  projects/clang380-import/sys/dev/oce/oce_if.h
  projects/clang380-import/sys/dev/otus/if_otus.c
  projects/clang380-import/sys/dev/sfxge/sfxge.h
  projects/clang380-import/sys/dev/sfxge/sfxge_rx.c
  projects/clang380-import/sys/dev/sfxge/sfxge_tx.c
  projects/clang380-import/sys/dev/sn/if_sn.c
  projects/clang380-import/sys/dev/tx/if_tx.c
  projects/clang380-import/sys/dev/usb/controller/ehci.c
  projects/clang380-import/sys/dev/usb/controller/ehci.h
  projects/clang380-import/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/clang380-import/sys/dev/usb/controller/ehci_mv.c
  projects/clang380-import/sys/dev/usb/controller/ehcireg.h
  projects/clang380-import/sys/dev/usb/wlan/if_rsu.c
  projects/clang380-import/sys/dev/vnic/thunder_bgx.c
  projects/clang380-import/sys/dev/vnic/thunder_bgx_fdt.c
  projects/clang380-import/sys/dev/vnic/thunder_bgx_var.h
  projects/clang380-import/sys/dev/vnic/thunder_mdio_fdt.c
  projects/clang380-import/sys/dev/vnic/thunder_mdio_var.h
  projects/clang380-import/sys/dev/wi/if_wi.c
  projects/clang380-import/sys/dev/wi/if_wi_pci.c
  projects/clang380-import/sys/dev/xe/if_xe.c
  projects/clang380-import/sys/dev/xl/if_xl.c
  projects/clang380-import/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/clang380-import/sys/kern/imgact_elf.c
  projects/clang380-import/sys/kern/init_main.c
  projects/clang380-import/sys/kern/kern_event.c
  projects/clang380-import/sys/kern/kern_fork.c
  projects/clang380-import/sys/kern/kern_kthread.c
  projects/clang380-import/sys/kern/kern_ktr.c
  projects/clang380-import/sys/kern/kern_malloc.c
  projects/clang380-import/sys/kern/kern_mbuf.c
  projects/clang380-import/sys/kern/kern_racct.c
  projects/clang380-import/sys/kern/subr_mchain.c
  projects/clang380-import/sys/kern/uipc_debug.c
  projects/clang380-import/sys/kern/uipc_sockbuf.c
  projects/clang380-import/sys/kern/uipc_socket.c
  projects/clang380-import/sys/kern/vfs_aio.c
  projects/clang380-import/sys/kern/vfs_mount.c
  projects/clang380-import/sys/kgssapi/krb5/kcrypto_aes.c
  projects/clang380-import/sys/mips/atheros/ar71xx_ehci.c
  projects/clang380-import/sys/mips/conf/AR933X_BASE
  projects/clang380-import/sys/mips/conf/AR934X_BASE
  projects/clang380-import/sys/mips/conf/QCA955X_BASE
  projects/clang380-import/sys/mips/include/asm.h
  projects/clang380-import/sys/mips/include/cpufunc.h
  projects/clang380-import/sys/mips/include/cpuregs.h
  projects/clang380-import/sys/mips/mips/uma_machdep.c
  projects/clang380-import/sys/mips/mips/vm_machdep.c
  projects/clang380-import/sys/mips/rt305x/std.rt305x
  projects/clang380-import/sys/modules/filemon/Makefile
  projects/clang380-import/sys/net/bridgestp.c
  projects/clang380-import/sys/net/if_epair.c
  projects/clang380-import/sys/net/if_mib.c
  projects/clang380-import/sys/net/netisr.c
  projects/clang380-import/sys/net/pfvar.h
  projects/clang380-import/sys/net80211/ieee80211.c
  projects/clang380-import/sys/net80211/ieee80211_acl.c
  projects/clang380-import/sys/net80211/ieee80211_action.c
  projects/clang380-import/sys/net80211/ieee80211_ageq.c
  projects/clang380-import/sys/net80211/ieee80211_amrr.c
  projects/clang380-import/sys/net80211/ieee80211_crypto_none.c
  projects/clang380-import/sys/net80211/ieee80211_ddb.c
  projects/clang380-import/sys/net80211/ieee80211_freebsd.c
  projects/clang380-import/sys/net80211/ieee80211_ht.c
  projects/clang380-import/sys/net80211/ieee80211_ioctl.c
  projects/clang380-import/sys/net80211/ieee80211_output.c
  projects/clang380-import/sys/net80211/ieee80211_power.c
  projects/clang380-import/sys/net80211/ieee80211_proto.c
  projects/clang380-import/sys/net80211/ieee80211_scan.c
  projects/clang380-import/sys/net80211/ieee80211_scan_sta.c
  projects/clang380-import/sys/net80211/ieee80211_scan_sw.c
  projects/clang380-import/sys/net80211/ieee80211_xauth.c
  projects/clang380-import/sys/netgraph/netflow/netflow.c
  projects/clang380-import/sys/netgraph/netflow/netflow_v9.c
  projects/clang380-import/sys/netgraph/netflow/ng_netflow.c
  projects/clang380-import/sys/netgraph/ng_base.c
  projects/clang380-import/sys/netinet/in_proto.c
  projects/clang380-import/sys/netinet/sctp_input.c
  projects/clang380-import/sys/netinet/sctp_output.c
  projects/clang380-import/sys/netinet/sctp_output.h
  projects/clang380-import/sys/netinet/sctp_pcb.c
  projects/clang380-import/sys/netinet/sctp_sysctl.c
  projects/clang380-import/sys/netinet/sctp_uio.h
  projects/clang380-import/sys/netinet/sctp_var.h
  projects/clang380-import/sys/netinet/tcp_lro.c
  projects/clang380-import/sys/netinet/toecore.c
  projects/clang380-import/sys/netinet6/in6_proto.c
  projects/clang380-import/sys/netinet6/send.c
  projects/clang380-import/sys/netipsec/ipsec_mbuf.c
  projects/clang380-import/sys/netipsec/key_debug.c
  projects/clang380-import/sys/netpfil/ipfw/ip_fw_log.c
  projects/clang380-import/sys/powerpc/fpu/fpu_emu.c
  projects/clang380-import/sys/powerpc/fpu/fpu_emu.h
  projects/clang380-import/sys/powerpc/fpu/fpu_explode.c
  projects/clang380-import/sys/powerpc/fpu/fpu_extern.h
  projects/clang380-import/sys/powerpc/include/reg.h
  projects/clang380-import/sys/powerpc/mpc85xx/lbc.c
  projects/clang380-import/sys/powerpc/powerpc/exec_machdep.c
  projects/clang380-import/sys/powerpc/powerpc/nexus.c
  projects/clang380-import/sys/powerpc/powerpc/sigcode32.S
  projects/clang380-import/sys/powerpc/powerpc/uma_machdep.c
  projects/clang380-import/sys/powerpc/ps3/ehci_ps3.c
  projects/clang380-import/sys/riscv/include/asm.h
  projects/clang380-import/sys/riscv/include/pcpu.h
  projects/clang380-import/sys/rpc/replay.c
  projects/clang380-import/sys/sparc64/sparc64/vm_machdep.c
  projects/clang380-import/sys/sys/ata.h
  projects/clang380-import/sys/sys/cdefs.h
  projects/clang380-import/sys/sys/event.h
  projects/clang380-import/sys/sys/kerneldump.h
  projects/clang380-import/sys/sys/proc.h
  projects/clang380-import/sys/sys/socket.h
  projects/clang380-import/sys/sys/socketvar.h
  projects/clang380-import/sys/tools/embed_mfs.sh
  projects/clang380-import/sys/ufs/ffs/ffs_extern.h
  projects/clang380-import/sys/vm/memguard.c
  projects/clang380-import/sys/vm/sg_pager.c
  projects/clang380-import/sys/vm/uma.h
  projects/clang380-import/sys/vm/uma_core.c
  projects/clang380-import/sys/vm/uma_dbg.c
  projects/clang380-import/sys/vm/uma_dbg.h
  projects/clang380-import/sys/vm/uma_int.h
  projects/clang380-import/sys/vm/vm_page.c
  projects/clang380-import/tests/sys/acl/Makefile
  projects/clang380-import/tests/sys/geom/class/gate/1_test.sh
  projects/clang380-import/tests/sys/kqueue/common.h
  projects/clang380-import/tests/sys/kqueue/main.c
  projects/clang380-import/tests/sys/kqueue/proc.c
  projects/clang380-import/tools/tools/nanobsd/defaults.sh
  projects/clang380-import/tools/tools/nanobsd/embedded/README
  projects/clang380-import/tools/tools/nanobsd/embedded/common
  projects/clang380-import/usr.bin/kdump/kdump.c
  projects/clang380-import/usr.bin/netstat/inet.c
  projects/clang380-import/usr.bin/netstat/sctp.c
  projects/clang380-import/usr.bin/netstat/unix.c
  projects/clang380-import/usr.bin/truss/aarch64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/aarch64-freebsd.c
  projects/clang380-import/usr.bin/truss/amd64-cloudabi64.c
  projects/clang380-import/usr.bin/truss/amd64-freebsd.c
  projects/clang380-import/usr.bin/truss/amd64-freebsd32.c
  projects/clang380-import/usr.bin/truss/amd64-linux32.c
  projects/clang380-import/usr.bin/truss/arm-freebsd.c
  projects/clang380-import/usr.bin/truss/i386-freebsd.c
  projects/clang380-import/usr.bin/truss/i386-linux.c
  projects/clang380-import/usr.bin/truss/mips-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc64-freebsd.c
  projects/clang380-import/usr.bin/truss/powerpc64-freebsd32.c
  projects/clang380-import/usr.bin/truss/sparc64-freebsd.c
  projects/clang380-import/usr.sbin/bsdconfig/bsdconfig
  projects/clang380-import/usr.sbin/bsdconfig/networking/share/media.subr
  projects/clang380-import/usr.sbin/bsdconfig/networking/share/resolv.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/common.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/device.subr
  projects/clang380-import/usr.sbin/bsdconfig/share/strings.subr
  projects/clang380-import/usr.sbin/bsdinstall/scripts/zfsboot
  projects/clang380-import/usr.sbin/ctld/Makefile
  projects/clang380-import/usr.sbin/ctld/ctld.c
  projects/clang380-import/usr.sbin/ctld/ctld.h
  projects/clang380-import/usr.sbin/ctld/parse.y
  projects/clang380-import/usr.sbin/devctl/devctl.8
  projects/clang380-import/usr.sbin/freebsd-update/freebsd-update.sh
  projects/clang380-import/usr.sbin/sysrc/sysrc
  projects/clang380-import/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/clang380-import/   (props changed)
  projects/clang380-import/cddl/   (props changed)
  projects/clang380-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang380-import/contrib/elftoolchain/   (props changed)
  projects/clang380-import/contrib/libucl/   (props changed)
  projects/clang380-import/contrib/openresolv/   (props changed)
  projects/clang380-import/contrib/unbound/   (props changed)
  projects/clang380-import/crypto/openssh/   (props changed)
  projects/clang380-import/crypto/openssl/   (props changed)
  projects/clang380-import/lib/libc/   (props changed)
  projects/clang380-import/sbin/   (props changed)
  projects/clang380-import/share/   (props changed)
  projects/clang380-import/share/man/man4/   (props changed)
  projects/clang380-import/sys/   (props changed)
  projects/clang380-import/sys/boot/   (props changed)
  projects/clang380-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang380-import/sys/conf/   (props changed)
  projects/clang380-import/sys/contrib/ipfilter/   (props changed)
  projects/clang380-import/sys/dev/hyperv/   (props changed)

Modified: projects/clang380-import/Makefile
==============================================================================
--- projects/clang380-import/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -136,6 +136,7 @@ TGTS+=	${BITGTS}
 .ORDER: buildworld installworld
 .ORDER: buildworld distributeworld
 .ORDER: buildworld buildkernel
+.ORDER: installworld distribution
 .ORDER: buildkernel installkernel
 .ORDER: buildkernel installkernel.debug
 .ORDER: buildkernel reinstallkernel
@@ -328,7 +329,7 @@ bmake: .PHONY
 		${MMAKE} all; \
 		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
-tinderbox toolchains kernel-toolchains: upgrade_checks
+tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
 
 tinderbox:
 	@cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
@@ -339,6 +340,12 @@ toolchains:
 kernel-toolchains:
 	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
 
+kernels:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe
+
+worlds:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
+
 #
 # universe
 #

Modified: projects/clang380-import/Makefile.inc1
==============================================================================
--- projects/clang380-import/Makefile.inc1	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/Makefile.inc1	Sat Feb  6 14:07:17 2016	(r295351)
@@ -72,7 +72,7 @@ SRCDIR?=	${.CURDIR}
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
-.if make(install*)
+.if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
@@ -127,7 +127,7 @@ SUBDIR+=	${_DIR}
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
-.if make(install*)
+.if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc
@@ -1083,16 +1083,14 @@ redistribute: .MAKE .PHONY
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
-
-distribution: .MAKE .PHONY
+distrib-dirs distribution: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+.if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig
+.endif
 
 #
 # buildkernel and installkernel

Modified: projects/clang380-import/UPDATING
==============================================================================
--- projects/clang380-import/UPDATING	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/UPDATING	Sat Feb  6 14:07:17 2016	(r295351)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160129:
+	Building ZFS pools on top of zvols is prohibited by default.  That
+	feature has never worked safely; it's always been prone to deadlocks.
+	Using a zvol as the backing store for a VM guest's virtual disk will
+	still work, even if the guest is using ZFS.  Legacy behavior can be
+	restored by setting vfs.zfs.vol.recursive=1.
+
 20160119:
 	The NONE and HPN patches has been removed from OpenSSH.  They are
 	still available in the security/openssh-portable port.

Modified: projects/clang380-import/bin/csh/Makefile
==============================================================================
--- projects/clang380-import/bin/csh/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/csh/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
 
-CATALOGS=	et:et_EE.ISO8859-15 \
-		finnish:fi_FI.ISO8859-1 \
-		french:fr_FR.ISO8859-1 \
-		german:de_DE.ISO8859-1 \
-		greek:el_GR.ISO8859-7 \
-		italian:it_IT.ISO8859-1 \
-		ja:ja_JP.eucJP \
-		russian:ru_RU.KOI8-R \
-		spanish:es_ES.ISO8859-1 \
-		ukrainian:uk_UA.KOI8-U
-
-NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
-		fr_CH.ISO8859-15 fr_FR.ISO8859-15
-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-		de_CH.ISO8859-15 de_DE.ISO8859-15
-NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
-NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
+CATALOGS=	et:et_EE.UTF-8 \
+		finnish:fi_FI.UTF-8 \
+		french:fr_FR.UTF-8 \
+		german:de_DE.UTF-8 \
+		greek:el_GR.UTF-8 \
+		italian:it_IT.UTF-8 \
+		ja:ja_JP.UTF-8 \
+		russian:ru_RU.UTF-8 \
+		spanish:es_ES.UTF-8 \
+		ukrainian:uk_UA.UTF-8
+
+NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8
+NLSLINKS_fr_FR.UTF-8 = fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8
+NLSLINKS_it_IT.UTF-8 = it_CH.UTF-8
 
 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV
 .if ${MK_ICONV} != "no"
-NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
-NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
-NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
-NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
-NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
-NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
-NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
-NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
-NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
-NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+NLSLINKS_de_DE.UTF-8 += de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+		de_CH.ISO8859-15 de_DE.ISO8859-1 de_DE.ISO8859-15
+NLSLINKS_el_GR.UTF-8 = el_GR.ISO8859-7
+NLSLINKS_es_ES.UTF-8 = es_ES.ISO8859-1 es_ES.ISO8859-15
+NLSLINKS_et_EE.UTF-8 = et_EE.ISO8859-15
+NLSLINKS_fi_FI.UTF-8 = fi_FI.ISO8859-1 fi_FI.ISO8859-15
+NLSLINKS_fr_FR.UTF-8 += fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
+		fr_CH.ISO8859-15 fr_FR.ISO8859-1 fr_FR.ISO8859-15
+NLSLINKS_it_IT.UTF-8 += it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-1 \
+		it_IT.ISO8859-15
+NLSLINKS_ja_JP.UTF-8 = ja_JP.SJIS ja_JP.eucJP
+NLSLINKS_ru_RU.UTF-8 = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.KOI8-R
+NLSLINKS_uk_UA.UTF-8 = uk_UA.ISO8859-5 uk_UA.KOI8-U
 .else
 # Above links can be installed from ports/shells/tcsh_nls
 

Modified: projects/clang380-import/bin/csh/iconv_stub.c
==============================================================================
--- projects/clang380-import/bin/csh/iconv_stub.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/csh/iconv_stub.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);
 

Modified: projects/clang380-import/bin/dd/args.c
==============================================================================
--- projects/clang380-import/bin/dd/args.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/dd/args.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -360,6 +360,46 @@ c_conv(const void *a, const void *b)
 	    ((const struct conv *)b)->name));
 }
 
+static uintmax_t
+postfix_to_mult(const char expr)
+{
+	uintmax_t mult;
+
+	mult = 0;
+	switch (expr) {
+	case 'B':
+	case 'b':
+		mult = 512;
+		break;
+	case 'K':
+	case 'k':
+		mult = 1 << 10;
+		break;
+	case 'M':
+	case 'm':
+		mult = 1 << 20;
+		break;
+	case 'G':
+	case 'g':
+		mult = 1 << 30;
+		break;
+	case 'T':
+	case 't':
+		mult = (uintmax_t)1 << 40;
+		break;
+	case 'P':
+	case 'p':
+		mult = (uintmax_t)1 << 50;
+		break;
+	case 'W':
+	case 'w':
+		mult = sizeof(int);
+		break;
+	}
+
+	return (mult);
+}
+
 /*
  * Convert an expression of the following forms to a uintmax_t.
  * 	1) A positive decimal number.
@@ -386,31 +426,7 @@ get_num(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	default:
-		;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;
@@ -460,29 +476,7 @@ get_off_t(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;

Modified: projects/clang380-import/bin/dd/dd.1
==============================================================================
--- projects/clang380-import/bin/dd/dd.1	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/dd/dd.1	Sat Feb  6 14:07:17 2016	(r295351)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd August 28, 2014
+.Dd February 4, 2016
 .Dt DD 1
 .Os
 .Sh NAME
@@ -332,10 +332,13 @@ If the number ends with a
 .Dq Li k ,
 .Dq Li m ,
 .Dq Li g ,
+.Dq Li t ,
+.Dq Li p ,
 or
 .Dq Li w ,
 the
-number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
+number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G),
+1099511627776 (1T), 1125899906842624 (1P)
 or the number of bytes in an integer, respectively.
 Two or more numbers may be separated by an
 .Dq Li x

Modified: projects/clang380-import/bin/sh/redir.c
==============================================================================
--- projects/clang380-import/bin/sh/redir.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/sh/redir.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -70,6 +70,7 @@ struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
 	int fd0_redirected;
+	unsigned int empty_redirs;
 };
 
 
@@ -82,6 +83,9 @@ static struct redirtab *redirlist;
 */
 static int fd0_redirected = 0;
 
+/* Number of redirtabs that have not been allocated. */
+static unsigned int empty_redirs = 0;
+
 static void openredirect(union node *, char[10 ]);
 static int openhere(union node *);
 
@@ -115,12 +119,17 @@ redirect(union node *redir, int flags)
 		memory[i] = 0;
 	memory[1] = flags & REDIR_BACKQ;
 	if (flags & REDIR_PUSH) {
-		sv = ckmalloc(sizeof (struct redirtab));
-		for (i = 0 ; i < 10 ; i++)
-			sv->renamed[i] = EMPTY;
-		sv->fd0_redirected = fd0_redirected;
-		sv->next = redirlist;
-		redirlist = sv;
+		empty_redirs++;
+		if (redir != NULL) {
+			sv = ckmalloc(sizeof (struct redirtab));
+			for (i = 0 ; i < 10 ; i++)
+				sv->renamed[i] = EMPTY;
+			sv->fd0_redirected = fd0_redirected;
+			sv->empty_redirs = empty_redirs - 1;
+			sv->next = redirlist;
+			redirlist = sv;
+			empty_redirs = 0;
+		}
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
@@ -303,6 +312,12 @@ popredir(void)
 	struct redirtab *rp = redirlist;
 	int i;
 
+	INTOFF;
+	if (empty_redirs > 0) {
+		empty_redirs--;
+		INTON;
+		return;
+	}
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
 			if (rp->renamed[i] >= 0) {
@@ -313,8 +328,8 @@ popredir(void)
 			}
 		}
 	}
-	INTOFF;
 	fd0_redirected = rp->fd0_redirected;
+	empty_redirs = rp->empty_redirs;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;

Modified: projects/clang380-import/bin/sh/sh.1
==============================================================================
--- projects/clang380-import/bin/sh/sh.1	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/sh/sh.1	Sat Feb  6 14:07:17 2016	(r295351)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2015
+.Dd January 30, 2016
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1952,13 +1952,20 @@ Execute the specified built-in command,
 This is useful when the user wishes to override a shell function
 with the same name as a built-in command.
 .It Ic cd Oo Fl L | P Oc Oo Fl e Oc Op Ar directory
+.It Ic cd Fl
 Switch to the specified
 .Ar directory ,
-or to the directory specified in the
+to the directory specified in the
 .Va HOME
 environment variable if no
 .Ar directory
-is specified.
+is specified or
+to the directory specified in the
+.Va OLDPWD
+environment variable if
+.Ar directory
+is
+.Fl .
 If
 .Ar directory
 does not begin with
@@ -1982,10 +1989,12 @@ the
 .Ic cd
 command will print out the name of the directory
 that it actually switched to
-if this is different from the name that the user gave.
-These may be different either because the
+if the
 .Va CDPATH
-mechanism was used or because a symbolic link was crossed.
+mechanism was used or if
+.Ar directory
+was
+.Fl .
 .Pp
 If the
 .Fl P
@@ -2774,6 +2783,10 @@ Initialization file for interactive shel
 Locale settings.
 These are inherited by children of the shell,
 and is used in a limited manner by the shell itself.
+.It Ev OLDPWD
+The previous current directory.
+This is used and updated by
+.Ic cd .
 .It Ev PWD
 An absolute pathname for the current directory,
 possibly containing symbolic links.

Modified: projects/clang380-import/bin/test/test.c
==============================================================================
--- projects/clang380-import/bin/test/test.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/bin/test/test.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -120,51 +120,53 @@ enum token {
 
 #define TOKEN_TYPE(token) ((token) & 0xff00)
 
-static struct t_op {
-	char op_text[4];
+static const struct t_op {
+	char op_text[2];
 	short op_num;
-} const ops [] = {
-	{"-r",	FILRD},
-	{"-w",	FILWR},
-	{"-x",	FILEX},
-	{"-e",	FILEXIST},
-	{"-f",	FILREG},
-	{"-d",	FILDIR},
-	{"-c",	FILCDEV},
-	{"-b",	FILBDEV},
-	{"-p",	FILFIFO},
-	{"-u",	FILSUID},
-	{"-g",	FILSGID},
-	{"-k",	FILSTCK},
-	{"-s",	FILGZ},
-	{"-t",	FILTT},
-	{"-z",	STREZ},
-	{"-n",	STRNZ},
-	{"-h",	FILSYM},		/* for backwards compat */
-	{"-O",	FILUID},
-	{"-G",	FILGID},
-	{"-L",	FILSYM},
-	{"-S",	FILSOCK},
+} ops1[] = {
 	{"=",	STREQ},
-	{"==",	STREQ},
-	{"!=",	STRNE},
 	{"<",	STRLT},
 	{">",	STRGT},
-	{"-eq",	INTEQ},
-	{"-ne",	INTNE},
-	{"-ge",	INTGE},
-	{"-gt",	INTGT},
-	{"-le",	INTLE},
-	{"-lt",	INTLT},
-	{"-nt",	FILNT},
-	{"-ot",	FILOT},
-	{"-ef",	FILEQ},
 	{"!",	UNOT},
-	{"-a",	BAND},
-	{"-o",	BOR},
 	{"(",	LPAREN},
 	{")",	RPAREN},
-	{"",	0}
+}, opsm1[] = {
+	{"r",	FILRD},
+	{"w",	FILWR},
+	{"x",	FILEX},
+	{"e",	FILEXIST},
+	{"f",	FILREG},
+	{"d",	FILDIR},
+	{"c",	FILCDEV},
+	{"b",	FILBDEV},
+	{"p",	FILFIFO},
+	{"u",	FILSUID},
+	{"g",	FILSGID},
+	{"k",	FILSTCK},
+	{"s",	FILGZ},
+	{"t",	FILTT},
+	{"z",	STREZ},
+	{"n",	STRNZ},
+	{"h",	FILSYM},		/* for backwards compat */
+	{"O",	FILUID},
+	{"G",	FILGID},
+	{"L",	FILSYM},
+	{"S",	FILSOCK},
+	{"a",	BAND},
+	{"o",	BOR},
+}, ops2[] = {
+	{"==",	STREQ},
+	{"!=",	STRNE},
+}, opsm2[] = {
+	{"eq",	INTEQ},
+	{"ne",	INTNE},
+	{"ge",	INTGE},
+	{"gt",	INTGT},
+	{"le",	INTLE},
+	{"lt",	INTLT},
+	{"nt",	FILNT},
+	{"ot",	FILOT},
+	{"ef",	FILEQ},
 };
 
 static int nargc;
@@ -416,35 +418,71 @@ filstat(char *nm, enum token mode)
 	}
 }
 
-static enum token
-t_lex(char *s)
+static int
+find_op_1char(const struct t_op *op, const struct t_op *end, const char *s)
 {
-	struct t_op const *op = ops;
+	char c;
 
-	if (s == 0) {
-		return EOI;
+	c = s[0];
+	while (op != end) {
+		if (c == *op->op_text)
+			return op->op_num;
+		op++;
 	}
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0) {
-			if (((TOKEN_TYPE(op->op_num) == UNOP ||
-			    TOKEN_TYPE(op->op_num) == BUNOP)
-						&& isunopoperand()) ||
-			    (op->op_num == LPAREN && islparenoperand()) ||
-			    (op->op_num == RPAREN && isrparenoperand()))
-				break;
+	return OPERAND;
+}
+
+static int
+find_op_2char(const struct t_op *op, const struct t_op *end, const char *s)
+{
+	while (op != end) {
+		if (s[0] == op->op_text[0] && s[1] == op->op_text[1])
 			return op->op_num;
-		}
 		op++;
 	}
 	return OPERAND;
 }
 
 static int
+find_op(const char *s)
+{
+	if (s[0] == '\0')
+		return OPERAND;
+	else if (s[1] == '\0')
+		return find_op_1char(ops1, (&ops1)[1], s);
+	else if (s[2] == '\0')
+		return s[0] == '-' ? find_op_1char(opsm1, (&opsm1)[1], s + 1) :
+		    find_op_2char(ops2, (&ops2)[1], s);
+	else if (s[3] == '\0')
+		return s[0] == '-' ? find_op_2char(opsm2, (&opsm2)[1], s + 1) :
+		    OPERAND;
+	else
+		return OPERAND;
+}
+
+static enum token
+t_lex(char *s)
+{
+	int num;
+
+	if (s == 0) {
+		return EOI;
+	}
+	num = find_op(s);
+	if (((TOKEN_TYPE(num) == UNOP || TOKEN_TYPE(num) == BUNOP)
+				&& isunopoperand()) ||
+	    (num == LPAREN && islparenoperand()) ||
+	    (num == RPAREN && isrparenoperand()))
+		return OPERAND;
+	return num;
+}
+
+static int
 isunopoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
 	char *t;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -452,20 +490,16 @@ isunopoperand(void)
 	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 TOKEN_TYPE(op->op_num) == BINOP &&
-			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP &&
+	    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 }
 
 static int
 islparenoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -474,12 +508,8 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0)
-			return TOKEN_TYPE(op->op_num) == BINOP;
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP;
 }
 
 static int

Modified: projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
==============================================================================
--- projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -26,6 +26,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2015 by Syneto S.R.L. All rights reserved.
  */
 
 /*
@@ -246,8 +247,9 @@ zpool_get_features(zpool_handle_t *zhp)
 		config = zpool_get_config(zhp, NULL);
 	}
 
-	verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
-	    &features) == 0);
+	if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
+	    &features) != 0)
+		return (NULL);
 
 	return (features);
 }

Modified: projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -982,7 +982,7 @@ handle_rtmsg(struct rt_msghdr *rtm)
 {
 	struct sockaddr *addrs[RTAX_MAX];
 	struct if_msghdr *ifm;
-	struct ifa_msghdr ifam;
+	struct ifa_msghdr ifam, *ifamp;
 	struct ifma_msghdr *ifmam;
 #ifdef RTM_IFANNOUNCE
 	struct if_announcemsghdr *ifan;
@@ -1002,8 +1002,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 	switch (rtm->rtm_type) {
 
 	  case RTM_NEWADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL)
 			break;
 
@@ -1029,8 +1030,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		break;
 
 	  case RTM_DELADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL)
 			break;
 

Modified: projects/clang380-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang380-import/contrib/elftoolchain/readelf/readelf.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/elftoolchain/readelf/readelf.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -1053,8 +1053,9 @@ static struct {
 static const char *
 r_type(unsigned int mach, unsigned int type)
 {
+	static char s_type[32];
+
 	switch(mach) {
-	case EM_NONE: return "";
 	case EM_386:
 	case EM_IAMCU:
 		switch(type) {
@@ -1089,8 +1090,8 @@ r_type(unsigned int mach, unsigned int t
 		case 35: return "R_386_TLS_DTPMOD32";
 		case 36: return "R_386_TLS_DTPOFF32";
 		case 37: return "R_386_TLS_TPOFF32";
-		default: return "";
 		}
+		break;
 	case EM_AARCH64:
 		switch(type) {
 		case 0: return "R_AARCH64_NONE";
@@ -1145,6 +1146,16 @@ r_type(unsigned int mach, unsigned int t
 		case 311: return "R_AARCH64_ADR_GOT_PAGE";
 		case 312: return "R_AARCH64_LD64_GOT_LO12_NC";
 		case 313: return "R_AARCH64_LD64_GOTPAGE_LO15";
+		case 560: return "R_AARCH64_TLSDESC_LD_PREL19";
+		case 561: return "R_AARCH64_TLSDESC_ADR_PREL21";
+		case 562: return "R_AARCH64_TLSDESC_ADR_PAGE21";
+		case 563: return "R_AARCH64_TLSDESC_LD64_LO12";
+		case 564: return "R_AARCH64_TLSDESC_ADD_LO12";
+		case 565: return "R_AARCH64_TLSDESC_OFF_G1";
+		case 566: return "R_AARCH64_TLSDESC_OFF_G0_NC";
+		case 567: return "R_AARCH64_TLSDESC_LDR";
+		case 568: return "R_AARCH64_TLSDESC_ADD";
+		case 569: return "R_AARCH64_TLSDESC_CALL";
 		case 1024: return "R_AARCH64_COPY";
 		case 1025: return "R_AARCH64_GLOB_DAT";
 		case 1026: return "R_AARCH64_JUMP_SLOT";
@@ -1154,8 +1165,8 @@ r_type(unsigned int mach, unsigned int t
 		case 1030: return "R_AARCH64_TLS_TPREL64";
 		case 1031: return "R_AARCH64_TLSDESC";
 		case 1032: return "R_AARCH64_IRELATIVE";
-		default: return "";
 		}
+		break;
 	case EM_ARM:
 		switch(type) {
 		case 0: return "R_ARM_NONE";
@@ -1206,8 +1217,8 @@ r_type(unsigned int mach, unsigned int t
 		case 253: return "R_ARM_RABS32";
 		case 254: return "R_ARM_RPC24";
 		case 255: return "R_ARM_RBASE";
-		default: return "";
 		}
+		break;
 	case EM_IA_64:
 		switch(type) {
 		case 0: return "R_IA_64_NONE";
@@ -1290,8 +1301,8 @@ r_type(unsigned int mach, unsigned int t
 		case 182: return "R_IA_64_DTPREL64MSB";
 		case 183: return "R_IA_64_DTPREL64LSB";
 		case 186: return "R_IA_64_LTOFF_DTPREL22";
-		default: return "";
 		}
+		break;
 	case EM_MIPS:
 		switch(type) {
 		case 0: return "R_MIPS_NONE";
@@ -1324,9 +1335,8 @@ r_type(unsigned int mach, unsigned int t
 		case 48: return "R_MIPS_TLS_TPREL64";
 		case 49: return "R_MIPS_TLS_TPREL_HI16";
 		case 50: return "R_MIPS_TLS_TPREL_LO16";
-
-		default: return "";
 		}
+		break;
 	case EM_PPC:
 		switch(type) {
 		case 0: return "R_PPC_NONE";
@@ -1406,8 +1416,8 @@ r_type(unsigned int mach, unsigned int t
 		case 114: return "R_PPC_EMB_RELST_HA";
 		case 115: return "R_PPC_EMB_BIT_FLD";
 		case 116: return "R_PPC_EMB_RELSDA";
-		default: return "";
 		}
+		break;
 	case EM_RISCV:
 		switch(type) {
 		case 0: return "R_RISCV_NONE";
@@ -1453,6 +1463,7 @@ r_type(unsigned int mach, unsigned int t
 		case 44: return "R_RISCV_RVC_BRANCH";
 		case 45: return "R_RISCV_RVC_JUMP";
 		}
+		break;
 	case EM_SPARC:
 	case EM_SPARCV9:
 		switch(type) {
@@ -1536,8 +1547,8 @@ r_type(unsigned int mach, unsigned int t
 		case 77: return "R_SPARC_TLS_DTPOFF64";
 		case 78: return "R_SPARC_TLS_TPOFF32";
 		case 79: return "R_SPARC_TLS_TPOFF64";
-		default: return "";
 		}
+		break;
 	case EM_X86_64:
 		switch(type) {
 		case 0: return "R_X86_64_NONE";
@@ -1578,10 +1589,12 @@ r_type(unsigned int mach, unsigned int t
 		case 35: return "R_X86_64_TLSDESC_CALL";
 		case 36: return "R_X86_64_TLSDESC";
 		case 37: return "R_X86_64_IRELATIVE";
-		default: return "";
 		}
-	default: return "";
+		break;
 	}
+
+	snprintf(s_type, sizeof(s_type), "<unknown: %#x>", type);
+	return (s_type);
 }
 
 static const char *

Modified: projects/clang380-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
==============================================================================
--- projects/clang380-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -5,7 +5,6 @@
 PROG=	cmatose
 MAN=
 SRCS=	cmatose.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang380-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile
==============================================================================
--- projects/clang380-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -5,7 +5,6 @@
 PROG=	mckey
 MAN=
 SRCS=	mckey.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang380-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
==============================================================================
--- projects/clang380-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -5,7 +5,6 @@
 PROG=	udaddy
 MAN=
 SRCS=	udaddy.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: projects/clang380-import/contrib/openresolv/Makefile
==============================================================================
--- projects/clang380-import/contrib/openresolv/Makefile	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/openresolv/Makefile	Sat Feb  6 14:07:17 2016	(r295351)
@@ -1,5 +1,5 @@
 PKG=		openresolv
-VERSION=	3.7.0
+VERSION=	3.7.1
 
 # Nasty hack so that make clean works without configure being run
 _CONFIG_MK!=	test -e config.mk && echo config.mk || echo config-null.mk
@@ -37,7 +37,7 @@ SED_RESTARTCMD=		-e 's:@RESTARTCMD \(.*\
 
 DISTPREFIX?=	${PKG}-${VERSION}
 DISTFILEGZ?=	${DISTPREFIX}.tar.gz
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.xz
 FOSSILID?=	current
 
 .SUFFIXES: .in
@@ -77,9 +77,9 @@ install: proginstall maninstall
 import:
 	rm -rf /tmp/${DISTPREFIX}
 	${INSTALL} -d /tmp/${DISTPREFIX}
-	cp README ${SRCS} /tmp/${DISPREFIX}
+	cp README ${SRCS} /tmp/${DISTPREFIX}
 
 dist:
 	fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ}
-	gunzip -c ${DISTFILEGZ} |  bzip2 >${DISTFILE}
+	gunzip -c ${DISTFILEGZ} | xz >${DISTFILE}
 	rm ${DISTFILEGZ}

Modified: projects/clang380-import/contrib/openresolv/resolvconf.8.in
==============================================================================
--- projects/clang380-import/contrib/openresolv/resolvconf.8.in	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/openresolv/resolvconf.8.in	Sat Feb  6 14:07:17 2016	(r295351)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 27, 2014
+.Dd April 27, 2015
 .Dt RESOLVCONF 8
 .Os
 .Sh NAME

Modified: projects/clang380-import/contrib/openresolv/resolvconf.conf.5.in
==============================================================================
--- projects/clang380-import/contrib/openresolv/resolvconf.conf.5.in	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/openresolv/resolvconf.conf.5.in	Sat Feb  6 14:07:17 2016	(r295351)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 2015
+.Dd May 14, 2015
 .Dt RESOLVCONF.CONF 5
 .Os
 .Sh NAME
@@ -91,6 +91,11 @@ To remove a block, you can use 192.168.*
 These interfaces name servers will only be queried for the domains listed
 in their resolv.conf.
 Useful for VPN domains.
+Setting
+.Sy private_interfaces Ns ="*"
+will stop the forwarding of the root zone and allows the local resolver to
+recursively query the root servers directly.
+Requires a local nameserver other than libc.
 This is equivalent to the
 .Nm resolvconf -p
 option.
@@ -149,7 +154,7 @@ When set to /dev/null or NULL,
 .Sy resolv_conf_local_only
 is defaulted to NO,
 .Sy local_nameservers
-is unset unless overriden and only the information set in
+is unset unless overridden and only the information set in
 .Nm
 is written to
 .Sy resolv_conf .
@@ -271,7 +276,7 @@ Each subscriber attempts to automaticall
 distribution has been catered for.
 Also, users could equally want to use a different version from the one
 installed by default, such as bind8 and bind9.
-To accomodate this, the subscribers have these files in configurable
+To accommodate this, the subscribers have these files in configurable
 variables, documented below.
 .Pp
 .Bl -tag -width indent

Modified: projects/clang380-import/contrib/openresolv/resolvconf.in
==============================================================================
--- projects/clang380-import/contrib/openresolv/resolvconf.in	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/openresolv/resolvconf.in	Sat Feb  6 14:07:17 2016	(r295351)
@@ -50,7 +50,6 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; th
 		interface_order="$(cat "$SYSCONFDIR"/interface-order)"
 	fi
 fi
-TMPDIR="$VARDIR/tmp"
 IFACEDIR="$VARDIR/interfaces"
 METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"

Modified: projects/clang380-import/contrib/openresolv/unbound.in
==============================================================================
--- projects/clang380-import/contrib/openresolv/unbound.in	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/openresolv/unbound.in	Sat Feb  6 14:07:17 2016	(r295351)
@@ -45,7 +45,8 @@ for d in $DOMAINS; do
 	ns="${d#*:}"
 	case "$unbound_insecure" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-		newconf="$newconf${NL}domain-insecure: \"$dn\""
+		newconf="$newconf${NL}server:$NL"
+		newconf="$newconf	domain-insecure: \"$dn\"$NL"
 		;;
 	esac
 	newconf="$newconf${NL}forward-zone:$NL	name: \"$dn\"$NL"

Modified: projects/clang380-import/contrib/smbfs/smbutil/print.c
==============================================================================
--- projects/clang380-import/contrib/smbfs/smbutil/print.c	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/contrib/smbfs/smbutil/print.c	Sat Feb  6 14:07:17 2016	(r295351)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include <sysexits.h>

Modified: projects/clang380-import/crypto/openssh/sshd_config
==============================================================================
--- projects/clang380-import/crypto/openssh/sshd_config	Sat Feb  6 14:03:31 2016	(r295350)
+++ projects/clang380-import/crypto/openssh/sshd_config	Sat Feb  6 14:07:17 2016	(r295351)
@@ -45,7 +45,7 @@
 # Authentication:
 
 #LoginGraceTime 2m
-#PermitRootLogin prohibit-password
+#PermitRootLogin no
 #StrictModes yes

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