Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fold NMU into Debian packaging.

Browse Source
This commit is contained in:
Simon Kelley
2021-03-30 22:42:29 +01:00
parent dfb1f7ccf1
commit 1bdbea2461
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@@ -1,8 +1,19 @@
dnsmasq (2.85-1) unstable; urgency=low dnsmasq (2.85-1) unstable; urgency=low
* New upstream. * New upstream.
* Includes fix to CVE-2021-3448.
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 2 Mar 2021 21:40:23 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Tue, 30 Mar 2021 21:40:23 +0100
dnsmasq (2.84-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Fix symlink to directory conversion for /usr/share/doc/dnsmasq.
This is achieved by directly calling dpkg-maintscript-helper in the preinst,
postinst, and postrm scripts, since the package does not use debhelper.
(Closes: #985282)
-- Sébastien Villemot <sebastien@debian.org> Sun, 28 Mar 2021 10:55:07 +0200
dnsmasq (2.84-1) unstable; urgency=low dnsmasq (2.84-1) unstable; urgency=low

3
debian/postinst vendored
View File

@@ -1,6 +1,9 @@
#!/bin/sh #!/bin/sh
set -e set -e
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.81-1~ dnsmasq -- "$@"
# Code copied from dh_systemd_enable ---------------------- # Code copied from dh_systemd_enable ----------------------
# This will only remove masks created by d-s-h on package removal. # This will only remove masks created by d-s-h on package removal.
deb-systemd-helper unmask dnsmasq.service >/dev/null || true deb-systemd-helper unmask dnsmasq.service >/dev/null || true

3
debian/postrm vendored
View File

@@ -1,6 +1,9 @@
#!/bin/sh #!/bin/sh
set -e set -e
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.81-1~ dnsmasq -- "$@"
if [ purge = "$1" ]; then if [ purge = "$1" ]; then
update-rc.d dnsmasq remove >/dev/null update-rc.d dnsmasq remove >/dev/null
fi fi

2
debian/rules vendored
View File

@@ -176,7 +176,7 @@ binary-indep: checkroot
-d debian/trees/daemon/usr/lib/tmpfiles.d \ -d debian/trees/daemon/usr/lib/tmpfiles.d \
-d debian/trees/daemon/etc/insserv.conf.d -d debian/trees/daemon/etc/insserv.conf.d
install -m 644 debian/conffiles debian/trees/daemon/DEBIAN install -m 644 debian/conffiles debian/trees/daemon/DEBIAN
install -m 755 debian/postinst debian/postrm debian/prerm debian/trees/daemon/DEBIAN install -m 755 debian/postinst debian/postrm debian/preinst debian/prerm debian/trees/daemon/DEBIAN
if ! dpkg-vendor --derives-from Ubuntu; then \ if ! dpkg-vendor --derives-from Ubuntu; then \
rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper; \ rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper; \
dh_runit -pdnsmasq -Pdebian/trees/daemon; \ dh_runit -pdnsmasq -Pdebian/trees/daemon; \