From: Mark Andrews <marka@isc.org>
Date: Thu, 4 Dec 2014 23:36:18 +0000 (+1100)
Subject: merge copyrights
X-Git-Tag: v9.11.0a1~1197
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fdd0516065be2316409d0cc7dfb4e4f54eadc5af;p=thirdparty%2Fbind9.git

merge copyrights
---

diff --git a/util/copyrights b/util/copyrights
index bb70cc2585f..1a8ce17daa9 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1418,6 +1418,7 @@
 ./bin/tests/system/ixfr/prereq.sh		SH	2001,2004,2007,2012,2014
 ./bin/tests/system/ixfr/setup.sh		SH	2001,2004,2007,2011,2012,2013,2014
 ./bin/tests/system/ixfr/tests.sh		SH	2001,2004,2007,2011,2012,2014
+./bin/tests/system/legacy/build.sh		SH	2014
 ./bin/tests/system/legacy/clean.sh		SH	2014
 ./bin/tests/system/legacy/ns1/named.conf	CONF-C	2014
 ./bin/tests/system/legacy/ns1/root.db		ZONE	2014
@@ -1436,15 +1437,16 @@
 ./bin/tests/system/legacy/ns5/named.notcp	X	2014
 ./bin/tests/system/legacy/ns5/plain-notcp.db	ZONE	2014
 ./bin/tests/system/legacy/ns6/edns512.db.in	ZONE	2014
+./bin/tests/system/legacy/ns6/edns512.db.signed	X	2014
 ./bin/tests/system/legacy/ns6/named.args	X	2014
 ./bin/tests/system/legacy/ns6/named.conf	CONF-C	2014
 ./bin/tests/system/legacy/ns6/sign.sh		SH	2014
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.in	ZONE	2014
+./bin/tests/system/legacy/ns7/edns512-notcp.db.signed	X	2014
 ./bin/tests/system/legacy/ns7/named.args	X	2014
 ./bin/tests/system/legacy/ns7/named.conf	CONF-C	2014
 ./bin/tests/system/legacy/ns7/named.notcp	X	2014
 ./bin/tests/system/legacy/ns7/sign.sh		SH	2014
-./bin/tests/system/legacy/setup.sh		SH	2014
 ./bin/tests/system/legacy/tests.sh		SH	2014
 ./bin/tests/system/limits/clean.sh		SH	2000,2001,2004,2007,2012
 ./bin/tests/system/limits/knowngood.dig.out.1000	X	2000,2001