Cleanup copyrights

diff --git a/util/copyrights b/util/copyrights
index cb48c26229401fcc304394998bd2274dd10fdf42..b2a583f7aaa717a3cb83102776e283bf8e34c5ed 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -536,7 +536,6 @@
 ./bin/tests/system/autosign/ns3/ttl4.example.db.in     ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns4/named.conf.in  CONF-C  2009,2016,2017,2018
 ./bin/tests/system/autosign/ns5/named.conf.in  CONF-C  2009,2016,2017,2018
-./bin/tests/system/autosign/prereq.sh          SH      2009,2010,2012,2014,2016,2018
 ./bin/tests/system/autosign/setup.sh           SH      2009,2010,2012,2014,2016,2017,2018
 ./bin/tests/system/autosign/tests.sh           SH      2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/builtin/clean.sh            SH      2014,2016,2018
@@ -578,7 +577,6 @@
 ./bin/tests/system/cds/checktime.pl            PERL    2017,2018
 ./bin/tests/system/cds/clean.sh                        SH      2017,2018
 ./bin/tests/system/cds/mangle.pl               PERL    2017,2018
-./bin/tests/system/cds/prereq.sh               SH      2017,2018
 ./bin/tests/system/cds/setup.sh                        SH      2017,2018
 ./bin/tests/system/cds/tests.sh                        SH      2017,2018
 ./bin/tests/system/chain/README                        TXT.BRIEF       2017,2018
@@ -865,7 +863,6 @@
 ./bin/tests/system/coverage/11-cutoff/README   X       2014,2018
 ./bin/tests/system/coverage/11-cutoff/expect   X       2014,2018
 ./bin/tests/system/coverage/clean.sh           SH      2013,2014,2016,2018
-./bin/tests/system/coverage/prereq.sh          SH      2014,2016,2018
 ./bin/tests/system/coverage/setup.sh           SH      2013,2014,2016,2017,2018
 ./bin/tests/system/coverage/tests.sh           SH      2013,2014,2016,2018
 ./bin/tests/system/database/clean.sh           SH      2011,2012,2014,2016,2018
@@ -928,7 +925,6 @@
 ./bin/tests/system/dlv/ns6/hints               ZONE    2010,2016,2018
 ./bin/tests/system/dlv/ns6/named.conf.in       CONF-C  2010,2011,2016,2018
 ./bin/tests/system/dlv/ns6/sign.sh             SH      2010,2011,2012,2014,2016,2018
-./bin/tests/system/dlv/prereq.sh               SH      2014,2016,2018
 ./bin/tests/system/dlv/setup.sh                        SH      2004,2007,2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/dlv/tests.sh                        SH      2004,2007,2010,2011,2012,2016,2018
 ./bin/tests/system/dlz/clean.sh                        SH      2010,2012,2014,2016,2018
@@ -974,7 +970,6 @@
 ./bin/tests/system/dns64/ns1/sign.sh           SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dns64/ns2/named.conf.in     CONF-C  2010,2011,2013,2016,2018
 ./bin/tests/system/dns64/ns2/rpz.db            ZONE    2013,2016,2018
-./bin/tests/system/dns64/prereq.sh             SH      2014,2016,2018
 ./bin/tests/system/dns64/setup.sh              SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dns64/tests.sh              SH      2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/README               TXT.BRIEF       2000,2001,2002,2004,2011,2016,2018
@@ -1154,7 +1149,6 @@
 ./bin/tests/system/dsdigest/ns2/sign.sh                SH      2012,2014,2016,2018
 ./bin/tests/system/dsdigest/ns3/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/dsdigest/ns4/named.conf.in  CONF-C  2012,2016,2018
-./bin/tests/system/dsdigest/prereq.sh          SH      2012,2014,2016,2018
 ./bin/tests/system/dsdigest/setup.sh           SH      2012,2014,2016,2017,2018
 ./bin/tests/system/dsdigest/tests.sh           SH      2012,2016,2018
 ./bin/tests/system/dupsigs/check_journal.pl    PERL    2018
@@ -1163,7 +1157,6 @@
 ./bin/tests/system/dupsigs/ns1/named.conf.in   CONF-C  2018
 ./bin/tests/system/dupsigs/ns1/reset_keys.sh   SH      2018
 ./bin/tests/system/dupsigs/ns1/signing.test.db.in      ZONE    2018
-./bin/tests/system/dupsigs/prereq.sh           SH      2018
 ./bin/tests/system/dupsigs/setup.sh            SH      2018
 ./bin/tests/system/dupsigs/tests.sh            SH      2018
 ./bin/tests/system/dyndb/Makefile.in           MAKE    2015,2016,2018
@@ -1195,7 +1188,6 @@
 ./bin/tests/system/ecdsa/ns1/root.db.in                ZONE    2012,2016,2018
 ./bin/tests/system/ecdsa/ns1/sign.sh           SH      2012,2014,2016,2018
 ./bin/tests/system/ecdsa/ns2/named.conf                CONF-C  2012,2016,2018
-./bin/tests/system/ecdsa/prereq.sh             SH      2012,2014,2016,2018
 ./bin/tests/system/ecdsa/setup.sh              SH      2012,2014,2016,2017,2018
 ./bin/tests/system/ecdsa/tests.sh              SH      2012,2013,2015,2016,2018
 ./bin/tests/system/eddsa/clean.sh              SH      2017,2018
@@ -1260,7 +1252,6 @@
 ./bin/tests/system/filter-aaaa/ns1/root.db     ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/sign.sh     SH      2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns1/signed.db.in        ZONE    2010,2012,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns1/signed.db.presigned X       2014,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/unsigned.db ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns2/hints       ZONE    2010,2016,2018
 ./bin/tests/system/filter-aaaa/ns2/named1.conf.in      CONF-C  2012,2013,2016,2017,2018
@@ -1273,7 +1264,6 @@
 ./bin/tests/system/filter-aaaa/ns4/root.db     ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/sign.sh     SH      2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns4/signed.db.in        ZONE    2010,2012,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns4/signed.db.presigned X       2014,2018
 ./bin/tests/system/filter-aaaa/ns4/unsigned.db ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/setup.sh                SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/filter-aaaa/tests.sh                SH      2010,2012,2015,2016,2018
@@ -1391,7 +1381,6 @@
 ./bin/tests/system/inline/ns6/named.conf.in    CONF-C  2011,2016,2018
 ./bin/tests/system/inline/ns7/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/inline/ns7/sign.sh          SH      2017,2018
-./bin/tests/system/inline/prereq.sh            SH      2014,2016,2018
 ./bin/tests/system/inline/setup.sh             SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/tests.sh             SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/integrity/clean.sh          SH      2017,2018
@@ -1463,7 +1452,6 @@
 ./bin/tests/system/keymgr/policy.conf          CONF-C  2016,2018
 ./bin/tests/system/keymgr/policy.good          X       2016,2018
 ./bin/tests/system/keymgr/policy.sample                CONF-C  2016,2017,2018
-./bin/tests/system/keymgr/prereq.sh            SH      2016,2018
 ./bin/tests/system/keymgr/setup.sh             SH      2016,2017,2018
 ./bin/tests/system/keymgr/testpolicy.py                PYTHON  2016,2018
 ./bin/tests/system/keymgr/tests.sh             SH      2016,2018
@@ -1550,13 +1538,11 @@
 ./bin/tests/system/masterformat/ns2/formerly-text.db.in        ZONE    2011,2016,2018
 ./bin/tests/system/masterformat/ns2/named.conf.in      CONF-C  2005,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/masterformat/ns3/named.conf.in      CONF-C  2012,2013,2016,2018
-./bin/tests/system/masterformat/prereq.sh      SH      2014,2016,2018
 ./bin/tests/system/masterformat/setup.sh       SH      2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterformat/tests.sh       SH      2005,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/metadata/child.db           ZONE    2009,2016,2018
 ./bin/tests/system/metadata/clean.sh           SH      2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/metadata/parent.db          ZONE    2009,2016,2018
-./bin/tests/system/metadata/prereq.sh          SH      2009,2012,2014,2016,2018
 ./bin/tests/system/metadata/setup.sh           SH      2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/metadata/tests.sh           SH      2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/mirror/clean.sh             SH      2018
@@ -1588,7 +1574,6 @@
 ./bin/tests/system/mkeys/ns5/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/mkeys/ns5/named1.args       X       2017,2018
 ./bin/tests/system/mkeys/ns5/named2.args       X       2017,2018
-./bin/tests/system/mkeys/prereq.sh             SH      2015,2016,2018
 ./bin/tests/system/mkeys/setup.sh              SH      2015,2016,2017,2018
 ./bin/tests/system/mkeys/tests.sh              SH      2015,2016,2017,2018
 ./bin/tests/system/names/clean.sh              SH      2015,2016,2018
@@ -1680,7 +1665,6 @@
 ./bin/tests/system/pending/ns3/mail.example.db ZONE    2009,2016,2018
 ./bin/tests/system/pending/ns3/named.conf.in   CONF-C  2009,2016,2018
 ./bin/tests/system/pending/ns4/named.conf.in   CONF-C  2009,2016,2018
-./bin/tests/system/pending/prereq.sh           SH      2009,2012,2014,2016,2018
 ./bin/tests/system/pending/setup.sh            SH      2009,2012,2014,2016,2017,2018
 ./bin/tests/system/pending/tests.sh            SH      2009,2010,2012,2015,2016,2018
 ./bin/tests/system/pipelined/Makefile.in       MAKE    2014,2015,2016,2018
@@ -1707,13 +1691,6 @@
 ./bin/tests/system/pkcs11/setup.sh             SH      2010,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/tests.sh             SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/usepkcs11            X       2010,2018
-./bin/tests/system/pkcs11ssl/clean.sh          SH      2014,2016,2018
-./bin/tests/system/pkcs11ssl/ns1/example.db.in ZONE    2014,2016,2018
-./bin/tests/system/pkcs11ssl/ns1/named.conf    CONF-C  2014,2016,2018
-./bin/tests/system/pkcs11ssl/prereq.sh         SH      2014,2016,2018
-./bin/tests/system/pkcs11ssl/setup.sh          SH      2014,2016,2018
-./bin/tests/system/pkcs11ssl/tests.sh          SH      2014,2016,2018
-./bin/tests/system/pkcs11ssl/usepkcs11         X       2014,2018
 ./bin/tests/system/qmin/ans2/ans.py            PYTHON  2018
 ./bin/tests/system/qmin/ans3/ans.py            PYTHON  2018
 ./bin/tests/system/qmin/ans4/ans.py            PYTHON  2018
@@ -1764,7 +1741,6 @@
 ./bin/tests/system/redirect/ns4/example.db.in  ZONE    2015,2016,2018
 ./bin/tests/system/redirect/ns4/named.conf.in  CONF-C  2015,2016,2018
 ./bin/tests/system/redirect/ns4/root.hint      ZONE    2015,2016,2018
-./bin/tests/system/redirect/prereq.sh          SH      2014,2016,2018
 ./bin/tests/system/redirect/setup.sh           SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/redirect/tests.sh           SH      2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ans2/ans.pl                PERL    2000,2001,2004,2007,2009,2010,2012,2016,2018
@@ -1830,7 +1806,6 @@
 ./bin/tests/system/rootkeysentinel/ns3/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/ns4/hint.db ZONE    2018
 ./bin/tests/system/rootkeysentinel/ns4/named.conf.in   CONF-C  2018
-./bin/tests/system/rootkeysentinel/prereq.sh   SH      2018
 ./bin/tests/system/rootkeysentinel/setup.sh    SH      2018
 ./bin/tests/system/rootkeysentinel/tests.sh    SH      2018
 ./bin/tests/system/rpz/Makefile.in             MAKE    2017,2018
@@ -1865,7 +1840,6 @@
 ./bin/tests/system/rpz/ns6/named.conf.in       CONF-C  2014,2016,2017,2018
 ./bin/tests/system/rpz/ns7/hints               ZONE    2014,2016,2018
 ./bin/tests/system/rpz/ns7/named.conf.in       CONF-C  2014,2016,2017,2018
-./bin/tests/system/rpz/prereq.sh               SH      2014,2016,2018
 ./bin/tests/system/rpz/qperf.sh                        SH      2012,2013,2016,2018
 ./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013,2016,2018
@@ -2039,7 +2013,6 @@
 ./bin/tests/system/smartsign/child.db          ZONE    2010,2016,2018
 ./bin/tests/system/smartsign/clean.sh          SH      2010,2012,2014,2016,2018
 ./bin/tests/system/smartsign/parent.db         ZONE    2010,2016,2018
-./bin/tests/system/smartsign/prereq.sh         SH      2010,2012,2014,2016,2018
 ./bin/tests/system/smartsign/setup.sh          SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/smartsign/tests.sh          SH      2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/sortlist/clean.sh           SH      2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
@@ -2087,7 +2060,6 @@
 ./bin/tests/system/staticstub/ns4/named.conf.in        CONF-C  2010,2016,2018
 ./bin/tests/system/staticstub/ns4/sign.sh      SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/staticstub/ns4/sub.example.db.in    ZONE    2010,2016,2018
-./bin/tests/system/staticstub/prereq.sh                SH      2014,2016,2018
 ./bin/tests/system/staticstub/setup.sh         SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/staticstub/tests.sh         SH      2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/statistics/ans4/ans.pl      PERL    2012,2016,2018
@@ -2160,7 +2132,6 @@
 ./bin/tests/system/synthfromdnssec/ns4/root.hints      ZONE    2017,2018
 ./bin/tests/system/synthfromdnssec/ns5/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns5/root.hints      ZONE    2017,2018
-./bin/tests/system/synthfromdnssec/prereq.sh   SH      2017,2018
 ./bin/tests/system/synthfromdnssec/setup.sh    SH      2017,2018
 ./bin/tests/system/synthfromdnssec/tests.sh    SH      2017,2018
 ./bin/tests/system/tcp/clean.sh                        SH      2014,2016,2018
@@ -2183,7 +2154,6 @@
 ./bin/tests/system/tkey/ns1/example.db         ZONE    2013,2016,2018
 ./bin/tests/system/tkey/ns1/named.conf.in      CONF-C  2001,2004,2007,2009,2011,2013,2014,2016,2017,2018
 ./bin/tests/system/tkey/ns1/setup.sh           SH      2001,2004,2007,2009,2012,2014,2016,2018
-./bin/tests/system/tkey/prereq.sh              SH      2001,2004,2006,2007,2009,2012,2014,2016,2018
 ./bin/tests/system/tkey/setup.sh               SH      2001,2004,2007,2009,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/tkey/tests.sh               SH      2001,2004,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/tools/clean.sh              SH      2017,2018
@@ -2218,7 +2188,6 @@
 ./bin/tests/system/unknown/ns2/named.conf.in   CONF-C  2012,2016,2018
 ./bin/tests/system/unknown/ns3/named.conf.in   CONF-C  2012,2016,2018
 ./bin/tests/system/unknown/ns3/sign.sh         SH      2012,2014,2016,2017,2018
-./bin/tests/system/unknown/prereq.sh           SH      2014,2016,2018
 ./bin/tests/system/unknown/setup.sh            SH      2012,2014,2016,2017,2018
 ./bin/tests/system/unknown/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/unknown/zones/nan.bad       ZONE    2013,2016,2018
@@ -2237,7 +2206,6 @@
 ./bin/tests/system/upforwd/setup.sh            SH      2000,2001,2004,2007,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/upforwd/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/verify/clean.sh             SH      2012,2014,2016,2018
-./bin/tests/system/verify/prereq.sh            SH      2014,2016,2018
 ./bin/tests/system/verify/setup.sh             SH      2012,2014,2016,2017,2018
 ./bin/tests/system/verify/tests.sh             SH      2012,2013,2016,2017,2018
 ./bin/tests/system/verify/zones/genzones.sh    SH      2012,2013,2014,2016,2017,2018
@@ -2278,7 +2246,6 @@
 ./bin/tests/system/wildcard/ns4/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/wildcard/ns5/hints          ZONE    2013,2016,2018
 ./bin/tests/system/wildcard/ns5/named.conf.in  CONF-C  2013,2016,2018
-./bin/tests/system/wildcard/prereq.sh          SH      2014,2016,2018
 ./bin/tests/system/wildcard/setup.sh           SH      2012,2014,2016,2017,2018
 ./bin/tests/system/wildcard/tests.sh           SH      2012,2013,2016,2018
 ./bin/tests/system/win32/bigkey.vcxproj.filters.in     X       2016,2018
@@ -2359,7 +2326,6 @@
 ./bin/tests/system/zonechecks/ns1/named.conf.in        CONF-C  2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/ns2/named.conf.in        CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/zonechecks/nxdomain.db      ZONE    2004,2007,2016,2018
-./bin/tests/system/zonechecks/prereq.sh                SH      2014,2016,2018
 ./bin/tests/system/zonechecks/setup.sh         SH      2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2013,2014,2015,2016,2018
 ./bin/tests/testdata/wire/wire_test.data       X       1999,2000,2001,2018