From f69059ff044f3d37e1e2d40ecc194886af0fc5ea Mon Sep 17 00:00:00 2001
From: David Hankins <dhankins@isc.org>
Date: Tue, 1 Jun 2010 17:28:20 +0000
Subject: [PATCH] Preparing for 4.2.0b2.

---
 README       | 10 +++++-----
 RELNOTES     | 16 ++++++++++++++--
 configure.ac |  2 +-
 util/bind.sh |  5 +++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 3272296ac..ec708cbc6 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 	      Internet Systems Consortium DHCP Distribution
-			    Version 4.2.0b1
+			    Version 4.2.0b2
 			     30 March 2010
 
 			      README FILE
@@ -94,7 +94,7 @@ directory, it may not have up-to-date information).
 
 			    RELEASE STATUS
 
-This is ISC DHCP 4.2.0b1, a BETA quality release containing new
+This is ISC DHCP 4.2.0b2, a BETA quality release containing new
 features.
 
 In this release, the DHCPv6 server should be fully functional on Linux,
@@ -131,12 +131,12 @@ information.   On Digital Unix, type ``man pfilt''.
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	gunzip dhcp-4.2.0b1.tar.gz
-	tar xvf dhcp-4.2.0b1.tar
+	gunzip dhcp-4.2.0b2.tar.gz
+	tar xvf dhcp-4.2.0b2.tar
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-4.2.0b1 subdirectory that you've just created and
+Now, cd to the dhcp-4.2.0b2 subdirectory that you've just created and
 configure the source tree by typing:
 
 	./configure
diff --git a/RELNOTES b/RELNOTES
index f99dfb937..24821cee6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
 	      Internet Systems Consortium DHCP Distribution
-			     Version 4.2.0b1
-			      30 March 2010
+			     Version 4.2.0b2
+			       1 June 2010
 
 			      Release Notes
 
@@ -75,6 +75,18 @@ work on other platforms. Please report any problems and suggested fixes to
   value for v6) may be used by defining USE_OLD_DDNS_TTL in site.h
   [ISC-Bugs #21126]
 
+- libisc/libdns is now brought up to version 9.7.1rc1.  This corrects
+  three reported flaws in ISC DHCP;
+
+  o DHCP processes (dhcpd, dhclient) fail to start if one of either the
+    IPv4 or IPv6 address families is not present.  [ISC-Bugs #21122]
+
+  o Assertion failure when attempting to cancel a previously running DDNS
+    update.  [ISC-Bugs #21133]
+
+  o Compilation failure of libisc/libdns due to the use of a flexible
+    array member.  [ISC-Bugs #21316]
+
 			Changes since 4.2.0a2
 
 - Update the fsync code to work with the changes to the DDNS code.  It now
diff --git a/configure.ac b/configure.ac
index 54f651149..40f59af36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.2.0b1], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.2.0b2], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such
diff --git a/util/bind.sh b/util/bind.sh
index 77482baf6..98db583f7 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bind.sh,v 1.6.2.2 2010/03/24 17:51:09 dhankins Exp $
+# $Id: bind.sh,v 1.6.2.3 2010/06/01 17:28:20 dhankins Exp $
 
 # Get the bind distribution for the libraries
 # This script is used to build the DHCP distribution and shouldn't be shipped
@@ -29,7 +29,8 @@ binddir=$topdir/bind
 case $# in 
     1)
 	case "$1" in 
-	4.2.0b1|4.2.0) BINDTAG=v9_7_0_P1 ;;
+	4.2.0b2|4.2.0) BINDTAG=v9_7_1rc1 ;;
+	4.2.0b1) BINDTAG=v9_7_0_P1 ;;
 	4.2.0a2|4.2.0a1|4.2.0) BINDTAG=v9_7_0b3 ;;
 	*) echo "bind.sh: unsupported version: $1" >&2
 	   exit 1
-- 
2.47.3