[v4_1_esv] 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 eef341e1dec93c5e951496980c20ec9b1c993ab0..dc09c0aa9a5ded70071509d859ccfcc7531cd10d 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -18,3 +18,6 @@
 #   Redwood City, CA 94063
 #   <info@isc.org>
 #   https://www.isc.org/
+
+See the specific source files for any additional copyright or
+license statements.

diff --git a/README b/README
index 538ab86a9c3aad98488a6d1cb4fdca5ba010b1d2..f5066e47b26aee0bed9196a304399dc453a33a2b 100644 (file)
--- 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
 
@@ -668,3 +669,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 cfcfe1e601b53bc87d05829a89066e05ec31c3f8..bcda59481ed7220bb6a16463ade800dad2551ef9 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -53,6 +53,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
 <dhcp-users@isc.org>.
 
+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.1-ESV-R8
 
 - Modify the server code to only prohibit the administrator from configuring

diff --git a/includes/arpa/nameser.h b/includes/arpa/nameser.h
index f254b6013c164742fb88a6e4dc6bfdc8d6c71174..ad6edb55d3e3a5f4b828a050ce0631c7e21a54ad 100644 (file)
--- 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 3ae17f0ee6833dc208c3fc53a4763a73cad8d91c..fa30d99ad011d8ba3489ce06057bb03ad1995cfa 100644 (file)
--- 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 8de80235beccbe2235ee9436199eff311db9b860..a133710074851d860cb7306a6e2feed1d7d9898a 100644 (file)
--- 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 0a1e35840443b8051290372207fb7383c020ab42..9d20e5f045633d37386f232cdd6ba600011c2a27 100644 (file)
--- 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 8fffb58b7362e141b0f84dea4301f020d90a3115..0f40c3bbb112c0e2ad378f45461ecc6f1de0e3ea 100644 (file)
--- 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 d0468f4c4f5aec507c9e29c16d7abe9524093d29..d12bfccbe8ea588de92d99b9a38fb60de6fd43a5 100644 (file)
--- 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 1dec368d4e9ccf14a58997aacf96e1eea960cca6..054129d058c7f3e8088697bc258278a963a05821 100644 (file)
--- 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 228924097889c93e5453539e48590fd9c3fbd720..0a188a93bcda98394e5a0be8c92fa966c1ecc0dc 100644 (file)
--- 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 ec5cdb5d3ed00967fc689d676a0d7f06f4f3d81d..2ac6cd0df06020733bd3e584c1574373555bae67 100644 (file)
--- 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 d56de5fe515e62867adb5e2306c1c5010d63151e..81aea91468623d98f0d776c4cfd1307203f961e4 100644 (file)
--- 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 13de7aac17a77dc8b3a2298d9e5897db18cbf4c6..fe0f85f914a618db2dd14c7ff27ee03acae275ed 100644 (file)
--- 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 c5ccc79f7f573a53cda0f7f1d721216a73f3e2db..c7d7ffe9704ad75778071000b491d4223d35d932 100644 (file)
--- 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.
  *