Update copyright management.

diff --git a/util/COPYRIGHT b/util/COPYRIGHT
index 0f5a0c22a12ad7739ef9d4baf59859af0ab032a0..8c00682f5c18f5873e71bfec1d32451bcb1ebc4c 100644 (file)
--- a/util/COPYRIGHT
+++ b/util/COPYRIGHT
@@ -1,4 +1,5 @@
-Copyright (C) @YEARS@  Internet Software Consortium.
+Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) @SFTYEARS@  Internet Software Consortium.
 
 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.BRIEF b/util/COPYRIGHT.BRIEF
index 16614cba3043fef5cfe17c8948974261bd917f8d..331ab81f646b2bc885d3064ada5e55978e35b160 100644 (file)
--- a/util/COPYRIGHT.BRIEF
+++ b/util/COPYRIGHT.BRIEF
@@ -1,2 +1,3 @@
-Copyright (C) @YEARS@  Internet Software Consortium.
+Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) @SFTYEARS@  Internet Software Consortium.
 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 e012c97e49cd01e05b095e6878eab082173c329a..e64e0fd37e1f52b6fc814516e3b5b790bf4266f8 100644 (file)
--- a/util/COPYRIGHT.BSDI
+++ b/util/COPYRIGHT.BSDI
@@ -1,4 +1,5 @@
-Copyright (C) @YEARS@  Internet Software Consortium.
+Copyright (C) @SYSYEARS@  Internet System Consortium, Inc. ("ISC")
+Copyright (C) @SFTYEARS@  Internet Software Consortium.
 
 This code is derived from software contributed to Internet Software
 Consortium by Berkeley Software Design, Inc.

diff --git a/util/COPYRIGHT.NAI b/util/COPYRIGHT.NAI
index 8410edd07801692e82fb61da6c34d2af56e05d31..4e1adafe50a7c9f8c7551f46e60e033d677c9ffe 100644 (file)
--- a/util/COPYRIGHT.NAI
+++ b/util/COPYRIGHT.NAI
@@ -1,4 +1,5 @@
-Portions Copyright (C) @YEARS@  Internet Software Consortium.
+Portions Copyright (C) @SYSYEARS@  Internet System Consortium, Inc. ("ISC")
+Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
 Portions Copyright (C) 1995-2000 by Network Associates, Inc.
 
 Permission to use, copy, modify, and distribute this software for any

diff --git a/util/COPYRIGHT.NOM b/util/COPYRIGHT.NOM
index bf78bc285b1cb16619f5b5508027357102a0a9df..549d24637ffda751106e1b01b32b575bd089e3d2 100644 (file)
--- a/util/COPYRIGHT.NOM
+++ b/util/COPYRIGHT.NOM
@@ -1,5 +1,6 @@
-Portions Copyright (C) @YEARS@  Internet Software Consortium.
-Portions Copyright (C) @YEARS@  Nominum, Inc.
+Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
+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 e340e56ca25350bdf30489ab3a2e1bea51dadaa9..607f28d99cfc13a510ff17d0c8bf65137038fceb 100644 (file)
--- a/util/COPYRIGHT.PORTION
+++ b/util/COPYRIGHT.PORTION
@@ -1,4 +1,5 @@
-Portions Copyright (C) @YEARS@  Internet Software Consortium.
+Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
+Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
 
 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/update_copyrights b/util/update_copyrights
index 998a91d32aa9687c3dd40ed595f26a4ad2f7d13b..52395372b9b704f0bcf4ead0c41dd397ba1cdc46 100644 (file)
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update_copyrights,v 1.26 2001/07/30 23:45:03 gson Exp $
+# $Id: update_copyrights,v 1.26.2.1 2004/03/04 03:21:11 marka Exp $
 
 require 5.002;
 
@@ -221,10 +221,75 @@ while (<>) {
         print TARGET $before_copyright if $before_copyright;
         print TARGET $start_comment if $start_comment;
 
-        $years = "";
+        $sysyears = "";
+        $sftyears = "";
+        $nomyears = "";
+
+       #
+       # Internet Software Consortium: up to 2003
+       #
+        $last_year = 0;
+        $anchor_year = 0;
+       $years = "";
+        foreach $year (@years) {
+               if ($year >= 2004) { next; }
+                if ($last_year != 0 && $year == $last_year + 1) {
+                        if ($year > $anchor_year + 1) {
+                                substr($years, $anchor_end) = "-$year";
+                        } else {
+                                $years .= ", $year";
+                        }
+                } 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);
+                }
+
+                $last_year = $year;
+        }
+       $sftyears = $years;
+
+       #
+       # Nominum: up to 2001.
+       #
         $last_year = 0;
         $anchor_year = 0;
+       $years = "";
+        foreach $year (@years) {
+               if ($year >= 2002) { next; }
+                if ($last_year != 0 && $year == $last_year + 1) {
+                        if ($year > $anchor_year + 1) {
+                                substr($years, $anchor_end) = "-$year";
+                        } else {
+                                $years .= ", $year";
+                        }
+                } 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);
+                }
+
+                $last_year = $year;
+        }
+       $nomyears = $years;
+
+       #
+       # Internet Systems Consortium: 2004 onwards.
+       #
+        $last_year = 2004;
+        $anchor_year = 2004;
+       $years = "2004";
+       $anchor_end = length($years);
         foreach $year (@years) {
+               if ($year < 2005) { next; }
                 if ($last_year != 0 && $year == $last_year + 1) {
                         if ($year > $anchor_year + 1) {
                                 substr($years, $anchor_end) = "-$year";
@@ -243,15 +308,21 @@ while (<>) {
 
                 $last_year = $year;
         }
+       $sysyears = $years;
 
-        ($firstline, $secondline, @otherlines) = @$textp;
+        ($firstline, $secondline, $thirdline, @otherlines) = @$textp;
 
-        $firstline =~ s/\@YEARS\@/$years/;
-        $secondline =~ s/\@YEARS\@/$years/;
+        $firstline =~ s/\@SYSYEARS\@/$sysyears/;
+        $secondline =~ s/\@SFTYEARS\@/$sftyears/;
+        $thirdline =~ s/\@NOMYEARS\@/$nomyears/;
 
         print TARGET "$prefix$firstline";
-        print TARGET $secondline =~ /^$/ ? $nonspaceprefix : $prefix;
-       print TARGET "$secondline";
+       if ($sftyears ne "" ) {
+               print TARGET $secondline =~ /^$/ ? $nonspaceprefix : $prefix;
+               print TARGET "$secondline";
+       }
+        print TARGET $thirdline =~ /^$/ ? $nonspaceprefix : $prefix;
+       print TARGET "$thirdline";
 
         foreach $_ (@otherlines) {
                 print TARGET (/^$/ ? $nonspaceprefix : $prefix);