[master] Pre-release tag prep for 4.4.0b1: version #, copyright etc...

diff --git a/LICENSE b/LICENSE
index 303746ae903baace544a9f9e6bbb2b7c1933e5d9..ae3fb470700fedd76c0aad3184bfb7fafe59382e 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
 # This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/README b/README
index 86064b7ac442d443a097e08bc5c93d532712b9e0..f98e3b63f029eacf15a829338ec267183cfb6858 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                           Version 4.4.0a1
-                           11 December 2017
+                           Version 4.4.0b1
+                           09 January 2018
 
                              README FILE
 
@@ -142,12 +142,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.4.0a1.tar.gz
-       tar xvf dhcp-4.4.0a1.tar
+       gunzip dhcp-4.4.0b1.tar.gz
+       tar xvf dhcp-4.4.0b1.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.4.0a1 subdirectory that you've just created and
+Now, cd to the dhcp-4.4.0b1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index fd345620f7cc59d31f1e72b16445e65e091a8029..db38ab02f6b5d7619fd5af489b8ae010cc1a7033 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,14 +1,56 @@
                 Internet Systems Consortium DHCP Distribution
-                           Version 4.4.0a1
-                           11 December 2017
+                           Version 4.4.0b1
+                           09 January 2018
 
                              Release Notes
 
                               NEW FEATURES
 
-The major "theme" for ISC DHCP 4.4.x ....
+Please note that that ISC DHCP is now licensed under the Mozilla Public License,
+MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0
+license terms.
 
-    <TBD PRIOR TO RELEASE OF 4.4.0>
+The areas of focus for ISC DHCP 4.4.0 were:
+
+1. Dynamic DNS additions
+2. dhclient improvements
+3. Support for dynamic shared libraries
+
+Dynamic DNS Improvements:
+
+- We added three new server configuration parameters which influence DDNS
+  conflict resolution:
+
+    1. ddns-dual-stack-mixed-mode - alters DNS conflict resolution behavior
+    to mitigate issues with non-compliant clients in dual stack environments.
+
+    2. ddns-guard-id-must-match - relaxes the DHCID RR client id matching
+    requirement of DNS conflict resolution.
+
+    3. ddns-other-guard-is-dynamic - alters dual-stack-mixed-mode behavior to
+    allow unguarded DNS entries to be overwritten in certain cases
+
+- The server now honors update-static-leases parameter for static DHCPv6
+  hosts.
+
+dhclient Improvements:
+
+  - We've added two new command line parameters to dhclient:
+
+    1. --prefix-len-hint - directs dhclient to use the given length as
+    the prefix length hint when requesting prefixes
+
+    2. --declient-wait-time - instructs the client to wiat the given number
+    of seconds after declining an IPv4 address before issuing a discover
+
+  - dhclient will now generate a DHCPv6 DECLINE message when the client script
+    indicates a DAD failure
+
+Dynamic shared library support:
+
+  Configure script, configure.ac+lt, which supports libtool is now provided
+  with the source tar ball.  This script can be used to configure ISC DHCP
+  to build with libtool and thus use dynamnic shared libaries.
 
 For information on how to install, configure and run this software, as
 well as how to find documentation and report bugs, please consult the
@@ -25,18 +67,9 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
-Please note that as of version 4.4.0, ISC DHCP is licensed under the Mozilla
-Public License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/
-to read the MPL 2.0 license terms.
+               Changes since 4.4.0a1
 
-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 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/.
-
-We welcome comments from DHCP users, about this or anything else we do.  Email
-Vicky Risk, Product Manager at vicky@isc.org or discuss on
-dhcp-users@lists.isc.org.
+- None
 
                Changes since 4.3.6 (New Features)
 

diff --git a/client/dhclient.c b/client/dhclient.c
index 55e1c61c333fcc3ea0b27bc6d08b2230ab8d54f5..9435b2f907186876845e1834f03425e6e31a6d05 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -75,7 +75,7 @@ int decline_wait_time = 10; /* Default to 10 secs per, RFC 2131, 3.1.5 */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
 #ifndef UNIT_TEST
-static const char copyright[] = "Copyright 2004-2017 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2018 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Client";
 static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";

diff --git a/configure b/configure
index e76404a804e861748910cb511d56c97464409589..9bc9be2966df1e203cc23724150639aa20969a39 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for DHCP 4.4.0a1.
+# Generated by GNU Autoconf 2.69 for DHCP 4.4.0b1.
 #
 # Report bugs to <dhcp-users@isc.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='DHCP'
 PACKAGE_TARNAME='dhcp'
-PACKAGE_VERSION='4.4.0a1'
-PACKAGE_STRING='DHCP 4.4.0a1'
+PACKAGE_VERSION='4.4.0b1'
+PACKAGE_STRING='DHCP 4.4.0b1'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 PACKAGE_URL=''
 
@@ -1349,7 +1349,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures DHCP 4.4.0a1 to adapt to many kinds of systems.
+\`configure' configures DHCP 4.4.0b1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1419,7 +1419,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DHCP 4.4.0a1:";;
+     short | recursive ) echo "Configuration of DHCP 4.4.0b1:";;
    esac
   cat <<\_ACEOF
 
@@ -1590,7 +1590,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DHCP configure 4.4.0a1
+DHCP configure 4.4.0b1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2383,7 +2383,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by DHCP $as_me 4.4.0a1, which was
+It was created by DHCP $as_me 4.4.0b1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3250,7 +3250,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dhcp'
- VERSION='4.4.0a1'
+ VERSION='4.4.0b1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8100,7 +8100,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by DHCP $as_me 4.4.0a1, which was
+This file was extended by DHCP $as_me 4.4.0b1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8166,7 +8166,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-DHCP config.status 4.4.0a1
+DHCP config.status 4.4.0b1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 62593d3f4855446a29aced8158095be27c453220..cf95d968bed2d46daa21c2eb5a5372a0bf20171c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org])
 
 
 # we specify "foreign" to avoid having to have the GNU mandated files,

diff --git a/configure.ac+lt b/configure.ac+lt
index ede7ec046cd69998cf4cedbdf931a8b8f9505b50..eb6a59a2fb0181fc899006bb9a79ed260f6b3b83 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org])
 
 # for libtool
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/configure.ac-base b/configure.ac-base
index c6136ca924aee2e57c319bc55b42396a03c3d078..e1e11d29469cb661b78a8d98e9673336a71674d2 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org])
 
 @BEGIN WITH LIBTOOL
 # for libtool

diff --git a/configure.ac-lt b/configure.ac-lt
index 62593d3f4855446a29aced8158095be27c453220..cf95d968bed2d46daa21c2eb5a5372a0bf20171c 100644 (file)
--- a/configure.ac-lt
+++ b/configure.ac-lt
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org])
 
 
 # we specify "foreign" to avoid having to have the GNU mandated files,

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index aaedd8ff83b0ee311479df01f423919839bc9625..d8caaaf6d70d013f587416a862fb5ce06fe30789 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2017 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2018 by Internet Systems Consortium, Inc.("ISC")
  * Copyright(c) 1997-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -142,7 +142,7 @@ static int strip_relay_agent_options(struct interface_info *,
 static void request_v4_interface(const char* name, int flags);
 
 static const char copyright[] =
-"Copyright 2004-2017 Internet Systems Consortium.";
+"Copyright 2004-2018 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";

diff --git a/server/dhcpd.c b/server/dhcpd.c
index dfc617d03634709cb7950c6801ba3834fc6be15a..4ac8bd7569522855ac26e146ee95a1d508abf98c 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -27,7 +27,7 @@
  */
 
 static const char copyright[] =
-"Copyright 2004-2017 Internet Systems Consortium.";
+"Copyright 2004-2018 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Server";
 static const char url [] =

diff --git a/util/bind.sh b/util/bind.sh
index 8fe5a25e7ece0fcc6a9ff0ede9275c70ba1f07cf..52b61da5956bb5459dca6e1f4e9eccc6147a2917 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -58,6 +58,7 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
+       4.4.0b1) noSNAP=snapshot BINDTAG=v9_11_2 ;;
        4.4.0a1) noSNAP=snapshot BINDTAG=v9_11_2 ;;
        4.3.4|4.3.4b1) BINDTAG=v9_9_8_P4 ;;
        4.3.3) BINDTAG=v9_9_7_P3 ;;