From owner-svn-src-all@FreeBSD.ORG  Mon Dec  2 14:28:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5B536A3C;
 Mon,  2 Dec 2013 14:28:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A0AD1776;
 Mon,  2 Dec 2013 14:28:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB2ESVvW006712;
 Mon, 2 Dec 2013 14:28:31 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB2ESV02006710;
 Mon, 2 Dec 2013 14:28:31 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312021428.rB2ESV02006710@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 2 Dec 2013 14:28:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258847 - head/release/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Dec 2013 14:28:31 -0000

Author: gjb
Date: Mon Dec  2 14:28:30 2013
New Revision: 258847
URL: http://svnweb.freebsd.org/changeset/base/258847

Log:
  Provide reproducibility between builds by building pkg(8) from ports,
  instead of using pkg-bootstrap.
  
  This should resolve a problem that was discovered during 10.0-BETA4
  freebsd-update(8) builds,
  
  Reported by:	secteam (delphij)
  MFC after:	3 days
  X-MFC-to-10:	possibly immediately, pending freebsd-update(8) builds
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/scripts/pkg-stage.sh

Modified: head/release/scripts/pkg-stage.sh
==============================================================================
--- head/release/scripts/pkg-stage.sh	Mon Dec  2 14:26:57 2013	(r258846)
+++ head/release/scripts/pkg-stage.sh	Mon Dec  2 14:28:30 2013	(r258847)
@@ -25,7 +25,7 @@ REVISION="${2}"
 . "${1}" || exit 1
 
 if [ ! -x /usr/local/sbin/pkg ]; then
-	/usr/sbin/pkg bootstrap	
+	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
 /bin/mkdir -p ${PKG_CACHEDIR}