2
0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00

[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
This commit is contained in:
Thomas Markwalder 2019-12-11 12:24:01 -05:00
parent 2661204d66
commit 82e0ea5760
18 changed files with 54 additions and 48 deletions

View File

@ -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 # Copyright (c) 1995-2003 by Internet Software Consortium
# #
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES # THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES

10
README
View File

@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution Internet Systems Consortium DHCP Distribution
Version 4.4.1 Version 4.4.2b1
05 June 2019 12 December 2019
README FILE 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 To build the DHCP Distribution, unpack the compressed tar file using
the tar utility and the gzip command - type something like: the tar utility and the gzip command - type something like:
gunzip dhcp-4.4.1.tar.gz gunzip dhcp-4.4.2b1.tar.gz
tar xvf dhcp-4.4.1.tar tar xvf dhcp-4.4.2b1.tar
CONFIGURING IT 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 the source tree by typing:
./configure ./configure

View File

@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution Internet Systems Consortium DHCP Distribution
Version 4.4.1 Version 4.4.2b1
28 February 2018 18 December 2019
Release Notes 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 MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0
license terms. 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 1. Dynamic DNS additions
2. dhclient improvements 2. dhclient improvements
@ -166,7 +183,7 @@ by Eric Young (eay@cryptsoft.com).
duplicates of server-provided leases and to retain such leases duplicates of server-provided leases and to retain such leases
after they have been used as the fallback active lease and after they have been used as the fallback active lease and
DHCP service has been restored. This allows them to be used 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. This applies to DHCPv4 operation only.
[Gitlab #9] [Gitlab #9]

View File

@ -1,6 +1,6 @@
.\" $Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp $ .\" $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 .\" Copyright (c) 1996-2003 by Internet Software Consortium
.\" .\"
.\" This Source Code Form is subject to the terms of the Mozilla Public .\" This Source Code Form is subject to the terms of the Mozilla Public

View File

@ -3,7 +3,7 @@
DHCP options parsing and reassembly. */ 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 * Copyright (c) 1995-2003 by Internet Software Consortium
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public

34
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # 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>. # Report bugs to <dhcp-users@isc.org>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='DHCP' PACKAGE_NAME='DHCP'
PACKAGE_TARNAME='dhcp' PACKAGE_TARNAME='dhcp'
PACKAGE_VERSION='4.4.2-dev' PACKAGE_VERSION='4.4.2b1'
PACKAGE_STRING='DHCP 4.4.2-dev' PACKAGE_STRING='DHCP 4.4.2b1'
PACKAGE_BUGREPORT='dhcp-users@isc.org' PACKAGE_BUGREPORT='dhcp-users@isc.org'
PACKAGE_URL='' PACKAGE_URL=''
@ -734,7 +734,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@ -847,7 +846,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1100,15 +1098,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; 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) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1246,7 +1235,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # 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. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF 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]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1399,7 +1388,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1430,7 +1418,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in 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 esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1601,7 +1589,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
DHCP configure 4.4.2-dev DHCP configure 4.4.2b1
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2394,7 +2382,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. 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 generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3261,7 +3249,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='dhcp' PACKAGE='dhcp'
VERSION='4.4.2-dev' VERSION='4.4.2b1'
cat >>confdefs.h <<_ACEOF 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 # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" 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 generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -8155,7 +8143,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ 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, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@ -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, # we specify "foreign" to avoid having to have the GNU mandated files,

View File

@ -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 # for libtool
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

View File

@ -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 @BEGIN WITH LIBTOOL
# for libtool # for libtool

View File

@ -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, # we specify "foreign" to avoid having to have the GNU mandated files,

View File

@ -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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -1,6 +1,6 @@
.\" keama.8 .\" 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 .\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above .\" purpose with or without fee is hereby granted, provided that the above

View File

@ -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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -3,7 +3,7 @@
DHCP Server Daemon. */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
@ -27,7 +27,7 @@
*/ */
static const char copyright[] = 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 arr [] = "All rights reserved.";
static const char message [] = "Internet Systems Consortium DHCP Server"; static const char message [] = "Internet Systems Consortium DHCP Server";
static const char url [] = static const char url [] =

View File

@ -73,7 +73,8 @@ case $# in
### For ease of use, this records the sticky tag of versions ### For ease of use, this records the sticky tag of versions
### released with each point release. ### 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.1) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;
4.4.0) 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 ;; 4.4.0b1) noSNAP=snapshot BINDTAG=v9_11_2 ;;