ensure COPYRIGHT file retains years; edit file headers for consistency

diff --git a/util/COPYRIGHT.BRIEF b/util/COPYRIGHT.BRIEF
index 7e8e0f41c827ae288ce51b1d774b2eb061f7f9c9..d8a4983dee876b5a2cea4542bfd03e534941789a 100644 (file)
--- a/util/COPYRIGHT.BRIEF
+++ b/util/COPYRIGHT.BRIEF
@@ -1,8 +1,3 @@
-Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 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/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

diff --git a/util/COPYRIGHT.BSDI b/util/COPYRIGHT.BSDI
index d12bfdc0a21f3fb219f551891472fd761f0e34ee..94c472d705702dea5dbd24b846c09d52716e3487 100644 (file)
--- a/util/COPYRIGHT.BSDI
+++ b/util/COPYRIGHT.BSDI
@@ -1,4 +1,4 @@
-Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 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/util/COPYRIGHT.NAI b/util/COPYRIGHT.NAI
index 9fa858d88b99f32d7f2cae9ca04dea9156299abc..30337954cc6aefa9e658e7ba0a3e3dfe02d1094d 100644 (file)
--- a/util/COPYRIGHT.NAI
+++ b/util/COPYRIGHT.NAI
@@ -1,4 +1,4 @@
-Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Portions Copyright (C) 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/util/COPYRIGHT.NOM b/util/COPYRIGHT.NOM
index 4ce20cbcd6c2bd14b96ea7dcb7c6614df81fff30..e23c9ce9d13d2e3da2d66aa1900ba7fdf43fcf10 100644 (file)
--- a/util/COPYRIGHT.NOM
+++ b/util/COPYRIGHT.NOM
@@ -1,4 +1,4 @@
-Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Portions Copyright (C) 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
@@ -7,7 +7,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 
-Portions Copyright (C) Nominum, Inc.
+Portions Copyright (C) @NOMYEARS@ Nominum, Inc.
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

diff --git a/util/COPYRIGHT.PORTION b/util/COPYRIGHT.PORTION
index 5a8c40a361061cb0cbec7c5f408633447db1e194..574248d00af014a1ea9a7ca5da83e3f48af05181 100644 (file)
--- a/util/COPYRIGHT.PORTION
+++ b/util/COPYRIGHT.PORTION
@@ -1,4 +1,4 @@
-Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Portions Copyright (C) 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/util/COPYRIGHT.TOP b/util/COPYRIGHT.TOP
new file mode 100644 (file)
index 0000000..36fd94a
--- /dev/null
+++ b/util/COPYRIGHT.TOP
@@ -0,0 +1,5 @@
+Copyright (C) @SYSYEARS@  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/.

diff --git a/util/copyrights b/util/copyrights
index 8eefaa15202bfd16f990ec09798a75068d67f7fd..795d7cbc5277151f779850347e2f7241e16e8186 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -7,7 +7,7 @@
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./CONTRIBUTING                                 X       2017,2018
 ./CONTRIBUTING.md                              MKD     2017,2018
-./COPYRIGHT                                    X       1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./COPYRIGHT                                    X.TOP   1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./HISTORY                                      X       2010,2013,2016,2017,2018
 ./HISTORY.md                                   MKD     2017,2018
 ./Kyuafile                                     X       2017,2018

diff --git a/util/update_copyrights b/util/update_copyrights
index 866303df97883257e7ce8d8323a9ea128b2384da..60b357b387c9c747dd5e964746d32c96de79fcf8 100644 (file)
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -21,6 +21,7 @@ require 5.002;
 
 my %owner2filename = (
        "" => "util/COPYRIGHT",
+        TOP => "util/COPYRIGHT.TOP",
        "NAI" => "util/COPYRIGHT.NAI",
        "NOM" => "util/COPYRIGHT.NOM",
        "BSDI" => "util/COPYRIGHT.BSDI",
@@ -442,10 +443,6 @@ foreach $file (keys %file_types) {
                         }
                 } else {
                         $years .= $last_year == 0 ? "$year" : ", $year";
-                        #if ($anchor_year != 0) {
-                        #        print "$file: noncontiguous year: ",
-                        #              "$year != $last_year + 1\n";
-                        #}
                         $anchor_year = $year;
                         $anchor_end = length($years);
                 }
@@ -454,9 +451,6 @@ foreach $file (keys %file_types) {
         }
        $nomyears = $years;
 
-       #
-       # Internet Systems Consortium: 2004 onwards.
-       #
         $last_year = 0;
         $anchor_year = 0;
        $years = "";