aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING10
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 11 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 256f6169727d..edc6081939dc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,16 @@ 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.
+20200805 p2 FreeBSD-SA-20:21.usb_net
+ FreeBSD-SA-20:22.unbound
+ FreeBSD-SA-20:23.ipv6
+
+ Fix memory corruption in USB network device drivers. [SA-20:21.usb_net]
+
+ Fix multiple vulnerabilities in sqlite3. [SA-20:22.sqlite]
+
+ Fix sendmsg(2) privilege escalation. [SA-20:23.sendmsg]
+
20200708 p1 FreeBSD-EN-20:15.mps
FreeBSD-SA-20:18.posix_spawnp
FreeBSD-SA-20:19.unbound
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ac0cff390dd4..5cf405ec9a5c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi