Your message dated Tue, 13 Feb 2024 15:49:15 +0000
with message-id <e1rzv23-000ik9...@fasolo.debian.org>
and subject line Bug#1063551: fixed in dnsmasq 2.90-1
has caused the Debian Bug report #1063551,
regarding dnsmasq: install systemd units below /usr (DEP17)
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 ow...@bugs.debian.org
immediately.)
--
1063551: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063551
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: dnsmasq
Version: 2.89-1
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi,
we want to finalize the /usr-merge transition by moving aliased files
from / to /usr via DEP17. dnsmasq is involved, because it contains
aliased systemd units. I'm attaching a patch, because dnsmasq cannot use
dh-sequence-movetousr as it does not use debhelper. Note that this patch
must not be uploaded to bookworm-backports or earlier.
Helmut
diff -u dnsmasq-2.89/debian/changelog dnsmasq-2.89/debian/changelog
--- dnsmasq-2.89/debian/changelog
+++ dnsmasq-2.89/debian/changelog
@@ -1,3 +1,10 @@
+dnsmasq (2.89-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move systemd units to /usr for DEP17. (closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 09 Feb 2024 15:01:03 +0100
+
dnsmasq (2.89-1) unstable; urgency=low
* New upstream.
diff -u dnsmasq-2.89/debian/rules dnsmasq-2.89/debian/rules
--- dnsmasq-2.89/debian/rules
+++ dnsmasq-2.89/debian/rules
@@ -176,7 +176,7 @@
-d debian/trees/daemon/usr/share/dnsmasq \
-d debian/trees/daemon/usr/share/doc/dnsmasq \
-d debian/trees/daemon/etc/default \
- -d debian/trees/daemon/lib/systemd/system \
+ -d debian/trees/daemon/usr/lib/systemd/system \
-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
@@ -195,8 +195,8 @@
install -m 644 debian/default debian/trees/daemon/etc/default/dnsmasq
install -m 644 dnsmasq.conf.example debian/trees/daemon/etc/dnsmasq.conf
install -m 644 debian/readme.dnsmasq.d
debian/trees/daemon/etc/dnsmasq.d/README
- install -m 644 debian/systemd.service
debian/trees/daemon/lib/systemd/system/dnsmasq.service
- install -m 644 debian/systemd@.service
debian/trees/daemon/lib/systemd/system/dnsmasq@.service
+ install -m 644 debian/systemd.service
debian/trees/daemon/usr/lib/systemd/system/dnsmasq.service
+ install -m 644 debian/systemd@.service
debian/trees/daemon/usr/lib/systemd/system/dnsmasq@.service
install -m 644 debian/tmpfiles.conf
debian/trees/daemon/usr/lib/tmpfiles.d/dnsmasq.conf
install -m 644 debian/insserv
debian/trees/daemon/etc/insserv.conf.d/dnsmasq
install -m 644 debian/copyright
debian/trees/daemon/usr/share/doc/dnsmasq/copyright
--- End Message ---
--- Begin Message ---
Source: dnsmasq
Source-Version: 2.90-1
Done: Simon Kelley <si...@thekelleys.org.uk>
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 1063...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Simon Kelley <si...@thekelleys.org.uk> (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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 23 Jan 2024 22:52:01 +0000
Source: dnsmasq
Architecture: source
Version: 2.90-1
Distribution: unstable
Urgency: medium
Maintainer: Simon Kelley <si...@thekelleys.org.uk>
Changed-By: Simon Kelley <si...@thekelleys.org.uk>
Closes: 844989 966505 1007041 1033165 1034135 1040923 1050750 1063551
Changes:
dnsmasq (2.90-1) unstable; urgency=medium
.
[ Simon Kelley ]
* New upstream. (closes: #1033165)
* Move hard-coding of Lua version from the upstream Makefile
to d/rules.
* Security fixes for Keytrap - DNSSEC validation CPU exhaustion.
CVE-2023-50387 and CVE-2023-50868
[ Sven Geuer ]
* Introduce autokpgtests per d/tests/* (closes: #1034135).
* Switch to dpkg-source 3.0 (quilt) format (closes: #1007041).
* doc.html: Add patch to eliminate privacy breaches leaving the Donations
paragraph as untouched as possible.
* Prepend dnsmasq. to default, init, preinst, postinst, prerm, postrm.
* Rename d/systemd.service to d/dnsmasq.service.
* Rename d/systemd@.service to d/dnsmasq@.service.
* Refactor d/rules to use the DH sequencer and fix major lintian issues
(closes: #844989, #1040923, #1063551).
Modified files:
- d/rules
Complete rewrite making use of debhelper and its tools, fixes lintian
warning debian-rules-sets-dpkg-architecture-variable.
- d/control
Build-Depends, Pre-Depends, Depends added or changed as needed, lintian
error depends-on-obsolete-package fixed.
- d/dnsmasq.default
ENABLED removed and comment changed to fix lintian error
init.d-script-should-always-start-service.
- d/dnsmasq.init
Remove handling of obsolete ENABLED flag.
Extract code used with System-V-style init and systemd into
d/init-system-common, extract code used with systemd only
into d/systemd-helper. This fixes lintian warning
systemd-service-file-wraps-init-script.
Drop workaround for hypothetically non-existent file
/lib/lsb/init-functions, it has been around for more than a decade.
- d/dnsmasq.service, d/dnsmasq@.service
Adapt these files to make use of init-system-common and systemd-helper.
- d/dnsmasq.{post,pre}{inst,rm}
Rely mostly on the script snippets created by the DH tools to get
things done, implicitly fixes the lintian warnings
maintainer-script-should-not-use-dpkg-maintscript-helper and
command-with-path-in-maintainer-script.
- d/resolvconf*
Change file mode bits to 0755, the installed files need it
New files:
- d/dnsmasq.{install,links,maintscript}
- d/dnsmasq-base.{dirs,docs,install}
- d/dnsmasq-base-lua.{dirs,docs,install,links}
- d/dnsmasq-utils.{install,manpages}
The DH tools use these to install what was scripted explicitly
in the previous version of the d/rules file,
lintian warning dbus-policy-in-etc fixed
- d/init-system-common
- d/systemd-helper
These files contain slightly modified code formerly part of in
d/dnsmasq.init.
Deleted files:
- d/*conffiles
- d/lintian-override
- d/installed-marker
These are not in use anymore.
* Deal with a removed conffile and changed links.
Modified files:
- d/dnsmasq-base.{postinst,postrm}
New files:
- d/dnsmasq-base.maintscript
- d/dnsmasq-base-lua.maintscript
* Add watch file and upstream's signing key.
New files:
- d/watch
- d/u/signing-key.asc
* Remove dependency on package adduser.
Modified files:
- d/control
- d/dnsmasq.post{inst,rm}
* Refactor d/copyright to comply with DEP 5 (closes: #966505).
* Remove trailing whitespace from various files under debian/.
* Bump Standards-Version to 4.6.2.
* Specify Rules-Requires-Root.
* Update http:// to https:// with Homepage, Vcs-Git and Vcs-Browser.
* Introduce d/u/metadata.
* Fix lintian issue duplicate-short-description.
* Fix lintian issue capitalization-error-in-description.
* Bump Lua version to 5.4 (closes: #1050750).
Modified files:
- d/control
- d/t/functions.d/log.patterns
Checksums-Sha1:
078b294b8f10eaf0d398fefc1591b094e47bb69a 2528 dnsmasq_2.90-1.dsc
67789e49191523d8b31d515d8b6e9a03bd57fd29 841075 dnsmasq_2.90.orig.tar.gz
c3da9ffdafda3d6a829fe54ed2a4d847d67bc9aa 833 dnsmasq_2.90.orig.tar.gz.asc
7dd9c0e9d2a67f7e23d79aa436be746382e8f5ad 31172 dnsmasq_2.90-1.debian.tar.xz
62ead3b151276a4255aca0cddedbf2d29fe784ed 10249 dnsmasq_2.90-1_amd64.buildinfo
Checksums-Sha256:
2240fcfc35f7a8944abe72469f1ac0a45612e9bb477b7f55e80b2b088c36686b 2528
dnsmasq_2.90-1.dsc
8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b 841075
dnsmasq_2.90.orig.tar.gz
55c4ffc04b88b0aaadc0eb6719bec17260fd510f1c9d44a111deb40741f8492a 833
dnsmasq_2.90.orig.tar.gz.asc
7132238326bd840a570ac558e42b5313cf6bb2c7d46324e437e5d63b7bb4d6b3 31172
dnsmasq_2.90-1.debian.tar.xz
3d6c0cc71ed2091218d99d9742145ee6283109867b2e505f56788b12795b805c 10249
dnsmasq_2.90-1_amd64.buildinfo
Files:
f3217ffde01b9b5021118418943c3b45 2528 net optional dnsmasq_2.90-1.dsc
23a767c3a6797d20492d06d352fd926b 841075 net optional dnsmasq_2.90.orig.tar.gz
3b71f1f0f694cc15d141d2dd5f1f49b0 833 net optional dnsmasq_2.90.orig.tar.gz.asc
c624d9fa7ac9488268bd3d307affb3c2 31172 net optional
dnsmasq_2.90-1.debian.tar.xz
fb481b08da55a60ea12bffeb4e6b9b9a 10249 net optional
dnsmasq_2.90-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE1urL1u5GuDQkjRESFc3aauGRNaIFAmXLc/MACgkQFc3aauGR
NaI8zg/7Bs6pLncgvlQ+jWIKTg+Rg/LV0gzHZAywZjYhHZil56DiieM1J1EmMm7P
gqCIB+Kcgl1eHwj2jlyJyk7PtjwpzhrLH4IJSBaxm0jrPuwpZ2v69KRTY50xd/2t
zK2cOun6PQqwQxcDTmeHNvPPSlGm0z8sC6R1ACcQYQ0oXUDkA9e7Ny5fMx6Fj6Ux
YOU5JR+DZEMYeZ310ssYza3LcJ6DCJernFiltYeCi/2JHK5P2dYOK5GzwdDsQY0p
MRMstQ8/QOQJPk2WOOIo3XGQBA+HYNISmQq6WDeAJFcswazXj2rzkZuxSHn0E6Es
kZC1Tt5kUyrL/b0cu+u7isZwhwhSyr3wDxzBvZiW0u7hgpfdrTYlk4nNcSLan7Xn
00yF/mNtB1tRx6dwXmoml0llBuIo0wDnQwucHFVKBUlZYzBF0w2CMe2G69fzLz+w
eRxwYH+4B2FqNNCKGKStaHyJDTXcDPHVDF8HlICOWG3moRE5u0mBXhQVMxccrI1Z
TZm7ynHjGQFjCx4/fKzpJXi6XAhyW5p5NYdthe/L1nrzYno3wSyGxqKwezSnqA9h
63cwU5E7LcuYvnl5/NP+BrFrenMRmnAcTc636vnU0XAzCfXPgxTvVWwuNwW75I4k
sUBliCqvWHwI8fopMIV9IHgWQD/syzlslvS4DBCx0JwhhhlbR38=
=YCIk
-----END PGP SIGNATURE-----
pgp8Zt7BOt2yy.pgp
Description: PGP signature
--- End Message ---
