summaryrefslogtreecommitdiff
path: root/includes/arpa
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2014-01-23 13:28:48 -0800
committerShawn Routhier <sar@isc.org>2014-01-23 13:28:48 -0800
commitfef8c6f09c8f47d63f0e6e282654d695ffa5c46d (patch)
tree5597abb1a77aa451754d070a48e158867cccbe38 /includes/arpa
parent4809ef5cf66bbcd68202b01871a1c3f73c7ad758 (diff)
downloadisc-dhcp-fef8c6f09c8f47d63f0e6e282654d695ffa5c46d.tar.gz
[master] Update 3rd party licnese issues
Instead of duplicating more third-party licenses here in LICENSE file (there are many), just generically suggest to see the other files. Per the md5 copyright license agreement, add mention of required verbatim advertising statement in the release notes and readme. In the RELNOTES, I also mention ISC is open source software. In the README, I added a HISTORY section and placed that advertising statement there. If the HISTORY section is not wanted, then remove it and just mention the required verbatim advertising statement. By the way, some good history is in old READMEs and at http://hack.org/mc/texts/dhcp-freenix.txt (but I can't find the official hosted Lemon version of that paper). Remove the advertising clause from the historical BSD code copyrighted by The Regents of the University of California. For details see ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change (To summarize: in 1999, the University said that distributors are no longer required to acknowledge within advertising and the paragraph in the license may be deleted.)
Diffstat (limited to 'includes/arpa')
-rw-r--r--includes/arpa/nameser.h6
-rw-r--r--includes/arpa/nameser_compat.h6
2 files changed, 2 insertions, 10 deletions
diff --git a/includes/arpa/nameser.h b/includes/arpa/nameser.h
index d96139d2..eaa95f9e 100644
--- a/includes/arpa/nameser.h
+++ b/includes/arpa/nameser.h
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/arpa/nameser_compat.h b/includes/arpa/nameser_compat.h
index 3ae17f0e..fa30d99a 100644
--- a/includes/arpa/nameser_compat.h
+++ b/includes/arpa/nameser_compat.h
@@ -9,11 +9,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*