From owner-svn-src-user@freebsd.org  Sat Sep 12 15:18:56 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C6F83DACF7
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Sat, 12 Sep 2020 15:18:56 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpbqx4lblz45sK;
 Sat, 12 Sep 2020 15:18:53 +0000 (UTC)
 (envelope-from gordon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DA7517134;
 Sat, 12 Sep 2020 15:18:52 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CFIquv024561;
 Sat, 12 Sep 2020 15:18:52 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CFIqmE024560;
 Sat, 12 Sep 2020 15:18:52 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <202009121518.08CFIqmE024560@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
 gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sat, 12 Sep 2020 15:18:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r365660 -
 user/cperciva/freebsd-update-build/patches/12.2-BETA1
X-SVN-Group: user
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: user/cperciva/freebsd-update-build/patches/12.2-BETA1
X-SVN-Commit-Revision: 365660
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Sep 2020 15:18:56 -0000

Author: gordon
Date: Sat Sep 12 15:18:52 2020
New Revision: 365660
URL: https://svnweb.freebsd.org/changeset/base/365660

Log:
  Add needed patch for 12.2-BETA1 to prevent spurious changes through
  freebsd-update processing.

Added:
  user/cperciva/freebsd-update-build/patches/12.2-BETA1/
  user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers

Added: user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers	Sat Sep 12 15:18:52 2020	(r365660)
@@ -0,0 +1,14 @@
+--- sys/conf/newvers.sh.orig	2020-09-12 08:05:28.983303000 +0000
++++ sys/conf/newvers.sh	2020-09-12 08:06:24.743930000 +0000
+@@ -49,7 +49,10 @@
+ 
+ TYPE="FreeBSD"
+ REVISION="12.2"
+-BRANCH=${BRANCH_OVERRIDE:-BETA1}
++BRANCH="BETA1"
++if [ -n "${BRANCH_OVERRIDE}" ]; then
++	BRANCH=${BRANCH_OVERRIDE}
++fi
+ RELEASE="${REVISION}-${BRANCH}"
+ VERSION="${TYPE} ${RELEASE}"
+