Commit 10eaeb6d authored by Michael Gilbert's avatar Michael Gilbert

release 4.3.5-2

parent 43a29d4c
isc-dhcp (4.3.5-2) unstable; urgency=medium
* Fix new upstream spelling errors.
* Add policykit-1 dependency to the server package (closes: #816325).
* Parse IPv6 server process id from the correct file (closes: #841766).
* Initialize all local variables in dhclient scripts (closes: #849100).
* Pass random device to configure when cross building (closes: #838382).
- Thanks to Helmut Grohne.
* Don't wait for a reply that will never come when releasing an ipv6 address
(closes: #769189).
-- Michael Gilbert <mgilbert@debian.org> Sun, 08 Jan 2017 23:11:52 +0000
isc-dhcp (4.3.5-1) unstable; urgency=medium
* New upstream release.
......
......@@ -26,6 +26,7 @@ Depends:
${shlibs:Depends},
debianutils (>= 2.8.2),
lsb-base,
policykit-1,
Recommends:
isc-dhcp-common,
policycoreutils,
......
......@@ -89,10 +89,8 @@ make_resolv_conf() {
# set host name
set_hostname() {
local current_hostname
if [ -n "$new_host_name" ]; then
current_hostname=$(hostname)
local current_hostname=$(hostname)
# current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP
if [ -z "$current_hostname" ] ||
......@@ -108,9 +106,8 @@ set_hostname() {
# run given script
run_hook() {
local script
local exit_status
script="$1"
local script="$1"
local exit_status=0
if [ -f $script ]; then
. $script
......@@ -141,7 +138,7 @@ run_hookdir() {
# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
exit_with_hooks() {
exit_status=$1
local exit_status=$1
# Source the documented exit-hook script, if it exists
if ! run_hook /etc/dhcp/dhclient-exit-hooks; then
......
......@@ -55,10 +55,8 @@ make_resolv_conf() {
# set host name
set_hostname() {
local current_hostname
if [ -n "$new_host_name" ]; then
current_hostname=$(cat /proc/sys/kernel/hostname)
local current_hostname=$(cat /proc/sys/kernel/hostname)
if [ -z "$current_hostname" ] || [ "$current_hostname" = "(none)" ]; then
echo "$new_host_name" > /proc/sys/kernel/hostname
......
......@@ -47,7 +47,7 @@ if [ -z "$DHCPDv4_PID" ]; then
DHCPDv4_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"\(.*\)"[ \t]*;.*$/\1/p' < "$DHCPDv4_CONF" 2>/dev/null | head -n 1)
fi
if [ -z "$DHCPDv6_PID" ]; then
DHCPDv6_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"\(.*\)"[ \t]*;.*$/\1/p' < "$DHCPDv6_CONF" 2>/dev/null | head -n 1)
DHCPDv6_PID=$(sed -n -e 's/^[ \t]*dhcpv6-pid-file-name[ \t]*"\(.*\)"[ \t]*;.*$/\1/p' < "$DHCPDv6_CONF" 2>/dev/null | head -n 1)
fi
DHCPDv4_PID="${DHCPDv4_PID:-/var/run/dhcpd.pid}"
DHCPDv6_PID="${DHCPDv6_PID:-/var/run/dhcpd6.pid}"
......
description: don't wait for a reply that will never come when releasing an ipv6 address
author: Michael Gilbert <mgilbert@debian.org>
bug-debian: http://bugs.debian.org/769189
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -802,7 +802,7 @@ main(int argc, char **argv) {
if (exit_mode)
return 0;
if (release_mode) {
-#ifndef DHCPv6
+#if 1
return 0;
#else
if ((local_family == AF_INET6) || dhcpv4_over_dhcpv6) {
description: check that exit status is 2
description: send DHCPDECLINE message only when dhclient script specifically returns exit status 2 indicating that the client should do so
author: Matt Zimmerman <mdz@debian.org>
origin: applied originally in 2004 to the debian dhcp3 package (version 3.0+3.0.1rc13-1)
--- a/client/dhclient.c
+++ b/client/dhclient.c
......
......@@ -21,17 +21,6 @@ Author: Michael Gilbert <mgilbert@debian.org>
goto badx;
}
} else {
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -337,7 +337,7 @@ a destination for DHCP protocol messages
has acquired an IP address. Normally,
.B dhclient
transmits these messages to 255.255.255.255 (the IP limited broadcast
-address). Overriding this is mostly useful for debugging purposes. This
+address). Overridding this is mostly useful for debugging purposes. This
feature is not supported in DHCPv6 (\fB-6\fR) mode.
.TP
.BI \-g \ relay
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -2663,7 +2663,7 @@ pool usage passes that level. After tha
......@@ -43,3 +32,36 @@ Author: Michael Gilbert <mgilbert@debian.org>
the high threshold. In this case, a message will be generated each time
a lease is acknowledged when the pool usage is above the high threshold.
.PP
@@ -2836,7 +2836,7 @@ response \fIis\fR heard, the lease is ab
not respond to the client. The lease will remain abandoned for a minimum
of abandon-lease-time seconds.
.PP
-If a there are no free addressses but there are abandoned IP addresses, the
+If a there are no free addresses but there are abandoned IP addresses, the
DHCP server will attempt to reclaim an abandoned IP address regardless of the
value of abandon-lease-time.
.PP
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -121,10 +121,10 @@ static void dhclient_ddns_cb_free(dhcp_d
* the description of the command line. The arguments provide
* a way for the caller to request more specific information about
* the error be printed as well. Mostly this will be that some
- * comamnd doesn't include its argument.
+ * command doesn't include its argument.
*
* \param sfmt - The basic string and format for the specific error
- * \param sarg - Generally the offending argument from the comamnd line.
+ * \param sarg - Generally the offending argument from the command line.
*
* \return Nothing
*/
@@ -434,7 +434,7 @@ main(int argc, char **argv) {
} else if (argv[i][0] == '-') {
usage("Unknown command: %s", argv[i]);
} else if (interfaces_requested < 0) {
- usage("No interfaces comamnd -n and "
+ usage("No interfaces command -n and "
" requested interface %s", argv[i]);
} else {
struct interface_info *tmp = NULL;
......@@ -3,6 +3,8 @@ dhclient-exit-hook.patch
dhclient-dividebyzero.patch
dhclient-64bit-time.patch
dhclient-more-detail.patch
dhclient-release.patch
dhcrelay-listen.patch
dhcpd-conf.patch
......@@ -10,7 +12,7 @@ dhcpd-conf.patch
fix-exit-hook-manpage.patch
fix-manpage-macro.patch
fix-manpage-error.patch
fix-spelling-error.patch
fix-spelling.patch
disable-nsupdate.patch
......
......@@ -27,7 +27,7 @@ CONFFLAGS=--prefix=/usr --enable-log-pid --enable-paranoia
# cross-architecture building
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CONFFLAGS+=--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
CONFFLAGS+=--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --with-random=/dev/random
endif
# hurd support
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment