[master] copyrights

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 79357451e0eea1ddb80188d1d6c06417e30264df..430592856f10a2844afd4a551e9852e473df4a6f 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2003-2005, 2007-2009, 2011-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2003-2005, 2007-2009, 2011-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 71ae2f6651d5313844dfd35ba3d24005d74be35e..2ce5134a2f61f417b8c393e104da5f13c7a26e86 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id$ */
-
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
 

diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h
index c855ea5b9ea7b247d085d80e013fcfa166e76136..1b9cbefe5b989ae177bd40d0ec8ea7e654f24c40 100644 (file)
--- a/lib/dns/include/dns/rriterator.h
+++ b/lib/dns/include/dns/rriterator.h
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2009, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: rriterator.h,v 1.4 2011/11/01 23:47:00 tbox Exp $ */
-
 #ifndef DNS_RRITERATOR_H
 #define DNS_RRITERATOR_H 1
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index ca9b605c166095b13455014011217b30cd865b84..97b89dfa5f9b8219a43c989e7ce2e3810cbd7217 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 03671b9ee64c2676a65e8afde62331e731a48e50..608702f4d1356f2bc5cf711ea1e40c906ed58437 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index c85645e0349540196ada458ca889c187e5b74eb9..95b8eaffaf0c2361578a5374ffe53097288afb0a 100644 (file)
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2001, 2003-2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2001, 2003-2009, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 69d2d1765101ed8ad049323dbec1701ba701ff0f..3d396a4a149c6bc5d9183e1492dd3d7d02f412a3 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2001, 2004-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1997-2001, 2004-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 59968a55d541cfee796ef1fd72ea66a238a64ac6..5bcd517629fcf0c1dcdb2902ed59a86b55ad5789 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 1999-2009, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id$ */
-
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1
 

diff --git a/util/copyrights b/util/copyrights
index 3ec08dd09674700c73c5da3139ffd589cb812060..eeeeeca71399561440331fd7916141bd0246098c 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,5 +1,6 @@
 ./.gitattributes                               X       2015,2017
 ./.gitignore                                   X       2012,2013,2014,2015,2016,2017
+./.gitlab-ci.yml                               X       2018
 ./Atffile                                      X       2011
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./COPYRIGHT                                    TXT     1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -1370,7 +1371,7 @@
 ./bin/tests/system/dyndb/driver/COPYING                X       2015,2016
 ./bin/tests/system/dyndb/driver/Makefile.in    MAKE    2015,2016,2017
 ./bin/tests/system/dyndb/driver/README         X       2015
-./bin/tests/system/dyndb/driver/db.c           X       2015,2016,2017
+./bin/tests/system/dyndb/driver/db.c           X       2015,2016,2017,2018
 ./bin/tests/system/dyndb/driver/db.h           X       2015,2016
 ./bin/tests/system/dyndb/driver/driver.c       X       2015,2016
 ./bin/tests/system/dyndb/driver/instance.c     X       2015,2016
@@ -2822,6 +2823,16 @@
 ./contrib/dnspriv/README.md                    MKD     2017
 ./contrib/dnspriv/named.conf                   CONF-C  2017
 ./contrib/dnspriv/nginx.conf                   SH      2017
+./contrib/docker/centos-amd64:latest/Dockerfile        X       2017
+./contrib/docker/debian-amd64:oldstable/Dockerfile     X       2017
+./contrib/docker/debian-amd64:stable/Dockerfile        X       2017
+./contrib/docker/debian-amd64:unstable/Dockerfile      X       2017
+./contrib/docker/debian-i386:oldstable/Dockerfile      X       2017
+./contrib/docker/debian-i386:stable/Dockerfile X       2017
+./contrib/docker/debian-i386:unstable/Dockerfile       X       2017
+./contrib/docker/fedora-amd64:latest/Dockerfile        X       2017
+./contrib/docker/ubuntu-amd64:latest/Dockerfile        X       2017
+./contrib/docker/ubuntu-i386:latest/Dockerfile X       2017
 ./contrib/idn/README.idnkit                    X       2005,2009
 ./contrib/idn/idnkit-1.0-src/.gitignore                X       2014
 ./contrib/idn/idnkit-1.0-src/ChangeLog         X       2003
@@ -3297,7 +3308,7 @@
 ./lib/dns/client.c                             C       2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/clientinfo.c                         C       2011,2014,2016
 ./lib/dns/compress.c                           C       1999,2000,2001,2004,2005,2006,2007,2015,2016,2017
-./lib/dns/db.c                                 C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017
+./lib/dns/db.c                                 C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017,2018
 ./lib/dns/dbiterator.c                         C       1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/dbtable.c                            C       1999,2000,2001,2004,2005,2007,2013,2016
 ./lib/dns/diff.c                               C       2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2013,2014,2015,2016,2017,2018
@@ -3343,7 +3354,7 @@
 ./lib/dns/include/dns/client.h                 C       2009,2013,2014,2016,2017
 ./lib/dns/include/dns/clientinfo.h             C       2011,2014,2016
 ./lib/dns/include/dns/compress.h               C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2015,2016,2017
-./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/include/dns/dbiterator.h             C       1999,2000,2001,2004,2005,2006,2007,2016
 ./lib/dns/include/dns/dbtable.h                        C       1999,2000,2001,2004,2005,2006,2007,2016
 ./lib/dns/include/dns/diff.h                   C       2000,2001,2004,2005,2006,2007,2008,2009,2010,2013,2016
@@ -3402,7 +3413,7 @@
 ./lib/dns/include/dns/result.h                 C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/rootns.h                 C       1999,2000,2001,2004,2005,2006,2007,2016
 ./lib/dns/include/dns/rpz.h                    C       2011,2012,2013,2015,2016,2017
-./lib/dns/include/dns/rriterator.h             C       2009,2011,2016
+./lib/dns/include/dns/rriterator.h             C       2009,2011,2016,2018
 ./lib/dns/include/dns/rrl.h                    C       2013,2015,2016,2017
 ./lib/dns/include/dns/sdb.h                    C       2000,2001,2004,2005,2006,2007,2009,2011,2012,2016
 ./lib/dns/include/dns/sdlz.h                   C.PORTION       1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2016
@@ -3469,7 +3480,7 @@
 ./lib/dns/portlist.c                           C       2003,2004,2005,2006,2007,2014,2016
 ./lib/dns/private.c                            C       2009,2011,2012,2015,2016,2017
 ./lib/dns/rbt.c                                        C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rbtdb.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rbtdb.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rbtdb.h                              C       1999,2000,2001,2004,2005,2007,2011,2012,2016
 ./lib/dns/rbtdb64.c                            C       1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rbtdb64.h                            C       1999,2000,2001,2004,2005,2007,2016
@@ -3806,7 +3817,7 @@
 ./lib/isc/.gitignore                           X       2014
 ./lib/isc/Atffile                              X       2011
 ./lib/isc/Kyuafile                             X       2017
-./lib/isc/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/isc/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/aes.c                                        C       2014,2016,2017
 ./lib/isc/alpha/Makefile.in                    MAKE    2007,2012,2016
 ./lib/isc/alpha/include/Makefile.in            MAKE    2007,2012,2016
@@ -3842,7 +3853,7 @@
 ./lib/isc/ia64/include/isc/Makefile.in         MAKE    2007,2012,2015,2016
 ./lib/isc/ia64/include/isc/atomic.h            C       2006,2007,2009,2012,2016
 ./lib/isc/include/Makefile.in                  MAKE    1998,1999,2000,2001,2004,2007,2012,2014,2016
-./lib/isc/include/isc/Makefile.in              MAKE    1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
+./lib/isc/include/isc/Makefile.in              MAKE    1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/include/isc/aes.h                    C       2014,2016
 ./lib/isc/include/isc/app.h                    C       1999,2000,2001,2004,2005,2006,2007,2009,2013,2014,2015,2016
 ./lib/isc/include/isc/assertions.h             C       1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2016,2017
@@ -3886,7 +3897,7 @@
 ./lib/isc/include/isc/log.h                    C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016,2017
 ./lib/isc/include/isc/magic.h                  C       1999,2000,2001,2004,2005,2006,2007,2016,2017
 ./lib/isc/include/isc/md5.h                    C       2000,2001,2004,2005,2006,2007,2009,2010,2014,2016,2017,2018
-./lib/isc/include/isc/mem.h                    C       1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2015,2016,2017
+./lib/isc/include/isc/mem.h                    C       1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2015,2016,2017,2018
 ./lib/isc/include/isc/meminfo.h                        C       2015,2016
 ./lib/isc/include/isc/msgcat.h                 C       1999,2000,2001,2004,2005,2007,2016
 ./lib/isc/include/isc/msgs.h                   C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2016,2017
@@ -3926,7 +3937,7 @@
 ./lib/isc/include/isc/taskpool.h               C       1999,2000,2001,2004,2005,2006,2007,2011,2012,2016
 ./lib/isc/include/isc/timer.h                  C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016
 ./lib/isc/include/isc/tm.h                     C       2014,2016
-./lib/isc/include/isc/types.h                  C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016,2017
+./lib/isc/include/isc/types.h                  C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016,2017,2018
 ./lib/isc/include/isc/util.h                   C       1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2015,2016,2017
 ./lib/isc/include/isc/version.h                        C       2001,2004,2005,2006,2007,2016
 ./lib/isc/include/isc/xml.h                    C       2006,2007,2016
@@ -4143,8 +4154,8 @@
 ./lib/isc/win32/libgen.h                       C       2009,2016
 ./lib/isc/win32/libisc.def.exclude             X       2015,2017
 ./lib/isc/win32/libisc.def.in                  X       2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/win32/libisc.vcxproj.filters.in      X       2013,2014,2015,2016
-./lib/isc/win32/libisc.vcxproj.in              X       2013,2014,2015,2016,2017
+./lib/isc/win32/libisc.vcxproj.filters.in      X       2013,2014,2015,2016,2018
+./lib/isc/win32/libisc.vcxproj.in              X       2013,2014,2015,2016,2017,2018
 ./lib/isc/win32/libisc.vcxproj.user            X       2013
 ./lib/isc/win32/meminfo.c                      C       2015,2016
 ./lib/isc/win32/net.c                          C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016