aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2023-10-03 21:19:27 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2023-10-03 21:19:27 +0000
commitb1b39c2f2fe4067527d96dfcda70e556a817ff41 (patch)
treeb6e47315ed824d67e780af22fbcb2348124e0aba
parentbb2ccf50d7f7c740743b29a26e2444e364df431e (diff)
downloadsrc-b1b39c2f2fe4067527d96dfcda70e556a817ff41.tar.gz
src-b1b39c2f2fe4067527d96dfcda70e556a817ff41.zip
Add UPDATING entries and bump version.
Approved by: so
-rw-r--r--UPDATING11
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 12 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index ecde75536cbc..100c281c3786 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,17 @@ 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.
+20231003:
+ 12.4-RELEASE-p6 FreeBSD-EN-23:09.freebsd-update
+ FreeBSD-EN-23:12.freebsd-update
+ FreeBSD-SA-23:12.msdosfs
+
+ freebsd-update incorrectly merges files on upgrade [EN-23:09.freebsd-update]
+
+ freebsd-update to 14.0 fails [EN-23:12.freebsd-update]
+
+ Fix msdosfs data disclosure [SA-23:12.msdosfs]
+
20230906:
12.4-RELEASE-p5 FreeBSD-SA-23:10.pf
FreeBSD-SA-23:11.wifi
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index bb919a38da7d..fa6d3e9340b8 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
TYPE="FreeBSD"
REVISION="12.4"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi