Hi, please consider unblocking dhcdbd 3.0-5. It fixes the following bugs: #491009, #485433, #497930, #422787 The Debian changelog is: dhcdbd (3.0-5) unstable; urgency=low * debian/control - Fix package description. (Closes: #491009) - Bump Standards-Version to 3.8.0, no further changes. - Set the Utopia Maintenance Team as Maintainer. Add Riccardo, Sjoerd and myself to Uploaders. * debian/copyright - Update the download location. (Closes: #485433) * debian/patches/04-domain_search_option.patch - Add support for the "domain search" option as defined in RFC 3397. Thanks to Bas Zoetekouw for the patch. (Closes: #497930) * debian/dhcdbd.init, debian/rules - Do not stop dhcdbd in runlevel 0 and 6. (Closes: #422787) * debian/dhcdbd.postinst - Remove old stop symlinks in rc0 and rc6 on upgrades. -- Michael Biebl <biebl@debian.org> Sat, 25 Oct 2008 00:33:51 +0200 The complete debdiff including diffstat is attached. Thanks for considering, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
debian/patches/04-domain_search_option.patch | 20 ++++++++++++++++++++ dhcdbd-3.0/debian/changelog | 19 +++++++++++++++++++ dhcdbd-3.0/debian/control | 8 ++++---- dhcdbd-3.0/debian/copyright | 2 +- dhcdbd-3.0/debian/dhcdbd.init | 2 +- dhcdbd-3.0/debian/dhcdbd.postinst | 5 +++++ dhcdbd-3.0/debian/rules | 2 +- 7 files changed, 51 insertions(+), 7 deletions(-) diff -u dhcdbd-3.0/debian/changelog dhcdbd-3.0/debian/changelog --- dhcdbd-3.0/debian/changelog +++ dhcdbd-3.0/debian/changelog @@ -1,3 +1,22 @@ +dhcdbd (3.0-5) unstable; urgency=low + + * debian/control + - Fix package description. (Closes: #491009) + - Bump Standards-Version to 3.8.0, no further changes. + - Set the Utopia Maintenance Team as Maintainer. Add Riccardo, Sjoerd and + myself to Uploaders. + * debian/copyright + - Update the download location. (Closes: #485433) + * debian/patches/04-domain_search_option.patch + - Add support for the "domain search" option as defined in RFC 3397. + Thanks to Bas Zoetekouw for the patch. (Closes: #497930) + * debian/dhcdbd.init, debian/rules + - Do not stop dhcdbd in runlevel 0 and 6. (Closes: #422787) + * debian/dhcdbd.postinst + - Remove old stop symlinks in rc0 and rc6 on upgrades. + + -- Michael Biebl <biebl@debian.org> Sat, 25 Oct 2008 00:33:51 +0200 + dhcdbd (3.0-4) unstable; urgency=low * debicon/control diff -u dhcdbd-3.0/debian/dhcdbd.init dhcdbd-3.0/debian/dhcdbd.init --- dhcdbd-3.0/debian/dhcdbd.init +++ dhcdbd-3.0/debian/dhcdbd.init @@ -6,7 +6,7 @@ # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Short-Description: DHCP D-Bus manager # Description: dhcdbd provides a D-DBus interface to dhclient, # the DHCP client from ISC. diff -u dhcdbd-3.0/debian/copyright dhcdbd-3.0/debian/copyright --- dhcdbd-3.0/debian/copyright +++ dhcdbd-3.0/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Thom May <thom@debian.org> on Tue, 17 May 2005 12:00:46 +0000. -It was downloaded from http://people.redhat.com/jvdias/dhcdbd/ +It was downloaded from http://dcantrel.fedorapeople.org/dhcdbd/ Copyright: Copyright (C) 2006 Red Hat, Inc. All rights reserved. diff -u dhcdbd-3.0/debian/rules dhcdbd-3.0/debian/rules --- dhcdbd-3.0/debian/rules +++ dhcdbd-3.0/debian/rules @@ -6,7 +6,7 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/dhcdbd/ DEB_MAKE_INVOKE = $(MAKE) -DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 . +DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 1 . binary-install/dhcdbd:: install -d $(CURDIR)/debian/dhcdbd/etc/dhcp3/dhclient-exit-hooks.d/ diff -u dhcdbd-3.0/debian/dhcdbd.postinst dhcdbd-3.0/debian/dhcdbd.postinst --- dhcdbd-3.0/debian/dhcdbd.postinst +++ dhcdbd-3.0/debian/dhcdbd.postinst @@ -34,6 +34,11 @@ if dpkg --compare-versions "$2" lt "2.0-4"; then rm_conffile /etc/dbus-1/event.d/24dhcdbd fi + + # Remove old stop symlinks + if dpkg --compare-versions "$2" lt-nl "3.0-5"; then + rm -f /etc/rc[06].d/K??dhcdbd + fi if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true diff -u dhcdbd-3.0/debian/control dhcdbd-3.0/debian/control --- dhcdbd-3.0/debian/control +++ dhcdbd-3.0/debian/control @@ -1,10 +1,10 @@ Source: dhcdbd Section: admin Priority: optional -Maintainer: Riccardo Setti <giskard@autistici.org> -Uploaders: Sjoerd Simons <sjoerd@debian.org>, Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org> +Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> +Uploaders: Riccardo Setti <giskard@autistici.org>, Sjoerd Simons <sjoerd@debian.org>, Michael Biebl <biebl@debian.org> Build-Depends: debhelper (>= 5.0.0), cdbs, pkg-config, libdbus-1-dev (>= 0.60) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dhcdbd Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dhcdbd @@ -17 +17 @@ - This allows an application-neutral interface for such operations + This allows an application-neutral interface for such operations. only in patch2: unchanged: --- dhcdbd-3.0.orig/debian/patches/04-domain_search_option.patch +++ dhcdbd-3.0/debian/patches/04-domain_search_option.patch @@ -0,0 +1,20 @@ +diff -Nbur dhcdbd-3.0/include/dhcp_options.h dhcdbd-3.0.bas/include/dhcp_options.h +--- dhcdbd-3.0/include/dhcp_options.h 2007-08-13 19:23:10.000000000 +0200 ++++ dhcdbd-3.0.bas/include/dhcp_options.h 2008-09-05 13:54:15.100660960 +0200 +@@ -285,6 +285,7 @@ + DHCO_NDS_CONTEXT=87, + DHCO_UAP_SERVERS=98, + DHCO_SUBNET_SELECTION=118, ++ DHCO_DOMAIN_SEARCH=119, /* RFC 3397 */ + DHCO_AUTHENTICATE=210, + DHCO_END=210, + DHCO_N=211 +@@ -542,7 +543,7 @@ + {0L, 0L, 0, 0, 0}, + {0L, 0L, 0, 0, 0}, + {"subnet-selection", "I", DHC_O_Universe, 118, 0}, +- {0L, 0L, 0, 0, 0}, ++ {"domain-search", "t", DHC_O_Universe, 119, 0}, /* RFC 3397 */ + {0L, 0L, 0, 0, 0}, + {0L, 0L, 0, 0, 0}, + {0L, 0L, 0, 0, 0},
Attachment:
signature.asc
Description: OpenPGP digital signature