ensure COPYRIGHT file retains years; edit file headers for consistency

diff --git a/util/COPYRIGHT.NOM b/util/COPYRIGHT.NOM
index 97120b64dcbcf05391de32fffd97685a46f3e14e..9f8db300182d2f4ed9e2a506fc854722b8313332 100644 (file)
--- a/util/COPYRIGHT.NOM
+++ b/util/COPYRIGHT.NOM
@@ -15,7 +15,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 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.TOP b/util/COPYRIGHT.TOP
new file mode 100644 (file)
index 0000000..3f654bc
--- /dev/null
+++ b/util/COPYRIGHT.TOP
@@ -0,0 +1,13 @@
+Copyright (C) @SYSYEARS@  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.

diff --git a/util/copyrights b/util/copyrights
index 201c676c999e5b855c8a2223ee13d8f1e2c331b5..fad4f465a2eee52977618a9faccff0b62dd363cd 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -5,7 +5,7 @@
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./CONTRIBUTING                                 X       2018
 ./CONTRIBUTING.md                              MKD     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
+./COPYRIGHT                                    TXT.TOP 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./EXCLUDED                                     X       2017,2018
 ./FAQ.xml                                      SGML    2017,2018
 ./HISTORY                                      X       2010,2013,2017,2018
@@ -4308,6 +4308,7 @@
 ./util/COPYRIGHT.NAI                           X       1996,1997,1998,1999,2000,2001,2004,2007,2018
 ./util/COPYRIGHT.NOM                           X       2001,2004,2007,2018
 ./util/COPYRIGHT.PORTION                       X       1996,1997,1998,1999,2000,2001,2004,2007,2018
+./util/COPYRIGHT.TOP                           X       2018
 ./util/altbuild.sh                             SH      2000,2001,2002,2004,2007,2008,2012,2018
 ./util/bindkeys.pl                             PERL    2009,2010,2011,2012,2014,2017,2018
 ./util/branchsync.sh                           SH      2013,2018

diff --git a/util/update_copyrights b/util/update_copyrights
index de1833e69d3e0263da94d70a577a2b7c06e7d1fc..5a3e2a8fef153462ca57c42471348ac9ec0e033a 100644 (file)
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -26,6 +26,7 @@ require 5.002;
 
 my %owner2filename = (
        "" => "util/COPYRIGHT",
+        TOP => "util/COPYRIGHT.TOP",
        "NAI" => "util/COPYRIGHT.NAI",
        "NOM" => "util/COPYRIGHT.NOM",
        "BSDI" => "util/COPYRIGHT.BSDI",
@@ -447,10 +448,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);
                }
@@ -459,9 +456,6 @@ foreach $file (keys %file_types) {
        }
        $nomyears = $years;
 
-       #
-       # Internet Systems Consortium: 2004 onwards.
-       #
        $last_year = 0;
        $anchor_year = 0;
        $years = "";