svn commit: r342233 - in releng/12.0: . sys/conf

[Ed Maste]

Author: emaste
Date: Wed Dec 19 18:32:32 2018
New Revision: 342233
URL: https://svnweb.freebsd.org/changeset/base/342233

Log:
  12.0-RELEASE-p1 UPDATING
  
  Approved by:	so
  Security:	FreeBSD-SA-18:15.bootpd

Modified:
  releng/12.0/UPDATING
  releng/12.0/sys/conf/newvers.sh

Modified: releng/12.0/UPDATING
==============================================================================
--- releng/12.0/UPDATING	Wed Dec 19 18:29:46 2018	(r342232)
+++ releng/12.0/UPDATING	Wed Dec 19 18:32:32 2018	(r342233)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 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.
 
+20181219:	p1	FreeBSD-SA-18:15.bootpd
+
+	bootpd: validate hardware type [SA-18:15.bootpd]
+
 20181211:
 	12.0-RELEASE.
 

Modified: releng/12.0/sys/conf/newvers.sh
==============================================================================
--- releng/12.0/sys/conf/newvers.sh	Wed Dec 19 18:29:46 2018	(r342232)
+++ releng/12.0/sys/conf/newvers.sh	Wed Dec 19 18:32:32 2018	(r342233)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.0"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi