aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2020-09-02 16:29:40 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2020-09-02 16:29:40 +0000
commit145fad722bf818e7924a3af3d383ee21d357c737 (patch)
treed21c083c1e38b9786015f2cf3379e79a51acc351
parentb2ed812dbd2e0872806aed91ec528ed46271c5ca (diff)
downloadsrc-145fad722bf818e7924a3af3d383ee21d357c737.tar.gz
src-145fad722bf818e7924a3af3d383ee21d357c737.zip
Add UPDATING entries and bump version.
Approved by: so
Notes
Notes: svn path=/releng/12.1/; revision=365258
-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 490e5851a0b0..119585956d2a 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.
+20200902 p9 FreeBSD-EN-20:17.linuxthread
+ FreeBSD-SA-20:25.sctp
+ FreeBSD-SA-20:26.dhclient
+
+ Fix FreeBSD Linux ABI kernel panic. [EN-20:17.linuxthread]
+
+ Fix SCTP socket use-after-free. [SA-20:25.sctp]
+
+ Fix dhclient heap overflow. [SA-20:26.dhclient]
+
20200805 p8 FreeBSD-EN-20:16.vmx
FreeBSD-SA-20:21.usb_net
FreeBSD-SA-20:22.unbound
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 2447cb5436dc..1a5b8dbaad17 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.1"
-BRANCH="RELEASE-p8"
+BRANCH="RELEASE-p9"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi