[pkg-dhcp-commits] [isc-dhcp] 08/08: release 4.3.1-1

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit 85292e6090a3384de13ecee0615bc8c414c4592c
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Thu Aug 14 00:53:05 2014 -0400

    release 4.3.1-1
---
 debian/README.source                       |  2 +-
 debian/changelog                           |  9 +++++++
 debian/dhclient-script.linux               |  2 +-
 debian/isc-dhcp-server.init.d              |  1 +
 debian/patches/dhclient-dividebyzero.patch | 41 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  7 +++--
 6 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 910b89e..756609e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -36,7 +36,7 @@ For each of the existing quilt patches, do these the next steps, resolving
 failed hunks and refreshing as you go:
 
 $ QUILT_PATCHES=debian/patches quilt push -f
-$ quilt refresh
+$ quilt refresh -p ab --no-index
 
 Commit changes made to the patches:
 
diff --git a/debian/changelog b/debian/changelog
index 98e87c3..7fa99b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.3.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Avoid divide by zero issue (closes: #694650).
+  * Correct typo in dhclient-script.linux (closes: #748272).
+  * Ensure dhcpd.leases exists for the server init script (closes: #720860).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Wed, 13 Aug 2014 23:36:21 +0000
+
 isc-dhcp (4.3.1~b1-1) experimental; urgency=medium
 
   * New upstream beta release.
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 8510155..503e051 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -228,7 +228,7 @@ case "$reason" in
 
 	    # if we have $new_rfc3442_classless_static_routes then we have to
 	    # ignore $new_routers entirely
-	    if [ ! "$new_rfc3442_classless_static_routers" ]; then
+	    if [ ! "$new_rfc3442_classless_static_routes" ]; then
 		    # set if_metric if IF_METRIC is set or there's more than one router
 		    if_metric="$IF_METRIC"
 		    if [ "${new_routers%% *}" != "${new_routers}" ]; then
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 3ca7378..10e4679 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -52,6 +52,7 @@ test_config()
 		/usr/sbin/dhcpd -t $OPTIONS -cf "$DHCPD_CONF"
 		exit 1
 	fi
+	touch /var/lib/dhcp/dhcpd.leases
 }
 
 # single arg is -v for messages, -q for none
diff --git a/debian/patches/dhclient-dividebyzero.patch b/debian/patches/dhclient-dividebyzero.patch
new file mode 100644
index 0000000..ce75f33
--- /dev/null
+++ b/debian/patches/dhclient-dividebyzero.patch
@@ -0,0 +1,41 @@
+Description: setting "backoff-cutoff 0;" in dhclient.conf will cause
+ dhclient to divide by zero and crash. It should be handled more
+ gracefully.
+Author: Kees Cook <kees at ubuntu.com>
+
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -1928,9 +1928,12 @@ void send_discover (cpp)
+ 			client->interval += random() % (2 * client->interval);
+ 
+ 		/* Don't backoff past cutoff. */
+-		if (client->interval > client->config->backoff_cutoff)
+-			client->interval = (client->config->backoff_cutoff / 2)
+-				 + (random() % client->config->backoff_cutoff);
++		if (client->interval > client->config->backoff_cutoff) {
++			client->interval = (client->config->backoff_cutoff / 2);
++			if (client->config->backoff_cutoff)
++				client->interval += (random() %
++					client->config->backoff_cutoff);
++		}
+ 	} else if (!client->interval)
+ 		client->interval = client->config->initial_interval;
+ 
+@@ -2177,11 +2180,13 @@ void send_request (cpp)
+ 
+ 	/* Don't backoff past cutoff. */
+ 	if (client -> interval >
+-	    client -> config -> backoff_cutoff)
++	    client -> config -> backoff_cutoff) {
+ 		client -> interval =
+-			((client -> config -> backoff_cutoff / 2)
+-			 + ((random () >> 2) %
+-					client -> config -> backoff_cutoff));
++			(client -> config -> backoff_cutoff / 2);
++		if (client -> config -> backoff_cutoff)
++			client -> interval += ((random () >> 2) %
++				client -> config -> backoff_cutoff);
++	}
+ 
+ 	/* If the backoff would take us to the expiry time, just set the
+ 	   timeout to the expiry time. */
diff --git a/debian/patches/series b/debian/patches/series
index 83dc5df..68011c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,9 @@
 dhclient-script-exit-status.patch
-fix-exit-hook-manpage.patch
-no-loopback-checksum.patch
 dhclient-exit-hook.patch
+dhclient-dividebyzero.patch
+
+no-loopback-checksum.patch
+
+fix-exit-hook-manpage.patch
 spelling-error.patch
 manpage-hyphens.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git