Package: dnsmasq
Version: 2.81-3
Hi,
the recent addition of runit makes dnsmasq an FTFBS in Ubuntu.
Ubuntu does not support runit in any way therefore the runit
related code in d/rules was removed in [1][2].
But I'd like to get it back to have this package able to be
synced from your uploads. Therefore I wanted to suggest
to add a dpkg-vendor based line to only enable the runit
code in d/rules in builds not derived from Ubuntu.
I have a Ubuntu test build with the change at [3] which
seems to work fine and should be a no-op for Debian.
Therefore I wanted to ask you to take the following
diff into the deb packaging.
diff --git a/debian/rules b/debian/rules
index ae8fcb23..d1fae51a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,11 +177,13 @@ binary-indep: checkroot
-d debian/trees/daemon/etc/insserv.conf.d
install -m 644 debian/conffiles debian/trees/daemon/DEBIAN
install -m 755 debian/postinst debian/postrm debian/prerm
debian/trees/daemon/DEBIAN
- rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper
- dh_runit -pdnsmasq -Pdebian/trees/daemon
- cd debian/trees/daemon && find etc/sv -type f -printf '/%p\n'
>>DEBIAN/conffiles
- cat debian/dnsmasq.postinst.debhelper >>
debian/trees/daemon/DEBIAN/postinst
- cat debian/dnsmasq.postrm.debhelper >>
debian/trees/daemon/DEBIAN/postrm
+ if ! dpkg-vendor --derives-from Ubuntu; then \
+ rm -f debian/dnsmasq.postinst.debhelper
debian/dnsmasq.postrm.debhelper; \
+ dh_runit -pdnsmasq -Pdebian/trees/daemon; \
+ cd debian/trees/daemon && find etc/sv -type f -printf
'/%p\n' >>DEBIAN/conffiles; \
+ cat debian/dnsmasq.postinst.debhelper >>
debian/trees/daemon/DEBIAN/postinst; \
+ cat debian/dnsmasq.postrm.debhelper >>
debian/trees/daemon/DEBIAN/postrm; \
+ fi
install -m 755 debian/init debian/trees/daemon/etc/init.d/dnsmasq
install -m 755 debian/resolvconf
debian/trees/daemon/etc/resolvconf/update.d/dnsmasq
install -m 755 debian/resolvconf-package
debian/trees/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
I have a branch based on git://thekelleys.org.uk/dnsmasq.git
but not found a place to submit this in the form of a PR.
Therefore for now as a bug (the changes are small anyway, so that might be ok)
[1]: https://launchpad.net/ubuntu/+source/dnsmasq/2.81-3ubuntu1
[2]: https://launchpad.net/ubuntu/+source/dnsmasq/2.81-3ubuntu2
[3]:
https://launchpad.net/~paelzer/+archive/ubuntu/dnsmasq-sniff-runit2/+packages
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
