[pkg-dhcp-commits] [isc-dhcp] 06/08: import upstream 4.3.1
Michael Gilbert
mgilbert at moszumanska.debian.org
Thu Aug 14 04:56:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository isc-dhcp.
commit c1b38e1274b84f8a42f91084249a2588559122c4
Author: Michael Gilbert <mgilbert at debian.org>
Date: Wed Aug 13 19:27:05 2014 -0400
import upstream 4.3.1
---
README | 10 +++++-----
RELNOTES | 42 +++++++++++++++++++++++++++++-------------
bind/bind.tar.gz | Bin 7740043 -> 7740063 bytes
client/scripts/linux | 8 +++-----
client/scripts/openwrt | 8 +++-----
configure.ac | 2 +-
includes/omapip/result.h | 2 +-
omapip/inet_addr.c | 8 --------
8 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/README b/README
index d1fc927..9357c45 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.1b1
- 8 July 2014
+ Version 4.3.1
+ 11 August 2014
README FILE
@@ -141,12 +141,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.1b1.tar.gz
- tar xvf dhcp-4.3.1b1.tar
+ gunzip dhcp-4.3.1.tar.gz
+ tar xvf dhcp-4.3.1.tar
CONFIGURING IT
-Now, cd to the dhcp-4.3.1b1 subdirectory that you've just created and
+Now, cd to the dhcp-4.3.1 subdirectory that you've just created and
configure the source tree by typing:
./configure
diff --git a/RELNOTES b/RELNOTES
index 6b5e038..1480cb8 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,12 +1,12 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.1b1
- 8 Julyy 2014
+ Version 4.3.1
+ 11 August 2014
Release Notes
NEW FEATURES
-The major "theme" for ISC DHCP 4.3.x was to update the suport for
+The major "theme" for ISC DHCP 4.3.x was to update the support for
DHCPv6 to include several of the features that have been available
for DHCPv4. These include:
@@ -52,9 +52,25 @@ ISC DHCP is open source software maintained by Internet Systems
Consortium. This product includes cryptographic software written
by Eric Young (eay at cryptsoft.com).
+ Changes since 4.3.1rc1
+
+- None
+
+ Changes since 4.3.1b1
+
+- Modify the linux and openwrt dhclient scripts to process information
+ from a stateless request. Thanks to Jiri Popelka at Red Hat for the
+ bug report and patch.
+ [ISC-Bugs 36102]
+
+- Remove more unused RCSID tags. These weren't noticed in 4.3 as
+ the code isn't used anymore but we remove them here to keep the
+ code consistent across versions.
+ [ISC-Bugs #36451]
+
Changes since 4.3.0
-- Tidy up several small tickets
+- Tidy up several small tickets.
Correct parsing of DUID from config file, previously the LL type
was put in the wrong place in the DUID string.
[ISC-Bugs #20962]
@@ -77,14 +93,14 @@ by Eric Young (eay at cryptsoft.com).
- Fix some minor issues in the dst code.
[ISC-Bugs #34172]
-- Properly #ifdef functions so that the code can compile without NSUPDATE
+- Properly #ifdef functions so that the code can compile without NSUPDATE.
[ISC-Bugs #35058]
- Update the partner's stos (start time of state, basically when we last
heard from this partner) field when updating the state in failover.
[ISC-Bugs #35549]
-- Modify the overload processing to allow space for the remote agent ID
+- Modify the overload processing to allow space for the remote agent ID.
[ISC-Bugs #35569]
Handle the ordering of the SUBNET_MASK option even if it is the last
option in the list.
@@ -100,7 +116,7 @@ by Eric Young (eay at cryptsoft.com).
- Correct the v6 client timing code. When doing the timing backoff
for MRT limit it to MRD.
- Thanks to Jiri Popelka at Red Hat for the bug and fix.
+ Thanks to Jiri Popelka at Red Hat for the bug report and fix.
[ISC-Bugs #21238
- Add a log entry when killing a client and remove the PID files
@@ -108,12 +124,12 @@ by Eric Young (eay at cryptsoft.com).
[ISC-Bugs #16970]
[ISC-Bugs #17258]
-- Some minor cleanups in the client code
- In addition to checking for dhcpc check for bootpc in the services list
+- Some minor cleanups in the client code.
+ In addition to checking for dhcpc check for bootpc in the services list.
[ISC-Bugs #18933]
Correct the client code to only try to get a lease once when the
given the "-1" argument.
- Thanks to Jiri Popelka at Red Hat for the bug and fix.
+ Thanks to Jiri Popelka at Red Hat for the bug report and fix.
[ISC-Bugs #26735]
When asked for the version don't send the output to syslog.
[ISC-Bugs #29772]
@@ -123,17 +139,17 @@ by Eric Young (eay at cryptsoft.com).
Thanks to Tomas Hozza at Red Hat for the suggestion and a prototype fix.
[ISC-Bugs #33098]
-- Several updates to the dhcp server code
+- Several updates to the dhcp server code.
When not in quiet mode print out the files being used.
[ISC-Bugs #17551]
As accessing some pid files may require privileges move the dropping
of permission bits due to the paranoia patch to be after the pid code.
- Thanks to Jiri Popelka at Red Hat for the bug and fix.
+ Thanks to Jiri Popelka at Red Hat for the bug report and fix.
[ISC-Bugs #25806]
When processing a "--version" request don't output the version information
to syslog.
-- Add the "enable-log-pid" option to the configure script. When enabled
+- Add the "enable-log-pid" build option to the configure script. When enabled
this causes the client, server and relay programs to include the PID
number in syslog messages.
Thanks to Marius Tomaschewski for the suggestion and proto-patch.
diff --git a/bind/bind.tar.gz b/bind/bind.tar.gz
index 8291176..ccc8614 100644
Binary files a/bind/bind.tar.gz and b/bind/bind.tar.gz differ
diff --git a/client/scripts/linux b/client/scripts/linux
index 14655f0..e6792c6 100755
--- a/client/scripts/linux
+++ b/client/scripts/linux
@@ -275,12 +275,10 @@ if [ x$reason = xBOUND6 ] ; then
fi
if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
- if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
- exit_with_hooks 2;
- fi
-
- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+ if [ x${new_ip6_address} != x ] && [ x${new_ip6_prefixlen} != x ] ; then
+ ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
dev ${interface} scope global
+ fi
# Make sure nothing has moved around on us.
diff --git a/client/scripts/openwrt b/client/scripts/openwrt
index 8c3059a..55a4aa9 100755
--- a/client/scripts/openwrt
+++ b/client/scripts/openwrt
@@ -244,13 +244,11 @@ if [ x$reason = xBOUND6 ]; then
fi
if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then
- if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
- exit_with_hooks 2;
+ if [ x${new_ip6_address} != x ] && [ x${new_ip6_prefixlen} != x ] ; then
+ ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+ dev ${interface} scope global
fi
- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
- dev ${interface} scope global
-
# Make sure nothing has moved around on us.
# Nameservers/domains/etc.
diff --git a/configure.ac b/configure.ac
index 73f8d33..d5bd6de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.3.1b1],[dhcp-users at isc.org])
+AC_INIT([DHCP],[4.3.1],[dhcp-users at isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,
# like AUTHORS, COPYING, and such
diff --git a/includes/omapip/result.h b/includes/omapip/result.h
index 85534d8..3e4cf6a 100644
--- a/includes/omapip/result.h
+++ b/includes/omapip/result.h
@@ -86,7 +86,7 @@
#define ISC_R_INVALIDARG DHCP_R_INVALIDARG
#define ISC_R_NOTYET DHCP_R_NOTYET
#define ISC_R_UNCHANGED DHCP_R_UNCHANGED
-#define ISC_R_MULTIPLE DHCP_R_MULTIPLE
+#define ISC_R_MULTIPLE DHCP_R_MULTIPLE
#define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT
#define ISC_R_BADPARSE DHCP_R_BADPARSE
#define ISC_R_NOKEYS DHCP_R_NOKEYS
diff --git a/omapip/inet_addr.c b/omapip/inet_addr.c
index c7d7ffe..611d9ee 100644
--- a/omapip/inet_addr.c
+++ b/omapip/inet_addr.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
-#else
-static char rcsid[] = "$NetBSD: inet_addr.c,v 1.6 1996/02/02 15:22:23 mrg Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include "dhcpd.h"
#include "omapip/omapip_p.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git
More information about the pkg-dhcp-commits
mailing list