[v4_1_esv] Pre-release tag prep for 4.1-ESV-R16: version #, copyright etc...

 Changes to be committed:
	modified:   LICENSE
	modified:   README
	modified:   RELNOTES
	modified:   client/dhclient.c
	modified:   common/discover.c
	modified:   configure.ac
	modified:   relay/dhcrelay.c
	modified:   relay/tests/relay_unittests.c
	modified:   server/dhcpd.c

diff --git a/LICENSE b/LICENSE
index eadd727a605e7481dac17c01f9efeb755b06c4be..cf4e6307efe3ca870a58ada283a3a51471d65e30 100644 (file)
--- a/LICENSE
+++ b/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
 #
 # Permission to use, copy, modify, and distribute this software for any

diff --git a/README b/README
index f3385bce7478eb1926285622c4ef7b73a997a43d..8908442706aa9fbd842f1ccbcf0929ffb1af47bc 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
               Internet Systems Consortium DHCP Distribution
-                          Version 4.1-ESV-R16b1
-                            18 December 2019
+                          Version 4.1-ESV-R16
+                            01 January 2020
 
                              README FILE
 
@@ -98,7 +98,7 @@ directory, it may not have up-to-date information).
 
                            RELEASE STATUS
 
-This is ISC DHCP 4.1-ESV-R16b1, an extended support (ESV) release that
+This is ISC DHCP 4.1-ESV-R16, an extended support (ESV) release that
 provides patches for several bugs.
 
 ESVs are intended for users who have longer upgrade constraints 
@@ -139,12 +139,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.1-ESV-R16b1.tar.gz
-       tar xvf dhcp-4.1-ESV-R16b1.tar
+       gunzip dhcp-4.1-ESV-R16.tar.gz
+       tar xvf dhcp-4.1-ESV-R16.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.1-ESV-R16b1 subdirectory that you've just created and
+Now, cd to the dhcp-4.1-ESV-R16 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index 0db52abdff093e48165c35ae3f7c239cc59aeb64..42a90fb447284983f45b6b61b9d09f1c18c538ae 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,16 +1,18 @@
               Internet Systems Consortium DHCP Distribution
 
-                          Version 4.1-ESV-R16b1
-                              18 December 2019
+                           Version 4.1-ESV-R16
+                             01 January 2020
 
                               Release Notes
 
                                NEW FEATURES
 
-Version 4.1-ESV-R16b1 is a maintenance release of an extended support version
+Version 4.1-ESV-R16 is a maintenance release of an extended support version
 (ESV) release.  ESVs are intended for users who have longer upgrade
-constraints.  Please see our web page
+constraints.  Please see our web page:
+
 http://www.isc.org/downloads/software-support-policy/
+
 for more information on ESVs.
 
 ISC DHCP 4.1.x includes several new DHCPv6 features that were not included

diff --git a/client/dhclient.c b/client/dhclient.c
index 554256f97c80490bac0f37d4b77838d170078761..d1824e9dc929c4710249ecd3cb1d4cd7ec80677a 100644 (file)
--- a/client/dhclient.c
+++ b/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
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -66,7 +66,7 @@ struct data_string default_duid;
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
 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 Client";
 static const char url [] = 

diff --git a/common/discover.c b/common/discover.c
index d6115b34c71d4a5a3b01e750a9b34f22e516cbe1..649ce3e5cb39a73c8eea70325e0150d2e6848e01 100644 (file)
--- a/common/discover.c
+++ b/common/discover.c
@@ -3,7 +3,7 @@
    Find and identify the network interfaces. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -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;

diff --git a/configure.ac b/configure.ac
index 901b77658c8f2d06d80dcf78e7cbb9260a38d1fb..e54cab1c3ef7e17a021a551014ae449014358cf2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.1-ESV-R16b1], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.1-ESV-R16], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 73fd30541f191eb618a73ce0ed3f8b69810a7690..ac9b6c8eeaefd103de754bd686910ad59d362458 100644 (file)
--- a/relay/dhcrelay.c
+++ b/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
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -133,7 +133,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";

diff --git a/relay/tests/relay_unittests.c b/relay/tests/relay_unittests.c
index 2297050aeb4f653e8905d723391cd08b76a92ed1..cba14bd587d5e43ae6268efe5ae635dcf6ef1784 100644 (file)
--- a/relay/tests/relay_unittests.c
+++ b/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

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 678ec9c5874d228898697370f3fcb1dbbce315c3..e8b7e429f7d359281854f8b2dc88c2310f06e4ff 100644 (file)
--- a/server/dhcpd.c
+++ b/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
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -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 [] =