Module Name: src
Committed By: martin
Date: Sat Nov 5 17:54:09 UTC 2016
Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/bind [netbsd-7]: Makefile.inc
src/external/bsd/bind/bin/delv [netbsd-7]: Makefile
src/external/bsd/bind/bin/dig [netbsd-7]: Makefile
src/external/bsd/bind/bin/dnssec [netbsd-7]: Makefile.inc
src/external/bsd/bind/bin/host [netbsd-7]: Makefile
src/external/bsd/bind/bin/named [netbsd-7]: Makefile
src/external/bsd/bind/bin/nslookup [netbsd-7]: Makefile
src/external/bsd/bind/bin/nsupdate [netbsd-7]: Makefile
src/external/bsd/bind/bin/rndc [netbsd-7]: Makefile
src/external/bsd/bind/bin/tools [netbsd-7]: Makefile.inc
src/external/bsd/bind/dist [netbsd-7]: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm [netbsd-7]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7]: api resolver.c
src/external/bsd/bind/lib/libbind9 [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #1271):
doc/3RDPARTY: 1.1374 via patch
external/bsd/bind/Makefile.inc: up to 1.24 via patch
external/bsd/bind/bin/delv/Makefile: up to 1.3
external/bsd/bind/bin/dig/Makefile: up to 1.2
external/bsd/bind/bin/dnssec/Makefile.inc: up to 1.2
external/bsd/bind/bin/host/Makefile: up to 1.2
external/bsd/bind/bin/named/Makefile: up to 1.10
external/bsd/bind/bin/nslookup/Makefile: up to 1.3
external/bsd/bind/bin/nsupdate/Makefile: up to 1.3
external/bsd/bind/bin/rndc/Makefile: up to 1.2
external/bsd/bind/bin/tools/Makefile.inc: up to 1.2
external/bsd/bind/dist/CHANGES: up to 1.23
external/bsd/bind/dist/README: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.18
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.20
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.17
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-settime.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-verify.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.genrandom.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.host.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.lwresd.html: up to 1.1.1.3
external/bsd/bind/dist/doc/arm/man.named-checkconf.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.named-checkzone.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.named-journalprint.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.named-rrchecker.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.named.conf.html: up to 1.1.1.3
external/bsd/bind/dist/doc/arm/man.named.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.nsec3hash.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.nsupdate.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.rndc-confgen.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.rndc.conf.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.rndc.html: up to 1.11
external/bsd/bind/dist/doc/arm/notes.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/notes.pdf: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/notes.xml: up to 1.1.1.9
external/bsd/bind/dist/lib/dns/api: up to 1.11
external/bsd/bind/dist/lib/dns/resolver.c: up to 1.27
external/bsd/bind/dist/srcid: up to 1.17
external/bsd/bind/dist/version: up to 1.21
external/bsd/bind/include/isc/platform.h: up to 1.22 via patch
external/bsd/bind/lib/libbind9/Makefile: up to 1.3
Update BIND to 9.10.4-P4. Fixes CVE-2016-8864.
To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.30 -r1.1145.2.31 src/doc/3RDPARTY
cvs rdiff -u -r1.21.2.2 -r1.21.2.3 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/bind/bin/delv/Makefile
cvs rdiff -u -r1.1 -r1.1.28.1 src/external/bsd/bind/bin/dig/Makefile
cvs rdiff -u -r1.1 -r1.1.28.1 src/external/bsd/bind/bin/dnssec/Makefile.inc
cvs rdiff -u -r1.1 -r1.1.28.1 src/external/bsd/bind/bin/host/Makefile
cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/external/bsd/bind/bin/named/Makefile
cvs rdiff -u -r1.2 -r1.2.12.1 src/external/bsd/bind/bin/nslookup/Makefile
cvs rdiff -u -r1.2 -r1.2.12.1 src/external/bsd/bind/bin/nsupdate/Makefile
cvs rdiff -u -r1.1 -r1.1.28.1 src/external/bsd/bind/bin/rndc/Makefile
cvs rdiff -u -r1.1 -r1.1.22.1 src/external/bsd/bind/bin/tools/Makefile.inc
cvs rdiff -u -r1.12.2.7 -r1.12.2.8 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.1.1.14.2.7 -r1.1.1.14.2.8 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.6.2.7 -r1.6.2.8 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.10.2.7 -r1.10.2.8 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.1.1.11.2.6 -r1.1.1.11.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html
cvs rdiff -u -r1.1.1.8.2.6 -r1.1.1.8.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html
cvs rdiff -u -r1.1.1.13.2.6 -r1.1.1.13.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html
cvs rdiff -u -r1.1.1.15.2.7 -r1.1.1.15.2.8 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.1.1.14.2.6 -r1.1.1.14.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html
cvs rdiff -u -r1.1.1.10.2.6 -r1.1.1.10.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html
cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html \
src/external/bsd/bind/dist/doc/arm/notes.html \
src/external/bsd/bind/dist/doc/arm/notes.pdf \
src/external/bsd/bind/dist/doc/arm/notes.xml
cvs rdiff -u -r1.7.2.6 -r1.7.2.7 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.1.1.12.2.7 -r1.1.1.12.2.8 \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html
cvs rdiff -u -r1.1.1.13.2.7 -r1.1.1.13.2.8 \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html
cvs rdiff -u -r1.1.1.1.4.7 -r1.1.1.1.4.8 \
src/external/bsd/bind/dist/doc/arm/man.delv.html
cvs rdiff -u -r1.1.1.3.2.7 -r1.1.1.3.2.8 \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html
cvs rdiff -u -r1.1.1.2.2.7 -r1.1.1.2.2.8 \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html
cvs rdiff -u -r1.1.1.5.2.7 -r1.1.1.5.2.8 \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html
cvs rdiff -u -r1.1.1.11.2.7 -r1.1.1.11.2.8 \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html
cvs rdiff -u -r1.1.1.2.4.2 -r1.1.1.2.4.3 \
src/external/bsd/bind/dist/doc/arm/man.lwresd.html \
src/external/bsd/bind/dist/doc/arm/man.named.conf.html
cvs rdiff -u -r1.1.1.16.2.7 -r1.1.1.16.2.8 \
src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.19.2.5 -r1.19.2.6 \
src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/bind/lib/libbind9/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1145.2.30 src/doc/3RDPARTY:1.1145.2.31
--- src/doc/3RDPARTY:1.1145.2.30 Fri Oct 14 12:01:08 2016
+++ src/doc/3RDPARTY Sat Nov 5 17:54:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1145.2.30 2016/10/14 12:01:08 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1145.2.31 2016/11/05 17:54:05 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -113,8 +113,8 @@ Notes:
bc includes dc, both of which are in the NetBSD tree.
Package: bind [named and utils]
-Version: 9.10.4-P3
-Current Vers: 9.10.4-P3
+Version: 9.10.3-P4
+Current Vers: 9.10.3-P4
Maintainer: Paul Vixie <vi...@vix.com>
Archive Site: ftp://ftp.isc.org/isc/bind9/
Home Page: http://www.isc.org/software/bind/
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.21.2.2 src/external/bsd/bind/Makefile.inc:1.21.2.3
--- src/external/bsd/bind/Makefile.inc:1.21.2.2 Fri Oct 14 12:01:08 2016
+++ src/external/bsd/bind/Makefile.inc Sat Nov 5 17:54:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21.2.2 2016/10/14 12:01:08 martin Exp $
+# $NetBSD: Makefile.inc,v 1.21.2.3 2016/11/05 17:54:05 martin Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -29,7 +29,8 @@ IDIST= ${NETBSDSRCDIR}/external/bsd/bin
BIND_SRCDIR= ${NETBSDSRCDIR}/external/bsd/bind
BIND_HTMLDIR= /usr/share/doc/reference/ref8/bind9
-.include "${IDIST}/version"
+VERSIONFILE=${IDIST}/version
+.include "${VERSIONFILE}"
VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
SYSCONFDIR=/etc
Index: src/external/bsd/bind/bin/delv/Makefile
diff -u src/external/bsd/bind/bin/delv/Makefile:1.2 src/external/bsd/bind/bin/delv/Makefile:1.2.4.1
--- src/external/bsd/bind/bin/delv/Makefile:1.2 Tue Jul 8 19:08:43 2014
+++ src/external/bsd/bind/bin/delv/Makefile Sat Nov 5 17:54:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/07/08 19:08:43 martin Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2016/11/05 17:54:05 martin Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@ DIST=${IDIST}/bin/delv
CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include
LDADD+= -lirs -lisccfg
+delv.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/dig/Makefile
diff -u src/external/bsd/bind/bin/dig/Makefile:1.1 src/external/bsd/bind/bin/dig/Makefile:1.1.28.1
--- src/external/bsd/bind/bin/dig/Makefile:1.1 Sun Apr 12 03:46:05 2009
+++ src/external/bsd/bind/bin/dig/Makefile Sat Nov 5 17:54:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:05 christos Exp $
+# $NetBSD: Makefile,v 1.1.28.1 2016/11/05 17:54:05 martin Exp $
.include <bsd.own.mk>
@@ -11,6 +11,8 @@ BINDIR= /usr/bin
DIST=${IDIST}/bin/dig
CPPFLAGS+= -I${DIST}/include
+dig.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/dnssec/Makefile.inc
diff -u src/external/bsd/bind/bin/dnssec/Makefile.inc:1.1 src/external/bsd/bind/bin/dnssec/Makefile.inc:1.1.28.1
--- src/external/bsd/bind/bin/dnssec/Makefile.inc:1.1 Sun Apr 12 03:46:05 2009
+++ src/external/bsd/bind/bin/dnssec/Makefile.inc Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/04/12 03:46:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.1.28.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -12,3 +12,4 @@ DNSSEC=${IDIST}/bin/dnssec
PROG=${BASE}
SRCS=${BASE}.c dnssectool.c
MAN=${BASE}.8
+${BASE}.o: ${VERSIONFILE}
Index: src/external/bsd/bind/bin/host/Makefile
diff -u src/external/bsd/bind/bin/host/Makefile:1.1 src/external/bsd/bind/bin/host/Makefile:1.1.28.1
--- src/external/bsd/bind/bin/host/Makefile:1.1 Sun Apr 12 03:46:06 2009
+++ src/external/bsd/bind/bin/host/Makefile Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.28.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -11,6 +11,8 @@ BINDIR= /usr/bin
DIST=${IDIST}/bin/dig
CPPFLAGS+= -I${DIST}/include
+host.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/named/Makefile
diff -u src/external/bsd/bind/bin/named/Makefile:1.8.4.1 src/external/bsd/bind/bin/named/Makefile:1.8.4.2
--- src/external/bsd/bind/bin/named/Makefile:1.8.4.1 Thu Apr 30 06:07:32 2015
+++ src/external/bsd/bind/bin/named/Makefile Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8.4.1 2015/04/30 06:07:32 riz Exp $
+# $NetBSD: Makefile,v 1.8.4.2 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -36,6 +36,8 @@ SRCS= builtin.c client.c config.c contro
pfilter.c tkeyconf.c tsigconf.c \
update.c xfrout.c zoneconf.c ${SRCS_UNIX}
+main.o: ${VERSIONFILE}
+
LDADD+=-lblacklist
DPADD+=${LIBBLACKLIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/nslookup/Makefile
diff -u src/external/bsd/bind/bin/nslookup/Makefile:1.2 src/external/bsd/bind/bin/nslookup/Makefile:1.2.12.1
--- src/external/bsd/bind/bin/nslookup/Makefile:1.2 Tue Jun 5 00:38:45 2012
+++ src/external/bsd/bind/bin/nslookup/Makefile Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/06/05 00:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2.12.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -16,4 +16,6 @@ CPPFLAGS+= -I${DIST}/include
DPADD+=${LIBEDIT} ${LIBTERMINFO}
LDADD+=-ledit -lterminfo
+nslookup.o: ${VERSIONFILE}
+
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/nsupdate/Makefile
diff -u src/external/bsd/bind/bin/nsupdate/Makefile:1.2 src/external/bsd/bind/bin/nsupdate/Makefile:1.2.12.1
--- src/external/bsd/bind/bin/nsupdate/Makefile:1.2 Tue Jun 5 00:38:45 2012
+++ src/external/bsd/bind/bin/nsupdate/Makefile Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/06/05 00:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2.12.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -14,4 +14,6 @@ DIST=${IDIST}/bin/nsupdate
DPADD+=${LIBEDIT} ${LIBTERMINFO}
LDADD+=-ledit -lterminfo
+nsupdate.o: ${VERSIONFILE}
+
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/rndc/Makefile
diff -u src/external/bsd/bind/bin/rndc/Makefile:1.1 src/external/bsd/bind/bin/rndc/Makefile:1.1.28.1
--- src/external/bsd/bind/bin/rndc/Makefile:1.1 Sun Apr 12 03:46:06 2009
+++ src/external/bsd/bind/bin/rndc/Makefile Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.28.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -14,6 +14,7 @@ CPPFLAGS+= -I${DIST}/include \
-DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
-DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
+rndc.o: ${VERSIONFILE}
.PATH: ${DIST}
Index: src/external/bsd/bind/bin/tools/Makefile.inc
diff -u src/external/bsd/bind/bin/tools/Makefile.inc:1.1 src/external/bsd/bind/bin/tools/Makefile.inc:1.1.22.1
--- src/external/bsd/bind/bin/tools/Makefile.inc:1.1 Sun Sep 11 18:55:24 2011
+++ src/external/bsd/bind/bin/tools/Makefile.inc Sat Nov 5 17:54:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/09/11 18:55:24 christos Exp $
+# $NetBSD: Makefile.inc,v 1.1.22.1 2016/11/05 17:54:06 martin Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@ TOOLS=${IDIST}/bin/tools
PROG=${BASE}
SRCS=${BASE}.c
+${BASE}.o: ${VERSIONFILE}
.if exists(${TOOLS}/${BASE}.8)
BINDIR=/usr/sbin
MAN=${BASE}.8
Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.12.2.7 src/external/bsd/bind/dist/CHANGES:1.12.2.8
--- src/external/bsd/bind/dist/CHANGES:1.12.2.7 Fri Oct 14 12:01:08 2016
+++ src/external/bsd/bind/dist/CHANGES Sat Nov 5 17:54:06 2016
@@ -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]
Index: src/external/bsd/bind/dist/README
diff -u src/external/bsd/bind/dist/README:1.1.1.14.2.7 src/external/bsd/bind/dist/README:1.1.1.14.2.8
--- src/external/bsd/bind/dist/README:1.1.1.14.2.7 Fri Oct 14 12:01:08 2016
+++ src/external/bsd/bind/dist/README Sat Nov 5 17:54:06 2016
@@ -51,6 +51,10 @@ BIND 9
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
Index: src/external/bsd/bind/dist/srcid
diff -u src/external/bsd/bind/dist/srcid:1.6.2.7 src/external/bsd/bind/dist/srcid:1.6.2.8
--- src/external/bsd/bind/dist/srcid:1.6.2.7 Fri Oct 14 12:01:08 2016
+++ src/external/bsd/bind/dist/srcid Sat Nov 5 17:54:06 2016
@@ -1 +1 @@
-SRCID=7e49f11
+SRCID=853aa4b
Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.10.2.7 src/external/bsd/bind/dist/version:1.10.2.8
--- src/external/bsd/bind/dist/version:1.10.2.7 Fri Oct 14 12:01:08 2016
+++ src/external/bsd/bind/dist/version Sat Nov 5 17:54:06 2016
@@ -7,5 +7,5 @@ MAJORVER=9
MINORVER=10
PATCHVER=4
RELEASETYPE=-P
-RELEASEVER=3
+RELEASEVER=4
EXTENSIONS=
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html:1.1.1.11.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html:1.1.1.11.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html:1.1.1.11.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html Sat Nov 5 17:54:06 2016
@@ -555,6 +555,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html:1.1.1.8.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html:1.1.1.8.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html:1.1.1.8.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html Sat Nov 5 17:54:06 2016
@@ -153,6 +153,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html:1.1.1.13.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html:1.1.1.13.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html:1.1.1.13.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html Sat Nov 5 17:54:06 2016
@@ -669,6 +669,6 @@ controls {
</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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Sat Nov 5 17:54:06 2016
@@ -2326,6 +2326,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.
</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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Sat Nov 5 17:54:06 2016
@@ -12845,6 +12845,6 @@ HOST-127.EXAMPLE. MX 0 .
</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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Sat Nov 5 17:54:07 2016
@@ -248,6 +248,6 @@ zone "example.com" {
</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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Sat Nov 5 17:54:07 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Sat Nov 5 17:54:07 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.1.1.15.2.7 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.html Sat Nov 5 17:54:07 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dig.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dig.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.dig.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dig.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dig.html Sat Nov 5 17:54:08 2016
@@ -809,6 +809,6 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
</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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Sat Nov 5 17:54:08 2016
@@ -564,6 +564,6 @@ db.example.com.signed
</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>
Index: src/external/bsd/bind/dist/doc/arm/man.host.html
diff -u src/external/bsd/bind/dist/doc/arm/man.host.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.host.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.host.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.host.html Sat Nov 5 17:54:09 2016
@@ -247,6 +247,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>
Index: src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html Sat Nov 5 17:54:09 2016
@@ -151,6 +151,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>
Index: src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html Sat Nov 5 17:54:09 2016
@@ -338,6 +338,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>
Index: src/external/bsd/bind/dist/doc/arm/man.named.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.named.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.named.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named.html Sat Nov 5 17:54:09 2016
@@ -369,6 +369,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>
Index: src/external/bsd/bind/dist/doc/arm/man.nsupdate.html
diff -u src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.nsupdate.html Sat Nov 5 17:54:09 2016
@@ -663,6 +663,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>
Index: src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html
diff -u src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html Sat Nov 5 17:54:09 2016
@@ -223,6 +223,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>
Index: src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html
diff -u src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html Sat Nov 5 17:54:09 2016
@@ -246,6 +246,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>
Index: src/external/bsd/bind/dist/doc/arm/man.rndc.html
diff -u src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.1.1.15.2.7 src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.1.1.15.2.8
--- src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.1.1.15.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.rndc.html Sat Nov 5 17:54:09 2016
@@ -621,6 +621,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html:1.1.1.14.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html:1.1.1.14.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html:1.1.1.14.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html Sat Nov 5 17:54:06 2016
@@ -138,6 +138,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html:1.1.1.10.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html:1.1.1.10.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html:1.1.1.10.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html Sat Nov 5 17:54:07 2016
@@ -155,6 +155,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html:1.1.1.1.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html:1.1.1.1.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html:1.1.1.1.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html Sat Nov 5 17:54:07 2016
@@ -497,6 +497,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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html:1.1.1.1.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html:1.1.1.1.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html:1.1.1.1.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html Sat Nov 5 17:54:07 2016
@@ -543,6 +543,6 @@ $ <strong class="userinput"><code>sample
</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>
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html
diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html:1.1.1.1.2.6 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html:1.1.1.1.2.7
--- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html:1.1.1.1.2.6 Fri Oct 14 12:01:25 2016
+++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html Sat Nov 5 17:54:07 2016
@@ -154,6 +154,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>
Index: src/external/bsd/bind/dist/doc/arm/notes.html
diff -u src/external/bsd/bind/dist/doc/arm/notes.html:1.1.1.1.2.6 src/external/bsd/bind/dist/doc/arm/notes.html:1.1.1.1.2.7
--- src/external/bsd/bind/dist/doc/arm/notes.html:1.1.1.1.2.6 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/notes.html Sat Nov 5 17:54:09 2016
@@ -21,7 +21,7 @@
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id-1.2"></a>Release Notes for BIND Version 9.10.4-P3</h2></div></div></div>
+<a name="id-1.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>
@@ -29,6 +29,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.
@@ -60,6 +64,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]
Index: src/external/bsd/bind/dist/doc/arm/notes.pdf
Binary files are different
Index: src/external/bsd/bind/dist/doc/arm/notes.xml
diff -u src/external/bsd/bind/dist/doc/arm/notes.xml:1.1.1.1.2.6 src/external/bsd/bind/dist/doc/arm/notes.xml:1.1.1.1.2.7
--- src/external/bsd/bind/dist/doc/arm/notes.xml:1.1.1.1.2.6 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/notes.xml Sat Nov 5 17:54:09 2016
@@ -24,6 +24,10 @@
This document summarizes changes since BIND 9.10.4:
</para>
<para>
+ BIND 9.10.4-P4 addresses the security issue described in
+ CVE-2016-8864.
+ </para>
+ <para>
BIND 9.10.4-P3 addresses the security issue described in
CVE-2016-2776 and addresses an interoperability issue with
ECS clients.
@@ -55,6 +59,12 @@
<itemizedlist>
<listitem>
<para>
+ It was possible to trigger assertions when processing
+ a response. This flaw is disclosed in CVE-2016-8864. [RT #43465]
+ </para>
+ </listitem>
+ <listitem>
+ <para>
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]
Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
Binary files are different
Index: src/external/bsd/bind/dist/doc/arm/man.arpaname.html
diff -u src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.1.1.12.2.7 src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.1.1.12.2.8
--- src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.1.1.12.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.arpaname.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.genrandom.html
diff -u src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.1.1.12.2.7 src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.1.1.12.2.8
--- src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.1.1.12.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.genrandom.html Sat Nov 5 17:54:09 2016
@@ -102,6 +102,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>
Index: src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.1.1.12.2.7 src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.1.1.12.2.8
--- src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.1.1.12.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html Sat Nov 5 17:54:09 2016
@@ -102,6 +102,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>
Index: src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html
diff -u src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.1.1.12.2.7 src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.1.1.12.2.8
--- src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.1.1.12.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html Sat Nov 5 17:54:09 2016
@@ -103,6 +103,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>
Index: src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html
diff -u src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.1.1.13.2.7 src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.1.1.13.2.8
--- src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.1.1.13.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.1.1.13.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.1.1.13.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.1.1.13.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.1.1.13.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.1.1.13.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.1.1.13.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.delv.html
diff -u src/external/bsd/bind/dist/doc/arm/man.delv.html:1.1.1.1.4.7 src/external/bsd/bind/dist/doc/arm/man.delv.html:1.1.1.1.4.8
--- src/external/bsd/bind/dist/doc/arm/man.delv.html:1.1.1.1.4.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.delv.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.1.1.3.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.1.1.3.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.1.1.3.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.1.1.3.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.1.1.3.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.1.1.3.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.1.1.2.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.1.1.2.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.1.1.2.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Sat Nov 5 17:54:08 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.1.1.2.2.7 src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.1.1.2.2.8
--- src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.1.1.2.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html Sat Nov 5 17:54:09 2016
@@ -104,6 +104,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>
Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html
diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.1.1.5.2.7 src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.1.1.5.2.8
--- src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.1.1.5.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html Sat Nov 5 17:54:08 2016
@@ -164,6 +164,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>
Index: src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html
diff -u src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.1.1.11.2.7 src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.1.1.11.2.8
--- src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.1.1.11.2.7 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html Sat Nov 5 17:54:09 2016
@@ -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>
Index: src/external/bsd/bind/dist/doc/arm/man.lwresd.html
diff -u src/external/bsd/bind/dist/doc/arm/man.lwresd.html:1.1.1.2.4.2 src/external/bsd/bind/dist/doc/arm/man.lwresd.html:1.1.1.2.4.3
--- src/external/bsd/bind/dist/doc/arm/man.lwresd.html:1.1.1.2.4.2 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.lwresd.html Sat Nov 5 17:54:09 2016
@@ -253,6 +253,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>
Index: src/external/bsd/bind/dist/doc/arm/man.named.conf.html
diff -u src/external/bsd/bind/dist/doc/arm/man.named.conf.html:1.1.1.2.4.2 src/external/bsd/bind/dist/doc/arm/man.named.conf.html:1.1.1.2.4.3
--- src/external/bsd/bind/dist/doc/arm/man.named.conf.html:1.1.1.2.4.2 Fri Oct 14 12:01:27 2016
+++ src/external/bsd/bind/dist/doc/arm/man.named.conf.html Sat Nov 5 17:54:09 2016
@@ -676,6 +676,6 @@ zone <em class="replaceable"><code>strin
</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>
Index: src/external/bsd/bind/dist/lib/dns/api
diff -u src/external/bsd/bind/dist/lib/dns/api:1.1.1.16.2.7 src/external/bsd/bind/dist/lib/dns/api:1.1.1.16.2.8
--- src/external/bsd/bind/dist/lib/dns/api:1.1.1.16.2.7 Fri Oct 14 12:01:28 2016
+++ src/external/bsd/bind/dist/lib/dns/api Sat Nov 5 17:54:09 2016
@@ -6,5 +6,5 @@
# 9.9-sub: 130-139, 150-159
# 9.10: 140-149, 160-169
LIBINTERFACE = 165
-LIBREVISION = 2
+LIBREVISION = 3
LIBAGE = 0
Index: src/external/bsd/bind/dist/lib/dns/resolver.c
diff -u src/external/bsd/bind/dist/lib/dns/resolver.c:1.19.2.5 src/external/bsd/bind/dist/lib/dns/resolver.c:1.19.2.6
--- src/external/bsd/bind/dist/lib/dns/resolver.c:1.19.2.5 Fri Oct 14 12:01:29 2016
+++ src/external/bsd/bind/dist/lib/dns/resolver.c Sat Nov 5 17:54:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: resolver.c,v 1.19.2.5 2016/10/14 12:01:29 martin Exp $ */
+/* $NetBSD: resolver.c,v 1.19.2.6 2016/11/05 17:54:09 martin Exp $ */
/*
* Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
@@ -623,7 +623,9 @@ valcreate(fetchctx_t *fctx, dns_adbaddri
valarg->addrinfo = addrinfo;
if (!ISC_LIST_EMPTY(fctx->validators))
- INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0);
+ valoptions |= DNS_VALIDATOR_DEFER;
+ else
+ valoptions &= ~DNS_VALIDATOR_DEFER;
result = dns_validator_create(fctx->res->view, name, type, rdataset,
sigrdataset, fctx->rmessage,
@@ -5554,13 +5556,6 @@ cache_name(fetchctx_t *fctx, dns_name_t
rdataset,
sigrdataset,
valoptions, task);
- /*
- * Defer any further validations.
- * This prevents multiple validators
- * from manipulating fctx->rmessage
- * simultaneously.
- */
- valoptions |= DNS_VALIDATOR_DEFER;
}
} else if (CHAINING(rdataset)) {
if (rdataset->type == dns_rdatatype_cname)
@@ -5675,6 +5670,11 @@ cache_name(fetchctx_t *fctx, dns_name_t
eresult == DNS_R_NCACHENXRRSET);
}
event->result = eresult;
+ if (adbp != NULL && *adbp != NULL) {
+ if (anodep != NULL && *anodep != NULL)
+ dns_db_detachnode(*adbp, anodep);
+ dns_db_detach(adbp);
+ }
dns_db_attach(fctx->cache, adbp);
dns_db_transfernode(fctx->cache, &node, anodep);
clone_results(fctx);
@@ -5925,6 +5925,11 @@ ncache_message(fetchctx_t *fctx, dns_adb
fctx->attributes |= FCTX_ATTR_HAVEANSWER;
if (event != NULL) {
event->result = eresult;
+ if (adbp != NULL && *adbp != NULL) {
+ if (anodep != NULL && *anodep != NULL)
+ dns_db_detachnode(*adbp, anodep);
+ dns_db_detach(adbp);
+ }
dns_db_attach(fctx->cache, adbp);
dns_db_transfernode(fctx->cache, &node, anodep);
clone_results(fctx);
@@ -6746,13 +6751,15 @@ static isc_result_t
answer_response(fetchctx_t *fctx) {
isc_result_t result;
dns_message_t *message;
- dns_name_t *name, *dname = NULL, *qname, tname, *ns_name;
+ dns_name_t *name, *dname = NULL, *qname, *dqname, tname, *ns_name;
+ dns_name_t *cname = NULL;
dns_rdataset_t *rdataset, *ns_rdataset;
isc_boolean_t done, external, chaining, aa, found, want_chaining;
- isc_boolean_t have_answer, found_cname, found_type, wanted_chaining;
+ isc_boolean_t have_answer, found_cname, found_dname, found_type;
+ isc_boolean_t wanted_chaining;
unsigned int aflag;
dns_rdatatype_t type;
- dns_fixedname_t fdname, fqname;
+ dns_fixedname_t fdname, fqname, fqdname;
dns_view_t *view;
FCTXTRACE("answer_response");
@@ -6766,6 +6773,7 @@ answer_response(fetchctx_t *fctx) {
done = ISC_FALSE;
found_cname = ISC_FALSE;
+ found_dname = ISC_FALSE;
found_type = ISC_FALSE;
chaining = ISC_FALSE;
have_answer = ISC_FALSE;
@@ -6775,12 +6783,13 @@ answer_response(fetchctx_t *fctx) {
aa = ISC_TRUE;
else
aa = ISC_FALSE;
- qname = &fctx->name;
+ dqname = qname = &fctx->name;
type = fctx->type;
view = fctx->res->view;
+ dns_fixedname_init(&fqdname);
result = dns_message_firstname(message, DNS_SECTION_ANSWER);
while (!done && result == ISC_R_SUCCESS) {
- dns_namereln_t namereln;
+ dns_namereln_t namereln, dnamereln;
int order;
unsigned int nlabels;
@@ -6788,6 +6797,8 @@ answer_response(fetchctx_t *fctx) {
dns_message_currentname(message, DNS_SECTION_ANSWER, &name);
external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain));
namereln = dns_name_fullcompare(qname, name, &order, &nlabels);
+ dnamereln = dns_name_fullcompare(dqname, name, &order,
+ &nlabels);
if (namereln == dns_namereln_equal) {
wanted_chaining = ISC_FALSE;
for (rdataset = ISC_LIST_HEAD(name->list);
@@ -6882,7 +6893,7 @@ answer_response(fetchctx_t *fctx) {
}
} else if (rdataset->type == dns_rdatatype_rrsig
&& rdataset->covers ==
- dns_rdatatype_cname
+ dns_rdatatype_cname
&& !found_type) {
/*
* We're looking for something else,
@@ -6912,11 +6923,18 @@ answer_response(fetchctx_t *fctx) {
* a CNAME or DNAME).
*/
INSIST(!external);
- if (aflag ==
- DNS_RDATASETATTR_ANSWER) {
+ if ((rdataset->type !=
+ dns_rdatatype_cname) ||
+ !found_dname ||
+ (aflag ==
+ DNS_RDATASETATTR_ANSWER))
+ {
have_answer = ISC_TRUE;
+ if (rdataset->type ==
+ dns_rdatatype_cname)
+ cname = name;
name->attributes |=
- DNS_NAMEATTR_ANSWER;
+ DNS_NAMEATTR_ANSWER;
}
rdataset->attributes |= aflag;
if (aa)
@@ -7010,11 +7028,11 @@ answer_response(fetchctx_t *fctx) {
return (DNS_R_FORMERR);
}
- if (namereln != dns_namereln_subdomain) {
+ if (dnamereln != dns_namereln_subdomain) {
char qbuf[DNS_NAME_FORMATSIZE];
char obuf[DNS_NAME_FORMATSIZE];
- dns_name_format(qname, qbuf,
+ dns_name_format(dqname, qbuf,
sizeof(qbuf));
dns_name_format(name, obuf,
sizeof(obuf));
@@ -7029,7 +7047,7 @@ answer_response(fetchctx_t *fctx) {
want_chaining = ISC_TRUE;
POST(want_chaining);
aflag = DNS_RDATASETATTR_ANSWER;
- result = dname_target(rdataset, qname,
+ result = dname_target(rdataset, dqname,
nlabels, &fdname);
if (result == ISC_R_NOSPACE) {
/*
@@ -7046,10 +7064,13 @@ answer_response(fetchctx_t *fctx) {
dname = dns_fixedname_name(&fdname);
if (!is_answertarget_allowed(view,
- qname, rdataset->type,
- dname, &fctx->domain)) {
+ dqname, rdataset->type,
+ dname, &fctx->domain))
+ {
return (DNS_R_SERVFAIL);
}
+ dqname = dns_fixedname_name(&fqdname);
+ dns_name_copy(dname, dqname, NULL);
} else {
/*
* We've found a signature that
@@ -7074,6 +7095,10 @@ answer_response(fetchctx_t *fctx) {
INSIST(!external);
if (aflag == DNS_RDATASETATTR_ANSWER) {
have_answer = ISC_TRUE;
+ found_dname = ISC_TRUE;
+ if (cname != NULL)
+ cname->attributes &=
+ ~DNS_NAMEATTR_ANSWER;
name->attributes |=
DNS_NAMEATTR_ANSWER;
}
Index: src/external/bsd/bind/lib/libbind9/Makefile
diff -u src/external/bsd/bind/lib/libbind9/Makefile:1.2 src/external/bsd/bind/lib/libbind9/Makefile:1.2.4.1
--- src/external/bsd/bind/lib/libbind9/Makefile:1.2 Wed Sep 11 23:04:10 2013
+++ src/external/bsd/bind/lib/libbind9/Makefile Sat Nov 5 17:54:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2016/11/05 17:54:09 martin Exp $
LIB=bind9
@@ -17,4 +17,6 @@ LIBDPLIBS+= isc ${.CURDIR}/../libisc \
dns ${.CURDIR}/../libdns \
isccfg ${.CURDIR}/../libisccfg \
+version.o version.go version.pico version.po : ${VERSIONFILE}
+
.include <bsd.lib.mk>
