From f132e99efa0e23b3a93beb5556923e2f865bbb76 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 12 May 2020 17:00:23 +0000
Subject: [PATCH] Add UPDATING entries and bump version.

Approved by:	so
Approved by:	re (implicit)
---
 UPDATING            | 22 ++++++++++++++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 7fb83a02ece..c4f08eb8508 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,28 @@ 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.
 
+20200512	p5	FreeBSD-EN-20:08.tzdata
+			FreeBSD-EN-20:09.igb
+			FreeBSD-EN-20:10.build
+			FreeBSD-SA-20:12.libalias
+			FreeBSD-SA-20:13.libalias
+			FreeBSD-SA-20:15.cryptodev
+			FreeBSD-SA-20:16.cryptodev
+
+        Import tzdata 2020a. [EN-20:08.tzdata]
+
+        Fix igb interfaces failing to switch to inactive state [EN-20:09.igb]
+
+        Fix incorrect build host Clang version detection [EN-20:10.build]
+
+	Fix insufficient packet length validation in libalias [SA-20:12.libalias]
+
+	Fix memory disclosure vulnerability in libalias [SA-20:13.libalias]
+
+	Fix use after free in cryptodev module [SA-20:15.cryptodev]
+
+	Fix insufficient cryptodev MAC key length check [SA-20:16.cryptodev]
+
 20200421	p4	FreeBSD-EN-20:07.quotad
 			FreeBSD-SA-20:10.ipfw
 			FreeBSD-SA-20:11.openssl
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 71793d84d9f..5d8a6a9454c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p5"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0