Merge branch 'esv-r16-p2-release' into 'v4_1_esv'

pre r16-p2 release changes

See merge request isc-private/dhcp!13

1 files changed, 9 insertions, 21 deletions

diff --git a/RELNOTES b/RELNOTES
index e9d3a879..ebb8122a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,17 +1,16 @@
               Internet Systems Consortium DHCP Distribution
 
                            Version 4.1-ESV-R16-P2
-                               ?? ???? 2022
+                              5 October 2022
                                Release Notes
 
 Version 4.1-ESV-R16-P2 is a security release of an extended support version
 (ESV) fixing a possible reference counter overflow in the server while adding
 options to lease query responses and a possible memory leak in the client and
-server when parsing inbound packets with malformed FQDN options.  ESVs are
-intended for users who have longer upgrade constraints. Please see our web page:
-http://www.isc.org/downloads/software-support-policy/
+server when parsing inbound packets with malformed FQDN options.  
 
-for more information on ESVs.
+NOTE: This software is now End-Of-Life. This is the final release planned. 
+We will continue to keep the public issue tracker and user mailing list open.
 
 ISC DHCP 4.1.x includes several new DHCPv6 features that were not included
 in DHCP 4.0.x.  These include:
@@ -27,9 +26,7 @@ in DHCP 4.0.x.  These include:
 - Basic and partial DHCPv6 leasequery support
 
 There are a number of DHCPv6 limitations and features missing in this
-release, which will be addressed in the future:
-
-- Only Solaris, Linux, FreeBSD, NetBSD, and OpenBSD are supported.
+release:
 
 - Only a single address is supported per IA.
 
@@ -58,13 +55,12 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
-Our next major version of ISC DHCP, version 4.4.0, will be re-licensed under
+Our next major version of ISC DHCP, version 4.4.0, has been re-licensed under
 the Mozilla Public License, MPL 2.0.  To read the MPL 2.0 license terms, please
 refer to: https://www.mozilla.org/en-US/MPL/2.0/.
 
-This change will apply to ISC DHCP version 4.4.0 and any 4.4.x versions.  Older
-versions already published under the ISC license will remain under the ISC
-license.  Those unsure whether or not the license change affects their use of
+This branch, 4.1-ESV, remains under the ISC license.  
+Those unsure whether or not the license change affects their use of
 ISC DHCP, or who wish to discuss how to comply with the license may contact
 ISC at info@isc.org or use https://www.isc.org/mission/contact/.
 
@@ -74,7 +70,6 @@ dhcp-users@lists.isc.org.
 
 			Changes since 4.1-ESV-R16-P1
 
-<<<<<<< HEAD
 ! Corrected a reference count leak that occurs when the server builds
   responses to leasequery packets.  Thanks to VictorV of Cyber Kunlun
   Lab for reporting the issue.
@@ -82,16 +77,9 @@ dhcp-users@lists.isc.org.
   CVE: CVS-2022-2928
 
 ! Corrected a memory leak that occurs when unpacking a packet that has an
-  FQDN option (81) that contains a label whose lenght is greater than 63.
+  FQDN option (81) that contains a label with length greater than 63 bytes.
   [Gitblab #254]
   CVE: CVS-2022-2929
-=======
- ! Corrected a memory leak that occurs when unpacking a packet that has an
-   FQDN option (81) that contains a label whose lenght is greater than 63.
-   Thanks to VictorV of Cyber Kunlun Lab for reporting the issue.
-   [Gitblab #254]
-   CVE: CVS-2022-2929
->>>>>>> [#254] Updated RELNOTES
 
 			Changes since 4.1-ESV-R16