Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/bind/dist merge conflicts for bind-9.10.2-P3 to...



details:   https://anonhg.NetBSD.org/src/rev/74ee9011189c
branches:  trunk
changeset: 809707:74ee9011189c
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 28 18:55:16 2015 +0000

description:
merge conflicts for bind-9.10.2-P3 to address CVE-2015-5477.

diffstat:

 external/bsd/bind/dist/CHANGES                              |    6 ++
 external/bsd/bind/dist/README                               |    7 ++-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html             |    4 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html             |    4 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html             |    4 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html             |    4 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html             |   32 +++++++++---
 external/bsd/bind/dist/doc/arm/Bv9ARM.html                  |   22 ++++----
 external/bsd/bind/dist/doc/arm/Bv9ARM.pdf                   |  Bin 
 external/bsd/bind/dist/doc/arm/man.arpaname.html            |   10 +-
 external/bsd/bind/dist/doc/arm/man.ddns-confgen.html        |   12 ++--
 external/bsd/bind/dist/doc/arm/man.delv.html                |   16 +++---
 external/bsd/bind/dist/doc/arm/man.dig.html                 |   22 ++++----
 external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html      |   12 ++--
 external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html     |   12 ++--
 external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html    |   18 +++---
 external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html    |   16 +++---
 external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html |   16 +++---
 external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html       |   18 +++---
 external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html       |   12 ++--
 external/bsd/bind/dist/doc/arm/man.dnssec-settime.html      |   16 +++---
 external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html     |   14 ++--
 external/bsd/bind/dist/doc/arm/man.dnssec-verify.html       |   12 ++--
 external/bsd/bind/dist/doc/arm/man.genrandom.html           |   12 ++--
 external/bsd/bind/dist/doc/arm/man.host.html                |   12 ++--
 external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html      |   12 ++--
 external/bsd/bind/dist/doc/arm/man.named-checkconf.html     |   14 ++--
 external/bsd/bind/dist/doc/arm/man.named-checkzone.html     |   14 ++--
 external/bsd/bind/dist/doc/arm/man.named-journalprint.html  |   10 +-
 external/bsd/bind/dist/doc/arm/man.named-rrchecker.html     |    8 +-
 external/bsd/bind/dist/doc/arm/man.named.html               |   18 +++---
 external/bsd/bind/dist/doc/arm/man.nsec3hash.html           |   12 ++--
 external/bsd/bind/dist/doc/arm/man.nsupdate.html            |   16 +++---
 external/bsd/bind/dist/doc/arm/man.rndc-confgen.html        |   14 ++--
 external/bsd/bind/dist/doc/arm/man.rndc.conf.html           |   14 ++--
 external/bsd/bind/dist/doc/arm/man.rndc.html                |   16 +++---
 external/bsd/bind/dist/lib/dns/api                          |    2 +-
 external/bsd/bind/dist/lib/dns/tkey.c                       |    3 +-
 external/bsd/bind/dist/srcid                                |    2 +-
 external/bsd/bind/dist/version                              |    2 +-
 40 files changed, 249 insertions(+), 221 deletions(-)

diffs (truncated from 2037 to 300 lines):

diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES    Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/CHANGES    Tue Jul 28 18:55:16 2015 +0000
@@ -1,3 +1,9 @@
+       --- 9.10.2-P3 released ---
+
+4165.  [security]      A failure to reset a value to NULL in tkey.c could
+                       result in an assertion failure. (CVE-2015-5477)
+                       [RT #40046]
+
        --- 9.10.2-P2 released ---
 
 4138.  [bug]           An uninitialized value in validator.c could result
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/README
--- a/external/bsd/bind/dist/README     Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/README     Tue Jul 28 18:55:16 2015 +0000
@@ -51,6 +51,11 @@
        For up-to-date release notes and errata, see
        http://www.isc.org/software/bind9/releasenotes
 
+BIND 9.10.2-P3
+
+       BIND 9.10.2-P3 is a security release addressing the flaw
+       described in CVE-2015-5477.
+
 BIND 9.10.2-P2
 
        BIND 9.10.2-P2 is a security release addressing the flaw
@@ -62,7 +67,7 @@
         bugs recently found in the response-policy zones (RPZ)
         implementation in BIND 9.10.  These mostly affect servers
         that have multiple frequently-updated response-policy
-        zones. Operators who are not using RPZ need not upgrade.
+        zones.
 
 BIND 9.10.2
 
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html   Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html   Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch04.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.ch04.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -2294,6 +2294,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html   Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html   Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch06.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.ch06.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -12150,6 +12150,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html   Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html   Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch07.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.ch07.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -247,6 +247,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html   Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html   Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch08.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.ch08.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -135,6 +135,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html   Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html   Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch09.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.ch09.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,7 +45,7 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2610666">Release Notes for BIND Version 9.10.2-P2</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2610666">Release Notes for BIND Version 9.10.2-P3</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
@@ -60,7 +60,7 @@
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2610666"></a>Release Notes for BIND Version 9.10.2-P2</h2></div></div></div>
+<a name="id2610666"></a>Release Notes for BIND Version 9.10.2-P3</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_intro"></a>Introduction</h3></div></div></div>
@@ -68,6 +68,10 @@
       This document summarizes changes since BIND 9.10.2:
     </p>
 <p>
+      BIND 9.10.2-P3 addresses a security issue described in
+      CVE-2015-5477.
+    </p>
+<p>
       BIND 9.10.2-P2 addresses a security issue described in
       CVE-2015-4620.
     </p>
@@ -97,17 +101,29 @@
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc"><li>
+<div class="itemizedlist"><ul type="disc">
+<li>
+<p>
+         A specially crafted query could trigger an assertion failure
+         in message.c.
+       </p>
 <p>
-         On servers configured to perform DNSSEC validation an
+         This flaw was discovered by Jonathan Foote, and is disclosed
+         in CVE-2015-5477. [RT #39795]
+       </p>
+</li>
+<li>
+<p>
+         On servers configured to perform DNSSEC validation, an
          assertion failure could be triggered on answers from
          a specially configured server.
        </p>
 <p>
          This flaw was discovered by Breno Silveira Soares, and is
          disclosed in CVE-2015-4620. [RT #39795]
-        </p>
-</li></ul></div>
+       </p>
+</li>
+</ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
@@ -210,6 +226,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.html        Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.html        Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: Bv9ARM.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -41,7 +41,7 @@
 <div>
 <div><h1 class="title">
 <a name="id2563180"></a>BIND 9 Administrator Reference Manual</h1></div>
-<div><p class="releaseinfo">BIND Version 9.10.2-P2</p></div>
+<div><p class="releaseinfo">BIND Version 9.10.2-P3</p></div>
 <div><p class="copyright">Copyright © 2004-2015 Internet Systems Consortium, Inc. ("ISC")</p></div>
 <div><p class="copyright">Copyright © 2000-2003 Internet Software Consortium.</p></div>
 </div>
@@ -240,7 +240,7 @@
 </dl></dd>
 <dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Release Notes</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2610666">Release Notes for BIND Version 9.10.2-P2</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2610666">Release Notes for BIND Version 9.10.2-P3</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
@@ -268,13 +268,13 @@
 <dd><dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch12.html#bind9.library">BIND 9 DNS Library Support</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2613041">Prerequisite</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612368">Compilation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612392">Installation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612423">Known Defects/Restrictions</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612500">The dns.conf File</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612526">Sample Applications</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2613568">Library References</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612371">Prerequisite</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612380">Compilation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612405">Installation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612436">Known Defects/Restrictions</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612513">The dns.conf File</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2612539">Sample Applications</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2613580">Library References</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="reference"><a href="Bv9ARM.ch13.html">I. Manual pages</a></span></dt>
@@ -380,6 +380,6 @@
 </tr>
 </table>
 </div>
-<p style="text-align: center;">BIND 9.10.2-P2</p>
+<p style="text-align: center;">BIND 9.10.2-P3</p>
 </body>
 </html>
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
Binary file external/bsd/bind/dist/doc/arm/Bv9ARM.pdf has changed
diff -r e25757f757ba -r 74ee9011189c external/bsd/bind/dist/doc/arm/man.arpaname.html
--- a/external/bsd/bind/dist/doc/arm/man.arpaname.html  Tue Jul 28 18:48:08 2015 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.arpaname.html  Tue Jul 28 18:55:16 2015 +0000
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: man.arpaname.html,v 1.3 2015/07/08 17:28:58 christos Exp $ -->
+<!-- $Id: man.arpaname.html,v 1.4 2015/07/28 18:55:16 christos Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -50,20 +50,20 @@
 <div class="cmdsynopsis"><p><code class="command">arpaname</code>  {<em class="replaceable"><code>ipaddress </code></em>...}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2622984"></a><h2>DESCRIPTION</h2>
+<a name="id2623065"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class="command">arpaname</strong></span> translates IP addresses (IPv4 and
       IPv6) to the corresponding IN-ADDR.ARPA or IP6.ARPA names.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2622999"></a><h2>SEE ALSO</h2>
+<a name="id2623558"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2665816"></a><h2>AUTHOR</h2>
+<a name="id2623572"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
@@ -87,6 +87,6 @@
 </tr>
 </table>



Home | Main Index | Thread Index | Old Index