diff --git a/CHANGES b/CHANGES index d725a876b1..c3e8d91db7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1849. [doc] All forms of the man pages (docbook, man, html) should + have consistant copyright dates. + 1848. [bug] Improve SMF integration. [RT #13238] 1847. [bug] isc_ondestroy_init() is called too late in diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8 index 9c1058ef48..08f1fcfec9 100644 --- a/bin/check/named-checkconf.8 +++ b/bin/check/named-checkconf.8 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 2000-2002 Internet Software Consortium. .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: named-checkconf.8,v 1.19 2004/06/03 04:12:35 marka Exp $ +.\" $Id: named-checkconf.8,v 1.20 2005/04/07 03:49:55 marka Exp $ .\" .TH "NAMED-CHECKCONF" "8" "June 14, 2000" "BIND9" "" .SH NAME diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook index 28bcbe3ccc..e1caf5238f 100644 --- a/bin/check/named-checkconf.docbook +++ b/bin/check/named-checkconf.docbook @@ -1,7 +1,7 @@ - + diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html index 21286e72a9..2a6c2c89c8 100644 --- a/bin/check/named-checkconf.html +++ b/bin/check/named-checkconf.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/check/named-checkzone.html b/bin/check/named-checkzone.html index 10be3b621f..fc50ef3270 100644 --- a/bin/check/named-checkzone.html +++ b/bin/check/named-checkzone.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/dnssec/dnssec-keygen.html b/bin/dnssec/dnssec-keygen.html index 7c8fe2c2d8..e73a9515bd 100644 --- a/bin/dnssec/dnssec-keygen.html +++ b/bin/dnssec/dnssec-keygen.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/dnssec/dnssec-makekeyset.html b/bin/dnssec/dnssec-makekeyset.html index 504cb5d391..ec9fe17c3c 100644 --- a/bin/dnssec/dnssec-makekeyset.html +++ b/bin/dnssec/dnssec-makekeyset.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/dnssec/dnssec-signkey.html b/bin/dnssec/dnssec-signkey.html index f88201d079..591e06b727 100644 --- a/bin/dnssec/dnssec-signkey.html +++ b/bin/dnssec/dnssec-signkey.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/dnssec/dnssec-signzone.html b/bin/dnssec/dnssec-signzone.html index 3936d4bba1..8725760f2b 100644 --- a/bin/dnssec/dnssec-signzone.html +++ b/bin/dnssec/dnssec-signzone.html @@ -1,6 +1,6 @@ - + diff --git a/bin/named/include/named/ns_smf_globals.h b/bin/named/include/named/ns_smf_globals.h index cfcde5587f..663375864c 100644 --- a/bin/named/include/named/ns_smf_globals.h +++ b/bin/named/include/named/ns_smf_globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,9 @@ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - + +/* $Id: ns_smf_globals.h,v 1.3 2005/04/07 03:49:58 marka Exp $ */ + #ifndef NS_SMF_GLOBALS_H #define NS_SMF_GLOBALS_H 1 diff --git a/bin/named/main.c b/bin/named/main.c index dc644536e9..809da4179c 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.c,v 1.143 2005/04/05 02:13:45 marka Exp $ */ +/* $Id: main.c,v 1.144 2005/04/07 03:49:57 marka Exp $ */ #include diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index c8944bf585..0d14872362 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.c,v 1.72 2005/04/05 00:58:16 marka Exp $ */ +/* $Id: os.c,v 1.73 2005/04/07 03:49:58 marka Exp $ */ #include #include diff --git a/bin/nsupdate/nsupdate.8 b/bin/nsupdate/nsupdate.8 index 83cbdcc13e..5bda530bda 100644 --- a/bin/nsupdate/nsupdate.8 +++ b/bin/nsupdate/nsupdate.8 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 2000-2003 Internet Software Consortium. .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: nsupdate.8,v 1.32 2004/04/07 00:57:00 marka Exp $ +.\" $Id: nsupdate.8,v 1.33 2005/04/07 03:49:58 marka Exp $ .\" .TH "NSUPDATE" "8" "Jun 30, 2000" "BIND9" "" .SH NAME diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook index 6dbd56a5d7..90ac8975fa 100644 --- a/bin/nsupdate/nsupdate.docbook +++ b/bin/nsupdate/nsupdate.docbook @@ -1,7 +1,7 @@ - + diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html index f3098165cc..7a49223147 100644 --- a/bin/nsupdate/nsupdate.html +++ b/bin/nsupdate/nsupdate.html @@ -1,6 +1,6 @@ - + - + - + diff --git a/bin/rndc/rndc.conf.html b/bin/rndc/rndc.conf.html index 11a277dc47..c380f63c9f 100644 --- a/bin/rndc/rndc.conf.html +++ b/bin/rndc/rndc.conf.html @@ -1,6 +1,6 @@ - + - + diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html index f078c1db80..b24ae4faea 100644 --- a/bin/rndc/rndc.html +++ b/bin/rndc/rndc.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres.html b/lib/lwres/man/lwres.html index 72ee370801..a8b7139523 100644 --- a/lib/lwres/man/lwres.html +++ b/lib/lwres/man/lwres.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_buffer.html b/lib/lwres/man/lwres_buffer.html index 552ea3dd53..ff292f3e25 100644 --- a/lib/lwres/man/lwres_buffer.html +++ b/lib/lwres/man/lwres_buffer.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_config.html b/lib/lwres/man/lwres_config.html index f22b0b64bf..3d61e34fb2 100644 --- a/lib/lwres/man/lwres_config.html +++ b/lib/lwres/man/lwres_config.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_context.html b/lib/lwres/man/lwres_context.html index 269e6c673c..aa25500fab 100644 --- a/lib/lwres/man/lwres_context.html +++ b/lib/lwres/man/lwres_context.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_gabn.html b/lib/lwres/man/lwres_gabn.html index 0a2c7961f0..eea65d70b6 100644 --- a/lib/lwres/man/lwres_gabn.html +++ b/lib/lwres/man/lwres_gabn.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_gai_strerror.html b/lib/lwres/man/lwres_gai_strerror.html index d5b7a11e3b..09a6b4255e 100644 --- a/lib/lwres/man/lwres_gai_strerror.html +++ b/lib/lwres/man/lwres_gai_strerror.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_getaddrinfo.html b/lib/lwres/man/lwres_getaddrinfo.html index 4d692765cf..8ca8a30021 100644 --- a/lib/lwres/man/lwres_getaddrinfo.html +++ b/lib/lwres/man/lwres_getaddrinfo.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_getipnode.html b/lib/lwres/man/lwres_getipnode.html index 446b5cdad3..ec121e174f 100644 --- a/lib/lwres/man/lwres_getipnode.html +++ b/lib/lwres/man/lwres_getipnode.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_getnameinfo.html b/lib/lwres/man/lwres_getnameinfo.html index c962704d1d..5d2ce0f8d9 100644 --- a/lib/lwres/man/lwres_getnameinfo.html +++ b/lib/lwres/man/lwres_getnameinfo.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_getrrsetbyname.html b/lib/lwres/man/lwres_getrrsetbyname.html index 7f7df9bca7..e310fc8a42 100644 --- a/lib/lwres/man/lwres_getrrsetbyname.html +++ b/lib/lwres/man/lwres_getrrsetbyname.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_gnba.html b/lib/lwres/man/lwres_gnba.html index fe13aabefc..3382e3979c 100644 --- a/lib/lwres/man/lwres_gnba.html +++ b/lib/lwres/man/lwres_gnba.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_hstrerror.html b/lib/lwres/man/lwres_hstrerror.html index 00ee370288..3e2618a80b 100644 --- a/lib/lwres/man/lwres_hstrerror.html +++ b/lib/lwres/man/lwres_hstrerror.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_inetntop.html b/lib/lwres/man/lwres_inetntop.html index 8a024f6545..83fdea5b87 100644 --- a/lib/lwres/man/lwres_inetntop.html +++ b/lib/lwres/man/lwres_inetntop.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_noop.html b/lib/lwres/man/lwres_noop.html index fdec6e3312..919504003c 100644 --- a/lib/lwres/man/lwres_noop.html +++ b/lib/lwres/man/lwres_noop.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_packet.html b/lib/lwres/man/lwres_packet.html index f815c0b311..3cc421cbcf 100644 --- a/lib/lwres/man/lwres_packet.html +++ b/lib/lwres/man/lwres_packet.html @@ -1,6 +1,6 @@ - + - + diff --git a/lib/lwres/man/lwres_resutil.html b/lib/lwres/man/lwres_resutil.html index e7b5533559..59096a9219 100644 --- a/lib/lwres/man/lwres_resutil.html +++ b/lib/lwres/man/lwres_resutil.html @@ -1,6 +1,6 @@ - + ) { } next if $file_types{$_} eq "X"; + next if ($file_years{$_} =~ /^PARENT:/); + next if ($file_years{$_} eq "DOCBOOK"); @years = split(/,/, $file_years{$_}); $has_current = 0; diff --git a/util/update_copyrights b/util/update_copyrights index ada5f4fd7e..bd40469f61 100644 --- a/util/update_copyrights +++ b/util/update_copyrights @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -w # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: update_copyrights,v 1.32 2004/03/16 05:22:33 marka Exp $ +# $Id: update_copyrights,v 1.33 2005/04/07 03:50:05 marka Exp $ require 5.002; @@ -47,15 +47,61 @@ foreach $owner (keys %owner2filename) { $owner2text{$owner} = [ @copyright_text ]; } +my %file_types = (); +my %file_years = (); +my $years_list; +my $parent; + while (<>) { - ($file, $typeandowner, $years_list) = split(/\s+/); - @years = split(/,/, $years_list); + chomp; + ($file, $type, $years) = split(/\s+/); + $file_types{$file} = $type; + $file_years{$file} = $years; +} + +sub getyears { + $parent = $_[0]; + $parent =~ s/PARENT://; + $years_list = $file_years{$parent}; + if (defined($years_list) && $years_list =~ /^PARENT:/) { + print "BAD PARENT:$parent\n"; + undefine($years_list); + } +} + +sub docbook { + $parent = $_[0]; + $parent =~ s/\.[^.]*$/.docbook/; + $years_list = $file_years{$parent}; +} + +foreach $file (keys %file_types) { + $typeandowner = $file_types{$file}; + $years_list = $file_years{$file}; if ( ! -f $file ) { print "$file: missing\n"; next; } + if ($years_list =~ /PARENT:/) { + getyears($years_list); + if (!defined $years_list) { + print "$file: has bad parent $parent\n"; + next; + } + } + + if ($years_list eq "DOCBOOK") { + docbook($file); + if (!defined $years_list) { + print "$file: has bad parent $parent\n"; + next; + } + } + + @years = split(/,/, $years_list); + my ($type, $owner) = split(/\./, $typeandowner); $owner = "" if !defined $owner; @@ -242,10 +288,10 @@ while (<>) { } } else { $years .= $last_year == 0 ? "$year" : ", $year"; - if ($anchor_year != 0) { - print "$file: noncontiguous year: ", - "$year != $last_year + 1\n"; - } + #if ($anchor_year != 0) { + # print "$file: noncontiguous year: ", + # "$year != $last_year + 1\n"; + #} $anchor_year = $year; $anchor_end = length($years); } @@ -270,10 +316,10 @@ while (<>) { } } else { $years .= $last_year == 0 ? "$year" : ", $year"; - if ($anchor_year != 0) { - print "$file: noncontiguous year: ", - "$year != $last_year + 1\n"; - } + #if ($anchor_year != 0) { + # print "$file: noncontiguous year: ", + # "$year != $last_year + 1\n"; + #} $anchor_year = $year; $anchor_end = length($years); } @@ -299,10 +345,10 @@ while (<>) { } } else { $years .= $last_year == 0 ? "$year" : ", $year"; - if ($anchor_year != 0) { - print "$file: noncontiguous year: ", - "$year != $last_year + 1\n"; - } + #if ($anchor_year != 0) { + # print "$file: noncontiguous year: ", + # "$year != $last_year + 1\n"; + #} $anchor_year = $year; $anchor_end = length($years); }