update copyrights

diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index 6ce38557b4f8ddf706abf645d9b1de1053e772ab..40a4de618e4f6aa1f4747a2b6211d819780f70fe 100644 (file)
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2013  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/dnssec/ns7/named.conf b/bin/tests/system/dnssec/ns7/named.conf
index 84f8a0d5c4e0d313defb190cfa6ab2a535924394..d5690704124ea369b17800714af0d8a02fd9c7a0 100644 (file)
--- a/bin/tests/system/dnssec/ns7/named.conf
+++ b/bin/tests/system/dnssec/ns7/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008, 2010, 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/dnssec/ns7/sign.sh b/bin/tests/system/dnssec/ns7/sign.sh
index 1eb22594393b2f4a88cced1f3da4182c7d906f0c..142cbc2e6b2689f3e63e718ef1142abd9e7dc38e 100644 (file)
--- a/bin/tests/system/dnssec/ns7/sign.sh
+++ b/bin/tests/system/dnssec/ns7/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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/dnssec/ns7/split-rrsig.db.in b/bin/tests/system/dnssec/ns7/split-rrsig.db.in
index 419d9930648cbf96e263db9930db536904f89092..8a02785ad73fddd2b5e9712aee8180cb49758934 100644 (file)
--- a/bin/tests/system/dnssec/ns7/split-rrsig.db.in
+++ b/bin/tests/system/dnssec/ns7/split-rrsig.db.in
@@ -1,3 +1,17 @@
+; Copyright (C) 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.
+
 split-rrsig.           3660    IN SOA  . . (
                                        1          ; serial
                                        3600       ; refresh (1 hour)

diff --git a/util/copyrights b/util/copyrights
index bfaab321553c72e2182e3fbc81d82a637620a2bf..37ed48c3cd80655a3223f8a52dcffec7fa9c9266 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -318,9 +318,9 @@
 ./bin/pkcs11/.gitignore                                X       2014
 ./bin/pkcs11/Makefile.in                       MAKE    2009,2012,2014
 ./bin/pkcs11/OLD-PKCS11-NOTES                  X       2009
-./bin/pkcs11/openssl-0.9.8y-patch              X       2013
-./bin/pkcs11/openssl-1.0.0l-patch              X       2014
-./bin/pkcs11/openssl-1.0.1g-patch              X       2014
+./bin/pkcs11/openssl-0.9.8za-patch             X       2014
+./bin/pkcs11/openssl-1.0.0m-patch              X       2014
+./bin/pkcs11/openssl-1.0.1h-patch              X       2014
 ./bin/pkcs11/pkcs11-destroy.8                  MAN     DOCBOOK
 ./bin/pkcs11/pkcs11-destroy.c                  X       2009,2010,2014
 ./bin/pkcs11/pkcs11-destroy.docbook            SGML    2009,2014
@@ -362,7 +362,7 @@
 ./bin/pkcs11/win32/pk11tokens.vcxproj.in       X       2014
 ./bin/pkcs11/win32/pk11tokens.vcxproj.user     X       2014
 ./bin/python/.gitignore                                X       2012,2013
-./bin/python/Makefile.in                       MAKE    2012,2013
+./bin/python/Makefile.in                       MAKE    2012,2013,2014
 ./bin/python/dnssec-checkds.8                  MAN     2012,2013,2014
 ./bin/python/dnssec-checkds.docbook            SGML    2012,2013,2014
 ./bin/python/dnssec-checkds.html               HTML    DOCBOOK
@@ -1158,9 +1158,11 @@
 ./bin/tests/system/dnssec/ns6/named.conf       CONF-C  2004,2006,2007,2013
 ./bin/tests/system/dnssec/ns6/optout-tld.db.in ZONE    2013
 ./bin/tests/system/dnssec/ns6/sign.sh          SH      2013,2014
-./bin/tests/system/dnssec/ns7/named.conf       CONF-C  2006,2008,2010
+./bin/tests/system/dnssec/ns7/named.conf       CONF-C  2006,2008,2010,2014
 ./bin/tests/system/dnssec/ns7/named.nosoa      TXT.BRIEF       2010
 ./bin/tests/system/dnssec/ns7/nosoa.secure.example.db  ZONE    2010
+./bin/tests/system/dnssec/ns7/sign.sh          SH      2014
+./bin/tests/system/dnssec/ns7/split-rrsig.db.in        ZONE    2014
 ./bin/tests/system/dnssec/prereq.sh            SH      2000,2001,2002,2004,2006,2007,2009,2012,2014
 ./bin/tests/system/dnssec/setup.sh             SH      2000,2001,2004,2007,2009,2011,2012,2013,2014
 ./bin/tests/system/dnssec/signer/example.db.in ZONE    2010