aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2024-06-18 17:34:24 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2024-06-19 20:21:41 +0000
commitbdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b (patch)
tree4e4dd56cc82506c4d24baffd65edbd0d994aff92
parentbdf75e830a77a16ec0baf1c9367f64c6b96c5e02 (diff)
downloadsrc-bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b.tar.gz
src-bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b.zip
Add UPDATING entries and bump the branch version.
Approved by: so
-rw-r--r--UPDATING5
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 8a24e55cb4b9..0a9ee0ff58f1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,11 @@ 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.0-RELEASE-p7 EN-24:11.ldns
+
+ Fix LDNS uses nameserver commented out in resolv.conf [EN-24:11.ldns]
+
20240327:
14.0-RELEASE-p6 SA-24:03.unbound
EN-24:05.tty
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 02f705ccc64a..2d5f3bbca98c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.0"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi