summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-12-11 12:24:01 -0500
committerThomas Markwalder <tmark@isc.org>2019-12-11 12:24:01 -0500
commit82e0ea5760d5ba3d16e9f1eef5549097e4c3a8dd (patch)
tree28b94a95dcb794eaad551cd6e215c56b289e6d2e
parent2661204d66ec4b79b1454451cb03aaac29c4cbaa (diff)
downloadisc-dhcp-82e0ea5760d5ba3d16e9f1eef5549097e4c3a8dd.tar.gz
[master] Pre-release tag prep for 4.4.2b1: version #, copyright etc...v4_4_2b1
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
-rw-r--r--LICENSE2
-rw-r--r--README10
-rw-r--r--RELNOTES25
-rw-r--r--client/dhclient.82
-rw-r--r--common/options.c2
-rwxr-xr-xconfigure34
-rw-r--r--configure.ac2
-rw-r--r--configure.ac+lt2
-rw-r--r--configure.ac-base2
-rw-r--r--configure.ac-lt2
-rw-r--r--keama/confparse.c2
-rw-r--r--keama/keama.82
-rw-r--r--keama/keama.c2
-rw-r--r--keama/keama.h2
-rw-r--r--keama/options.c2
-rw-r--r--keama/parse.c2
-rw-r--r--server/dhcpd.c4
-rw-r--r--util/bind.sh3
18 files changed, 54 insertions, 48 deletions
diff --git a/LICENSE b/LICENSE
index ffb01b7c..fa217c39 100644
--- 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 2565d7e2..6b13d502 100644
--- 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 1576286a..d0b6eb3b 100644
--- 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 81c8ee72..0ec9fc76 100644
--- 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 405f7049..4e1fe99e 100644
--- 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 51894cad..191c6e35 100755
--- 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 7ec27800..b2880303 100644
--- 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 7e3448c7..cadd0d53 100644
--- 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 302f6f04..0d7e2d7c 100644
--- 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 7ec27800..b2880303 100644
--- 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 5b916064..2c1865ab 100644
--- 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 80a2823a..8e4cc2c7 100644
--- 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 f1b50da0..e2c41c32 100644
--- 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 19593ad7..8dbb7eb1 100644
--- 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 12fa5ddf..3f714108 100644
--- 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 3596d5d5..e60fe95a 100644
--- 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 55ffae70..f27a795e 100644
--- 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 896acc38..46c87b01 100644
--- 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 ;;