From: Evan Hunt <each@isc.org>
Date: Sun, 18 Feb 2018 03:54:52 +0000 (-0800)
Subject: [v9_12] re-prep 9.12.1rc1 to include needed fixes; update README
X-Git-Tag: v9.12.1rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5254978eec3b416703d60505ea94b24e630f1a03;p=thirdparty%2Fbind9.git

[v9_12] re-prep 9.12.1rc1 to include needed fixes; update README
---

diff --git a/CHANGES b/CHANGES
index ee1d663ecd2..ef900ab907e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+	--- 9.12.1rc1 released ---
+
 4894.	[bug]		named could crash while rolling a dnstap output file.
 			[RT #46942]
 
@@ -7,8 +9,6 @@
 			before all zone loading actions triggered by a previous
 			"rndc reload" command were completed. [RT #47076]
 
-	--- 9.12.1rc1 released ---
-
 4889.	[func]		Warn about the use of old root keys without the new
 			root key being present.  Warn about dlv.isc.org's
 			key being present. Warn about both managed and
diff --git a/README b/README
index 0b10096ed5e..14858c41e2d 100644
--- a/README
+++ b/README
@@ -77,8 +77,7 @@ mailman/listinfo/bind-workers.
 Contributing to BIND
 
 ISC maintains a public git repository for BIND; details can be found at
-http://www.isc.org/git/, and also on Github at https://github.com/
-isc-projects.
+http://www.isc.org/git/.
 
 Information for BIND contributors can be found in the following files: -
 General information: doc/dev/contrib.md - BIND 9 code style: doc/dev/
diff --git a/README.md b/README.md
index b61e4e2e56f..f81a5c5e516 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,7 @@ may also want to join the __BIND Workers__ mailing list, at
 ### <a name="contrib"/> Contributing to BIND
 
 ISC maintains a public git repository for BIND; details can be found
-at [http://www.isc.org/git/](http://www.isc.org/git/), and also on Github
-at [https://github.com/isc-projects](https://github.com/isc-projects).
+at [http://www.isc.org/git/](http://www.isc.org/git/).
 
 Information for BIND contributors can be found in the following files:
 - General information: [doc/dev/contrib.md](doc/dev/contrib.md)
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 2413fe5d725..f63ce5bb0d0 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -79,6 +79,20 @@
 	  address. [RT #45999]
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  <command>named</command> could crash due to a race condition when
+	  rolling <command>dnstap</command> log files. [RT #46942]
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  <command>rndc reload</command> could cause <command>named</command>
+	  to leak memory if it was invoked before the zone loading actions
+	  from a previous <command>rndc reload</command> command were
+	  completed. [RT #47076]
+	</para>
+      </listitem>
     </itemizedlist>
   </section>
 
diff --git a/lib/dns/api b/lib/dns/api
index a814bd38241..3f48bdea6fc 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -8,6 +8,6 @@
 # 9.10-sub: 180-189
 # 9.11: 160-169,1100-1199
 # 9.12: 1200-1299
-LIBINTERFACE = 1203
+LIBINTERFACE = 1204
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1
diff --git a/lib/isc/api b/lib/isc/api
index 4be6653297b..f9a664bb7d7 100644
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -9,5 +9,5 @@
 # 9.11: 160-169,1100-1199
 # 9.12: 1200-1299
 LIBINTERFACE = 1203
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 3