From 1a63fb1d1448ed3f8fd7227ae57be67c2e71279e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sat, 30 Aug 2014 12:27:49 +1000 Subject: [PATCH] update copyrights --- bin/tests/system/acl/ns2/named6.conf | 2 +- bin/tests/system/acl/ns2/named7.conf | 2 +- bin/tests/system/geoip/ns2/named1.conf | 2 +- bin/tests/system/geoip/ns2/named11.conf | 2 +- bin/tests/system/geoip/ns2/named12.conf | 2 +- bin/tests/system/sit/bad-sit-badhex.conf | 16 ++++++++++++++++ bin/tests/system/sit/bad-sit-toolong.conf | 16 ++++++++++++++++ lib/dns/include/dns/geoip.h | 2 +- lib/dns/include/dns/iptable.h | 2 +- lib/dns/iptable.c | 2 +- lib/isccfg/include/isccfg/namedconf.h | 2 +- util/copyrights | 22 +++++++++++++--------- 12 files changed, 54 insertions(+), 18 deletions(-) diff --git a/bin/tests/system/acl/ns2/named6.conf b/bin/tests/system/acl/ns2/named6.conf index 1e384fb0d8..1a5cd8dfad 100644 --- a/bin/tests/system/acl/ns2/named6.conf +++ b/bin/tests/system/acl/ns2/named6.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 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/acl/ns2/named7.conf b/bin/tests/system/acl/ns2/named7.conf index 1f1c9f333a..1adb71b4b8 100644 --- a/bin/tests/system/acl/ns2/named7.conf +++ b/bin/tests/system/acl/ns2/named7.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 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/geoip/ns2/named1.conf b/bin/tests/system/geoip/ns2/named1.conf index d9356c45e1..2679b47962 100644 --- a/bin/tests/system/geoip/ns2/named1.conf +++ b/bin/tests/system/geoip/ns2/named1.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 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/geoip/ns2/named11.conf b/bin/tests/system/geoip/ns2/named11.conf index 1ceece41cf..7770619205 100644 --- a/bin/tests/system/geoip/ns2/named11.conf +++ b/bin/tests/system/geoip/ns2/named11.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 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/geoip/ns2/named12.conf b/bin/tests/system/geoip/ns2/named12.conf index 85c0d32c34..a5025022a9 100644 --- a/bin/tests/system/geoip/ns2/named12.conf +++ b/bin/tests/system/geoip/ns2/named12.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 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/sit/bad-sit-badhex.conf b/bin/tests/system/sit/bad-sit-badhex.conf index 6b84d8a6a1..f61ea93fd4 100644 --- a/bin/tests/system/sit/bad-sit-badhex.conf +++ b/bin/tests/system/sit/bad-sit-badhex.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + options { sit-secret "012345678901234567890123456789012345678901234567890123456789012"; }; diff --git a/bin/tests/system/sit/bad-sit-toolong.conf b/bin/tests/system/sit/bad-sit-toolong.conf index aec4d252c8..812f9d808e 100644 --- a/bin/tests/system/sit/bad-sit-toolong.conf +++ b/bin/tests/system/sit/bad-sit-toolong.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + options { sit-secret "01234567890123456789012345678901234567890123456789012345678901234567890"; }; diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h index a656783223..dd3e34775a 100644 --- a/lib/dns/include/dns/geoip.h +++ b/lib/dns/include/dns/geoip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 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/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index 512e73da06..527e133cb6 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2007, 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/lib/dns/iptable.c b/lib/dns/iptable.c index 9413774947..b90ff22481 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009, 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2007-2009, 2013, 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/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h index 67cca35bbc..d77cd0bcd8 100644 --- a/lib/isccfg/include/isccfg/namedconf.h +++ b/lib/isccfg/include/isccfg/namedconf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2010, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/util/copyrights b/util/copyrights index a1cc91e696..73ec70351b 100644 --- a/util/copyrights +++ b/util/copyrights @@ -727,6 +727,8 @@ ./bin/tests/system/acl/ns2/named3.conf CONF-C 2008 ./bin/tests/system/acl/ns2/named4.conf CONF-C 2008 ./bin/tests/system/acl/ns2/named5.conf CONF-C 2013 +./bin/tests/system/acl/ns2/named6.conf CONF-C 2014 +./bin/tests/system/acl/ns2/named7.conf CONF-C 2014 ./bin/tests/system/acl/setup.sh SH 2008,2012,2014 ./bin/tests/system/acl/tests.sh SH 2008,2012,2013,2014 ./bin/tests/system/additional/clean.sh SH 2013 @@ -1287,8 +1289,8 @@ ./bin/tests/system/geoip/.gitignore X 2013 ./bin/tests/system/geoip/Makefile.in MAKE 2013 ./bin/tests/system/geoip/clean.sh SH 2013,2014 -./bin/tests/system/geoip/data/GeoIP.csv X 2013 -./bin/tests/system/geoip/data/GeoIP.dat X 2013 +./bin/tests/system/geoip/data/GeoIP.csv X 2013,2014 +./bin/tests/system/geoip/data/GeoIP.dat X 2013,2014 ./bin/tests/system/geoip/data/GeoIPASNum.csv X 2013 ./bin/tests/system/geoip/data/GeoIPASNum.dat X 2013 ./bin/tests/system/geoip/data/GeoIPASNumv6.csv X 2013 @@ -1312,10 +1314,10 @@ ./bin/tests/system/geoip/data/README TXT.BRIEF 2013,2014 ./bin/tests/system/geoip/geoip.c C 2013 ./bin/tests/system/geoip/ns2/example.db.in ZONE 2013 -./bin/tests/system/geoip/ns2/named1.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named1.conf CONF-C 2013,2014 ./bin/tests/system/geoip/ns2/named10.conf CONF-C 2014 -./bin/tests/system/geoip/ns2/named11.conf CONF-C 2013 -./bin/tests/system/geoip/ns2/named12.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named11.conf CONF-C 2013,2014 +./bin/tests/system/geoip/ns2/named12.conf CONF-C 2013,2014 ./bin/tests/system/geoip/ns2/named13.conf CONF-C 2014 ./bin/tests/system/geoip/ns2/named14.conf CONF-C 2014 ./bin/tests/system/geoip/ns2/named2.conf CONF-C 2013 @@ -1711,6 +1713,8 @@ ./bin/tests/system/send.pl PERL 2001,2004,2007,2011,2012 ./bin/tests/system/setup.sh SH 2000,2001,2004,2007,2012,2014 ./bin/tests/system/sit/.gitignore X 2014 +./bin/tests/system/sit/bad-sit-badhex.conf CONF-C 2014 +./bin/tests/system/sit/bad-sit-toolong.conf CONF-C 2014 ./bin/tests/system/sit/clean.sh SH 2014 ./bin/tests/system/sit/ns1/example.db ZONE 2014 ./bin/tests/system/sit/ns1/named.conf CONF-C 2014 @@ -2970,8 +2974,8 @@ ./lib/dns/include/dns/events.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011 ./lib/dns/include/dns/fixedname.h C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/include/dns/forward.h C 2000,2001,2004,2005,2006,2007,2009,2013 -./lib/dns/include/dns/geoip.h C 2013 -./lib/dns/include/dns/iptable.h C 2007,2012 +./lib/dns/include/dns/geoip.h C 2013,2014 +./lib/dns/include/dns/iptable.h C 2007,2012,2014 ./lib/dns/include/dns/journal.h C 1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013 ./lib/dns/include/dns/keydata.h C 2009 ./lib/dns/include/dns/keyflags.h C 1999,2000,2001,2004,2005,2006,2007 @@ -3037,7 +3041,7 @@ ./lib/dns/include/dst/gssapi.h C 2000,2001,2004,2005,2006,2007,2009,2010,2011,2013 ./lib/dns/include/dst/lib.h C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/include/dst/result.h C 1999,2000,2001,2004,2005,2006,2007,2008,2012,2014 -./lib/dns/iptable.c C 2007,2008,2009,2013 +./lib/dns/iptable.c C 2007,2008,2009,2013,2014 ./lib/dns/journal.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014 ./lib/dns/key.c C 2001,2004,2005,2006,2007,2011 ./lib/dns/keydata.c C 2009,2014 @@ -3748,7 +3752,7 @@ ./lib/isccfg/include/isccfg/dnsconf.h C 2009 ./lib/isccfg/include/isccfg/grammar.h C 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014 ./lib/isccfg/include/isccfg/log.h C 2001,2004,2005,2006,2007,2009 -./lib/isccfg/include/isccfg/namedconf.h C 2002,2004,2005,2006,2007,2009,2010 +./lib/isccfg/include/isccfg/namedconf.h C 2002,2004,2005,2006,2007,2009,2010,2014 ./lib/isccfg/include/isccfg/version.h C 2001,2004,2005,2006,2007 ./lib/isccfg/log.c C 2001,2004,2005,2006,2007 ./lib/isccfg/namedconf.c C 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014