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
details: https://anonhg.NetBSD.org/src/rev/7fd28df44a95
branches: trunk
changeset: 348669:7fd28df44a95
user: christos <christos%NetBSD.org@localhost>
date: Tue Nov 01 21:55:51 2016 +0000
description:
merge conflicts
diffstat:
external/bsd/bind/dist/CHANGES | 5 +
external/bsd/bind/dist/README | 4 +
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html | 2 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html | 2 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html | 2 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html | 2 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html | 14 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.html | 6 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf | Bin
external/bsd/bind/dist/doc/arm/man.arpaname.html | 2 +-
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html | 2 +-
external/bsd/bind/dist/doc/arm/man.delv.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dig.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-settime.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html | 2 +-
external/bsd/bind/dist/doc/arm/man.dnssec-verify.html | 2 +-
external/bsd/bind/dist/doc/arm/man.genrandom.html | 2 +-
external/bsd/bind/dist/doc/arm/man.host.html | 2 +-
external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html | 2 +-
external/bsd/bind/dist/doc/arm/man.named-checkconf.html | 2 +-
external/bsd/bind/dist/doc/arm/man.named-checkzone.html | 2 +-
external/bsd/bind/dist/doc/arm/man.named-journalprint.html | 2 +-
external/bsd/bind/dist/doc/arm/man.named-rrchecker.html | 2 +-
external/bsd/bind/dist/doc/arm/man.named.html | 2 +-
external/bsd/bind/dist/doc/arm/man.nsec3hash.html | 2 +-
external/bsd/bind/dist/doc/arm/man.nsupdate.html | 2 +-
external/bsd/bind/dist/doc/arm/man.rndc-confgen.html | 2 +-
external/bsd/bind/dist/doc/arm/man.rndc.conf.html | 2 +-
external/bsd/bind/dist/doc/arm/man.rndc.html | 2 +-
external/bsd/bind/dist/lib/dns/api | 2 +-
external/bsd/bind/dist/lib/dns/resolver.c | 71 ++++++++---
external/bsd/bind/dist/srcid | 2 +-
external/bsd/bind/dist/version | 2 +-
40 files changed, 105 insertions(+), 63 deletions(-)
diffs (truncated from 666 to 300 lines):
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/CHANGES Tue Nov 01 21:55:51 2016 +0000
@@ -1,3 +1,8 @@
+ --- 9.10.4-P4 released ---
+
+4489. [security] It was possible to trigger assertions when processing
+ a response. (CVE-2016-8864) [RT #43465]
+
--- 9.10.4-P3 released ---
4468. [bug] Address ECS option handling issues. [RT #43191]
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/README
--- a/external/bsd/bind/dist/README Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/README Tue Nov 01 21:55:51 2016 +0000
@@ -51,6 +51,10 @@
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.10.4-P4
+
+ This version contains a fix for CVE-2016-8864.
+
BIND 9.10.4-P3
This version contains a fix for CVE-2016-2776 and addresses
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Tue Nov 01 21:55:51 2016 +0000
@@ -2326,6 +2326,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Tue Nov 01 21:55:51 2016 +0000
@@ -12845,6 +12845,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Tue Nov 01 21:55:51 2016 +0000
@@ -248,6 +248,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Tue Nov 01 21:55:51 2016 +0000
@@ -134,6 +134,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Tue Nov 01 21:55:51 2016 +0000
@@ -44,7 +44,7 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl class="toc">
-<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P3</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P4</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
@@ -60,7 +60,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P3</h2></div></div></div>
+<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P4</h2></div></div></div>
<div class="section">
<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.4:
</p>
<p>
+ BIND 9.10.4-P4 addresses the security issue described in
+ CVE-2016-8864.
+ </p>
+<p>
BIND 9.10.4-P3 addresses the security issue described in
CVE-2016-2776 and addresses an interoperability issue with
ECS clients.
@@ -99,6 +103,10 @@
<a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"><p>
+ It was possible to trigger assertions when processing
+ a response. This flaw is disclosed in CVE-2016-8864. [RT #43465]
+ </p></li>
+<li class="listitem"><p>
It was possible to trigger a assertion when rendering a
message using a specially crafted request. This flaw is
disclosed in CVE-2016-2776. [RT #43139]
@@ -190,6 +198,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.html Tue Nov 01 21:55:51 2016 +0000
@@ -40,7 +40,7 @@
<div>
<div><h1 class="title">
<a name="id-1"></a>BIND 9 Administrator Reference Manual</h1></div>
-<div><p class="releaseinfo">BIND Version 9.10.4-P3</p></div>
+<div><p class="releaseinfo">BIND Version 9.10.4-P4</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>
@@ -239,7 +239,7 @@
</dl></dd>
<dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Release Notes</a></span></dt>
<dd><dl>
-<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P3</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P4</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
@@ -385,6 +385,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
Binary file external/bsd/bind/dist/doc/arm/Bv9ARM.pdf has changed
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.arpaname.html
--- a/external/bsd/bind/dist/doc/arm/man.arpaname.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.arpaname.html Tue Nov 01 21:55:51 2016 +0000
@@ -81,6 +81,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.ddns-confgen.html
--- a/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Tue Nov 01 21:55:51 2016 +0000
@@ -185,6 +185,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.delv.html
--- a/external/bsd/bind/dist/doc/arm/man.delv.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.delv.html Tue Nov 01 21:55:51 2016 +0000
@@ -498,6 +498,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dig.html
--- a/external/bsd/bind/dist/doc/arm/man.dig.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dig.html Tue Nov 01 21:55:51 2016 +0000
@@ -809,6 +809,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Tue Nov 01 21:55:51 2016 +0000
@@ -112,6 +112,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Tue Nov 01 21:55:51 2016 +0000
@@ -219,6 +219,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Tue Nov 01 21:55:51 2016 +0000
@@ -213,6 +213,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Tue Nov 01 21:55:51 2016 +0000
@@ -177,6 +177,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Tue Nov 01 21:55:51 2016 +0000
@@ -381,6 +381,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Tue Nov 01 21:55:51 2016 +0000
@@ -455,6 +455,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Tue Nov 01 21:55:51 2016 +0000
@@ -134,6 +134,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-settime.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Tue Nov 01 21:55:51 2016 +0000
@@ -264,6 +264,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Tue Nov 01 21:55:51 2016 +0000
@@ -564,6 +564,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P3</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.4-P4</p>
</body>
</html>
diff -r 0183ed162abe -r 7fd28df44a95 external/bsd/bind/dist/doc/arm/man.dnssec-verify.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html Tue Nov 01 20:45:40 2016 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html Tue Nov 01 21:55:51 2016 +0000
@@ -164,6 +164,6 @@
</tr>
Home |
Main Index |
Thread Index |
Old Index