From ab3c509cbd034d7d6170aaa72d9d3202ea891555 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 8 Jul 2014 12:43:13 +1000 Subject: [PATCH] update copyrights --- bin/tests/system/dnssec/ns7/named.conf | 2 +- bin/tests/system/dnssec/ns7/sign.sh | 2 +- bin/tests/system/dnssec/ns7/split-rrsig.db.in | 14 ++++++++++++++ bin/tests/system/resolver/tests.sh | 2 +- util/copyrights | 12 +++++++----- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/bin/tests/system/dnssec/ns7/named.conf b/bin/tests/system/dnssec/ns7/named.conf index 84f8a0d5c4..d569070412 100644 --- 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 1eb2259439..142cbc2e6b 100644 --- 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 419d993064..8a02785ad7 100644 --- 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/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index 804db626e9..24fec78f67 100644 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2009-2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009-2014 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/util/copyrights b/util/copyrights index d5da5b8088..a5d0a6e3ec 100644 --- a/util/copyrights +++ b/util/copyrights @@ -289,9 +289,9 @@ ./bin/pkcs11/include/pkcs11.h X 2009 ./bin/pkcs11/include/pkcs11f.h X 2009 ./bin/pkcs11/include/pkcs11t.h 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 ./bin/pkcs11/pkcs11-destroy.docbook SGML 2009,2014 @@ -1001,9 +1001,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 @@ -1274,7 +1276,7 @@ ./bin/tests/system/resolver/ns7/server.db.in ZONE 2011,2012 ./bin/tests/system/resolver/prereq.sh SH 2000,2001,2004,2007,2012,2014 ./bin/tests/system/resolver/setup.sh SH 2010,2011,2012,2014 -./bin/tests/system/resolver/tests.sh SH 2000,2001,2004,2007,2009,2010,2011,2012,2013 +./bin/tests/system/resolver/tests.sh SH 2000,2001,2004,2007,2009,2010,2011,2012,2013,2014 ./bin/tests/system/rndc/clean.sh SH 2011,2012 ./bin/tests/system/rndc/ns2/named.conf CONF-C 2011,2012 ./bin/tests/system/rndc/ns2/secondkey.conf CONF-C 2012