From 5aaf6178a5f01d313849428254f8a562a02dfd30 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 7 Apr 2005 04:08:53 +0000 Subject: [PATCH] 1849. [doc] All forms of the man pages (docbook, man, html) should have consistant copyright dates. --- CHANGES | 3 + bin/check/named-checkconf.8 | 4 +- bin/check/named-checkconf.docbook | 6 +- bin/check/named-checkconf.html | 6 +- bin/check/named-checkzone.docbook | 4 +- bin/check/named-checkzone.html | 4 +- bin/dnssec/dnssec-keygen.8 | 4 +- bin/dnssec/dnssec-keygen.docbook | 6 +- bin/dnssec/dnssec-keygen.html | 6 +- bin/dnssec/dnssec-makekeyset.8 | 4 +- bin/dnssec/dnssec-makekeyset.docbook | 6 +- bin/dnssec/dnssec-makekeyset.html | 6 +- bin/dnssec/dnssec-signkey.8 | 4 +- bin/dnssec/dnssec-signkey.docbook | 6 +- bin/dnssec/dnssec-signkey.html | 6 +- bin/dnssec/dnssec-signzone.docbook | 4 +- bin/dnssec/dnssec-signzone.html | 4 +- bin/named/control.c | 4 +- bin/named/include/named/ns_smf_globals.h | 6 +- bin/named/main.c | 4 +- bin/named/unix/os.c | 4 +- bin/nsupdate/nsupdate.8 | 4 +- bin/nsupdate/nsupdate.docbook | 6 +- bin/nsupdate/nsupdate.html | 6 +- bin/rndc/rndc-confgen.8 | 4 +- bin/rndc/rndc-confgen.html | 4 +- bin/rndc/rndc.8 | 4 +- bin/rndc/rndc.conf.5 | 4 +- bin/rndc/rndc.conf.docbook | 6 +- bin/rndc/rndc.conf.html | 6 +- bin/rndc/rndc.docbook | 6 +- bin/rndc/rndc.html | 6 +- lib/lwres/man/lwres.3 | 4 +- lib/lwres/man/lwres.docbook | 6 +- lib/lwres/man/lwres.html | 6 +- lib/lwres/man/lwres_buffer.3 | 4 +- lib/lwres/man/lwres_buffer.docbook | 6 +- lib/lwres/man/lwres_buffer.html | 6 +- lib/lwres/man/lwres_config.3 | 4 +- lib/lwres/man/lwres_config.docbook | 6 +- lib/lwres/man/lwres_config.html | 6 +- lib/lwres/man/lwres_context.3 | 6 +- lib/lwres/man/lwres_context.docbook | 6 +- lib/lwres/man/lwres_context.html | 6 +- lib/lwres/man/lwres_gabn.3 | 4 +- lib/lwres/man/lwres_gabn.docbook | 6 +- lib/lwres/man/lwres_gabn.html | 6 +- lib/lwres/man/lwres_gai_strerror.3 | 4 +- lib/lwres/man/lwres_gai_strerror.docbook | 6 +- lib/lwres/man/lwres_gai_strerror.html | 6 +- lib/lwres/man/lwres_getaddrinfo.3 | 6 +- lib/lwres/man/lwres_getaddrinfo.docbook | 6 +- lib/lwres/man/lwres_getaddrinfo.html | 6 +- lib/lwres/man/lwres_getipnode.3 | 6 +- lib/lwres/man/lwres_getipnode.docbook | 6 +- lib/lwres/man/lwres_getipnode.html | 6 +- lib/lwres/man/lwres_getnameinfo.3 | 4 +- lib/lwres/man/lwres_getnameinfo.docbook | 6 +- lib/lwres/man/lwres_getnameinfo.html | 6 +- lib/lwres/man/lwres_getrrsetbyname.3 | 4 +- lib/lwres/man/lwres_getrrsetbyname.docbook | 6 +- lib/lwres/man/lwres_getrrsetbyname.html | 6 +- lib/lwres/man/lwres_gnba.3 | 4 +- lib/lwres/man/lwres_gnba.docbook | 6 +- lib/lwres/man/lwres_gnba.html | 6 +- lib/lwres/man/lwres_hstrerror.3 | 4 +- lib/lwres/man/lwres_hstrerror.docbook | 6 +- lib/lwres/man/lwres_hstrerror.html | 6 +- lib/lwres/man/lwres_inetntop.3 | 4 +- lib/lwres/man/lwres_inetntop.docbook | 6 +- lib/lwres/man/lwres_inetntop.html | 6 +- lib/lwres/man/lwres_noop.3 | 4 +- lib/lwres/man/lwres_noop.docbook | 6 +- lib/lwres/man/lwres_noop.html | 6 +- lib/lwres/man/lwres_packet.3 | 4 +- lib/lwres/man/lwres_packet.docbook | 6 +- lib/lwres/man/lwres_packet.html | 6 +- lib/lwres/man/lwres_resutil.3 | 4 +- lib/lwres/man/lwres_resutil.docbook | 6 +- lib/lwres/man/lwres_resutil.html | 6 +- util/copyrights | 186 ++++++++++----------- util/merge_copyrights | 6 +- util/update_copyrights | 78 +++++++-- 83 files changed, 371 insertions(+), 318 deletions(-) diff --git a/CHANGES b/CHANGES index 4acaf6d599..cb68ecd3c1 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 40a8238ae0..24beb0604c 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.16.18.3 2004/06/03 04:17:52 marka Exp $ +.\" $Id: named-checkconf.8,v 1.16.18.4 2005/04/07 04:08:41 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 3893b72300..da41d7c5be 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 88d75aaba9..ffbabcff61 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 f1a2cc5653..95c3e87d9b 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 ead4904f4e..b36a3bef22 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..94c604f43e 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..0120063bc9 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 903fc914c1..88c976f264 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..a0d3ccf974 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.2.2.2 2005/04/07 04:08:45 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 4b9527db41..d8ac782275 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.136.18.7 2005/04/05 02:13:28 marka Exp $ */ +/* $Id: main.c,v 1.136.18.8 2005/04/07 04:08:45 marka Exp $ */ #include diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index aa6517e442..324993e450 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.66.18.6 2005/04/05 01:04:49 marka Exp $ */ +/* $Id: os.c,v 1.66.18.7 2005/04/07 04:08:46 marka Exp $ */ #include #include diff --git a/bin/nsupdate/nsupdate.8 b/bin/nsupdate/nsupdate.8 index ca57da2389..ad6d96d41b 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.30.18.2 2004/04/07 00:58:12 marka Exp $ +.\" $Id: nsupdate.8,v 1.30.18.3 2005/04/07 04:08:46 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..a64b3381b1 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 0b2e91dcd1..0c30becfe3 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 d338a1028e..f5136df58f 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 1f70991ff1..7ccbf402c4 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 f21fe96d38..5506eb434b 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 e6da3aa62d..c74dd715f7 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 6d660660cd..555124d1a6 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 a11e9b78af..54c2614404 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 c70cd49948..c09aa1b179 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 259e39ada1..660ece33d1 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 3f3998f555..dbd5d7990d 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 1876af4611..829cbe28ef 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 46cd39f838..a11298a71e 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 e45ab04709..caa17161bc 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 eaa1a29185..3b6b7379ba 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 a627549a0a..786a9e78de 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 7588bf1edf..c49a785614 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 5b37717e37..65b4b71462 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 82cbef5332..6ebcb05a6d 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 8f4f188f85..b8b9d25956 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..08af7f782e 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.32.18.1 2005/04/07 04:08:53 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); }