Browse Source

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

Changes to be committed:
	modified:   LICENSE
	modified:   README
	modified:   RELNOTES
	modified:   client/dhclient.c
	modified:   common/discover.c
	modified:   configure
	modified:   configure.ac
	modified:   configure.ac+lt
	modified:   configure.ac-base
	modified:   configure.ac-lt
	modified:   relay/dhcrelay.c
	modified:   relay/tests/relay_unittests.c
	modified:   server/dhcpd.c
	modified:   server/failover.c
	modified:   util/bind.sh
master
Thomas Markwalder 1 year ago
parent
commit
109fa1d093
  1. 2
      LICENSE
  2. 10
      README
  3. 7
      RELNOTES
  4. 4
      client/dhclient.c
  5. 7
      common/discover.c
  6. 20
      configure
  7. 2
      configure.ac
  8. 2
      configure.ac+lt
  9. 2
      configure.ac-base
  10. 2
      configure.ac-lt
  11. 4
      relay/dhcrelay.c
  12. 2
      relay/tests/relay_unittests.c
  13. 4
      server/dhcpd.c
  14. 2
      server/failover.c
  15. 3
      util/bind.sh

2
LICENSE

@ -1,4 +1,4 @@
# Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
# Copyright (c) 2004-2020 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

10
README

@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
Version 4.4.2b1
12 December 2019
Version 4.4.2
22 January 2020
README FILE
@ -97,12 +97,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.2b1.tar.gz
tar xvf dhcp-4.4.2b1.tar
gunzip dhcp-4.4.2.tar.gz
tar xvf dhcp-4.4.2.tar
CONFIGURING IT
Now, cd to the dhcp-4.4.2b1 subdirectory that you've just created and
Now, cd to the dhcp-4.4.2 subdirectory that you've just created and
configure the source tree by typing:
./configure

7
RELNOTES

@ -1,7 +1,6 @@
Internet Systems Consortium DHCP Distribution
Version 4.4.2b1
18 December 2019
Version 4.4.2
22 January 2020
Release Notes
NEW FEATURES
@ -10,7 +9,7 @@ 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.
While release 4.4.2b1 is primarily a maintenance release that addresses a number
While release 4.4.2 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

4
client/dhclient.c

@ -3,7 +3,7 @@
DHCP Client. */
/*
* Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2020 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
@ -77,7 +77,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-2019 Internet Systems Consortium.";
static const char copyright[] = "Copyright 2004-2020 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/";

7
common/discover.c

@ -3,7 +3,7 @@
Find and identify the network interfaces. */
/*
* Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2020 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
@ -39,7 +39,10 @@
# include <net/if6.h>
#endif
struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
struct interface_info *interfaces = 0;
struct interface_info *dummy_interfaces = 0;
struct interface_info *fallback_interface = 0;
int interfaces_invalidated;
int quiet_interface_discovery;
u_int16_t local_port;

20
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.2b1.
# Generated by GNU Autoconf 2.69 for DHCP 4.4.2.
#
# 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.2b1'
PACKAGE_STRING='DHCP 4.4.2b1'
PACKAGE_VERSION='4.4.2'
PACKAGE_STRING='DHCP 4.4.2'
PACKAGE_BUGREPORT='dhcp-users@isc.org'
PACKAGE_URL=''
@ -1350,7 +1350,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.2b1 to adapt to many kinds of systems.
\`configure' configures DHCP 4.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1420,7 +1420,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of DHCP 4.4.2b1:";;
short | recursive ) echo "Configuration of DHCP 4.4.2:";;
esac
cat <<\_ACEOF
@ -1591,7 +1591,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
DHCP configure 4.4.2b1
DHCP configure 4.4.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2384,7 +2384,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.2b1, which was
It was created by DHCP $as_me 4.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3251,7 +3251,7 @@ fi
# Define the identity of the package.
PACKAGE='dhcp'
VERSION='4.4.2b1'
VERSION='4.4.2'
cat >>confdefs.h <<_ACEOF
@ -8093,7 +8093,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.2b1, which was
This file was extended by DHCP $as_me 4.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -8159,7 +8159,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.2b1
DHCP config.status 4.4.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac

@ -1,4 +1,4 @@
AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,

2
configure.ac+lt

@ -1,4 +1,4 @@
AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
# for libtool
AC_CONFIG_MACRO_DIR([m4])

2
configure.ac-base

@ -1,4 +1,4 @@
AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
@BEGIN WITH LIBTOOL
# for libtool

2
configure.ac-lt

@ -1,4 +1,4 @@
AC_INIT([DHCP],[4.4.2b1],[dhcp-users@isc.org])
AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,

4
relay/dhcrelay.c

@ -3,7 +3,7 @@
DHCP/BOOTP Relay Agent. */
/*
* Copyright(c) 2004-2019 by Internet Systems Consortium, Inc.("ISC")
* Copyright(c) 2004-2020 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
@ -149,7 +149,7 @@ extern int strip_relay_agent_options(struct interface_info *,
static void request_v4_interface(const char* name, int flags);
static const char copyright[] =
"Copyright 2004-2019 Internet Systems Consortium.";
"Copyright 2004-2020 Internet Systems Consortium.";
static const char arr[] = "All rights reserved.";
static const char message[] =
"Internet Systems Consortium DHCP Relay Agent";

2
relay/tests/relay_unittests.c

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2019-2020 by Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this

4
server/dhcpd.c

@ -3,7 +3,7 @@
DHCP Server Daemon. */
/*
* Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2020 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-2019 Internet Systems Consortium.";
"Copyright 2004-2020 Internet Systems Consortium.";
static const char arr [] = "All rights reserved.";
static const char message [] = "Internet Systems Consortium DHCP Server";
static const char url [] =

2
server/failover.c

@ -3,7 +3,7 @@
Failover protocol support code... */
/*
* Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public

3
util/bind.sh

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2009-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2009-2020 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@ -73,6 +73,7 @@ case $# in
### For ease of use, this records the sticky tag of versions
### released with each point release.
###
4.4.2) noSNAP=snapshot BINDTAG=v9_11_14 ;;
4.4.2b1) noSNAP=snapshot BINDTAG=v9_11_14 ;;
4.4.2-dev) noSNAP=snapshot BINDTAG=v9_11_8 ;;
4.4.1) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;

Loading…
Cancel
Save