Your message dated Sun, 12 Apr 2020 15:48:56 +0000
with message-id <[email protected]>
and subject line Bug#929884: fixed in dnsmasq 2.81-1
has caused the Debian Bug report #929884,
regarding dnsmasq: please provide runscript file
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
929884: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929884
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: dnsmasq
Version: 2.80-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: runscript
Dear maintainer,
please include native script for runit init system into 'dnsmasq'.
Below is diff aganist latest package release (2.80-1).
Here are some links:
* http://smarden.org/runit -- more information about 'runit'
* https://bugs.debian.org/746715 -- technical committe position
on support of init systems, other then sysvinit.
From 3c516dde2b8dd552b141196ed98379800b3e0611 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <[email protected]>
Date: Sun, 26 May 2019 18:54:36 +0000
Subject: [PATCH] Add integration script for runit init
---
debian/control | 5 ++--
debian/dnsmasq.runit | 1 +
debian/dnsmasq.runscript/finish | 5 ++++
debian/dnsmasq.runscript/run | 43 +++++++++++++++++++++++++++++++++
debian/rules | 7 +++++-
5 files changed, 58 insertions(+), 3 deletions(-)
create mode 100644 debian/dnsmasq.runit
create mode 100755 debian/dnsmasq.runscript/finish
create mode 100755 debian/dnsmasq.runscript/run
diff --git a/debian/control b/debian/control
index 9d4d7e8..40ad6c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Build-depends: gettext, libnetfilter-conntrack-dev [linux-any],
libidn11-dev, libdbus-1-dev (>=0.61), libgmp-dev,
nettle-dev (>=2.4-3), libbsd-dev [!linux-any],
- liblua5.2-dev
+ liblua5.2-dev, dh-runit, debhelper-compat (= 10)
Maintainer: Simon Kelley <[email protected]>
Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html
Standards-Version: 3.9.8
@@ -12,8 +12,9 @@ Standards-Version: 3.9.8
Package: dnsmasq
Architecture: all
Depends: netbase, dnsmasq-base,
- init-system-helpers (>= 1.18~), lsb-base (>= 3.0-6)
+ init-system-helpers (>= 1.18~), lsb-base (>= 3.0-6), ${misc:Depends}
Suggests: resolvconf
+Breaks: ${runit:Breaks}
Conflicts: resolvconf (<<1.15)
Description: Small caching DNS proxy and DHCP/TFTP server
Dnsmasq is a lightweight, easy to configure, DNS forwarder and DHCP
diff --git a/debian/dnsmasq.runit b/debian/dnsmasq.runit
new file mode 100644
index 0000000..6a457f7
--- /dev/null
+++ b/debian/dnsmasq.runit
@@ -0,0 +1 @@
+debian/dnsmasq.runscript name=dnsmasq,logscript,since=2.80-1+runit
diff --git a/debian/dnsmasq.runscript/finish b/debian/dnsmasq.runscript/finish
new file mode 100755
index 0000000..cf35240
--- /dev/null
+++ b/debian/dnsmasq.runscript/finish
@@ -0,0 +1,5 @@
+#!/bin/sh -eu
+if [ -x /sbin/resolvconf ] ; then
+ /sbin/resolvconf -d lo.dnsmasq
+fi
+
diff --git a/debian/dnsmasq.runscript/run b/debian/dnsmasq.runscript/run
new file mode 100755
index 0000000..1a43393
--- /dev/null
+++ b/debian/dnsmasq.runscript/run
@@ -0,0 +1,43 @@
+#!/lib/runit/invoke-run
+
+readonly name=dnsmasq
+readonly daemon=/usr/sbin/dnsmasq
+readonly marker=/usr/share/dnsmasq/installed-marker
+
+test -e "${marker}" || exec sv down "${name}"
+test -x "${daemon}" || exec sv down "${name}"
+
+if [ ! "${RESOLV_CONF:-}" ] &&
+ [ "${IGNORE_RESOLVCONF:-}" != "yes" ] &&
+ [ -x /sbin/resolvconf ]
+then
+ RESOLV_CONF=/run/dnsmasq/resolv.conf
+fi
+
+# This tells dnsmasq to ignore DNS requests that don't come from a local
network.
+# It's automatically ignored if --interface --except-interface,
--listen-address
+# or --auth-server exist in the configuration, so for most installations, it
will
+# have no effect, but for otherwise-unconfigured installations, it stops
dnsmasq
+# from being vulnerable to DNS-reflection attacks.
+
+DNSMASQ_OPTS="${DNSMASQ_OPTS:-} --local-service"
+
+# If the dns-root-data package is installed, then the trust anchors will be
+# available in $ROOT_DS, in BIND zone-file format. Reformat as dnsmasq
+# --trust-anchor options.
+
+ROOT_DS="/usr/share/dns/root.ds"
+
+if [ -f $ROOT_DS ]; then
+ DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne
"s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp"
$ROOT_DS | tr '\n' ' '`"
+fi
+
+mkdir -p /run/dnsmasq
+chown dnsmasq:nogroup /run/dnsmasq
+[ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq
+exec "${daemon}" \
+ --keep-in-foreground \
+ --log-facility=/dev/stdout \
+ ${RESOLV_CONF:+ -r $RESOLV_CONF} \
+ ${DNSMASQ_OPTS} \
+ -u dnsmasq
diff --git a/debian/rules b/debian/rules
index b4ec4e9..f8d84fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,6 +159,9 @@ clean:
binary-indep: checkroot
$(checkdir)
rm -rf debian/trees/daemon
+ mkdir -p debian/trees
+ dh_runit -pdnsmasq
+ mv debian/dnsmasq/ debian/trees/daemon
install -m 755 \
-d debian/trees/daemon/DEBIAN \
-d debian/trees/daemon/usr/share/doc \
@@ -173,6 +176,8 @@ 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
+ cat debian/dnsmasq.postinst.debhelper >>
debian/trees/daemon/DEBIAN/postinst
+ cat debian/dnsmasq.postrm.debhelper >>
debian/trees/daemon/DEBIAN/postrm
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
@@ -185,7 +190,7 @@ binary-indep: checkroot
install -m 644 debian/insserv
debian/trees/daemon/etc/insserv.conf.d/dnsmasq
ln -s $(package) debian/trees/daemon/usr/share/doc/dnsmasq
cd debian/trees/daemon && find . -type f ! -regex '.*DEBIAN/.*' -printf
'%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
- dpkg-gencontrol $(PACKAGE_VERSION) -T -pdnsmasq -Pdebian/trees/daemon
+ dpkg-gencontrol $(PACKAGE_VERSION) -Tdebian/dnsmasq.substvars -pdnsmasq
-Pdebian/trees/daemon
find debian/trees/daemon -depth -newermt '$(BUILD_DATE)' -print0 |
xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
chown -R root.root debian/trees/daemon
chmod -R g-ws debian/trees/daemon
--- End Message ---
--- Begin Message ---
Source: dnsmasq
Source-Version: 2.81-1
Done: Simon Kelley <[email protected]>
We believe that the bug you reported is fixed in the latest version of
dnsmasq, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Simon Kelley <[email protected]> (supplier of updated dnsmasq package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 8 Apr 2020 17:33:15 +0000
Source: dnsmasq
Binary: dnsmasq dnsmasq-base dnsmasq-base-lua dnsmasq-utils
Architecture: source amd64 all
Version: 2.81-1
Distribution: unstable
Urgency: low
Maintainer: Simon Kelley <[email protected]>
Changed-By: Simon Kelley <[email protected]>
Description:
dnsmasq - Small caching DNS proxy and DHCP/TFTP server
dnsmasq-base - Small caching DNS proxy and DHCP/TFTP server
dnsmasq-base-lua - Small caching DNS proxy and DHCP/TFTP server
dnsmasq-utils - Utilities for manipulating DHCP leases
Closes: 914305 914755 920224 922422 922758 929884 932695 940985 942363 948373
949565
Changes:
dnsmasq (2.81-1) unstable; urgency=low
.
* New upstream.
* Fix nodocs/nodoc confusion in rules. (closes: #922758)
* Add Vcs-* fields to control. (closes: #922422)
* Add systemd support for multiple daemon instances. (closes: #914305)
* Add note explaining that ENABLED is SYSV-init only. (closes: #914755)
* Replace ash with dash in contrib/reverse-dns. (closes: #920224)
* Move to libidn2. (closes: #932695)
* Fix RA problem with two interfaces on same net, but RA service on
only one of the interfaces. (closes: #949565)
* Fix breakage of dig +trace. (closes: #942363)
* Fix build faliure with newer Nettle libraries. (closes: #940985)
* Support runscript init-system (closes: #929884)
* Security fix for CVE-2019-14834 (closes: #948373)
Checksums-Sha1:
c824dc44c26d21c3e512540a89ffc45bbf7c44d8 2153 dnsmasq_2.81-1.dsc
b319c0522d463a866102b4283ed5e41cbf20003b 734661 dnsmasq_2.81.orig.tar.gz
98ce68cef50936943685abe6703bd64fd04f77f9 26111 dnsmasq_2.81-1.diff.gz
4e7ffdacc4d11c279e174a96730379a11aa46011 450992
dnsmasq-base-lua_2.81-1_amd64.deb
b752a81cfa34de9586db8279171d3e4c0e536741 449256 dnsmasq-base_2.81-1_amd64.deb
3c411fcd0c2260988a61c05b1bc47113a694c08b 24580 dnsmasq-utils_2.81-1_amd64.deb
c77837b0ca88276b3abad7c293290be47968cbd1 31460 dnsmasq_2.81-1_all.deb
c6864af5b72b9574a9c36a92fbc64e9013c0d6cd 7839 dnsmasq_2.81-1_amd64.buildinfo
Checksums-Sha256:
fe8bb2849b1abd336ec4290888712cff0f74ee07ebc539ce904b1d1ffb9c924a 2153
dnsmasq_2.81-1.dsc
b489c8b6a85286fe4e5c723b7d35c6b138b1a7506c0cb78723d0ed0c48a27013 734661
dnsmasq_2.81.orig.tar.gz
f6a6fe6e3d3fe5b495f2708a646020d22ace55f7101d6c73a7c95349db579ce1 26111
dnsmasq_2.81-1.diff.gz
74bb7eaa8f2756fd4940d2da8b70900f05febce48135d8b3502906a471c0957c 450992
dnsmasq-base-lua_2.81-1_amd64.deb
a058a2c6811d5479d57fad6dd8731b4109e3109ed3f6c650d5c4e089e04bb255 449256
dnsmasq-base_2.81-1_amd64.deb
306be99c49e33b74dfac37706f4b9cb2b5a8164731c0612cc158ae4515b50805 24580
dnsmasq-utils_2.81-1_amd64.deb
6136a497fa228bb3a0f1265a456ca637d7969ad1d6fd7c2f8fbaaa987ca915fb 31460
dnsmasq_2.81-1_all.deb
24dc0bb2fbd2febda36ea05f592c453fe6fabc0e66afc321224a6045d7d7c5fa 7839
dnsmasq_2.81-1_amd64.buildinfo
Files:
fb7061669efd7215a63400e706745b9e 2153 net optional dnsmasq_2.81-1.dsc
52db125c5fdeb4f2478ed95b8dd174f4 734661 net optional dnsmasq_2.81.orig.tar.gz
92bf425bd598b17ce9a5c4ed77391ddc 26111 net optional dnsmasq_2.81-1.diff.gz
b081d432f70763216e7a7e0f31776ef7 450992 net optional
dnsmasq-base-lua_2.81-1_amd64.deb
e3ee824aeb0c0b562f53bce6fb89420e 449256 net optional
dnsmasq-base_2.81-1_amd64.deb
6131af8bc3da1d997196d3cdc46790c4 24580 net optional
dnsmasq-utils_2.81-1_amd64.deb
59d18ce60c819972378c3e75a07a5242 31460 net optional dnsmasq_2.81-1_all.deb
4cbd388bda9a86158ccfccc8ab2aca80 7839 net optional
dnsmasq_2.81-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEE1urL1u5GuDQkjRESFc3aauGRNaIFAl6TMh0ACgkQFc3aauGR
NaLtvg/8DFd61edG2I0Sn7G5KWBc25HJI+7IKhYuETK1BFbk+4HsBZHa/MTyjIzp
MKjWBRabwY2iNhJ7VUUg6RL8Qlq92PLGFbxHyaNdiPRZGaktpL7B5rje286KEZw6
SiNKMfW+O8PwzVbGjC4q5AtqOV3VgwvigilQIEVAPBSebiUyhfNJtYmb0hNtiY5m
LzYWnjgO/8ZYXzkDiCtUQ0cmxPM3FF166t2wznLpNxxkOIfkBaQSY59cWITmR1h6
z8pOb+ZQcLda2s4Bt7YY4RqdqWTgP+Umzz84R4fMZunhkexeg2VWklyzdg52Z6LT
wfncx2HtfUv3wXAQs0N5gK1eEZfyann46Rhr4FlrXedWY/j9o/iA3seB8L+o7gg1
yjQOMUELnGNFfhuTF7Ncq2gP5184ey7Sz8KSA1vlpx/+iNzi59GiLoOFFgF7q0bG
6GgxHmLLoGJzPs4nStZt+i8Cl67FQgiNhXFJVTBQz+LLuUQ2IbSgv8X5u7iU8wBj
HzmCwR9d7joIkE0mldGCixSyQ9boo07yB8CpMNuzMttskGvTtJ/FSt/jul0u6kwW
0ynV2kceRF8l5XgWRpZvowww5MZSSd9nD3a/NPrYfp7BM0TdSrflAebZ5ddEyhVF
Pjsi7e3tovobYfI1jPQBISyZk2S5CqxgoFodX657TXGv/rXrmBE=
=2WYM
-----END PGP SIGNATURE-----
--- End Message ---
