From 4d53a6b7a427f8fa7273896f8b856c9d37acc3b2 Mon Sep 17 00:00:00 2001 From: Gordon Tetlow Date: Tue, 18 Jun 2024 10:48:38 -0700 Subject: [PATCH] Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 2d4a66d0d29..d972b89c5f6 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. +20240619: + 14.1-RELEASE-p1 EN-24:10.zfs + EN-24:13.libc++ + + Fix kernel memory leak in ZFS [EN-24:10.zfs] + + Fix incorrect size passed to heap allocated std::string delete [EN-24:13.libc++] + 20240604: 14.1-RELEASE. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 38d445be32a..8b55836841d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="RELEASE" +BRANCH="RELEASE-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi