aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2020-12-01 19:40:58 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2020-12-01 19:40:58 +0000
commitfc825298b84729facaced36d32c3fc8d111648c1 (patch)
treef4959ebad0dee55eb35e3db1543ba37d90fefc5c
parent85b4a006794d02f6e0e2f53bca3782732932a7c2 (diff)
downloadsrc-fc825298b84729facaced36d32c3fc8d111648c1.tar.gz
src-fc825298b84729facaced36d32c3fc8d111648c1.zip
Add UPDATING entries and bump version.
Approved by: so
Notes
Notes: svn path=/releng/12.2/; revision=368257
-rw-r--r--UPDATING19
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 20 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index c8087540fe07..2e13d9dd1f7b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,25 @@ 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.
+20201201: p1 FreeBSD-EN-20:19.audit
+ FreeBSD-EN-20:20.tzdata
+ FreeBSD-EN-20:21.ipfw
+ FreeBSD-EN-20:22.callout
+ FreeBSD-SA-20:31.icmp6
+ FreeBSD-SA-20:32.rtsold
+
+ Fix execve/fexecve system call auditing. [EN-20:19.audit]
+
+ Update timezone database information. [EN-20:20.tzdata]
+
+ Fix uninitialized variable in ipfw. [EN-20:21.ipfw]
+
+ Fix race condition in callout CPU migration. [EN-20:22.callout]
+
+ Fix ICMPv6 use-after-free in error message handling. [SA-20:31.icmp6]
+
+ Fix multiple vulnerabilities in rtsold. [SA-20:32.rtsold]
+
20201027:
12.2-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 4415230630d8..98c30a869a7e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
TYPE="FreeBSD"
REVISION="12.2"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi