summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2017-06-30 15:36:04 -0400
committerThomas Markwalder <tmark@isc.org>2017-06-30 15:36:04 -0400
commit0faf45b12d66f72a5b9ee1a17fdadf67f3447e04 (patch)
treebd00a7fb592075e62c9ab0c47549bbbd86d1bd93
parent71dc36a5d34df55c462e032a0e3fbfcfe606de0e (diff)
downloadisc-dhcp-0faf45b12d66f72a5b9ee1a17fdadf67f3447e04.tar.gz
[v4_3] Pre-release tag prep for 4.3.6b1: version #, copyright etc...
-rw-r--r--LICENSE2
-rw-r--r--README10
-rw-r--r--RELNOTES4
-rw-r--r--client/dhclient.conf.52
-rw-r--r--common/ns_name.c2
-rw-r--r--common/options.c2
-rw-r--r--common/packet.c3
-rw-r--r--common/socket.c2
-rw-r--r--configure.ac2
-rw-r--r--includes/dhcpd.h2
-rw-r--r--omapip/alloc.c4
-rw-r--r--omapip/generic.c2
-rw-r--r--omapip/toisc.c2
-rw-r--r--relay/dhcrelay.c4
-rw-r--r--server/confpars.c2
-rw-r--r--server/dhcpd.c4
-rw-r--r--server/dhcpv6.c2
-rw-r--r--util/bind.sh5
18 files changed, 27 insertions, 29 deletions
diff --git a/LICENSE b/LICENSE
index f9fd7d6c..a8de3ed4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2017 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 aefe8574..410bf7f1 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.5
- 5 October 2016
+ Version 4.3.6b1
+ 7 July 2017
README FILE
@@ -142,12 +142,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.3.5.tar.gz
- tar xvf dhcp-4.3.5.tar
+ gunzip dhcp-4.3.6b1.tar.gz
+ tar xvf dhcp-4.3.6b1.tar
CONFIGURING IT
-Now, cd to the dhcp-4.3.5 subdirectory that you've just created and
+Now, cd to the dhcp-4.3.6b1 subdirectory that you've just created and
configure the source tree by typing:
./configure
diff --git a/RELNOTES b/RELNOTES
index 8a94df3b..6f7efa28 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.5
- 5 October 2016
+ Version 4.3.6b1
+ 14 July 2017
Release Notes
diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
index 966970bd..14f0518b 100644
--- a/client/dhclient.conf.5
+++ b/client/dhclient.conf.5
@@ -1,6 +1,6 @@
.\" $Id: dhclient.conf.5,v 1.34 2012/01/24 22:23:39 sar Exp $
.\"
-.\" Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2017 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/common/ns_name.c b/common/ns_name.c
index 8630008b..06f710c1 100644
--- a/common/ns_name.c
+++ b/common/ns_name.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/common/options.c b/common/options.c
index d9167e83..5547287f 100644
--- a/common/options.c
+++ b/common/options.c
@@ -3,7 +3,7 @@
DHCP options parsing and reassembly. */
/*
- * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/common/packet.c b/common/packet.c
index 6f51df40..05aedb84 100644
--- a/common/packet.c
+++ b/common/packet.c
@@ -3,8 +3,7 @@
Packet assembly code, originally contributed by Archie Cobbs. */
/*
- * Copyright (c) 2009,2012,2014 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2005,2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/common/socket.c b/common/socket.c
index 779fc02e..8f5e2f64 100644
--- a/common/socket.c
+++ b/common/socket.c
@@ -3,7 +3,7 @@
BSD socket interface code... */
/*
- * Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/configure.ac b/configure.ac
index 2015585e..79325d2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.3.6-dev],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.3.6b1],[dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,
# like AUTHORS, COPYING, and such
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 080565ef..eab09a62 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
Definitions for dhcpd... */
/*
- * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/omapip/alloc.c b/omapip/alloc.c
index a95ad6ca..18d763a3 100644
--- a/omapip/alloc.c
+++ b/omapip/alloc.c
@@ -4,9 +4,7 @@
protocol... */
/*
- * Copyright (c) 2012,2014,2016 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) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/omapip/generic.c b/omapip/generic.c
index fa6e5f88..92c0438c 100644
--- a/omapip/generic.c
+++ b/omapip/generic.c
@@ -3,7 +3,7 @@
Subroutines that support the generic object. */
/*
- * Copyright (c) 2004-2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/omapip/toisc.c b/omapip/toisc.c
index 51ced479..b9e82450 100644
--- a/omapip/toisc.c
+++ b/omapip/toisc.c
@@ -3,7 +3,7 @@
Convert non-ISC result codes to ISC result codes. */
/*
- * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2001-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 fe121139..8eb938e1 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
DHCP/BOOTP Relay Agent. */
/*
- * Copyright(c) 2004-2016 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2017 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
@@ -139,7 +139,7 @@ static int strip_relay_agent_options(struct interface_info *,
static void request_v4_interface(const char* name, int flags);
static const char copyright[] =
-"Copyright 2004-2016 Internet Systems Consortium.";
+"Copyright 2004-2017 Internet Systems Consortium.";
static const char arr[] = "All rights reserved.";
static const char message[] =
"Internet Systems Consortium DHCP Relay Agent";
diff --git a/server/confpars.c b/server/confpars.c
index 782aba14..c0735fed 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -3,7 +3,7 @@
Parser for dhcpd config file... */
/*
- * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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/server/dhcpd.c b/server/dhcpd.c
index ca960911..c6d9eb85 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
DHCP Server Daemon. */
/*
- * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2017 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-2016 Internet Systems Consortium.";
+"Copyright 2004-2017 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/server/dhcpv6.c b/server/dhcpv6.c
index c12f6193..74487667 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2017 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/util/bind.sh b/util/bind.sh
index 125bada1..8f43ed9f 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2009-2016 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2017 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@@ -59,7 +59,8 @@ case $# in
### For ease of use, this records the sticky tag of versions
### released with each point release.
###
- 4.3.6-dev) noSNAP=snapshot BINDTAG=v9_9 ;;
+ 4.3.6b1) noSNAP=snapshot BINDTAG=v9_9_11b1 ;;
+ 4.3.6-dev) noSNAP=snapshot BINDTAG=v9_9 ;;
4.3.5) BINDTAG=v9_9_9_P3 ;;
4.3.5b1) BINDTAG=v9_9_9_P2 ;;
4.3.4|4.3.4b1) BINDTAG=v9_9_8_P4 ;;