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/6fa94b6c7d90
branches: trunk
changeset: 354820:6fa94b6c7d90
user: christos <christos%NetBSD.org@localhost>
date: Fri Jun 30 11:32:33 2017 +0000
description:
merge conflicts
diffstat:
external/bsd/bind/dist/CHANGES | 8 +
external/bsd/bind/dist/README | 5 +
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 | 18 +-
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/dnssec.c | 5 +-
external/bsd/bind/dist/lib/dns/message.c | 17 +-
external/bsd/bind/dist/lib/dns/rootns.c | 4 +-
external/bsd/bind/dist/lib/dns/tsig.c | 293 +++++++++--
external/bsd/bind/dist/srcid | 2 +-
external/bsd/bind/dist/version | 2 +-
43 files changed, 309 insertions(+), 115 deletions(-)
diffs (truncated from 1012 to 300 lines):
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/CHANGES Fri Jun 30 11:32:33 2017 +0000
@@ -1,3 +1,11 @@
+ --- 9.10.5-P2 released ---
+
+4643. [security] An error in TSIG handling could permit unauthorized
+ zone transfers or zone updates. (CVE-2017-3142)
+ (CVE-2017-3143) [RT #45383]
+
+4633. [maint] Updated AAAA (2001:500:200::b) for B.ROOT-SERVERS.NET.
+
--- 9.10.5-P1 released ---
4632. [security] The BIND installer on Windows used an unquoted
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/README
--- a/external/bsd/bind/dist/README Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/README Fri Jun 30 11:32:33 2017 +0000
@@ -51,6 +51,11 @@
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.10.5-P2
+
+ This version contains a fix for the security flaws
+ disclosed in CVE-2017-3142 and CVE-2017-3143.
+
BIND 9.10.5-P1
This version contains a fix for the security flaws
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Fri Jun 30 11:32:33 2017 +0000
@@ -2498,6 +2498,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Fri Jun 30 11:32:33 2017 +0000
@@ -13790,6 +13790,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Fri Jun 30 11:32:33 2017 +0000
@@ -262,6 +262,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Fri Jun 30 11:32:33 2017 +0000
@@ -145,6 +145,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Fri Jun 30 11:32:33 2017 +0000
@@ -45,7 +45,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.5-P1</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.5-P2</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>
@@ -58,7 +58,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.5-P1</h2></div></div></div>
+<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.5-P2</h2></div></div></div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
@@ -70,6 +70,11 @@
BIND 9.10.5-P1 addresses the security issues described in
CVE-2017-3140 and CVE-2017-3141.
</p>
+ <p>
+ BIND 9.11.1-P2 addresses the security issues described in
+ CVE-2017-3142 and CVE-2017-3143. It also includes an update
+ to the address of the B root server.
+ </p>
</div>
@@ -121,6 +126,13 @@
<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem">
<p>
+ An error in TSIG handling could permit unauthorized zone
+ transfers or zone updates. These flaws are disclosed in
+ CVE-2017-3142 and CVE-2017-3143. [RT #45383]
+ </p>
+ </li>
+<li class="listitem">
+ <p>
The BIND installer on Windows used an unquoted service path,
which can enable privilege escalation. This flaw is disclosed
in CVE-2017-3141. [RT #45229]
@@ -177,6 +189,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.html
--- a/external/bsd/bind/dist/doc/arm/Bv9ARM.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/Bv9ARM.html Fri Jun 30 11:32:33 2017 +0000
@@ -41,7 +41,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.5-P1</p></div>
+<div><p class="releaseinfo">BIND Version 9.10.5-P2</p></div>
<div><p class="copyright">Copyright © 2004-2016 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="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.5-P1</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.5-P2</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>
@@ -410,6 +410,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
Binary file external/bsd/bind/dist/doc/arm/Bv9ARM.pdf has changed
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.arpaname.html
--- a/external/bsd/bind/dist/doc/arm/man.arpaname.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.arpaname.html Fri Jun 30 11:32:33 2017 +0000
@@ -100,6 +100,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.ddns-confgen.html
--- a/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Fri Jun 30 11:32:33 2017 +0000
@@ -245,6 +245,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.delv.html
--- a/external/bsd/bind/dist/doc/arm/man.delv.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.delv.html Fri Jun 30 11:32:33 2017 +0000
@@ -619,6 +619,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dig.html
--- a/external/bsd/bind/dist/doc/arm/man.dig.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dig.html Fri Jun 30 11:32:33 2017 +0000
@@ -1035,6 +1035,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Fri Jun 30 11:32:33 2017 +0000
@@ -160,6 +160,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Fri Jun 30 11:32:33 2017 +0000
@@ -279,6 +279,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Fri Jun 30 11:32:33 2017 +0000
@@ -298,6 +298,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Fri Jun 30 11:32:33 2017 +0000
@@ -241,6 +241,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Fri Jun 30 11:32:33 2017 +0000
@@ -485,6 +485,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Fri Jun 30 11:32:33 2017 +0000
@@ -572,6 +572,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Fri Jun 30 11:32:33 2017 +0000
@@ -180,6 +180,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-settime.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Fri Jun 30 11:32:33 2017 +0000
@@ -337,6 +337,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P2</p>
</body>
</html>
diff -r c4c7d65ce2c5 -r 6fa94b6c7d90 external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html
--- a/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Fri Jun 30 11:21:53 2017 +0000
+++ b/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Fri Jun 30 11:32:33 2017 +0000
@@ -711,6 +711,6 @@
</tr>
</table>
</div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 9.10.5-P1</p>
Home |
Main Index |
Thread Index |
Old Index