]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
some script updates were missing
authorEvan Hunt <each@isc.org>
Thu, 15 Mar 2018 18:26:25 +0000 (11:26 -0700)
committerEvan Hunt <each@isc.org>
Thu, 15 Mar 2018 18:26:25 +0000 (11:26 -0700)
util/COPYRIGHT
util/COPYRIGHT.BRIEF
util/COPYRIGHT.BSDI
util/COPYRIGHT.NAI
util/COPYRIGHT.NOM
util/COPYRIGHT.PORTION
util/merge_copyrights
util/update_copyrights

index 9fb279d97877886d16edd286d2cb698d30d3b72a..c867f8570c3a30926759724e4d608a06328befcb 100644 (file)
@@ -1,5 +1,4 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-Copyright (C) Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
index c349fd166acb5d3778ee643335a158b78549b69c..d8a4983dee876b5a2cea4542bfd03e534941789a 100644 (file)
@@ -1,2 +1,3 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
index cabc4d93464d4b8dce03cfb22aff9afb432b3a3e..66942e2603d70d69518be47e11c48fbb66c5542a 100644 (file)
@@ -1,5 +1,7 @@
-Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
-Copyright (C) @SFTYEARS@  Internet Software Consortium.
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
+See the COPYRIGHT file distributed with this work for additional
+information regarding copyright ownership.
 
 See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
index 994b3ea5fd513952ec3dc1e88a20031a1f39a59c..46b875cb9eb1874b3f45ba890e093581cd630ba9 100644 (file)
@@ -1,5 +1,4 @@
-Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
-Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
+Portions Copyright (C) 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
index e1639d4ccce28ade932c0277a76e527a89f3ddbd..97120b64dcbcf05391de32fffd97685a46f3e14e 100644 (file)
@@ -1,5 +1,4 @@
-Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
-Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
+Portions Copyright (C) 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
index dc4d661e674501ca723185a48f1c71260ed5fb75..be5efebd9e822a108199a30644ab92388ee1519e 100644 (file)
@@ -1,5 +1,4 @@
 Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-Portions Copyright (C) Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
index 6df026783eecba741a8ef2324ec118421fbc713c..0253b11c7046fadcfc781c63f0679610a0fb2270 100644 (file)
@@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 use strict;
 
 my %file_types = ();
index 9bbcd3cdd4a5b5663856b64de4f5eba02756cbdb..29143b8b19276fac9794bf390ecd7f2ae6e361e3 100644 (file)
@@ -42,11 +42,11 @@ my %owner2text = ();
 my $keyword_pat = '\$(Id:.*|Revision:.*|Id|Revision)\$';
 
 foreach $owner (keys %owner2filename) {
-        my $f = $owner2filename{$owner};
-        open(COPYRIGHT, "<$f") || die "can't open $f: $!";
-        @copyright_text = <COPYRIGHT>;
-        close(COPYRIGHT);
-        $owner2text{$owner} = [ @copyright_text ];
+       my $f = $owner2filename{$owner};
+       open(COPYRIGHT, "<$f") || die "can't open $f: $!";
+       @copyright_text = <COPYRIGHT>;
+       close(COPYRIGHT);
+       $owner2text{$owner} = [ @copyright_text ];
 }
 
 my %file_types = ();
@@ -92,24 +92,21 @@ sub copyright {
 }
 
 sub copyrights {
-       my $a = copyright("Internet Systems Consortium, Inc. (\"ISC\")",
-                  grep({ $_ >= 2004} @_));
-       my $b = copyright("Internet Software Consortium.",
-                  grep({ $_ < 2004} @_));
-       return "$a$b";
+       my $a = copyright("Internet Systems Consortium, Inc. (\"ISC\")", @_);
+       return "$a";
 }
 
 foreach $file (keys %file_types) {
        $typeandowner = $file_types{$file};
        $years_list = $file_years{$file};
 
-        if ( ! -f $file ) {
-                print "$file: missing\n";
-                next;
-        }
+       if ( ! -f $file ) {
+               print "$file: missing\n";
+               next;
+       }
        # print "Doing: $file";
 
-        if ($years_list =~ /PARENT:/) {
+       if ($years_list =~ /PARENT:/) {
                getyears($years_list);
                if (!defined $years_list) {
                        print "$file: has bad parent $parent\n";
@@ -128,16 +125,16 @@ foreach $file (keys %file_types) {
                }
        }
 
-        @years = split(/,/, $years_list);
+       @years = split(/,/, $years_list);
 
-        my ($type, $owner) = split(/\./, $typeandowner);
-        $owner = "" if !defined $owner;
+       my ($type, $owner) = split(/\./, $typeandowner);
+       $owner = "" if !defined $owner;
 
-        $textp = $owner2text{$owner};
-        if (!defined $textp) {
-                print "$file: unknown copyright owner $owner\n";
-                next;
-        }
+       $textp = $owner2text{$owner};
+       if (!defined $textp) {
+               print "$file: unknown copyright owner $owner\n";
+               next;
+       }
 
        if ($file eq "./CHANGES" || $file eq "./EXCLUDED" ||
            $file eq "./CHANGES.SE")
@@ -171,159 +168,159 @@ foreach $file (keys %file_types) {
                }
        }
 
-        next if $type eq "X" or $type eq "BAT";
-
-        $before_copyright = "";
-        $c_comment = 0;
-        $shell_comment = 0;
-        $m4_comment = 0;
-        $sgml_comment = 0;
-        $mkd_comment = 0;
-        $zone_comment = 0;
-        $man_comment = 0;
-        $python_comment = 0;
-        $python_bin_comment = 0;
-        $start_comment = "";
-        $end_comment = "";
-        $first = "";
-        if ($type =~ /^(C|YACC|CONF-C)$/) {
-                $c_comment = 1;
-                $start_comment = "/*\n";
-                $prefix = " * ";
-                $end_comment = " */\n";
-        } elsif ($type =~ /^(SH|PERL|TCL|MAKE|CONF-SH|RNC)$/) {
-                $shell_comment = 1;
+       next if $type eq "X" or $type eq "BAT";
+
+       $before_copyright = "";
+       $c_comment = 0;
+       $shell_comment = 0;
+       $m4_comment = 0;
+       $sgml_comment = 0;
+       $mkd_comment = 0;
+       $zone_comment = 0;
+       $man_comment = 0;
+       $python_comment = 0;
+       $python_bin_comment = 0;
+       $start_comment = "";
+       $end_comment = "";
+       $first = "";
+       if ($type =~ /^(C|YACC|CONF-C)$/) {
+               $c_comment = 1;
+               $start_comment = "/*\n";
+               $prefix = " * ";
+               $end_comment = " */\n";
+       } elsif ($type =~ /^(SH|PERL|TCL|MAKE|CONF-SH|RNC)$/) {
+               $shell_comment = 1;
+               $prefix = "# ";
+       } elsif ($type =~ /^PYTHON-BIN$/) {
+               $python_bin_comment = 1;
+               $start_comment = "############################################################################\n";
                $prefix = "# ";
-        } elsif ($type =~ /^PYTHON-BIN$/) {
-                $python_bin_comment = 1;
-                $start_comment = "############################################################################\n";
-                $prefix = "# ";
                $end_comment = "############################################################################\n"
-        } elsif ($type =~ /^PYTHON$/) {
-                $python_comment = 1;
-                $start_comment = "############################################################################\n";
-                $prefix = "# ";
+       } elsif ($type =~ /^PYTHON$/) {
+               $python_comment = 1;
+               $start_comment = "############################################################################\n";
+               $prefix = "# ";
                $end_comment = "############################################################################\n"
-        } elsif ($type eq "ZONE" || $type eq "MC") {
-                $zone_comment = 1;
-                $prefix = "; ";
-        } elsif ($type eq "MAN") {
-                $man_comment = 1;
-                $prefix = ".\\\" ";
-        } elsif ($type eq "M4") {
-                $m4_comment = 1;
-                $prefix = "dnl ";
-        } elsif ($type eq "HTML" || $type eq "SGML") {
-                $sgml_comment = 1;
-                $start_comment = "<!--\n";
-                $prefix = " - ";
-                $end_comment = "-->\n";
-        } elsif ($type eq "MKD") {
-                $mkd_comment = 1;
-                $start_comment = "<!--\n";
-                $prefix = " - ";
-                $end_comment = "-->";
-        } elsif ($type eq "TXT") {
-                $prefix = "";
-        } else {
-                print "$file: type '$type' not supported yet; skipping\n";
-                next;
-        }
-
-        ($nonspaceprefix = $prefix) =~ s/\s+$//;
-
-        open(SOURCE, "<$file") || die "can't open $file: $!";
-        $_ = <SOURCE>;
-        if ($type eq "YACC") {
-                unless ($_ eq "%{\n") {
-                        print "$file: unexpected yacc file start ",
-                              "(expected \"%{\\n\")\n";
-                        close(SOURCE);
-                        next;
-                }
-                $before_copyright = "$_";
-                $_ = <SOURCE>;
-        }
-        if ($c_comment && /^\/\*/) {
-                $_ = <SOURCE>;
-                if ($_ !~ /[Cc]opyright/) {
-                        print "$file: non-copyright comment\n";
-                        close(SOURCE);
-                        next;
-                }
-                if ($_ !~ /\*\//) {
-                        while (<SOURCE>) {
-                                last if $_ =~ /\*\//;
-                        }
-                }
-        } elsif ($shell_comment) {
-                if (/^\#\!/) {
-                        $before_copyright = "$_#\n";
-                        $_ = <SOURCE>;
-                        $_ = <SOURCE> if $_ eq "#\n";
-                }
-                if (/^\#/) {
-                        if ($_ !~ /[Cc]opyright/) {
-                                print "$file: non-copyright comment\n";
-                                close(SOURCE);
-                                next;
-                        }
-                        while (<SOURCE>) {
-                                if ($_ !~ /^\#/) {
-                                        $first = $_;
-                                        last;
-                                }
-                        }
-                } else {
-                        $first = $_;
-                }
-        } elsif ($python_comment || $python_bin_comment) {
-                if ($python_bin_comment && /^\#\!/) {
-                        $before_copyright = "$_";
-                        $_ = <SOURCE>;
-                        $_ = <SOURCE> if $_ eq "#\n";
-                        $_ = <SOURCE> if $_ eq "############################################################################\n";
-                } elsif ($python_comment && /^\#/) {
-                        $_ = <SOURCE> if $_ eq "#\n";
-                        $_ = <SOURCE> if $_ eq "############################################################################\n";
-                }
-                if (/^\#/) {
-                        if ($_ !~ /[Cc]opyright/) {
-                                print "$file: non-copyright comment\n";
-                                close(SOURCE);
-                                next;
-                        }
-                        while (<SOURCE>) {
-                                if ($_ !~ /^\#/) {
-                                        $first = $_;
-                                        last;
-                                }
-                        }
-                } else {
-                        $first = $_;
-                }
-        } elsif (($m4_comment || $zone_comment || $man_comment) &&
-                 /^\Q$nonspaceprefix\E/) {
-
-                while (/^\Q$nonspaceprefix\E\s*$/) {
-                        $_ = <SOURCE>;
-                }
-
-                if ($_ !~ /[Cc]opyright/) {
-                        print "$file: non-copyright comment\n";
-                        close(SOURCE);
-                        next;
-                }
-                while (<SOURCE>) {
-                        if ($_ !~ /^\Q$nonspaceprefix\E/ ||
-                            $_ =~ /$keyword_pat/) {
-                                $first = $_;
-                                last;
-                        }
-                }
-        } elsif ($sgml_comment) {
+       } elsif ($type eq "ZONE" || $type eq "MC") {
+               $zone_comment = 1;
+               $prefix = "; ";
+       } elsif ($type eq "MAN") {
+               $man_comment = 1;
+               $prefix = ".\\\" ";
+       } elsif ($type eq "M4") {
+               $m4_comment = 1;
+               $prefix = "dnl ";
+       } elsif ($type eq "HTML" || $type eq "SGML") {
+               $sgml_comment = 1;
+               $start_comment = "<!--\n";
+               $prefix = " - ";
+               $end_comment = "-->\n";
+       } elsif ($type eq "MKD") {
+               $mkd_comment = 1;
+               $start_comment = "<!--\n";
+               $prefix = " - ";
+               $end_comment = "-->";
+       } elsif ($type eq "TXT") {
+               $prefix = "";
+       } else {
+               print "$file: type '$type' not supported yet; skipping\n";
+               next;
+       }
+
+       ($nonspaceprefix = $prefix) =~ s/\s+$//;
+
+       open(SOURCE, "<$file") || die "can't open $file: $!";
+       $_ = <SOURCE>;
+       if ($type eq "YACC") {
+               unless ($_ eq "%{\n") {
+                       print "$file: unexpected yacc file start ",
+                             "(expected \"%{\\n\")\n";
+                       close(SOURCE);
+                       next;
+               }
+               $before_copyright = "$_";
+               $_ = <SOURCE>;
+       }
+       if ($c_comment && /^\/\*/) {
+               $_ = <SOURCE>;
+               if ($_ !~ /[Cc]opyright/) {
+                       print "$file: non-copyright comment\n";
+                       close(SOURCE);
+                       next;
+               }
+               if ($_ !~ /\*\//) {
+                       while (<SOURCE>) {
+                               last if $_ =~ /\*\//;
+                       }
+               }
+       } elsif ($shell_comment) {
+               if (/^\#\!/) {
+                       $before_copyright = "$_#\n";
+                       $_ = <SOURCE>;
+                       $_ = <SOURCE> if $_ eq "#\n";
+               }
+               if (/^\#/) {
+                       if ($_ !~ /[Cc]opyright/) {
+                               print "$file: non-copyright comment\n";
+                               close(SOURCE);
+                               next;
+                       }
+                       while (<SOURCE>) {
+                               if ($_ !~ /^\#/) {
+                                       $first = $_;
+                                       last;
+                               }
+                       }
+               } else {
+                       $first = $_;
+               }
+       } elsif ($python_comment || $python_bin_comment) {
+               if ($python_bin_comment && /^\#\!/) {
+                       $before_copyright = "$_";
+                       $_ = <SOURCE>;
+                       $_ = <SOURCE> if $_ eq "#\n";
+                       $_ = <SOURCE> if $_ eq "############################################################################\n";
+               } elsif ($python_comment && /^\#/) {
+                       $_ = <SOURCE> if $_ eq "#\n";
+                       $_ = <SOURCE> if $_ eq "############################################################################\n";
+               }
+               if (/^\#/) {
+                       if ($_ !~ /[Cc]opyright/) {
+                               print "$file: non-copyright comment\n";
+                               close(SOURCE);
+                               next;
+                       }
+                       while (<SOURCE>) {
+                               if ($_ !~ /^\#/) {
+                                       $first = $_;
+                                       last;
+                               }
+                       }
+               } else {
+                       $first = $_;
+               }
+       } elsif (($m4_comment || $zone_comment || $man_comment) &&
+                /^\Q$nonspaceprefix\E/) {
+
+               while (/^\Q$nonspaceprefix\E\s*$/) {
+                       $_ = <SOURCE>;
+               }
+
+               if ($_ !~ /[Cc]opyright/) {
+                       print "$file: non-copyright comment\n";
+                       close(SOURCE);
+                       next;
+               }
+               while (<SOURCE>) {
+                       if ($_ !~ /^\Q$nonspaceprefix\E/ ||
+                           $_ =~ /$keyword_pat/) {
+                               $first = $_;
+                               last;
+                       }
+               }
+       } elsif ($sgml_comment) {
                $before_copyright = "";
-                while (/^<!DOCTYPE/ || /^<!ENTITY/ || /^<\?xml-stylesheet/ || /^<\?xml /) {
+               while (/^<!DOCTYPE/ || /^<!ENTITY/ || /^<\?xml-stylesheet/ || /^<\?xml /) {
                        # print "SGML: $_";
                        $before_copyright = "$before_copyright$_";
                        if (/\]>$/ ) {
@@ -359,198 +356,165 @@ foreach $file (keys %file_types) {
                                close(SOURCE);
                                next;
                        }
-                }
-                if (/^<!--/) {
-                        $_ = <SOURCE> if $_ eq "<!--\n";
-                        if ($_ !~ /[Cc]opyright/) {
-                                print "$file: non-copyright comment\n";
-                                close(SOURCE);
-                                next;
-                        }
-                        while (defined($_)) {
-                                last if s/.*-->//;
-                                $_ = <SOURCE>;
-                        }
-                        print "$file: unterminated comment\n"
-                          unless defined($_);
-                        if ($_ ne "\n") {
-                                $first = $_;
-                        } else {
-                                $first = <SOURCE>;
-                        }
-                } else {
-                        $first = $_;
-                }
-        } elsif ($mkd_comment) {
+               }
+               if (/^<!--/) {
+                       $_ = <SOURCE> if $_ eq "<!--\n";
+                       if ($_ !~ /[Cc]opyright/) {
+                               print "$file: non-copyright comment\n";
+                               close(SOURCE);
+                               next;
+                       }
+                       while (defined($_)) {
+                               last if s/.*-->//;
+                               $_ = <SOURCE>;
+                       }
+                       print "$file: unterminated comment\n"
+                         unless defined($_);
+                       if ($_ ne "\n") {
+                               $first = $_;
+                       } else {
+                               $first = <SOURCE>;
+                       }
+               } else {
+                       $first = $_;
+               }
+       } elsif ($mkd_comment) {
                $before_copyright = "";
-                if (/^<!/) {
-                        $_ = <SOURCE> if $_ eq "<!--\n";
-                        if ($_ !~ /[Cc]opyright/) {
-                                print "$file: non-copyright comment\n";
-                                close(SOURCE);
-                                next;
-                        }
-                        while (defined($_)) {
-                                last if s/.*-->//;
-                                $_ = <SOURCE>;
-                        }
-                        print "$file: unterminated comment\n"
-                          unless defined($_);
-                        if ($_ ne "\n") {
-                                $first = $_;
-                        } else {
-                                $first = <SOURCE>;
-                        }
-                } else {
-                        $first = $_;
-                }
-        } elsif ($type eq "TXT") {
-                if ($_ =~ /[Cc]opyright/) {
-                        $/ = "";            # paragraph at a time
-                        while (<SOURCE>) {
-                                # Not very maintainable, but ok enough for now.
+               if (/^<!/) {
+                       $_ = <SOURCE> if $_ eq "<!--\n";
+                       if ($_ !~ /[Cc]opyright/) {
+                               print "$file: non-copyright comment\n";
+                               close(SOURCE);
+                               next;
+                       }
+                       while (defined($_)) {
+                               last if s/.*-->//;
+                               $_ = <SOURCE>;
+                       }
+                       print "$file: unterminated comment\n"
+                         unless defined($_);
+                       if ($_ ne "\n") {
+                               $first = $_;
+                       } else {
+                               $first = <SOURCE>;
+                       }
+               } else {
+                       $first = $_;
+               }
+       } elsif ($type eq "TXT") {
+               if ($_ =~ /[Cc]opyright/) {
+                       $/ = "";            # paragraph at a time
+                       while (<SOURCE>) {
+                               # Not very maintainable, but ok enough for now.
                                last if /Portions of this code/;
-                                last unless
-                                  /[Cc]opyright/ ||
-                                  /See COPYRIGHT in the source root/ ||
-                                  /Permission to use, copy, modify, and / ||
-                                  /THE SOFTWARE IS PROVIDED "AS IS" AND /;
-                        }
-                        $/ = "\n";
-                }
-                $first = $_;
-        } else {
-                $first = $_;
-        }
-
-        $first = "" if ! defined($first);
-
-        open(TARGET, ">$file.new") || die "can't open $file.new: $!";
-        print TARGET $before_copyright if $before_copyright;
-        print TARGET $start_comment if $start_comment;
-
-        $sysyears = "";
-        $sftyears = "";
-        $nomyears = "";
+                               last unless
+                                 /[Cc]opyright/ ||
+                                  /This Source Code Form is subject to the terms of the Mozilla Public/ ||
+                                  /If a copy of the MPL was not distributed with this/ ||
+                                  /You can obtain one at http:\/\/mozilla.org\/MPL\/2.0\// ||
+                                 /See COPYRIGHT in the source root/ ||
+                                 /Permission to use, copy, modify, and / ||
+                                 /THE SOFTWARE IS PROVIDED "AS IS" AND /;
+                       }
+                       $/ = "\n";
+               }
+               $first = $_;
+       } else {
+               $first = $_;
+       }
 
-       #
-       # 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;
+       $first = "" if ! defined($first);
+
+       open(TARGET, ">$file.new") || die "can't open $file.new: $!";
+       print TARGET $before_copyright if $before_copyright;
+       print TARGET $start_comment if $start_comment;
+
+       $sysyears = "";
+       $nomyears = "";
 
        #
        # Nominum: up to 2001.
        #
-        $last_year = 0;
-        $anchor_year = 0;
+       $last_year = 0;
+       $anchor_year = 0;
        $years = "";
-        foreach $year (@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;
-        }
+               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 = 0;
-        $anchor_year = 0;
+       $last_year = 0;
+       $anchor_year = 0;
        $years = "";
        $anchor_end = length($years);
        my $andor = 0;
        my $noid = 0;
-        foreach $year (@years) {
-               if ($year < 2004) { next; }
+       foreach $year (@years) {
                $andor = 1 if ($year >= 2007);
                $noid = 1 if ($year > 2012 || ($year == 2012 && $this_month >= 5) );
-                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;
-        }
-       $sysyears = $years;
-
-        ($firstline, $secondline, @otherlines) = @$textp;
-
-        $firstline =~ s/\@SYSYEARS\@/$sysyears/;
-        $secondline =~ s/\@SFTYEARS\@/$sftyears/;
+               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);
+               }
 
-        print TARGET "$prefix$firstline";
-       if ($sftyears ne "" ) {
-               print TARGET $secondline =~ /^$/ ? $nonspaceprefix : $prefix;
-               print TARGET "$secondline";
+               $last_year = $year;
        }
+       $sysyears = $years;
 
-        foreach $_ (@otherlines) {
+       # make a copy
+       @lines = @$textp;
+
+       foreach $_ (@lines) {
+               next if (/\@SYSYEARS\@/ && $sysyears eq "");
                s:modify, and distribute:modify, and/or distribute: if ($andor);
-                print TARGET (/^$/ ? $nonspaceprefix : $prefix);
+               print TARGET (/^$/ ? $nonspaceprefix : $prefix);
+               s/\@SYSYEARS\@/$sysyears/;
                s/\@NOMYEARS\@/$nomyears/;
-                print TARGET "$_";
-        }
-        print TARGET $end_comment if $end_comment;
+               print TARGET "$_";
+       }
+       print TARGET $end_comment if $end_comment;
 
-        if ($first eq "") {
-                $first = <SOURCE>;
-        }
+       if ($first eq "") {
+               $first = <SOURCE>;
+       }
 
-        if (defined($first)) {
-               if ($type eq 'MAN') {
-                       print TARGET "$nonspaceprefix\n";
+       if (defined($first)) {
+               if ($type eq 'MAN') {
+                       print TARGET "$nonspaceprefix\n";
                } else {
-                       print TARGET "\n";
-                }
+                       print TARGET "\n";
+               }
 
                if (($type eq "C" || $type eq "CONF-C") &&
                    $sysyears =~ /$this_year/) {
@@ -570,7 +534,7 @@ foreach $file (keys %file_types) {
                        $_ = $body;
                } elsif (($type eq "SGML" || $type eq "HTML" ||
                          $type eq "MAKE") &&
-                        $sysyears =~ /$this_year/) {
+                        $sysyears =~ /$this_year/) {
                        my $body = "";
                        while (<SOURCE>) {
                        # Remove trailing white space.
@@ -605,42 +569,42 @@ foreach $file (keys %file_types) {
                        s:<!-- insert copyright start -->.*?<!-- insert copyright end -->:<!-- insert copyright start -->\n$r    <!-- insert copyright end -->:s;
                }
 
-                my ($start, $end);
+               my ($start, $end);
                if ($type =~ /^PYTHON(|-BIN)$/) {
-                        ($start = $prefix) =~ s/\s*\n//;
+                       ($start = $prefix) =~ s/\s*\n//;
+                       $end = "\n";
+               } elsif ($start_comment ne "") {
+                       ($start = $start_comment) =~ s/\s*\n/ /;
+                       ($end = $end_comment) =~ s/^\s*(.*)\n/ $1\n/;
+               } elsif ($prefix ne "") {
+                       ($start = $prefix) =~ s/\s*\n//;
+                       $end = "\n";
+               } else {
+                       $start = "";
                        $end = "\n";
-                } elsif ($start_comment ne "") {
-                        ($start = $start_comment) =~ s/\s*\n/ /;
-                        ($end = $end_comment) =~ s/^\s*(.*)\n/ $1\n/;
-                } elsif ($prefix ne "") {
-                        ($start = $prefix) =~ s/\s*\n//;
-                        $end = "\n";
-                } else {
-                        $start = "";
-                        $end = "\n";
-                }
-
-                if (!$noid && $first !~ /$keyword_pat/ && 
+               }
+
+               if (!$noid && $first !~ /$keyword_pat/ &&
                    (!defined($_) || $_ !~ /$keyword_pat/)) {
                        $end = "\n$nonspaceprefix" if ($type eq "MAN");
-                        print TARGET "$start\$";
-                        print TARGET "Id";
-                        print TARGET "\$$end\n";
-                }
-
-                print TARGET $first if $first !~ /^\s*$/;
-                print TARGET $_ if (defined($_));
-        }
-        close(TARGET);
-        close(SOURCE);
-
-        $mode = (stat $file)[2]&511;
-        chmod $mode, "$file.new";
-
-        if (system("cmp -s $file.new $file") == 0) {
-                unlink("$file.new");
-        } else {
-                rename("$file.new", "$file")
-                  or die "rename($file.new, $file): $!";
-        }
+                       print TARGET "$start\$";
+                       print TARGET "Id";
+                       print TARGET "\$$end\n";
+               }
+
+               print TARGET $first if $first !~ /^\s*$/;
+               print TARGET $_ if (defined($_));
+       }
+       close(TARGET);
+       close(SOURCE);
+
+       $mode = (stat $file)[2]&511;
+       chmod $mode, "$file.new";
+
+       if (system("cmp -s $file.new $file") == 0) {
+               unlink("$file.new");
+       } else {
+               rename("$file.new", "$file")
+                 or die "rename($file.new, $file): $!";
+       }
 }