From: Evan Hunt <each@isc.org>
Date: Thu, 2 Nov 2017 18:50:07 +0000 (-0700)
Subject: [master] prep 9.12.0b2
X-Git-Tag: v9.12.0b2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d2310554738502b15987992dfed11973e9da4d4;p=thirdparty%2Fbind9.git

[master] prep 9.12.0b2
---

diff --git a/CHANGES b/CHANGES
index 4289f2b0ab4..1a03576f032 100644
--- 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 3df129d129b..72e5e5d06e2 100644
--- 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 74d9f01db60..3076c74b648 100644
--- 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 6e017f570da..a9131cd9109 100644
--- 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 ad3f063d57b..ebab145435a 100644
--- 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 d36ff89a91f..6e017f570da 100644
--- 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 490f262cd72..aa4542fc27a 100644
--- 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 490f262cd72..f7839c9f0d1 100644
--- 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 e489090a277..573013b9f41 100644
--- a/version
+++ b/version
@@ -7,5 +7,5 @@ MAJORVER=9
 MINORVER=12
 PATCHVER=0
 RELEASETYPE=b
-RELEASEVER=1
+RELEASEVER=2
 EXTENSIONS=