[master] Versioning updates for v4.3.2b1

diff --git a/README b/README
index f1dcfadfd1f79984570d274a7f3827cbfb714d4e..23449eb881a3b65572010695d46c28e998c743d5 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.3.2.pre-beta
-                             08 January 2015
+                             Version 4.3.2b1
+                             29 January 2015
 
                              README FILE
 
@@ -141,12 +141,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.3.1.tar.gz
-       tar xvf dhcp-4.3.1.tar
+       gunzip dhcp-4.3.2b1.tar.gz
+       tar xvf dhcp-4.3.2b1.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.3.1 subdirectory that you've just created and
+Now, cd to the dhcp-4.3.2b1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index aff13dd220cf4a738481ec951cbeb579b9fc9b6e..00e5d6eec3576e09d75eacb5db18e84273c7bbf9 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,5 @@
              Internet Systems Consortium DHCP Distribution
-                          Version 4.3.2.pre-beta
+                          Version 4.3.2b1
                             08 January 2015
 
                              Release Notes
@@ -52,6 +52,17 @@ 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.3.2.pre-beta
+
+- Corrected inconsistencies in dhcrelay's setting the upper interface hop count
+  limit such that it now sets it to 32 when the upstream address is a multicast
+  address per RFC 3315 Section 20. Prior to this if the -u argument preceded
+  the -l argument on the command line or if the same interface was specified
+  for both; the logic to set the hop limit count for the upper interface was
+  skipped.  This caused the hop count limit to be set to the default value
+  (typically 1) in the outbound upstream packets.
+  [ISC-Bugs #37426]
+
                        Changes since 4.3.1
 
 - Corrected parser's right brace matching when a statement contains an error.
@@ -246,15 +257,6 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #36780]
   [ISC-Bugs #32228]
 
-- Corrected inconsistencies in dhcrelay's setting the upper interface hop count
-  limit such that it now sets it to 32 when the upstream address is a multicast
-  address per RFC 3315 Section 20. Prior to this if the -u argument preceded
-  the -l argument on the command line or if the same interface was specified
-  for both; the logic to set the hop limit count for the upper interface was
-  skipped.  This caused the hop count limit to be set to the default value
-  (typically 1) in the outbound upstream packets.
-  [ISC-Bugs #37426]
-
                        Changes since 4.3.1b1
 
 - Modify the linux and openwrt dhclient scripts to process information

diff --git a/configure.ac b/configure.ac
index d829f5c72c09b66916ffe1bfe19c56721bd5a6eb..5c74f2067f9b6857b2feeae63a245114e29304a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.3.2.pre-beta],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.3.2b1],[dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 4d1d6fd221f5e6c83e512115c4f218edf7861e8b..15b49976db9ebf45c1461ec6d6ae3f1962c1dec5 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -133,7 +133,7 @@ static int strip_relay_agent_options(struct interface_info *,
                                     struct dhcp_packet *, unsigned);
 
 static const char copyright[] =
-"Copyright 2004-2014 Internet Systems Consortium.";
+"Copyright 2004-2015 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";

diff --git a/util/bind.sh b/util/bind.sh
index f60750a314ad91b5b38735cdb5bbd32cc5a20b14..6ac68b5d346aef44a004e519359698858fc9dfdc 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -59,6 +59,7 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
+       4.3.2b1) BINDTAG=v9_9_7rc1 ;;
        4.3.2.pre-beta) BINDTAG=v9_9_5_P1 ;;
        4.3.1b1|4.3.1rc1|4.3.1) BINDTAG=v9_9_5_P1 ;;
        4.3.0) BINDTAG=v9_9_5 ;;