From: Michał Kępień <michal@isc.org>
Date: Wed, 15 Nov 2023 13:54:10 +0000 (+0100)
Subject: Merge tag 'v9.19.18'
X-Git-Tag: v9.19.19~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc25df18f32099fa4ac366435c55a51fe19c4657;p=thirdparty%2Fbind9.git

Merge tag 'v9.19.18'
---

dc25df18f32099fa4ac366435c55a51fe19c4657
diff --cc CHANGES
index eecdf51e0fe,1888012a675..9c49510cf74
--- a/CHANGES
+++ b/CHANGES
@@@ -1,18 -1,5 +1,20 @@@
 +6285.	[func]		Remove AES-based DNS cookies. [GL #4421]
 +
 +6284.	[bug]		Fix a catz db update notification callback registration
 +			logic error, which could cause an assertion failure when
 +			receiving an AXFR update for a catalog zone while the
 +			previous update process of the catalog zone was already
 +			running. [GL #4418]
 +
 +6283.	[bug]		Fix a data race in isc_hashmap by using atomics for the
 +			iterators number. [GL !8474]
 +
 +6282.	[func]		Deprecate AES-based DNS cookies. [GL #4421]
 +
 +6281.	[bug]		Fix a data race in dns_tsigkeyring_dump(). [GL #4328]
 +
+ 	--- 9.19.18 released ---
+ 
  6280.	[bug]		Fix missing newlines in the output of "rndc nta -dump".
  			[GL !8454]
  
diff --cc doc/arm/notes.rst
index 5eff08bf47a,67710fe4fed..947760fca9c
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -38,7 -38,7 +38,8 @@@ information about each release, and sou
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.19.18.rst
  .. include:: ../notes/notes-9.19.17.rst
  .. include:: ../notes/notes-9.19.16.rst
  .. include:: ../notes/notes-9.19.15.rst