From 0686b950e69548d2cf5cb4f275b25f2ca96ce37d Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 15 Sep 2020 21:48:24 +0000
Subject: Add UPDATING entries and bump version.

Approved by:	so
Approved by:	re (implicit for releng/12.2)
---
 UPDATING            | 14 ++++++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index ac80b270c8c4..d545d40d29a0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,20 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200915	p1	FreeBSD-SA-20:27.ure
+			FreeBSD-SA-20:28.bhyve_vmcs
+			FreeBSD-SA-20:29.bhyve_svm
+			FreeBSD-SA-20:30.ftpd
+
+        Fix ure device driver susceptible to packet-in-packet attack.
+          [SA-20:27.ure]
+
+        Fix bhyve privilege escalation via VMCS access. [SA-20:28.bhyve_vmcs]
+
+        Fix bhyve SVM guest escape. [SA-20:29.bhyve_svm]
+
+        Fix ftpd privilege escalation via ftpchroot. [SA-20:30.ftpd]
+
 20200912:
 	The make.conf(5) MALLOC_PRODUCTION variable, used for disabling and
 	enabling assertions and statistics gathering in malloc(3), has been
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index aae51a8cbc48..8e186103e34f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH=${BRANCH_OVERRIDE:-BETA1}
+BRANCH=${BRANCH_OVERRIDE:-BETA1-p1}
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 
-- 
cgit v1.2.3