[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-56-g60ffcb6

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 60ffcb63bb589488d8d61dac2e3e7cd7298424a8
Author: Andrew Pollock <apollock at debian.org>
Date:   Mon Jun 7 09:55:39 2010 -0700

    Adjust Default-Stop to match invocation of update-rc.d in postinst

diff --git a/debian/changelog b/debian/changelog
index 5b7e871..9c46dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+isc-dhcp (4.1.1-P1-1) experimental; urgency=low
+
+  * New Upstream Version
+    - Fix for fencepost error on zero-length client identifier
+    - CVE-2010-2156
+    - VU#541921
+  * debian/isc-dhcp-{server,relay}.init: adjust Default-Stop to match
+    invocation of update-rc.d in postinst to avoid warning from update-rc.d
+
+ -- Andrew Pollock <apollock at debian.org>  Mon, 07 Jun 2010 09:41:34 -0700
+
 isc-dhcp (4.1.1-3) experimental; urgency=low
 
   * debian/control: don't make the new packages conflict with the
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 3220fe9..9f874d7 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -9,7 +9,7 @@
 # Should-Start:      $local_fs slapd
 # Should-Stop:       $local_fs slapd
 # Default-Start:     2 3 4 5
-# Default-Stop:
+# Default-Stop:      0 1 6
 # Short-Description: DHCP server
 # Description:       Dynamic Host Configuration Protocol Server
 ### END INIT INFO

-- 
ISC DHCP packaging for Debian