consolidate copyrights

2025-08-22 10:10:06 +00:00 · 2016-07-21 17:24:07 +10:00 · 2016-07-21 17:24:07 +10:00 · 30e4fbdfb5
commit 30e4fbdfb5
parent 6807a2dc3c
31 changed files with 74 additions and 165 deletions
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@ -26,6 +26,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -35,12 +38,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@ -24,6 +24,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
      <year>2004</year>
      <year>2005</year>
      <year>2006</year>
@ -38,12 +41,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@ -29,6 +29,8 @@

  <docinfo>
    <copyright>
+      <year>2001</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -39,11 +41,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@ -31,6 +31,10 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2006</year>
@ -45,13 +49,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@ -31,6 +31,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -41,12 +44,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@ -30,6 +30,10 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -43,13 +47,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@ -29,6 +29,10 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2006</year>
@ -43,13 +47,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@ -29,6 +29,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -39,11 +41,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@ -29,6 +29,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2006</year>
@ -42,12 +45,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@ -28,6 +28,10 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2006</year>
@ -42,13 +46,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@ -29,6 +29,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -38,11 +40,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@ -29,6 +29,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -38,11 +40,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@ -28,6 +28,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -36,11 +38,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refsynopsisdiv>
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@ -26,6 +26,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,12 +37,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@ -26,6 +26,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,11 +36,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@ -26,6 +26,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,12 +37,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@ -26,6 +26,7 @@

  <docinfo>
    <copyright>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,10 +35,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@ -24,6 +24,9 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,12 +35,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@ -26,6 +26,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,11 +36,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@ -26,6 +26,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,11 +36,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@ -26,6 +26,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -34,11 +36,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@ -24,6 +24,8 @@

  <docinfo>
    <copyright>
+      <year>2000</year>
+      <year>2001</year>
      <year>2004</year>
      <year>2005</year>
      <year>2007</year>
@ -32,11 +34,6 @@
      <year>2016</year>
      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
    </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
  </docinfo>

  <refnamediv>
--- a/util/copyrights
+++ b/util/copyrights
@ -3279,7 +3279,6 @@
 ./doc/markdown/howto.mkd			MKD	2014,2016
 ./doc/markdown/style.mkd			MKD	2014,2016
 ./doc/misc/Makefile.in				MAKE	2001,2004,2007,2009,2012,2016
-./doc/misc/SIT					TXT.BRIEF	2014,2016
 ./doc/misc/dnssec				TXT.BRIEF	2000,2001,2002,2004,2016
 ./doc/misc/format-options.pl			PERL	2001,2004,2007,2012,2016
 ./doc/misc/ipv6					TXT.BRIEF	2000,2001,2004,2016
--- a/util/update_copyrights
+++ b/util/update_copyrights
@ -83,11 +83,8 @@ 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) {