Merge tag 'v9_18_12' into v9_18

BIND 9.18.12

diff --cc CHANGES
index 908eadcc9e3735bad2e77832bcf6b7359f6401d9,e46a3243930160f594baf97eb20fb62b27befb32..c9d30df542f7e0e50250d8cd0ec340da5a281f04
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,25 -1,5 +1,27 @@@
 +6098. [test]          Don't test HMAC-MD5 when not supported by libcrypto.
 +                      [GL #3871]
 +
 +6096. [bug]           Fix RPZ reference counting error on shutdown in
 +                      dns__rpz_timer_cb(). [GL #3866]
 +
 +6095. [test]          Test various 'islands of trust' configurations when
 +                      using managed keys. [GL #3662]
 +
 +6094. [bug]           Building against (or running with) libuv versions
 +                      1.35.0 and 1.36.0 is now a fatal error.  The rules for
 +                      mixing and matching compile-time and run-time libuv
 +                      versions have been tightened for libuv versions between
 +                      1.35.0 and 1.40.0. [GL #3840]
 +
 +6092. [bug]           dnssec-cds failed to cleanup properly. [GL #3831]
 +
 +6089. [bug]           Source ports configured for query-source,
 +                      transfer-source, etc, were being ignored. (This
 +                      feature is deprecated, but it is not yet removed,
 +                      so the bug still needed fixing.) [GL #3790]
 +
+       --- 9.18.12 released ---
+ 
  6083. [bug]           Fix DNSRPS-enabled builds as they were inadvertently
                        broken by change 6042. [GL #3827]
  

diff --cc configure.ac
index 531d47a1072f1e147ba2ee679ac3728ea8941a84,eb829a91113aa38210d84bcd819f80573e8317d2..14e64c2876cc92ec9f3441be04c4dbcb083008d1
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -16,9 -16,9 +16,9 @@@
  #
  m4_define([bind_VERSION_MAJOR], 9)dnl
  m4_define([bind_VERSION_MINOR], 18)dnl
 -m4_define([bind_VERSION_PATCH], 12)dnl
 -m4_define([bind_VERSION_EXTRA], )dnl
 +m4_define([bind_VERSION_PATCH], 13)dnl
 +m4_define([bind_VERSION_EXTRA], -dev)dnl
- m4_define([bind_DESCRIPTION], [(Stable Release)])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
  

diff --cc doc/arm/notes.rst
index 42eed6bdc1de0a8faa453ff67f243e5881617785,4b7448be80c98526c96d6ab83daa77e22c69cad5..3e50823301c06411e5687148f481bfba34455969
--- 1/doc/arm/notes.rst
--- 2/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@@ -35,7 -35,7 +35,8 @@@ information about each release, and sou
  
  .. include:: ../notes/notes-known-issues.rst
  
 +.. include:: ../notes/notes-current.rst
+ .. include:: ../notes/notes-9.18.12.rst
  .. include:: ../notes/notes-9.18.11.rst
  .. include:: ../notes/notes-9.18.10.rst
  .. include:: ../notes/notes-9.18.9.rst