[master] prep 9.12.0b2

diff --git a/CHANGES b/CHANGES
index 4289f2b0ab4eb625e5e794783c8f49a3ece68237..1a03576f03221ded0afc2bfa2fc21cc5a0f26882 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+       --- 9.12.0b2 released ---
+
 4806.  [func]          Log messages related to loading of zones are now
                        directed to the "zoneload" logging category.
                        [RT #41640]

diff --git a/README b/README
index 3df129d129bdf75529f3abcd806d6c2f016fb87b..72e5e5d06e280febdbf44c030ae2b81b420f5c5b 100644 (file)
--- a/README
+++ b/README
@@ -118,6 +118,10 @@ include:
   * Added support for the EDNS Padding and Keepalive options.
   * 'new-zones-directory' option sets the location where the configuration
     data for zones added by rndc addzone is stored
+  * The default key algorithm in rndc-confgen is now hmac-sha256.
+  * filter-aaaa-on-v4 and filter-aaaa-on-v6 options are now available by
+    default without a configure option.
+  * The obsolete isc-hmac-fixup command has been removed.
 
 Building BIND
 

diff --git a/README.md b/README.md
index 74d9f01db60e9719a71882f3619421aebd956a2c..3076c74b64848b94ece2f8853f09b07b0c4a2e0c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -130,6 +130,10 @@ include:
 * Added support for the EDNS Padding and Keepalive options.
 * 'new-zones-directory' option sets the location where the configuration
   data for zones added by rndc addzone is stored
+* The default key algorithm in `rndc-confgen` is now hmac-sha256.
+* `filter-aaaa-on-v4` and `filter-aaaa-on-v6` options are now available
+  by default without a configure option.
+* The obsolete `isc-hmac-fixup` command has been removed.
 
 ### <a name="build"/> Building BIND
 

diff --git a/lib/bind9/api b/lib/bind9/api
index 6e017f570da0c0715f6a5878e28e350ae8aeac0c..a9131cd91091bfd1f1621464d25257d1f28b763c 100644 (file)
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -9,5 +9,5 @@
 # 9.11: 160-169
 # 9.12: 1200-1299
 LIBINTERFACE = 1200
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 0

diff --git a/lib/dns/api b/lib/dns/api
index ad3f063d57be30aa0b6cde6c844f5157d99c5f80..ebab145435abd441df44680f6b3396be7df940b5 100644 (file)
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -8,6 +8,6 @@
 # 9.10-sub: 180-189
 # 9.11: 160-169
 # 9.12: 1200-1299
-LIBINTERFACE = 1201
+LIBINTERFACE = 1202
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1

diff --git a/lib/irs/api b/lib/irs/api
index d36ff89a91fbcbc19c0d2bf901dc8a5a6ad13b53..6e017f570da0c0715f6a5878e28e350ae8aeac0c 100644 (file)
--- a/lib/irs/api
+++ b/lib/irs/api
@@ -9,5 +9,5 @@
 # 9.11: 160-169
 # 9.12: 1200-1299
 LIBINTERFACE = 1200
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/lib/isc/api b/lib/isc/api
index 490f262cd7283198a75852a877fb773e46e65175..aa4542fc27a140fafc4be0bc946a90b7784652fd 100644 (file)
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -8,6 +8,6 @@
 # 9.10-sub: 180-189
 # 9.11: 160-169
 # 9.12: 1200-1299
-LIBINTERFACE = 1201
+LIBINTERFACE = 1202
 LIBREVISION = 0
-LIBAGE = 1
+LIBAGE = 2

diff --git a/lib/ns/api b/lib/ns/api
index 490f262cd7283198a75852a877fb773e46e65175..f7839c9f0d1e123cd2a6e4849b6dcb9974ba69cc 100644 (file)
--- a/lib/ns/api
+++ b/lib/ns/api
@@ -8,6 +8,6 @@
 # 9.10-sub: 180-189
 # 9.11: 160-169
 # 9.12: 1200-1299
-LIBINTERFACE = 1201
+LIBINTERFACE = 1202
 LIBREVISION = 0
-LIBAGE = 1
+LIBAGE = 0

diff --git a/version b/version
index e489090a27794e67a8badc505994305157e8a5cd..573013b9f411d63d9398eac4d13a990dfce2eb57 100644 (file)
--- a/version
+++ b/version
@@ -7,5 +7,5 @@ MAJORVER=9
 MINORVER=12
 PATCHVER=0
 RELEASETYPE=b
-RELEASEVER=1
+RELEASEVER=2
 EXTENSIONS=