aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2020-07-08 20:26:19 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2020-07-08 20:26:19 +0000
commite5bc066b765354f41979012ae4d3d3a161dec54c (patch)
tree1fb14155d7ba348e74172c20795408890cbc4d7e
parent9a1fa54dd1f9eb9560c4cc136b88f90fd9d4ed4e (diff)
downloadsrc-e5bc066b765354f41979012ae4d3d3a161dec54c.tar.gz
src-e5bc066b765354f41979012ae4d3d3a161dec54c.zip
Add UPDATING entries and bump version.
Approved by: so
Notes
Notes: svn path=/releng/11.4/; revision=363030
-rw-r--r--UPDATING13
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 14 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 3ab424ed339e..256f6169727d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,19 @@ 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.
+20200708 p1 FreeBSD-EN-20:15.mps
+ FreeBSD-SA-20:18.posix_spawnp
+ FreeBSD-SA-20:19.unbound
+ FreeBSD-SA-20:20.ipv6
+
+ Fix kernel panic in mps(4) driver. [EN-20:15.mps]
+
+ Fix posix_spawnp(3) buffer overflow. [SA-20:18.posix_spawnp]
+
+ Fix multiple vulnerabilities in unbound. [SA-20:19.unbound]
+
+ Fix IPv6 socket option race condition and use after free. [SA-20:20.ipv6]
+
20200616:
11.4-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ce94973f73fd..ac0cff390dd4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi