update

diff --git a/util/copyrights b/util/copyrights
index 888be39ad52a892d4c6a26374ed655b4c7ba05c2..7d3fc3b41e1a965bbdfdece501fedc843a400d76 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -549,7 +549,6 @@
 ./bin/tests/system/autosign/ns2/keygen.sh      SH      2009,2010
 ./bin/tests/system/autosign/ns2/named.conf     CONF-C  2009,2010
 ./bin/tests/system/autosign/ns2/private.secure.example.db.in   ZONE    2009
-./bin/tests/system/autosign/ns2/revkeys.shar   X       2010
 ./bin/tests/system/autosign/ns3/.cvsignore     X       2009
 ./bin/tests/system/autosign/ns3/insecure.example.db    ZONE    2009
 ./bin/tests/system/autosign/ns3/keygen.sh      SH      2009,2010
@@ -716,7 +715,6 @@
 ./bin/tests/system/dnssec/signer/example.db.in ZONE    2010
 ./bin/tests/system/dnssec/tests.sh             SH      2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
 ./bin/tests/system/filter-aaaa/.cvsignore      X       2010
-./bin/tests/system/filter-aaaa/Makefile                MAKE    2010
 ./bin/tests/system/filter-aaaa/Makefile.in     MAKE    2010
 ./bin/tests/system/filter-aaaa/clean.sh                SH      2010
 ./bin/tests/system/filter-aaaa/conf/bad1.conf  CONF-C  2010
@@ -1557,220 +1555,54 @@
 ./contrib/zkt/debug.h                          X       2008
 ./contrib/zkt/dki.c                            X       2008,2009,2010
 ./contrib/zkt/dki.h                            X       2008,2009,2010
-./contrib/zkt/dnssec-signer.c                  X       2008,2009
 ./contrib/zkt/dnssec-zkt.c                     X       2008,2009,2010
 ./contrib/zkt/doc/KeyRollover.ms               X       2009
-./contrib/zkt/doc/KeyRollover.ps               X       2009
-./contrib/zkt/doc/draft-gudmundsson-life-of-dnskey-00.txt      X       2009
-./contrib/zkt/doc/draft-ietf-dnsop-rfc4641bis-01.txt   X       2009
-./contrib/zkt/doc/rfc4641.txt                  X       2009
 ./contrib/zkt/doc/rfc5011.txt                  X       2009
 ./contrib/zkt/domaincmp.c                      X       2008,2010
 ./contrib/zkt/domaincmp.h                      X       2008,2010
-./contrib/zkt/examples/dnssec-signer.sh                X       2008
-./contrib/zkt/examples/dnssec-zkt.sh           X       2008
 ./contrib/zkt/examples/dnssec.conf             X       2010
-./contrib/zkt/examples/flat/dist.sh            X       2008,2009
-./contrib/zkt/examples/flat/dnssec-signer.sh   X       2009
-./contrib/zkt/examples/flat/dnssec.conf                X       2008,2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+003+42138.key    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+003+42138.private        X       2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+005+01355.depreciated    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+005+01355.key    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+005+10643.key    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+005+10643.private        X       2009
 ./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+007+30323.key    X       2010
 ./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+007+30323.private        X       2010
 ./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+007+52935.key    X       2010
 ./contrib/zkt/examples/flat/dyn.example.net/Kdyn.example.net.+007+52935.private        X       2010
-./contrib/zkt/examples/flat/dyn.example.net/dnskey.db  X       2009
-./contrib/zkt/examples/flat/dyn.example.net/dnssec.conf        X       2009
-./contrib/zkt/examples/flat/dyn.example.net/dsset-dyn.example.net.     X       2009
-./contrib/zkt/examples/flat/dyn.example.net/keyset-dyn.example.net.    X       2009
 ./contrib/zkt/examples/flat/dyn.example.net/zktlog-dyn.example.net.    X       2010
-./contrib/zkt/examples/flat/dyn.example.net/zone.db    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/zone.db.dsigned    X       2009
-./contrib/zkt/examples/flat/dyn.example.net/zone.org   X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+07308.key    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+07308.private        X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+24545.key    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+24545.published      X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+33840.key    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+33840.published      X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+34925.depreciated    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+34925.key    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+48089.key    X       2009
-./contrib/zkt/examples/flat/example.net/Kexample.net.+005+48089.private        X       2009
 ./contrib/zkt/examples/flat/example.net/Kexample.net.+008+08406.key    X       2010
 ./contrib/zkt/examples/flat/example.net/Kexample.net.+008+08406.private        X       2010
 ./contrib/zkt/examples/flat/example.net/Kexample.net.+008+36257.key    X       2010
 ./contrib/zkt/examples/flat/example.net/Kexample.net.+008+36257.private        X       2010
-./contrib/zkt/examples/flat/example.net/dnskey.db      X       2009
 ./contrib/zkt/examples/flat/example.net/dnssec.conf    X       2010
-./contrib/zkt/examples/flat/example.net/dsset-example.net.     X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+01764.key    X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+01764.private        X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+14829.key    X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+14829.private        X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+41151.key    X       2009
-./contrib/zkt/examples/flat/example.net/kexample.net.+005+41151.private        X       2009
-./contrib/zkt/examples/flat/example.net/keyset-example.net.    X       2009
 ./contrib/zkt/examples/flat/example.net/z.db   X       2010
 ./contrib/zkt/examples/flat/example.net/zktlog-example.net.    X       2010
-./contrib/zkt/examples/flat/example.net/zone.db        X       2009
-./contrib/zkt/examples/flat/example.net/zone.db.signed X       2009
-./contrib/zkt/examples/flat/keysets/dlvset-sub.example.net.    X       2008,2009
-./contrib/zkt/examples/flat/keysets/dsset-dyn.example.net.     X       2008
-./contrib/zkt/examples/flat/keysets/dsset-example.net. X       2008,2009
-./contrib/zkt/examples/flat/keysets/dsset-sub.example.net.     X       2008,2009
-./contrib/zkt/examples/flat/keysets/keyset-dyn.example.net.    X       2008
-./contrib/zkt/examples/flat/keysets/keyset-example.net.        X       2008,2009
-./contrib/zkt/examples/flat/keysets/keyset-sub.example.net.    X       2008,2009
-./contrib/zkt/examples/flat/named.conf         X       2008,2009
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+02048.key    X       2010
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+02048.published      X       2010
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+14600.depreciated    X       2009
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+14600.key    X       2009
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+32345.key    X       2009
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+32345.private        X       2009
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+41747.key    X       2010
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+41747.private        X       2010
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+42834.key    X       2010
 ./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+42834.private        X       2010
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+48516.key    X       2009
-./contrib/zkt/examples/flat/sub.example.net/Ksub.example.net.+007+48516.private        X       2009
-./contrib/zkt/examples/flat/sub.example.net/dlvset-sub.example.net.    X       2009
-./contrib/zkt/examples/flat/sub.example.net/dnskey.db  X       2009
-./contrib/zkt/examples/flat/sub.example.net/dnssec.conf        X       2009
-./contrib/zkt/examples/flat/sub.example.net/dsset-sub.example.net.     X       2009
-./contrib/zkt/examples/flat/sub.example.net/keyset-sub.example.net.    X       2009
-./contrib/zkt/examples/flat/sub.example.net/maxhexsalt X       2009
-./contrib/zkt/examples/flat/sub.example.net/maxhexsalt+1       X       2009
 ./contrib/zkt/examples/flat/sub.example.net/zktlog-sub.example.net.    X       2010
-./contrib/zkt/examples/flat/sub.example.net/zone.db    X       2009
-./contrib/zkt/examples/flat/sub.example.net/zone.db.signed     X       2009
-./contrib/zkt/examples/flat/zkt.log            X       2008,2009
-./contrib/zkt/examples/flat/zone.conf          X       2008,2009
 ./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+09743.key   X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+09743.published     X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+37983.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+37983.published     X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+39599.key   X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+39599.private       X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+47280.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+47280.private       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+55529.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/Kexample.de.+005+55529.private       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/dnskey.db    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/dsset-example.de.    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+17439.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+17439.private       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+41145.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+41145.private       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+59244.key   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/kexample.de.+005+59244.private       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/keyset-example.de.   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/keyset-sub.example.de.       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+11091.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+11091.published  X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+38598.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+38598.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+60332.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+001+60332.private    X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+07295.key        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+07295.private    X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+08544.key        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+08544.private    X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+24426.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+24426.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+26451.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+26451.private    X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+27861.key        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+27861.private    X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+37547.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+37547.private    X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+40559.key        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+40559.published  X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+40956.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+40956.private    X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+42639.key        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+42639.private    X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+57863.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+57863.published  X       2009
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+63530.depreciated        X       2010
 ./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/Ksub.example.de.+005+63530.key        X       2010
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/dlvset-sub.example.de.        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/dnskey.db     X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/dnssec.conf   X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/dsset-sub.example.de. X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/keyset-sub.example.de.        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+06903.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+06903.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+31785.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+31785.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+40998.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+40998.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+56595.key        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/ksub.example.de.+005+56595.private    X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/parent-sub.example.de.        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/zone.db       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/sub.example.de/zone.db.signed        X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/zone.db      X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/zone.db.signed       X       2009
-./contrib/zkt/examples/hierarchical/de/example.de/zone.soa     X       2009
-./contrib/zkt/examples/hierarchical/de/keyset-example.de.      X       2009
-./contrib/zkt/examples/hierarchical/dnssec.conf        X       2008
 ./contrib/zkt/examples/hierarchical/log/zktlog-example.de.     X       2010
 ./contrib/zkt/examples/hierarchical/log/zktlog-sub.example.de. X       2010
-./contrib/zkt/examples/hierarchical/named.conf X       2008
-./contrib/zkt/examples/hierarchical/zone.conf  X       2008,2009
-./contrib/zkt/examples/views/dnssec-extern.conf        X       2008
-./contrib/zkt/examples/views/dnssec-intern.conf        X       2008
-./contrib/zkt/examples/views/dnssec-signer-extern      X       2008
-./contrib/zkt/examples/views/dnssec-signer-intern      X       2008
-./contrib/zkt/examples/views/dnssec-zkt-extern X       2008
-./contrib/zkt/examples/views/dnssec-zkt-intern X       2008
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+10367.key    X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+10367.private        X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+14714.key    X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+14714.published      X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+23553.key    X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+23553.private        X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+35744.depreciated    X       2009
-./contrib/zkt/examples/views/extern/example.net/Kexample.net.+005+35744.key    X       2009
-./contrib/zkt/examples/views/extern/example.net/dnskey.db      X       2009
-./contrib/zkt/examples/views/extern/example.net/dsset-example.net.     X       2009
-./contrib/zkt/examples/views/extern/example.net/keyset-example.net.    X       2009
-./contrib/zkt/examples/views/extern/example.net/zone.db        X       2009
-./contrib/zkt/examples/views/extern/example.net/zone.db.signed X       2009
-./contrib/zkt/examples/views/extern/zkt-ext.log        X       2008,2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+00126.key    X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+00126.private        X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+05972.depreciated    X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+05972.key    X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+23375.key    X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+23375.private        X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+55745.key    X       2009
-./contrib/zkt/examples/views/intern/example.net/Kexample.net.+005+55745.published      X       2009
-./contrib/zkt/examples/views/intern/example.net/dnskey.db      X       2009
-./contrib/zkt/examples/views/intern/example.net/dsset-example.net.     X       2009
-./contrib/zkt/examples/views/intern/example.net/keyset-example.net.    X       2009
-./contrib/zkt/examples/views/intern/example.net/zone.db        X       2009
-./contrib/zkt/examples/views/intern/example.net/zone.db.signed X       2009
-./contrib/zkt/examples/views/intern/zkt-int.log        X       2008,2009
-./contrib/zkt/examples/views/named.conf                X       2008,2009
-./contrib/zkt/examples/views/named.log         X       2008
-./contrib/zkt/examples/views/root.hint         X       2008
-./contrib/zkt/examples/views/viewtest.sh       X       2008
 ./contrib/zkt/examples/zkt-ls.sh               X       2010
 ./contrib/zkt/examples/zkt-signer.sh           X       2010
 ./contrib/zkt/log.c                            X       2008,2010
 ./contrib/zkt/log.h                            X       2008,2010
-./contrib/zkt/man/dnssec-signer.8              X       2009
-./contrib/zkt/man/dnssec-signer.8.html         X       2009
-./contrib/zkt/man/dnssec-signer.8.pdf          X       2009
 ./contrib/zkt/man/dnssec-zkt.8                 X       2009
-./contrib/zkt/man/dnssec-zkt.8.html            X       2009
 ./contrib/zkt/man/dnssec-zkt.8.pdf             X       2009
 ./contrib/zkt/man/zkt-conf.8                   X       2010
 ./contrib/zkt/man/zkt-conf.8.html              X       2010