From 65df298b3a8cb1586f356b4623dd1d2c16620783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Sun, 11 Feb 2024 11:05:50 +0100
Subject: [PATCH 1/2] Update BIND version to 9.18.25-dev

(cherry picked from commit 5e3d4ade065d4267c7c083d81ffdb5a0bd3760cb)
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8aa7a90cb1..b73c0fc3cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@
 #
 m4_define([bind_VERSION_MAJOR], 9)dnl
 m4_define([bind_VERSION_MINOR], 18)dnl
-m4_define([bind_VERSION_PATCH], 24)dnl
-m4_define([bind_VERSION_EXTRA], )dnl
+m4_define([bind_VERSION_PATCH], 25)dnl
+m4_define([bind_VERSION_EXTRA], -dev)dnl
 m4_define([bind_DESCRIPTION], [(Extended Support Version)])dnl
 m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD | cut -b1-7])])dnl
 m4_define([bind_PKG_VERSION], [[bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA])dnl

From ffaed05053b37d6ad872ed87f92017034de8c1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Sun, 11 Feb 2024 11:05:50 +0100
Subject: [PATCH 2/2] Set up release notes for BIND 9.18.25

(cherry picked from commit eef4bc99d0881471467d8ba4c36cb359dd9f1d73)
---
 doc/notes/notes-current.rst | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 doc/notes/notes-current.rst

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
new file mode 100644
index 0000000000..53088528e7
--- /dev/null
+++ b/doc/notes/notes-current.rst
@@ -0,0 +1,45 @@
+.. Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+..
+.. SPDX-License-Identifier: MPL-2.0
+..
+.. This Source Code Form is subject to the terms of the Mozilla Public
+.. License, v. 2.0.  If a copy of the MPL was not distributed with this
+.. file, you can obtain one at https://mozilla.org/MPL/2.0/.
+..
+.. See the COPYRIGHT file distributed with this work for additional
+.. information regarding copyright ownership.
+
+Notes for BIND 9.18.25
+----------------------
+
+Security Fixes
+~~~~~~~~~~~~~~
+
+- None.
+
+New Features
+~~~~~~~~~~~~
+
+- None.
+
+Removed Features
+~~~~~~~~~~~~~~~~
+
+- None.
+
+Feature Changes
+~~~~~~~~~~~~~~~
+
+- None.
+
+Bug Fixes
+~~~~~~~~~
+
+- None.
+
+Known Issues
+~~~~~~~~~~~~
+
+- There are no new known issues with this release. See :ref:`above
+  <relnotes_known_issues>` for a list of all known issues affecting this
+  BIND 9 branch.