aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2023-12-05 18:29:45 +0000
committerMark Johnston <markj@FreeBSD.org>2023-12-05 18:29:45 +0000
commite8439726cfa5bd0059a65117447d8c4160bfed43 (patch)
tree4f7de653c513df326164e12076dd93b569b1a858
parent45e256e24c976a55dc856907a57564cbc30cfb60 (diff)
downloadsrc-e8439726cfa5bd0059a65117447d8c4160bfed43.tar.gz
src-e8439726cfa5bd0059a65117447d8c4160bfed43.zip
Add UPDATING entries and bump version
Approved by: so
-rw-r--r--UPDATING8
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 9 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 9e997c89f59b..d03d434a87d8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20231205:
+ 13.2-RELEASE-p7 SA-23:17.pf
+ EN-23:15.sanitizer
+
+ TCP spoofing vulnerability in pf(4) [SA-23:17.pf]
+
+ Fix clang sanitizer failure with ASLR enabled [EN-23:15.sanitizer]
+
20231130:
13.2-RELEASE-p6 EN-23:16.openzfs
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 9e399bc19d20..627c99e8b973 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -54,7 +54,7 @@
TYPE="FreeBSD"
REVISION="13.2"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi