From: Shawn Routhier Date: Thu, 23 Jan 2014 21:28:48 +0000 (-0800) Subject: [master] Update 3rd party licnese issues X-Git-Tag: v4_3_0rc1~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef8c6f09c8f47d63f0e6e282654d695ffa5c46d;p=thirdparty%2Fdhcp.git [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.) --- diff --git a/LICENSE b/LICENSE index eef341e1d..dc09c0aa9 100644 --- a/LICENSE +++ b/LICENSE @@ -18,3 +18,6 @@ # Redwood City, CA 94063 # # https://www.isc.org/ + +See the specific source files for any additional copyright or +license statements. diff --git a/README b/README index bef92d8b5..3a3a2d3db 100644 --- a/README +++ b/README @@ -40,6 +40,7 @@ the ISC DHCP Distribution. 5.10 MacOS X 6 SUPPORT 6.1 HOW TO REPORT BUGS + 7 HISTORY WHERE TO FIND DOCUMENTATION @@ -699,3 +700,19 @@ bug reports are more likely to get handled more quickly overall. Please see https://www.isc.org/software/dhcp/ for details on how to subscribe to the ISC DHCP mailing lists. + HISTORY + +ISC DHCP was originally written by Ted Lemon under a contract with +Vixie Labs with the goal of being a complete reference implementation +of the DHCP protocol. Funding for this project was provided by +Internet Systems Consortium. The first release of the ISC DHCP +distribution in December 1997 included just the DHCP server. +Release 2 in June 1999 added a DHCP client and a BOOTP/DHCP relay +agent. DHCP 3 was released in October 2001 and included DHCP failover +support, OMAPI, Dynamic DNS, conditional behaviour, client classing, +and more. Version 3 of the DHCP server was funded by Nominum, Inc. +The 4.0 release in December 2007 introduced DHCPv6 protocol support +for the server and client. + +This product includes cryptographic software written +by Eric Young (eay@cryptsoft.com). diff --git a/RELNOTES b/RELNOTES index 94b3459ed..4e72ad5e1 100644 --- a/RELNOTES +++ b/RELNOTES @@ -48,6 +48,10 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not work on other platforms. Please report any problems and suggested fixes to . +ISC DHCP is open source software maintained by Internet Systems +Consortium. This product includes cryptographic software written +by Eric Young (eay@cryptsoft.com). + Changes since 4.2.0 (new features) - If a client renews before 'dhcp-cache-threshold' percent of its lease diff --git a/includes/arpa/nameser.h b/includes/arpa/nameser.h index d96139d20..eaa95f9e3 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 3ae17f0ee..fa30d99ad 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. * diff --git a/includes/netinet/if_ether.h b/includes/netinet/if_ether.h index 8de80235b..a13371007 100644 --- a/includes/netinet/if_ether.h +++ b/includes/netinet/if_ether.h @@ -12,11 +12,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/netinet/ip.h b/includes/netinet/ip.h index 0a1e35840..9d20e5f04 100644 --- a/includes/netinet/ip.h +++ b/includes/netinet/ip.h @@ -12,11 +12,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/netinet/ip_icmp.h b/includes/netinet/ip_icmp.h index 8fffb58b7..0f40c3bbb 100644 --- a/includes/netinet/ip_icmp.h +++ b/includes/netinet/ip_icmp.h @@ -12,11 +12,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/netinet/udp.h b/includes/netinet/udp.h index 5f1cd7d22..d86cf447b 100644 --- a/includes/netinet/udp.h +++ b/includes/netinet/udp.h @@ -12,11 +12,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/minires/res_comp.c b/minires/res_comp.c index 5b6839070..5c4c73d5c 100644 --- a/minires/res_comp.c +++ b/minires/res_comp.c @@ -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/minires/res_init.c b/minires/res_init.c index 051184979..2163039c8 100644 --- a/minires/res_init.c +++ b/minires/res_init.c @@ -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/minires/res_mkquery.c b/minires/res_mkquery.c index d24a177b2..1a58d1a9b 100644 --- a/minires/res_mkquery.c +++ b/minires/res_mkquery.c @@ -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/minires/res_query.c b/minires/res_query.c index 9036697e3..124d1dde9 100644 --- a/minires/res_query.c +++ b/minires/res_query.c @@ -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/minires/res_send.c b/minires/res_send.c index 8513d7df1..a26e0ef56 100644 --- a/minires/res_send.c +++ b/minires/res_send.c @@ -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/omapip/inet_addr.c b/omapip/inet_addr.c index c5ccc79f7..c7d7ffe97 100644 --- a/omapip/inet_addr.c +++ b/omapip/inet_addr.c @@ -12,11 +12,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. *