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/d2ce987aebda
branches: trunk
changeset: 818275:d2ce987aebda
user: christos <christos%NetBSD.org@localhost>
date: Tue Oct 04 23:46:00 2016 +0000
description:
Merge conflicts.
diffstat:
external/bsd/bind/dist/CHANGES | 27 ++++
external/bsd/bind/dist/README | 14 +-
external/bsd/bind/dist/bin/named/lwdgrbn.c | 20 +-
external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 | 67 ++++++---
external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8 | 81 +++++++----
external/bsd/bind/dist/bin/pkcs11/pkcs11-list.8 | 69 ++++++---
external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c | 12 +-
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 | 36 ++++-
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/message.c | 44 ++++-
external/bsd/bind/dist/lib/dns/nsec3.c | 8 +-
external/bsd/bind/dist/lib/dns/rbtdb.c | 28 ++-
external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c | 5 +-
external/bsd/bind/dist/lib/dns/tests/rdata_test.c | 6 +-
external/bsd/bind/dist/srcid | 2 +-
external/bsd/bind/dist/version | 2 +-
49 files changed, 320 insertions(+), 171 deletions(-)
diffs (truncated from 1321 to 300 lines):
diff -r e28cce3e28b4 -r d2ce987aebda external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Tue Oct 04 23:33:48 2016 +0000
+++ b/external/bsd/bind/dist/CHANGES Tue Oct 04 23:46:00 2016 +0000
@@ -1,3 +1,30 @@
+ --- 9.10.4-P3 released ---
+
+4468. [bug] Address ECS option handling issues. [RT #43191]
+
+ Note: Only the parts required to restore
+ interoperation with ECS clients have been
+ included in this security release. The full
+ fix is included in BIND 9.10.5.
+
+4467. [security] It was possible to trigger a assertion when rendering
+ a message. (CVE-2016-2776) [RT #43139]
+
+ --- 9.10.4-P2 released ---
+
+4406. [bug] getrrsetbyname with a non absolute name could
+ trigger an infinite recursion bug in lwresd
+ and named with lwres configured if when combined
+ with a search list entry the resulting name is
+ too long. (CVE-2016-2775) [RT #42694]
+
+4405. [bug] Change 4342 introduced a regression where you could
+ not remove a delegation in a NSEC3 signed zone using
+ OPTOUT via nsupdate. [RT #42702]
+
+4387. [bug] Change 4336 was not complete leading to SERVFAIL
+ being return as NS records expired. [RT #42683]
+
--- 9.10.4-P1 released ---
4368. [bug] Fix a crash when calling "rndc stats" on some
diff -r e28cce3e28b4 -r d2ce987aebda external/bsd/bind/dist/README
--- a/external/bsd/bind/dist/README Tue Oct 04 23:33:48 2016 +0000
+++ b/external/bsd/bind/dist/README Tue Oct 04 23:46:00 2016 +0000
@@ -51,13 +51,23 @@
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.10.4-P3
+
+ This version contains a fix for CVE-2016-2776 and addresses
+ an interoperability issue with ECS clients.
+
+BIND 9.10.4-P2
+
+ This version contains a fix for CVE-2016-2775 and addresses
+ two regressions introduced with BIND 9.10.4.
+
BIND 9.10.4-P1
- This version contains tree urgent fixes to BIND 9.10.4:
+ This version contains three urgent fixes to BIND 9.10.4:
1) Windows installation was failing without manual updating
of BINDinstall's attributes.
2) Windows doesn't support the %z printf modifier.
- 3) A race condition was causing instability in the rbt
+ 3) A race condition was causing instability in the RBT
tree state.
BIND 9.10.4
diff -r e28cce3e28b4 -r d2ce987aebda external/bsd/bind/dist/bin/named/lwdgrbn.c
--- a/external/bsd/bind/dist/bin/named/lwdgrbn.c Tue Oct 04 23:33:48 2016 +0000
+++ b/external/bsd/bind/dist/bin/named/lwdgrbn.c Tue Oct 04 23:46:00 2016 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: lwdgrbn.c,v 1.7 2016/05/26 16:49:56 christos Exp $ */
+/* $NetBSD: lwdgrbn.c,v 1.8 2016/10/04 23:46:00 christos Exp $ */
/*
- * Copyright (C) 2004-2007, 2009, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -405,14 +405,18 @@
INSIST(client->lookup == NULL);
dns_fixedname_init(&absname);
- result = ns_lwsearchctx_current(&client->searchctx,
- dns_fixedname_name(&absname));
+
/*
- * This will return failure if relative name + suffix is too long.
- * In this case, just go on to the next entry in the search path.
+ * Perform search across all search domains until success
+ * is returned. Return in case of failure.
*/
- if (result != ISC_R_SUCCESS)
- start_lookup(client);
+ while (ns_lwsearchctx_current(&client->searchctx,
+ dns_fixedname_name(&absname)) != ISC_R_SUCCESS) {
+ if (ns_lwsearchctx_next(&client->searchctx) != ISC_R_SUCCESS) {
+ ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE);
+ return;
+ }
+ }
result = dns_lookup_create(cm->mctx,
dns_fixedname_name(&absname),
diff -r e28cce3e28b4 -r d2ce987aebda external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8
--- a/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 Tue Oct 04 23:33:48 2016 +0000
+++ b/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 Tue Oct 04 23:46:00 2016 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: pkcs11-destroy.8,v 1.5 2014/12/10 04:37:52 christos Exp $
+.\" $NetBSD: pkcs11-destroy.8,v 1.6 2016/10/04 23:46:00 christos Exp $
.\"
-.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -14,26 +14,41 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" Id
-.\"
.hy 0
.ad l
-.\" Title: pkcs11\-destroy
+'\" t
+.\" Title: pkcs11-destroy
.\" Author:
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
-.\" Date: Sep 18, 2009
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" Date: 2014-01-15
.\" Manual: BIND9
-.\" Source: BIND9
+.\" Source: ISC
+.\" Language: English
.\"
-.TH "PKCS11\-DESTROY" "8" "Sep 18, 2009" "BIND9" "BIND9"
+.TH "PKCS11\-DESTROY" "8" "2014\-01\-15" "ISC" "BIND9"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
.SH "NAME"
-pkcs11\-destroy \- destroy PKCS#11 objects
+pkcs11-destroy \- destroy PKCS#11 objects
.SH "SYNOPSIS"
-.HP 15
+.HP \w'\fBpkcs11\-destroy\fR\ 'u
\fBpkcs11\-destroy\fR [\fB\-m\ \fR\fB\fImodule\fR\fR] [\fB\-s\ \fR\fB\fIslot\fR\fR] {\-i\ \fIID\fR | \-l\ \fIlabel\fR} [\fB\-p\ \fR\fB\fIPIN\fR\fR] [\fB\-w\ \fR\fB\fIseconds\fR\fR]
.SH "DESCRIPTION"
.PP
@@ -41,50 +56,52 @@
destroys keys stored in a PKCS#11 device, identified by their
\fBID\fR
or
-\fBlabel\fR.
+\fBlabel\fR\&.
.PP
-Matching keys are displayed before being destroyed. By default, there is a five second delay to allow the user to interrupt the process before the destruction takes place.
+Matching keys are displayed before being destroyed\&. By default, there is a five second delay to allow the user to interrupt the process before the destruction takes place\&.
.SH "ARGUMENTS"
.PP
\-m \fImodule\fR
.RS 4
-Specify the PKCS#11 provider module. This must be the full path to a shared library object implementing the PKCS#11 API for the device.
+Specify the PKCS#11 provider module\&. This must be the full path to a shared library object implementing the PKCS#11 API for the device\&.
.RE
.PP
\-s \fIslot\fR
.RS 4
-Open the session with the given PKCS#11 slot. The default is slot 0.
+Open the session with the given PKCS#11 slot\&. The default is slot 0\&.
.RE
.PP
\-i \fIID\fR
.RS 4
-Destroy keys with the given object ID.
+Destroy keys with the given object ID\&.
.RE
.PP
\-l \fIlabel\fR
.RS 4
-Destroy keys with the given label.
+Destroy keys with the given label\&.
.RE
.PP
\-p \fIPIN\fR
.RS 4
-Specify the PIN for the device. If no PIN is provided on the command line,
+Specify the PIN for the device\&. If no PIN is provided on the command line,
\fBpkcs11\-destroy\fR
-will prompt for it.
+will prompt for it\&.
.RE
.PP
\-w \fIseconds\fR
.RS 4
-Specify how long to pause before carrying out key destruction. The default is five seconds. If set to
-0, destruction will be immediate.
+Specify how long to pause before carrying out key destruction\&. The default is five seconds\&. If set to
+0, destruction will be immediate\&.
.RE
.SH "SEE ALSO"
.PP
-\fBpkcs11\-list\fR(3),
-\fBpkcs11\-keygen\fR(3)
+\fBpkcs11-keygen\fR(8),
+\fBpkcs11-list\fR(8),
+\fBpkcs11-tokens\fR(8)
.SH "AUTHOR"
.PP
-Internet Systems Consortium
+\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
-Copyright \(co 2009 Internet Systems Consortium, Inc. ("ISC")
.br
+Copyright \(co 2009, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
+.br
diff -r e28cce3e28b4 -r d2ce987aebda external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8
--- a/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8 Tue Oct 04 23:33:48 2016 +0000
+++ b/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8 Tue Oct 04 23:46:00 2016 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: pkcs11-keygen.8,v 1.5 2014/12/10 04:37:52 christos Exp $
+.\" $NetBSD: pkcs11-keygen.8,v 1.6 2016/10/04 23:46:00 christos Exp $
.\"
-.\" Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -14,26 +14,41 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" Id
-.\"
.hy 0
.ad l
-.\" Title: pkcs11\-ecgen
+'\" t
+.\" Title: pkcs11-keygen
.\" Author:
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
-.\" Date: Feb 30, 2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" Date: 2014-01-15
.\" Manual: BIND9
-.\" Source: BIND9
+.\" Source: ISC
+.\" Language: English
.\"
-.TH "PKCS11\-ECGEN" "8" "Feb 30, 2012" "BIND9" "BIND9"
+.TH "PKCS11\-KEYGEN" "8" "2014\-01\-15" "ISC" "BIND9"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
.SH "NAME"
-pkcs11\-keygen \- generate keys on a PKCS#11 device
+pkcs11-keygen \- generate keys on a PKCS#11 device
.SH "SYNOPSIS"
-.HP 14
+.HP \w'\fBpkcs11\-keygen\fR\ 'u
\fBpkcs11\-keygen\fR {\-a\ \fIalgorithm\fR} [\fB\-b\ \fR\fB\fIkeysize\fR\fR] [\fB\-e\fR] [\fB\-i\ \fR\fB\fIid\fR\fR] [\fB\-m\ \fR\fB\fImodule\fR\fR] [\fB\-P\fR] [\fB\-p\ \fR\fB\fIPIN\fR\fR]
[\fB\-q\fR] [\fB\-S\fR] [\fB\-s\ \fR\fB\fIslot\fR\fR] {label}
.SH "DESCRIPTION"
.PP
@@ -42,74 +57,74 @@
\fBlabel\fR
(which must be unique) and with
\fBkeysize\fR
-bits of prime.
+bits of prime\&.
Home |
Main Index |
Thread Index |
Old Index