From 1bdbea2461b522c680feb6516fc06615510ad4a0 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Tue, 30 Mar 2021 22:42:29 +0100 Subject: [PATCH] Fold NMU into Debian packaging. --- debian/changelog | 13 ++++++++++++- debian/postinst | 3 +++ debian/postrm | 3 +++ debian/rules | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 836be1f..06d768c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,19 @@ dnsmasq (2.85-1) unstable; urgency=low * New upstream. + * Includes fix to CVE-2021-3448. - -- Simon Kelley Tue, 2 Mar 2021 21:40:23 +0000 + -- Simon Kelley 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 Sun, 28 Mar 2021 10:55:07 +0200 dnsmasq (2.84-1) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index 155d325..a987c43 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,6 +1,9 @@ #!/bin/sh 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 ---------------------- # This will only remove masks created by d-s-h on package removal. deb-systemd-helper unmask dnsmasq.service >/dev/null || true diff --git a/debian/postrm b/debian/postrm index 8a45fd1..65079a7 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,6 +1,9 @@ #!/bin/sh 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 update-rc.d dnsmasq remove >/dev/null fi diff --git a/debian/rules b/debian/rules index 8d634a3..70d4ea8 100755 --- a/debian/rules +++ b/debian/rules @@ -176,7 +176,7 @@ binary-indep: checkroot -d debian/trees/daemon/usr/lib/tmpfiles.d \ -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 + install -m 755 debian/postinst debian/postrm debian/preinst debian/prerm debian/trees/daemon/DEBIAN if ! dpkg-vendor --derives-from Ubuntu; then \ rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper; \ dh_runit -pdnsmasq -Pdebian/trees/daemon; \