aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-06-29 17:19:33 +0000
committerMark Johnston <markj@FreeBSD.org>2021-06-29 20:01:28 +0000
commit7fe589000ce991bff5919054fa1b1b7e4c38be68 (patch)
tree06f76420a99f07f29bec619adbbd5cf38f78537b
parentf82ccb6f5974f0aae5957e47901476bfeb2a5387 (diff)
downloadsrc-7fe589000ce991bff5919054fa1b1b7e4c38be68.tar.gz
src-7fe589000ce991bff5919054fa1b1b7e4c38be68.zip
Add UPDATING entries and bump version
Approved by: so
-rw-r--r--UPDATING7
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 8 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 8a9f819405fa..39436624b2d7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,13 @@ 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.
+20210629: p12 FreeBSD-EN-21:19.libcasper
+ FreeBSD-EN-21:22.linux_futex
+
+ libcasper assertion failure [EN-21:19.libcasper]
+
+ Linux compatibility layer futex(2) system call vulnerability [EN-21:22.linux_futex]
+
20210601: p11 FreeBSD-EN-21:17.libradius
Incorrect validation in rad_get_attr(3) [FreeBSD-EN-21:17.libradius]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 360ee0de08ab..fd228bf9ad03 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi