From a04588e781b513ae3b30e061ac98035802b5e8e8 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 31 Jul 2014 09:47:00 +1000 Subject: [PATCH] update copyrights --- lib/lwres/Makefile.in | 2 +- lib/lwres/include/lwres/compat.h | 3 +-- lib/lwres/include/lwres/platform.h.in | 6 +++--- lib/lwres/print.c | 2 +- lib/lwres/tests/Makefile.in | 2 +- util/copyrights | 17 +++++++++++------ util/merge_copyrights | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in index 667bff94f7..3eba053969 100644 --- 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 5f9b60f8c1..b6f6baf8cd 100644 --- a/lib/lwres/include/lwres/compat.h +++ b/lib/lwres/include/lwres/compat.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2003 Internet Software Consortium. + * 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/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in index 95ad40b609..d350a6a104 100644 --- 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 ebd54c8046..4c0f5aac33 100644 --- 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 e0a329321a..e80ad3f69a 100644 --- 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 1af4e3f6f3..a5ee8dea87 100644 --- a/util/copyrights +++ b/util/copyrights @@ -2865,7 +2865,7 @@ ./isc-config.sh.html HTML 2009,2011,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,2014 ./lib/bind9/Makefile.in MAKE 2001,2004,2007,2009,2012 ./lib/bind9/api X 2001,2006,2008,2009,2010,2011,2012,2013,2014 @@ -3747,9 +3747,11 @@ ./lib/isccfg/win32/libisccfg.vcxproj.in X 2013,2014 ./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,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 @@ -3761,6 +3763,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 @@ -3770,9 +3773,8 @@ ./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,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 @@ -3838,9 +3840,12 @@ ./lib/lwres/man/lwres_resutil.docbook SGML 2000,2001,2004,2005,2007,2014 ./lib/lwres/man/lwres_resutil.html HTML DOCBOOK ./lib/lwres/man/resolver.5 MAN 2000,2001,2004,2007 -./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 -./lib/lwres/strtoul.c C 2003,2004,2005,2007,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 ac8d7d3e0d..3904254947 100644 --- a/util/merge_copyrights +++ b/util/merge_copyrights @@ -102,7 +102,7 @@ while () { $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";