Commit 813e9f7e authored by Mark Andrews's avatar Mark Andrews

copyright

parent 2d857690
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -35,12 +38,6 @@ ...@@ -35,12 +38,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refnamediv> <refnamediv>
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -38,12 +41,6 @@ ...@@ -38,12 +41,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refnamediv> <refnamediv>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2001</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -39,11 +41,6 @@ ...@@ -39,11 +41,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2001</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -45,13 +49,6 @@ ...@@ -45,13 +49,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -41,12 +44,6 @@ ...@@ -41,12 +44,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -43,13 +47,6 @@ ...@@ -43,13 +47,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -43,13 +47,6 @@ ...@@ -43,13 +47,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -39,11 +41,6 @@ ...@@ -39,11 +41,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -42,12 +45,6 @@ ...@@ -42,12 +45,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -42,13 +46,6 @@ ...@@ -42,13 +46,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -38,11 +40,6 @@ ...@@ -38,11 +40,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<docinfo> <docinfo>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2007</year> <year>2007</year>
...@@ -38,11 +40,6 @@ ...@@ -38,11 +40,6 @@
<year>2016</year> <year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<holder>Internet Software Consortium.</holder>
</copyright>
</docinfo> </docinfo>
<refsynopsisdiv> <refsynopsisdiv>
......
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
<info> <info>
<title>BIND 9 Administrator Reference Manual</title> <title>BIND 9 Administrator Reference Manual</title>
<copyright> <copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year> <year>2006</year>
...@@ -25,13 +29,6 @@ ...@@ -25,13 +29,6 @@
<year>2015</year> <year>2015</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
<copyright>
<year>2000</year>
<year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>Internet Software Consortium.</holder>
</copyright>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="releaseinfo.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="releaseinfo.xml"/>
</info> </info>
......
...@@ -30,17 +30,9 @@ ...@@ -30,17 +30,9 @@
<xsl:variable name="isc.copyright.text"> <xsl:variable name="isc.copyright.text">
<xsl:text> <xsl:text>
Permission to use, copy, modify, and/or distribute this software for any This Source Code Form is subject to the terms of the Mozilla Public
purpose with or without fee is hereby granted, provided that the above License, v. 2.0. If a copy of the MPL was not distributed with this
copyright notice and this permission notice appear in all copies. file, You can obtain one at http://mozilla.org/MPL/2.0/.
THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
</xsl:text> </xsl:text>
</xsl:variable> </xsl:variable>
......
<!-- <!--
- Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000, 2001 Internet Software Consortium. -
- - This Source Code Form is subject to the terms of the Mozilla Public
- Permission to use, copy, modify, and distribute this software for any - License, v. 2.0. If a copy of the MPL was not distributed with this
- purpose with or without fee is hereby granted, provided that the above - file, You can obtain one at http://mozilla.org/MPL/2.0/.
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
--> -->
.\" .\"
.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000, 2001 Internet Software Consortium. .\"
.\" .\" This Source Code Form is subject to the terms of the Mozilla Public
.\" Permission to use, copy, modify, and distribute this software for any .\" License, v. 2.0. If a copy of the MPL was not distributed with this
.\" purpose with or without fee is hereby granted, provided that the above .\" file, You can obtain one at http://mozilla.org/MPL/2.0/.
.\" copyright notice and this permission notice appear in all copies.
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\" .\"
...@@ -105,20 +105,11 @@ ...@@ -105,20 +105,11 @@
static const char copyright[] = static const char copyright[] =
"/*\n" "/*\n"
" * Copyright (C) 2004%s Internet Systems Consortium, Inc. (\"ISC\")\n" " * Copyright (C) 1998%s Internet Systems Consortium, Inc. (\"ISC\")\n"
" * Copyright (C) 1998-2003 Internet Software Consortium.\n"
" *\n" " *\n"
" * Permission to use, copy, modify, and distribute this software for any\n" " * This Source Code Form is subject to the terms of the Mozilla Public\n"
" * purpose with or without fee is hereby granted, provided that the above\n" " * License, v. 2.0. If a copy of the MPL was not distributed with this\n"
" * copyright notice and this permission notice appear in all copies.\n" " * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
" *\n"
" * THE SOFTWARE IS PROVIDED \"AS IS\" AND ISC DISCLAIMS ALL WARRANTIES WITH\n"
" * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n"
" * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,\n"
" * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n"
" * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE\n"
" * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n"
" * PERFORMANCE OF THIS SOFTWARE.\n"
" */\n" " */\n"
"\n" "\n"
"/***************\n" "/***************\n"
...@@ -630,9 +621,9 @@ main(int argc, char **argv) { ...@@ -630,9 +621,9 @@ main(int argc, char **argv) {
tm->tm_year + 1900); tm->tm_year + 1900);
INSIST(n > 0 && (unsigned)n < sizeof(year)); INSIST(n > 0 && (unsigned)n < sizeof(year));
} else } else
year[0] = 0; strcpy(year, "-2016");
} else } else
year[0] = 0; strcpy(year, "-2016");
if (!depend) fprintf(stdout, copyright, year); if (!depend) fprintf(stdout, copyright, year);
......
...@@ -21,20 +21,11 @@ ...@@ -21,20 +21,11 @@
print <<\END; print <<\END;
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!-- <!--
- Copyright (C) 2000, 2001 Internet Software Consortium. - Copyright (C) 2000, 2001 Internet Systems Consortium, Inc. ("ISC")
- -
- Permission to use, copy, modify, and distribute this software for any - This Source Code Form is subject to the terms of the Mozilla Public
- purpose with or without fee is hereby granted, provided that the above - License, v. 2.0. If a copy of the MPL was not distributed with this
- copyright notice and this permission notice appear in all copies. - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--> -->
<!-- $Id$ --> <!-- $Id$ -->
......
...@@ -2821,20 +2821,11 @@ sub makeversion { ...@@ -2821,20 +2821,11 @@ sub makeversion {
# Standard Header # Standard Header
print O '/* print O '/*
* Copyright (C) 2001 Internet Software Consortium. * Copyright (C) 2001 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and distribute this software for any * This Source Code Form is subject to the terms of the Mozilla Public
* purpose with or without fee is hereby granted, provided that the above * License, v. 2.0. If a copy of the MPL was not distributed with this
* copyright notice and this permission notice appear in all copies. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
'; ';
...@@ -2927,20 +2918,11 @@ sub makesrcid { ...@@ -2927,20 +2918,11 @@ sub makesrcid {
# Standard Header # Standard Header
print SOUT '/* print SOUT '/*
* Copyright (C) 2012 Internet Software Consortium. * Copyright (C) 2012 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
* copyright notice and this permission notice appear in all copies.
* *
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM * This Source Code Form is subject to the terms of the Mozilla Public
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL * License, v. 2.0. If a copy of the MPL was not distributed with this
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL * file, You can obtain one at http://mozilla.org/MPL/2.0/.
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
'; ';
......