From: Evan Hunt <each@isc.org>
Date: Fri, 16 Mar 2018 01:32:02 +0000 (-0700)
Subject: ensure COPYRIGHT file retains years; edit file headers for consistency
X-Git-Tag: v9.13.0~91^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4aa9b03f91a965c26119d3e34587af58085e65;p=thirdparty%2Fbind9.git

ensure COPYRIGHT file retains years; edit file headers for consistency
---

diff --git a/util/COPYRIGHT.BRIEF b/util/COPYRIGHT.BRIEF
index 7e8e0f41c82..d8a4983dee8 100644
--- 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 d12bfdc0a21..94c472d7057 100644
--- 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 9fa858d88b9..30337954cc6 100644
--- 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 4ce20cbcd6c..e23c9ce9d13 100644
--- 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 5a8c40a3610..574248d00af 100644
--- 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
index 00000000000..36fd94a48ae
--- /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 8eefaa15202..795d7cbc527 100644
--- 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 866303df978..60b357b387c 100644
--- 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 = "";