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

 Changes to be committed:
	modified:   LICENSE
	modified:   README
	modified:   RELNOTES
	modified:   client/dhclient.8
	modified:   common/options.c
	modified:   configure
	modified:   configure.ac
	modified:   configure.ac+lt
	modified:   configure.ac-base
	modified:   configure.ac-lt
	modified:   keama/confparse.c
	modified:   keama/keama.8
	modified:   keama/keama.c
	modified:   keama/keama.h
	modified:   keama/options.c
	modified:   keama/parse.c
	modified:   server/dhcpd.c
	modified:   util/bind.sh

diff --git a/LICENSE b/LICENSE
index ffb01b7cf57f3eff22c0e5a99bb0511dec3a5b01..fa217c39a50413ab053d0185d0fcbe186d97045d 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
 # THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES

diff --git a/README b/README
index 2565d7e2ee8ef2c7e27cfb9165809d50f643d9bf..6b13d50209aa6bdeb811a7bde1b286b9754f10b2 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                            Version 4.4.1
-                           05 June 2019
+                            Version 4.4.2b1
+                           12 December 2019
 
                              README FILE
 
@@ -108,12 +108,12 @@ directory, it may not have up-to-date information).
 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.1.tar.gz
-       tar xvf dhcp-4.4.1.tar
+       gunzip dhcp-4.4.2b1.tar.gz
+       tar xvf dhcp-4.4.2b1.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.4.1 subdirectory that you've just created and
+Now, cd to the dhcp-4.4.2b1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index 1576286a035c0d1d3ef271d6d3daa7717905c3a9..d0b6eb3b82ce76be1b26f09601abf2fde4853846 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
                 Internet Systems Consortium DHCP Distribution
-                            Version 4.4.1
-                           28 February 2018
+                            Version 4.4.2b1
+                           18 December 2019
 
                              Release Notes
 
@@ -10,7 +10,24 @@ 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.
 
-The areas of focus for ISC DHCP 4.4 were:
+While release 4.4.2b1 is primarily a maintenance release that addresses a number
+of defects, it does introduce a few new features:
+
+- Keama - Keama is a migration utility that assists in converting ISC DHCP server
+  configuration files to Kea configuration files.  It is found in the keama
+  subdirectory and includes a README.md file with instructions on how to build it
+  as well as a manpage on its usage.
+
+- Two new server parameters related to ping checking were added:
+
+1. ping-cltt-secs which allows the user to specify the number of seconds that must
+   elapse since CLTT before a ping check is conducted.
+
+2. ping-timeout-ms which allows the user to specify the amount of time the server
+   waits for a ping-check response in milliseconds rather than in seconds.
+
+
+In general, the areas of focus for ISC DHCP 4.4 were:
 
 1. Dynamic DNS additions
 2. dhclient improvements
@@ -166,7 +183,7 @@ by Eric Young (eay@cryptsoft.com).
   duplicates of server-provided leases and to retain such leases
   after they have been used as the fallback active lease and
   DHCP service has been restored.  This allows them to be used
-  more than once during the lifetime of a dhclient instance. 
+  more than once during the lifetime of a dhclient instance.
   This applies to DHCPv4 operation only.
   [Gitlab #9]
 

diff --git a/client/dhclient.8 b/client/dhclient.8
index 81c8ee7273e4e374c8ca9f27a1576f903dfbcbf3..0ec9fc7662f7d1abf406f384ef82801dccf66ee4 100644 (file)
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -1,6 +1,6 @@
 .\"    $Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp $
 .\"
-.\" Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2019 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

diff --git a/common/options.c b/common/options.c
index 405f70496e1e673933f5f8e32160477dcf8b3b59..4e1fe99eaae14b73b48072bf6d00d1a5656c655d 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -3,7 +3,7 @@
    DHCP options parsing and reassembly. */
 
 /*
- * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2019 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/configure b/configure
index 51894cade4171823bffd326ed9923a2fd1dc7b9d..191c6e358b3c7f18138c94a85b0db82c17215d48 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.2-dev.
+# Generated by GNU Autoconf 2.69 for DHCP 4.4.2b1.
 #
 # 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.2-dev'
-PACKAGE_STRING='DHCP 4.4.2-dev'
+PACKAGE_VERSION='4.4.2b1'
+PACKAGE_STRING='DHCP 4.4.2b1'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 PACKAGE_URL=''
 
@@ -734,7 +734,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -847,7 +846,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1100,15 +1098,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1246,7 +1235,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir runstatedir
+               libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1359,7 +1348,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.2-dev to adapt to many kinds of systems.
+\`configure' configures DHCP 4.4.2b1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1388,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1430,7 +1418,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DHCP 4.4.2-dev:";;
+     short | recursive ) echo "Configuration of DHCP 4.4.2b1:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1589,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DHCP configure 4.4.2-dev
+DHCP configure 4.4.2b1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2394,7 +2382,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.2-dev, which was
+It was created by DHCP $as_me 4.4.2b1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3261,7 +3249,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dhcp'
- VERSION='4.4.2-dev'
+ VERSION='4.4.2b1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8089,7 +8077,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.2-dev, which was
+This file was extended by DHCP $as_me 4.4.2b1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8155,7 +8143,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.2-dev
+DHCP config.status 4.4.2b1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 7ec27800d139a246241efdd48a1e40fd22bec921..b2880303416e509b0a5fee837dbba5ba3555b616 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.2-dev],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.2b1],[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 7e3448c7c45b557235686a5d60d1830a9506a705..cadd0d538113a7553cde406192ff00e97b89a031 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.2-dev],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
 
 # for libtool
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/configure.ac-base b/configure.ac-base
index 302f6f0432f01921da06d3addab065c0c92a2f28..0d7e2d7c08f5ef6be18bf9b7d669c61b65780bf2 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.2-dev],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
 
 @BEGIN WITH LIBTOOL
 # for libtool

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

diff --git a/keama/confparse.c b/keama/confparse.c
index 5b9160645fae69237358c1dcbfe568561d9ed166..2c1865abf30988bb9ba96e3b531e56b84e159b30 100644 (file)
--- a/keama/confparse.c
+++ b/keama/confparse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2017, 2019 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/keama/keama.8 b/keama/keama.8
index 80a2823ab5b98189ddb0600cc56c1fdafdb8fdd8..8e4cc2c75bc0f60b9375757123f2ff92b01da5c2 100644 (file)
--- a/keama/keama.8
+++ b/keama/keama.8
@@ -1,6 +1,6 @@
 .\"    keama.8
 .\"
-.\" Copyright (c) 2017, 2018 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above

diff --git a/keama/keama.c b/keama/keama.c
index f1b50da02dc257d11352877c5d6dbaf1b42e4551..e2c41c326bd0e3f3b9dde9e275c960cf380853e2 100644 (file)
--- a/keama/keama.c
+++ b/keama/keama.c
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017, 2018 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2017-2019 by Internet Systems Consortium, Inc.("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/keama/keama.h b/keama/keama.h
index 19593ad7f4715f3ae3ca581741af87ca2c6b3e41..8dbb7eb1dc984e00182bce9ae1a35271db055dcd 100644 (file)
--- a/keama/keama.h
+++ b/keama/keama.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/keama/options.c b/keama/options.c
index 12fa5ddf1dcce3b8592f61b4ef93ead3c2d7d060..3f714108ff8e7cc33424c746b922ef7e8c358483 100644 (file)
--- a/keama/options.c
+++ b/keama/options.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/keama/parse.c b/keama/parse.c
index 3596d5d5a124f87054d066788bc98f6f7f43e037..e60fe95a30152e26aa4611a8f6c673b29c245612 100644 (file)
--- a/keama/parse.c
+++ b/keama/parse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 55ffae705653b682a2151f7cbfe7d6dac26ac7e8..f27a795e57f440c716a69a51c22221eed5eef40d 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2019 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-2018 Internet Systems Consortium.";
+"Copyright 2004-2019 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 896acc383311406ef97a45cbe2cdf016ff29a257..46c87b016ff451648df85144a368e30ec65f0c7c 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -73,7 +73,8 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
-       4.4.2-dev) noSNAP=snapshot BINDTAG=v9_11 ;;
+       4.4.2b1) noSNAP=snapshot BINDTAG=v9_11_8 ;;
+       4.4.2-dev) noSNAP=snapshot BINDTAG=v9_11_8 ;;
        4.4.1) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;
        4.4.0) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;
        4.4.0b1) noSNAP=snapshot BINDTAG=v9_11_2 ;;