From 813e9f7ee291c611828041727c21a9f225fe1bcb Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 21 Jul 2016 17:00:44 +1000 Subject: [PATCH] copyright --- bin/check/named-checkconf.docbook | 9 +++----- bin/check/named-checkzone.docbook | 9 +++----- bin/confgen/rndc-confgen.docbook | 7 ++---- bin/dig/dig.docbook | 11 ++++------ bin/dig/host.docbook | 9 +++----- bin/dnssec/dnssec-keygen.docbook | 11 ++++------ bin/dnssec/dnssec-signzone.docbook | 11 ++++------ bin/named/lwresd.docbook | 7 ++---- bin/named/named.docbook | 9 +++----- bin/nsupdate/nsupdate.docbook | 11 ++++------ bin/rndc/rndc.conf.docbook | 7 ++---- bin/rndc/rndc.docbook | 7 ++---- doc/arm/Bv9ARM-book.xml | 11 ++++------ doc/xsl/copyright.xsl | 14 +++--------- docutil/HTML_COPYRIGHT | 19 +++++----------- docutil/MAN_COPYRIGHT | 19 +++++----------- lib/dns/gen.c | 21 +++++------------- util/mandoc2docbook.pl | 17 ++++----------- win32utils/Configure | 34 +++++++---------------------- win32utils/legacy/BuildAll.bat.in | 17 ++++----------- win32utils/legacy/BuildSetup.bat.in | 19 +++++----------- 21 files changed, 80 insertions(+), 199 deletions(-) diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook index 11b36714ff..040071e58b 100644 --- a/bin/check/named-checkconf.docbook +++ b/bin/check/named-checkconf.docbook @@ -26,6 +26,9 @@ + 2000 + 2001 + 2002 2004 2005 2007 @@ -35,12 +38,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - Internet Software Consortium. - diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook index c702cdf1b8..e7c5f60adc 100644 --- a/bin/check/named-checkzone.docbook +++ b/bin/check/named-checkzone.docbook @@ -24,6 +24,9 @@ + 2000 + 2001 + 2002 2004 2005 2006 @@ -38,12 +41,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - Internet Software Consortium. - diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook index 094a376a5f..d58964880f 100644 --- a/bin/confgen/rndc-confgen.docbook +++ b/bin/confgen/rndc-confgen.docbook @@ -29,6 +29,8 @@ + 2001 + 2003 2004 2005 2007 @@ -39,11 +41,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2001 - 2003 - Internet Software Consortium. - diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook index 7673a75630..cc056e76ed 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook @@ -31,6 +31,10 @@ + 2000 + 2001 + 2002 + 2003 2004 2005 2006 @@ -45,13 +49,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - 2003 - Internet Software Consortium. - diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook index e59d11530f..cdf9df729b 100644 --- a/bin/dig/host.docbook +++ b/bin/dig/host.docbook @@ -31,6 +31,9 @@ + 2000 + 2001 + 2002 2004 2005 2007 @@ -41,12 +44,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - Internet Software Consortium. - diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook index 865758cec4..fd5fda637f 100644 --- a/bin/dnssec/dnssec-keygen.docbook +++ b/bin/dnssec/dnssec-keygen.docbook @@ -30,6 +30,10 @@ + 2000 + 2001 + 2002 + 2003 2004 2005 2007 @@ -43,13 +47,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - 2003 - Internet Software Consortium. - diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook index 5c7caaed5b..761d343867 100644 --- a/bin/dnssec/dnssec-signzone.docbook +++ b/bin/dnssec/dnssec-signzone.docbook @@ -29,6 +29,10 @@ + 2000 + 2001 + 2002 + 2003 2004 2005 2006 @@ -43,13 +47,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - 2003 - Internet Software Consortium. - diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook index 44c8078d79..43e54d4f95 100644 --- a/bin/named/lwresd.docbook +++ b/bin/named/lwresd.docbook @@ -29,6 +29,8 @@ + 2000 + 2001 2004 2005 2007 @@ -39,11 +41,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - Internet Software Consortium. - diff --git a/bin/named/named.docbook b/bin/named/named.docbook index f1aa76bab6..2e4e2a517e 100644 --- a/bin/named/named.docbook +++ b/bin/named/named.docbook @@ -29,6 +29,9 @@ + 2000 + 2001 + 2003 2004 2005 2006 @@ -42,12 +45,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2003 - Internet Software Consortium. - diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook index 984522c1f4..2facc4bb17 100644 --- a/bin/nsupdate/nsupdate.docbook +++ b/bin/nsupdate/nsupdate.docbook @@ -28,6 +28,10 @@ + 2000 + 2001 + 2002 + 2003 2004 2005 2006 @@ -42,13 +46,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - 2003 - Internet Software Consortium. - diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook index f769d9bef1..0e51cb47a2 100644 --- a/bin/rndc/rndc.conf.docbook +++ b/bin/rndc/rndc.conf.docbook @@ -29,6 +29,8 @@ + 2000 + 2001 2004 2005 2007 @@ -38,11 +40,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - Internet Software Consortium. - diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook index 9247e4835b..dcd228db27 100644 --- a/bin/rndc/rndc.docbook +++ b/bin/rndc/rndc.docbook @@ -29,6 +29,8 @@ + 2000 + 2001 2004 2005 2007 @@ -38,11 +40,6 @@ 2016 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - Internet Software Consortium. - diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 5cb6a0ba2a..2119d564e7 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -11,6 +11,10 @@ BIND 9 Administrator Reference Manual + 2000 + 2001 + 2002 + 2003 2004 2005 2006 @@ -25,13 +29,6 @@ 2015 Internet Systems Consortium, Inc. ("ISC") - - 2000 - 2001 - 2002 - 2003 - Internet Software Consortium. - diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl index b76764dd5e..c46d55f184 100644 --- a/doc/xsl/copyright.xsl +++ b/doc/xsl/copyright.xsl @@ -30,17 +30,9 @@ - Permission to use, copy, modify, and/or 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 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. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/docutil/HTML_COPYRIGHT b/docutil/HTML_COPYRIGHT index 61ae4b37d8..82c7e91199 100644 --- a/docutil/HTML_COPYRIGHT +++ b/docutil/HTML_COPYRIGHT @@ -1,16 +1,7 @@ diff --git a/docutil/MAN_COPYRIGHT b/docutil/MAN_COPYRIGHT index fe5f81b4b4..b00f6c3009 100644 --- a/docutil/MAN_COPYRIGHT +++ b/docutil/MAN_COPYRIGHT @@ -1,16 +1,7 @@ .\" -.\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") -.\" Copyright (C) 2000, 2001 Internet Software Consortium. -.\" -.\" 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 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) 1996-2016 Internet Systems Consortium, Inc. ("ISC") +.\" +.\" This Source Code Form is subject to the terms of the Mozilla Public +.\" License, v. 2.0. If a copy of the MPL was not distributed with this +.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. .\" diff --git a/lib/dns/gen.c b/lib/dns/gen.c index eb185cb71b..30f94c1eef 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -105,20 +105,11 @@ static const char copyright[] = "/*\n" -" * Copyright (C) 2004%s Internet Systems Consortium, Inc. (\"ISC\")\n" -" * Copyright (C) 1998-2003 Internet Software Consortium.\n" +" * Copyright (C) 1998%s Internet Systems Consortium, Inc. (\"ISC\")\n" " *\n" -" * Permission to use, copy, modify, and distribute this software for any\n" -" * purpose with or without fee is hereby granted, provided that the above\n" -" * copyright notice and this permission notice appear in all copies.\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" +" * This Source Code Form is subject to the terms of the Mozilla Public\n" +" * License, v. 2.0. If a copy of the MPL was not distributed with this\n" +" * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n" " */\n" "\n" "/***************\n" @@ -630,9 +621,9 @@ main(int argc, char **argv) { tm->tm_year + 1900); INSIST(n > 0 && (unsigned)n < sizeof(year)); } else - year[0] = 0; + strcpy(year, "-2016"); } else - year[0] = 0; + strcpy(year, "-2016"); if (!depend) fprintf(stdout, copyright, year); diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl index 81f83a95eb..1a33c9c456 100644 --- a/util/mandoc2docbook.pl +++ b/util/mandoc2docbook.pl @@ -21,20 +21,11 @@ print <<\END; diff --git a/win32utils/Configure b/win32utils/Configure index cd496a5449..11bb1fc278 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -2821,20 +2821,11 @@ sub makeversion { # Standard Header 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 - * 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 - * 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. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ '; @@ -2927,20 +2918,11 @@ sub makesrcid { # Standard Header print SOUT '/* - * Copyright (C) 2012 Internet Software Consortium. - * - * 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. + * Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") * - * 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. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ '; diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in index 9e4cc3a321..df633ab659 100644 --- a/win32utils/legacy/BuildAll.bat.in +++ b/win32utils/legacy/BuildAll.bat.in @@ -1,19 +1,10 @@ echo off rem -rem Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") -rem Copyright (C) 2001-2002 Internet Software Consortium. -rem -rem Permission to use, copy, modify, and distribute this software for any -rem purpose with or without fee is hereby granted, provided that the above -rem copyright notice and this permission notice appear in all copies. +rem Copyright (C) 2001-2002,2004,2016 Internet Systems Consortium, Inc. ("ISC") rem -rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -rem PERFORMANCE OF THIS SOFTWARE. +rem This Source Code Form is subject to the terms of the Mozilla Public +rem License, v. 2.0. If a copy of the MPL was not distributed with this +rem file, You can obtain one at http://mozilla.org/MPL/2.0/. rem BuildAll.bat rem This script sets up the files necessary ready to build BIND 9 diff --git a/win32utils/legacy/BuildSetup.bat.in b/win32utils/legacy/BuildSetup.bat.in index 6d730ee996..7b43aa52d2 100644 --- a/win32utils/legacy/BuildSetup.bat.in +++ b/win32utils/legacy/BuildSetup.bat.in @@ -1,19 +1,10 @@ echo off rem -rem Copyright (C) 2004,2005 Internet Systems Consortium, Inc. ("ISC") -rem Copyright (C) 2001-2002 Internet Software Consortium. -rem -rem Permission to use, copy, modify, and distribute this software for any -rem purpose with or without fee is hereby granted, provided that the above -rem copyright notice and this permission notice appear in all copies. -rem -rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -rem PERFORMANCE OF THIS SOFTWARE. +rem Copyright (C) 2001-2002,2004,2005,2016 Internet Systems Consortium, Inc. ("ISC") +rem +rem This Source Code Form is subject to the terms of the Mozilla Public +rem License, v. 2.0. If a copy of the MPL was not distributed with this +rem file, You can obtain one at http://mozilla.org/MPL/2.0/. rem BuildSetup.bat rem This script sets up the files necessary ready to build BIND 9. -- GitLab