From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Oct 2014 00:16:10 +0000 (+1100)
Subject: update
X-Git-Tag: v9.11.0a1~1339
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=169f44b082b340b952e26c0fdb930c102a957752;p=thirdparty%2Fbind9.git

update
---

diff --git a/util/copyrights b/util/copyrights
index 301f51b419f..c1d8515c095 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -880,6 +880,7 @@
 ./bin/tests/system/checkconf/bad-dnssec.conf	CONF-C	2012,2013
 ./bin/tests/system/checkconf/bad-hint.conf	CONF-C	2014
 ./bin/tests/system/checkconf/bad-inline-slave.conf	CONF-C	2013
+./bin/tests/system/checkconf/bad-lifetime.conf	CONF-C	2014
 ./bin/tests/system/checkconf/bad-many.conf	CONF-C	2005,2012
 ./bin/tests/system/checkconf/bad-master-request-ixfr.conf	CONF-C	2014
 ./bin/tests/system/checkconf/bad-maxttlmap.conf	CONF-C	2014
@@ -1296,15 +1297,15 @@
 ./bin/tests/system/forward/ns1/named.conf	CONF-C	2000,2001,2004,2007,2014
 ./bin/tests/system/forward/ns1/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/forward/ns2/example.db	X	2000,2001
-./bin/tests/system/forward/ns2/named.conf	CONF-C	2000,2001,2004,2007,2013
+./bin/tests/system/forward/ns2/named.conf	CONF-C	2000,2001,2004,2007,2013,2014
 ./bin/tests/system/forward/ns2/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/forward/ns3/named.conf	CONF-C	2000,2001,2004,2007
 ./bin/tests/system/forward/ns3/root.db		ZONE	2000,2001,2004,2007
-./bin/tests/system/forward/ns4/named.conf	CONF-C	2000,2001,2004,2007,2013
+./bin/tests/system/forward/ns4/named.conf	CONF-C	2000,2001,2004,2007,2013,2014
 ./bin/tests/system/forward/ns4/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/forward/ns5/named.conf	CONF-C	2011
 ./bin/tests/system/forward/ns5/root.db		ZONE	2011
-./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013
+./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014
 ./bin/tests/system/genzone.sh			SH	2001,2002,2003,2004,2007,2009,2011,2012,2013,2014
 ./bin/tests/system/geoip/.gitignore		X	2013
 ./bin/tests/system/geoip/Makefile.in		MAKE	2013
@@ -2856,6 +2857,10 @@
 ./doc/arm/man.rndc.conf.html			X	2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./doc/arm/man.rndc.html				X	2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./doc/arm/managed-keys.xml			SGML	2010,2014
+./doc/arm/notes-wrapper.xml			SGML	2014
+./doc/arm/notes.html				X	2014
+./doc/arm/notes.pdf				X	2014
+./doc/arm/notes.xml				SGML	2014
 ./doc/arm/pkcs11.xml				SGML	2010,2012,2013,2014
 ./doc/design/addressdb				TXT.BRIEF	2000,2001,2004
 ./doc/design/compression			TXT.BRIEF	1999,2000,2001,2004
@@ -2907,7 +2912,7 @@
 ./doc/misc/sdb					TXT.BRIEF	2000,2001,2004
 ./doc/misc/sort-options.pl			PERL	2007,2012
 ./doc/xsl/.gitignore				X	2012
-./doc/xsl/Makefile.in				MAKE	2005,2007,2012
+./doc/xsl/Makefile.in				MAKE	2005,2007,2012,2014
 ./doc/xsl/copyright.xsl				SGML	2005,2007,2009
 ./doc/xsl/isc-docbook-chunk.xsl.in		SGML	2005,2007,2014
 ./doc/xsl/isc-docbook-html.xsl.in		SGML	2005,2007,2014
@@ -2915,6 +2920,7 @@
 ./doc/xsl/isc-docbook-latex.xsl.in		SGML	2005,2007,2010
 ./doc/xsl/isc-docbook-text.xsl			SGML	2005,2007
 ./doc/xsl/isc-manpage.xsl.in			SGML	2005,2007
+./doc/xsl/isc-notes-latex.xsl.in		SGML	2014
 ./doc/xsl/pre-latex.xsl				SGML	2005,2007
 ./docutil/HTML_COPYRIGHT			X	2001,2004
 ./docutil/MAN_COPYRIGHT				X	2001,2004
@@ -3289,11 +3295,13 @@
 ./lib/dns/stats.c				C	2000,2001,2004,2005,2007,2008,2009,2012
 ./lib/dns/tcpmsg.c				C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/tests/Atffile				X	2011
+./lib/dns/tests/Kdh.+002+18602.key		X	2014
 ./lib/dns/tests/Makefile.in			MAKE	2011,2012,2013,2014
 ./lib/dns/tests/db_test.c			C	2013
 ./lib/dns/tests/dbdiff_test.c			C	2011,2012
 ./lib/dns/tests/dbiterator_test.c		C	2011,2012
 ./lib/dns/tests/dbversion_test.c		C	2011,2012,2014
+./lib/dns/tests/dh_test.c			C	2014
 ./lib/dns/tests/dispatch_test.c			C	2012,2014
 ./lib/dns/tests/dnstest.c			C	2011,2012,2013,2014
 ./lib/dns/tests/dnstest.h			C	2011,2012,2014