[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.2.4-4-1-gdca448b

[Michael Gilbert]

The following commit has been merged in the master branch:
commit dca448b7fce00251cd7edc6ca2fcff57d849de95
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Feb 11 22:49:07 2013 -0500

    dhclient.conf fixes

diff --git a/debian/changelog b/debian/changelog
index ff9210f..b0a43ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.2.4-5) unstable; urgency=medium
+
+  * Handle dhclient.conf left behind during a prior lenny->squeeze upgrade,
+    upgrade it now to avoid an unnecessary conffile prompt (closes: #698582).
+    - Thanks to Gregor Herrmann for the patch.
+  * Also, do not copy dhclient.conf from /etc/dhcp3 anymore (closes: #700363).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Tue, 12 Feb 2013 03:14:13 +0000
+
 isc-dhcp (4.2.4-4) unstable; urgency=medium
 
   * Run exit hooks when "dhclient -1" fails (closes: #486520).
diff --git a/debian/isc-dhcp-client.postinst b/debian/isc-dhcp-client.postinst
index 48dc6f3..4e3f5d3 100644
--- a/debian/isc-dhcp-client.postinst
+++ b/debian/isc-dhcp-client.postinst
@@ -17,12 +17,6 @@ case "$1" in
             fi
         fi
 
-	if [ -z "$2" ]; then
-		if [ -e /etc/dhcp3/dhclient.conf ]; then
-			cp /etc/dhcp3/dhclient.conf /etc/dhcp/dhclient.conf
-		fi
-	fi
-
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/isc-dhcp-client.preinst b/debian/isc-dhcp-client.preinst
index e6c156c..ab92ac3 100644
--- a/debian/isc-dhcp-client.preinst
+++ b/debian/isc-dhcp-client.preinst
@@ -15,6 +15,13 @@ case "$1" in
 		cp /etc/dhclient.conf /etc/dhcp3/dhclient.conf.oldconfig
         fi
 
+	# handle lingering dhclient.conf from lenny (this can be safely removed
+	# after the wheezy release)
+	if [ -e /etc/dhcp/dhclient.conf ] && \
+		[ "`md5sum /etc/dhcp/dhclient.conf  | awk '{print $1;}'`" = 6e3910d75cd5cde0042ecb6d48492ae9 ]; then
+		sed -i -e 's/rfc3442-classless-static-routes;/rfc3442-classless-static-routes, ntp-servers;/' /etc/dhcp/dhclient.conf
+	fi
+
 	# We renamed debug-enter to debug - handle the transition
 	if [ ! -e /etc/dhcp3/dhclient-enter-hooks.d/debug ] && \
 	      [ -e /etc/dhcp3/dhclient-enter-hooks.d/debug-enter ]; then

-- 
ISC DHCP packaging for Debian