update copyrights

diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 667bff94f7a7cae56371ae5ef5994f8176866831..3eba053969ab28c976e7fc16e89fefc75bcaf4c3 100644 (file)
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2012, 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/lib/lwres/include/lwres/compat.h b/lib/lwres/include/lwres/compat.h
index 5f9b60f8c176321fef961b1e5df85675d2c270f7..19a9372166627c414b88c6c407c320c8763240bb 100644 (file)
--- a/lib/lwres/include/lwres/compat.h
+++ b/lib/lwres/include/lwres/compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index c63cbef4da217256d8264290a2f0d80ea08e4ae4..5b2b03a99eec019df79643fb253983ce6d1b0452 100644 (file)
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 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/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in
index 95ad40b6093a55858c7b4aea04f5985209414874..d350a6a1043d803520fb9d143402c4ad0f76292a 100644 (file)
--- a/lib/lwres/include/lwres/platform.h.in
+++ b/lib/lwres/include/lwres/platform.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 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
@@ -59,7 +59,7 @@
 @LWRES_PLATFORM_NEEDIN6ADDRANY@
 
 /*
- * If this system is missing in6addr_loopback, 
+ * If this system is missing in6addr_loopback,
  * LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK will be defined.
  */
 @LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK@
@@ -84,7 +84,7 @@
  * Defined this system needs vsnprintf() and snprintf().
  */
 @LWRES_PLATFORM_NEEDVSNPRINTF@
- 
+
 /*
  * If this system need a modern sprintf() that returns (int) not (char*).
  */

diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index ebd54c8046fba7538287309ffc4b5750e39b9779..4c0f5aac33b33f36bcd62f63adbc4b673f91dcc1 100644 (file)
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/lwres/tests/Makefile.in b/lib/lwres/tests/Makefile.in
index e0a329321a886971406513079d8d08b20b8d65c6..e80ad3f69a8af4069738152142c9ffef257934c6 100644 (file)
--- a/lib/lwres/tests/Makefile.in
+++ b/lib/lwres/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-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/util/copyrights b/util/copyrights
index cc26a6736d6b89540d76a53c84f0bafdbcc50a77..eb22cd7fe842c5833e8d9c536d167657a48dcefe 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2307,7 +2307,7 @@
 ./isc-config.sh.html                           HTML    2009,2012,2014
 ./isc-config.sh.in                             SH      2000,2001,2003,2004,2007,2012,2013
 ./lib/.gitignore                               X       2012
-./lib/Atffile                                  X       2011
+./lib/Atffile                                  X       2011,2014
 ./lib/Makefile.in                              MAKE    1998,1999,2000,2001,2003,2004,2007,2012,2013
 ./lib/bind9/Makefile.in                                MAKE    2001,2004,2007,2009,2012
 ./lib/bind9/api                                        X       2001,2006,2008,2009,2010,2011,2012,2013,2014
@@ -3138,9 +3138,11 @@
 ./lib/isccfg/win32/libisccfg.vcxproj.in                X       2013
 ./lib/isccfg/win32/libisccfg.vcxproj.user      X       2013
 ./lib/isccfg/win32/version.c                   C       1998,1999,2000,2001,2004,2007
-./lib/lwres/Makefile.in                                MAKE    2000,2001,2004,2005,2007,2012
+./lib/lwres/Atffile                            X       2014
+./lib/lwres/Makefile.in                                MAKE    2000,2001,2004,2005,2007,2012,2014
 ./lib/lwres/api                                        X       2000,2001,2006,2008,2009,2010,2011,2012,2013,2014
 ./lib/lwres/assert_p.h                         C       2000,2001,2004,2005,2007,2011,2012
+./lib/lwres/compat.c                           C       2003,2004,2005,2007,2012,2014
 ./lib/lwres/context.c                          C       2000,2001,2003,2004,2005,2007,2008,2009,2012,2013,2014
 ./lib/lwres/context_p.h                                C       2000,2001,2004,2005,2007,2008
 ./lib/lwres/gai_strerror.c                     C       2000,2001,2004,2005,2006,2007,2014
@@ -3152,6 +3154,7 @@
 ./lib/lwres/herror.c                           C.PORTION       2000,2001,2003,2004,2005,2007,2011,2012,2014
 ./lib/lwres/include/Makefile.in                        MAKE    2000,2001,2004,2007,2012
 ./lib/lwres/include/lwres/Makefile.in          MAKE    2000,2001,2004,2007,2012,2014
+./lib/lwres/include/lwres/compat.h             C       2003,2004,2005,2006,2007,2014
 ./lib/lwres/include/lwres/context.h            C       2000,2001,2004,2005,2006,2007,2008
 ./lib/lwres/include/lwres/int.h                        C       2000,2001,2004,2005,2006,2007
 ./lib/lwres/include/lwres/ipv6.h               C       2000,2001,2004,2005,2006,2007
@@ -3159,11 +3162,10 @@
 ./lib/lwres/include/lwres/list.h               C       1997,1998,1999,2000,2001,2004,2005,2006,2007
 ./lib/lwres/include/lwres/lwbuffer.h           C       2000,2001,2004,2005,2006,2007
 ./lib/lwres/include/lwres/lwpacket.h           C       1999,2000,2001,2004,2005,2006,2007
-./lib/lwres/include/lwres/lwres.h              C       2000,2001,2004,2005,2006,2007
+./lib/lwres/include/lwres/lwres.h              C       2000,2001,2004,2005,2006,2007,2014
 ./lib/lwres/include/lwres/netdb.h.in           C       2000,2001,2004,2005,2007,2009,2014
-./lib/lwres/include/lwres/platform.h.in                C       2000,2001,2004,2005,2007
+./lib/lwres/include/lwres/platform.h.in                C       2000,2001,2004,2005,2007,2014
 ./lib/lwres/include/lwres/result.h             C       2000,2001,2004,2005,2006,2007
-./lib/lwres/include/lwres/stdlib.h             C       2003,2004,2005,2006,2007
 ./lib/lwres/include/lwres/version.h            C       2001,2004,2005,2006,2007
 ./lib/lwres/lwbuffer.c                         C       2000,2001,2004,2005,2007,2014
 ./lib/lwres/lwconfig.c                         C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2014
@@ -3229,9 +3231,12 @@
 ./lib/lwres/man/lwres_resutil.docbook          SGML    2000,2001,2004,2005,2007,2012,2014
 ./lib/lwres/man/lwres_resutil.html             HTML    DOCBOOK
 ./lib/lwres/man/resolver.5                     MAN     2000,2001,2004,2007,2012
-./lib/lwres/print.c                            C       1999,2000,2001,2003,2004,2005,2007,2011,2012
+./lib/lwres/print.c                            C       1999,2000,2001,2003,2004,2005,2007,2011,2012,2014
 ./lib/lwres/print_p.h                          C       1999,2000,2001,2003,2004,2007,2010,2012
-./lib/lwres/strtoul.c                          C       2003,2004,2005,2007,2012,2014
+./lib/lwres/tests/Atffile                      X       2014
+./lib/lwres/tests/Makefile.in                  MAKE    2014
+./lib/lwres/tests/config_test.c                        C       2014
+./lib/lwres/tests/testdata/link-local.conf     X       2014
 ./lib/lwres/unix/Makefile.in                   MAKE    2001,2004,2007,2012
 ./lib/lwres/unix/include/Makefile.in           MAKE    2001,2004,2007,2012
 ./lib/lwres/unix/include/lwres/Makefile.in     MAKE    2001,2004,2007,2012

diff --git a/util/merge_copyrights b/util/merge_copyrights
index ac8d7d3e0df1aa5b5d25adb5520f41432c5a899d..3904254947d293581b4c7546e5dfdd4dd1477889 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -102,7 +102,7 @@ while (<CHANGES>) {
            $file_types{$_} = "CONF-SH";
        } elsif ($base =~ /\.(db|hint)$/) {
            $file_types{$_} = "ZONE";
-       } elsif ($base =~ /(\/\.gitignore|\.(gif|jpg))$/i) {
+       } elsif ($base =~ /(\/\.gitignore|Atffile|\.(gif|jpg))$/i) {
            $file_types{$_} = "X";
        } elsif ($base =~ /\.(def|dep|dsp|dsw|mak|sln)$/i) {
            $file_types{$_} = "X";