Updates for 4.2.1b1 - dates, copyrights, versions, bind version

diff --git a/LICENSE b/LICENSE
index 10c0fbcb356586f499c4a2a9fab184ad3344fe97..e537b29cf81f1856f9d474f5861521f340a42dfe 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2011 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 424b392700e14c14cf284977f936445b09ccd8e0..8c445c7f0baedc92e19c2a3c9428f17eb19cbc5a 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                            Version 4.2.0
-                             9 July 2010
+                            Version 4.2.1b1
+                            25 January 2011
 
                              README FILE
 
@@ -94,7 +94,7 @@ directory, it may not have up-to-date information).
 
                            RELEASE STATUS
 
-This is ISC DHCP 4.2.0, a release containing new features.
+This is ISC DHCP 4.2.1b1, a beta maintenance release containing patches.
 
 In this release, the DHCPv6 server should be fully functional on Linux,
 Solaris, or any BSD.  The DHCPv6 client should be similarly functional
@@ -130,12 +130,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.2.0.tar.gz
-       tar xvf dhcp-4.2.0.tar
+       gunzip dhcp-4.2.1b1.tar.gz
+       tar xvf dhcp-4.2.1b1.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.2.0 subdirectory that you've just created and
+Now, cd to the dhcp-4.2.1b1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index eba4d04b9e4f945b8baa5910fd31252c088b4bd5..da99676b489624701ffc7519a8a6b7521717b455 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                            Version 4.2.0
-                             9 July 2010
+                            Version 4.2.1b1
+                            25 January 2011
 
                              Release Notes
 

diff --git a/client/dhclient.c b/client/dhclient.c
index b98484e365cc979dde16c552180c45703db37ac3..dc19e8be81d9a8f38aa5f76a35b2b1d2254689f8 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2011 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
@@ -64,10 +64,12 @@ int duid_type = 0;
    assert (state_is == state_shouldbe). */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
-static const char copyright[] = "Copyright 2004-2010 Internet Systems Consortium.";
+static const char copyright[] =
+"Copyright 2004-2011 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/";
+static const char url [] = 
+"For info, please visit https://www.isc.org/software/dhcp/";
 
 u_int16_t local_port = 0;
 u_int16_t remote_port = 0;

diff --git a/configure.ac b/configure.ac
index 76616c06bb74b28ca29e8a7070724c175b5e3bc2..86458b1e4bc60501803e9b17ac1fe6088541e996 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.2.0], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.2.1b1], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such

diff --git a/doc/ja_JP.eucJP/dhcp-options.5 b/doc/ja_JP.eucJP/dhcp-options.5
index 15a622d89e58cddd9f52e6e7acdae424ca52fd92..1fe09d70ad3ede5485ab3a696fe9e390fb82038e 100644 (file)
--- a/doc/ja_JP.eucJP/dhcp-options.5
+++ b/doc/ja_JP.eucJP/dhcp-options.5
@@ -1,6 +1,7 @@
-.\"    $Id: dhcp-options.5,v 1.3.24.2 2010/07/13 20:56:56 dhankins Exp $
+.\"    $Id: dhcp-options.5,v 1.3.24.3 2011/01/20 23:46:46 sar Exp $
 .\"
-.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004 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

diff --git a/includes/config.h.in b/includes/config.h.in
index 07a381b9af899162be9a77a2b5b4687a53650479..44dbfa6481382e61e940c0db92c1607efc718cbf 100644 (file)
--- a/includes/config.h.in
+++ b/includes/config.h.in
@@ -136,16 +136,12 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
 #endif
 
 /* Define to 1 if on MINIX. */
@@ -186,30 +182,41 @@
 #undef _POSIX_SOURCE
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT32_T
 
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT64_T
 
 /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT8_T
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
 
 /* Define to the type of a signed integer type of width exactly 16 bits if
    such a type exists and the standard includes do not define it. */

diff --git a/omapip/auth.c b/omapip/auth.c
index ab00b280851cb56f49f07dab4906a318a2592c52..1269afd2d6860341f67150d01f32e4d37a1a3d2e 100644 (file)
--- a/omapip/auth.c
+++ b/omapip/auth.c
@@ -3,7 +3,8 @@
    Subroutines having to do with authentication. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 0a5ea1a4b3012eae525fb3747d4a810f0f95916b..351484915a4e6829db8ec9e5bd11a8f9d82148d2 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2010 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2011 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
@@ -127,7 +127,7 @@ static int strip_relay_agent_options(struct interface_info *,
                                     struct dhcp_packet *, unsigned);
 
 static const char copyright[] =
-"Copyright 2004-2010 Internet Systems Consortium.";
+"Copyright 2004-2011 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 04f8ac1d24e5fcb923e99f53432d1e9ab4509613..d8d419d50bf0740dac58357a10a700575346df0b 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2011 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
@@ -33,7 +33,7 @@
  */
 
 static const char copyright[] =
-"Copyright 2004-2010 Internet Systems Consortium.";
+"Copyright 2004-2011 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 ac883ff16925e9eade4a06f9e0041ebda741864b..5c42d98cc233416ba0444e131d484fad2a3821e4 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bind.sh,v 1.6.2.8 2010/06/15 18:42:34 dhankins Exp $
+# $Id: bind.sh,v 1.6.2.9 2011/01/20 23:46:47 sar Exp $
 
 # Get the bind distribution for the libraries
 # This script is used to build the DHCP distribution and shouldn't be shipped
@@ -45,6 +45,7 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
+       4.2.1b1) BINDTAG=v9_8_0b1 ;;
        4.2.0rc1|4.2.0) BINDTAG=v9_7_1 ;;
        4.2.0b2) BINDTAG=v9_7_1rc1 ;;
        4.2.0b1) BINDTAG=v9_7_0_P1 ;;