copyright cleanups

diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index 85cef750081e57cf7b86870a2ce1b60e830e84a3..7dc4d237791365a3da7d34135213a0d3506e34ed 100644 (file)
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 #
 # Clean up after dlzexternal tests.
 #

diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh
index 54b7da82e031c2f12bd84626114185abe248901f..88d13bcc18f3a3938b5248226f56e3bce9c0596f 100644 (file)
--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2010-2013  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 # tests for TSIG-GSS updates
 
 SYSTEMTESTTOP=..

diff --git a/bin/tests/system/dsdigest/prereq.sh b/bin/tests/system/dsdigest/prereq.sh
index 897ffcd9257240d7489e6b5417cc175463dfd91d..ef21ed5ba8cbc815bb805b36a9f020ab5ef9577f 100644 (file)
--- a/bin/tests/system/dsdigest/prereq.sh
+++ b/bin/tests/system/dsdigest/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/ecdsa/prereq.sh b/bin/tests/system/ecdsa/prereq.sh
index 2f107bf96dcbcf3b85f98c44404ce8e0ea9ad28c..a46b135d578a0af67744e11b88bb45771b540ea4 100644 (file)
--- a/bin/tests/system/ecdsa/prereq.sh
+++ b/bin/tests/system/ecdsa/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 20122014  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/gost/prereq.sh b/bin/tests/system/gost/prereq.sh
index 26c9582e8af073e26ab93f07f6ff140fb6ad7dc8..a49e8ff9c1f20f4c5fdd04109c035a3e3d5e40d8 100644 (file)
--- a/bin/tests/system/gost/prereq.sh
+++ b/bin/tests/system/gost/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh
index eeb9aab5e563230a39470c2adf62343f8664775a..d1d3a3088c240c70d82c1d390f80347b1c89c439 100644 (file)
--- a/bin/tests/system/tsiggss/clean.sh
+++ b/bin/tests/system/tsiggss/clean.sh
@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2010, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 #
 # Clean up after tsiggss tests.
 #

diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
index a8220633e05ae0d6a928afcf4876e54312b50cd4..c9b065e700ebc4805ba9a70ba5db30f456cbfdd6 100644 (file)
--- a/bin/tests/system/tsiggss/tests.sh
+++ b/bin/tests/system/tsiggss/tests.sh
@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2010, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 # tests for TSIG-GSS updates
 
 SYSTEMTESTTOP=..

diff --git a/util/copyrights b/util/copyrights
index 445f72fcd4cecd73004fc3f3d1b57c581fced060..2a90b26835ef4f2e404a529b7132d1c381cab07f 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1159,8 +1159,7 @@
 ./bin/tests/system/dsdigest/ns2/sign.sh                SH      2012,2014
 ./bin/tests/system/dsdigest/ns3/named.conf     CONF-C  2012
 ./bin/tests/system/dsdigest/ns4/named.conf     CONF-C  2012
-./bin/tests/system/dsdigest/prereq.sh          SH      2014
-./bin/tests/system/dsdigest/prereq.sh.in       SH      2012,2014
+./bin/tests/system/dsdigest/prereq.sh          SH      2012,2014
 ./bin/tests/system/dsdigest/setup.sh           SH      2012,2014
 ./bin/tests/system/dsdigest/tests.sh           SH      2012
 ./bin/tests/system/ecdsa/.gitignore            X       2013
@@ -1169,8 +1168,7 @@
 ./bin/tests/system/ecdsa/ns1/root.db.in                ZONE    2012
 ./bin/tests/system/ecdsa/ns1/sign.sh           SH      2012,2014
 ./bin/tests/system/ecdsa/ns2/named.conf                CONF-C  2012
-./bin/tests/system/ecdsa/prereq.sh             SH      2014
-./bin/tests/system/ecdsa/prereq.sh.in          SH      2012,2014
+./bin/tests/system/ecdsa/prereq.sh             SH      20122014
 ./bin/tests/system/ecdsa/setup.sh              SH      2012,2014
 ./bin/tests/system/ecdsa/tests.sh              SH      2012,2013
 ./bin/tests/system/emptyzones/clean.sh         SH      2014
@@ -1304,8 +1302,7 @@
 ./bin/tests/system/gost/ns1/root.db.in         ZONE    2010
 ./bin/tests/system/gost/ns1/sign.sh            SH      2010,2012,2014
 ./bin/tests/system/gost/ns2/named.conf         CONF-C  2010
-./bin/tests/system/gost/prereq.sh              SH      2014
-./bin/tests/system/gost/prereq.sh.in           SH      2010,2012,2014
+./bin/tests/system/gost/prereq.sh              SH      2010,2012,2014
 ./bin/tests/system/gost/setup.sh               SH      2010,2012,2014
 ./bin/tests/system/gost/tests.sh               SH      2010,2012,2013
 ./bin/tests/system/ifconfig.sh                 SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013