On Sun, 10 Feb 2013 18:16:15 +0100, gregor herrmann wrote: > Ok, first attempt (patch against the package in testing) attached; > improvements welcome.
As pointed out on IRC, this might fail if dhcp3-client was purged in the meantime (and /etc/dhcp3/dhclient.conf removed); here's a second version that checks only the (copied) /etc/dhcp/dhclient.conf. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rolling Stones
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/changelog isc-dhcp-4.2.2.dfsg.1/debian/changelog
--- isc-dhcp-4.2.2.dfsg.1/debian/changelog 2012-10-15 00:04:44.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/changelog 2013-02-10 18:14:12.000000000 +0100
@@ -1,3 +1,16 @@
+isc-dhcp (4.2.2.dfsg.1-5+deb70u3) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "prompting due to modified conffiles which were not modified by
+ the user: /etc/dhcp/dhclient.conf":
+ mangle /etc/dhcp/dhclient.conf in debian/isc-dhcp-client.preinst: if it's
+ the same as /etc/dhcp3/dhclient.conf from lenny's dhcp3-client, change it
+ to the same as a freshly installed /etc/dhcp/dhclient.conf from squeeze's
+ isc-dhcp-client.
+ (Closes: #698582)
+
+ -- gregor herrmann <gre...@debian.org> Sun, 10 Feb 2013 17:06:05 +0100
+
isc-dhcp (4.2.2.dfsg.1-5+deb70u2) testing-proposed-updates; urgency=high
* Non-maintainer upload by the Security Team.
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst 2012-09-14 05:24:53.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst 2013-02-11 16:52:00.000000000 +0100
@@ -15,6 +15,15 @@
cp /etc/dhclient.conf /etc/dhcp3/dhclient.conf.oldconfig
fi
+ # if the /etc/dhcp/dhclient.conf is the same as the
+ # /etc/dhcp3/dhclient.conf from lenny, mangle it to the one of a freshly
+ # installed squeeze /etc/dhcp/dhclient.conf, otherwise we get a dpkg
+ # prompt at updates to wheezy (#698582)
+ 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
signature.asc
Description: Digital signature
