[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 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 bef92d8b51ebdaf9f0d1a56cd4f3952f4355c708..3a3a2d3dbd3341217f22d7043ae45c3b12fef038 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
 
@@ -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 94b3459ed008c769aa4649ec5113031e778d7f90..4e72ad5e1a43cabe012cfebe8257b2301eff8b2f 100644 (file)
--- 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
 <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.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 d96139d20b05a3bc90e7a6b76be0fa99ef3b5623..eaa95f9e327adf721f39533c95f2bc3532f190ce 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 5f1cd7d224db9ef97662ae9b2ff40ebed9836c2c..d86cf447b572c4e31bd36161a6cf980ece228a26 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 5b68390705ec2a36851d14f65f1a523906b3623a..5c4c73d5c5620502c1579afc3e624cf9f3f9b5fc 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 051184979e2aedfc9116c83cd3f15e2b66632daa..2163039c87782f2f9c665cf854d84baaae84d036 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 d24a177b23f7807547ebf4b3e1a1ec59ff5fd2c6..1a58d1a9b75fbf4363579ad33ab6b6cce8583750 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 9036697e34bcf96302d1ac5f186c8d546419d9c5..124d1dde9a25fc74eb26e646dba4081f8c59b00e 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 8513d7df12b9ec1f311603f54c26f411e9cfbab0..a26e0ef56426016c45e1fc6b6b316d11c61ef5db 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.
  *