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
commitc944cb7416ea291d56989168890ec13ff98465d0 (patch)
treebd8ed1436a3cbe308bce99ac0fda00d1bd9ec054
parent0c3089f7ac357bfd66b08678db5a22892f3bbccb (diff)
downloadsrc-c944cb7416ea291d56989168890ec13ff98465d0.tar.gz
src-c944cb7416ea291d56989168890ec13ff98465d0.zip
Add UPDATING entries and bump version.
Approved by: so
Notes
Notes: svn path=/releng/12.1/; revision=368257
-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 74e5bbcadf8e..67a929f1314b 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.
+20201201: p11 FreeBSD-EN-20:20.tzdata
+ FreeBSD-SA-20:31.icmp6
+ FreeBSD-SA-20:32.rtsold
+
+ Update timezone database information. [EN-20:20.tzdata]
+
+ Fix ICMPv6 use-after-free in error message handling. [SA-20:31.icmp6]
+
+ Fix multiple vulnerabilities in rtsold. [SA-20:32.rtsold]
+
20200915 p10 FreeBSD-SA-20:27.ure
FreeBSD-SA-20:28.bhyve_vmcs
FreeBSD-SA-20:29.bhyve_svm
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0a1dbe789dc1..bc67b2d1adb5 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.1"
-BRANCH="RELEASE-p10"
+BRANCH="RELEASE-p11"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi