Source: sudo Version: 1.9.15p3-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
Dear Maintainer, your package installs a systemd system unit mask (symlink to /dev/null), currently into /lib. This symlink needs to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using systemd.pc to place it (using pkg-config). This works for unstable today, and also for bookworm-backports, and is safe to do now. Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru sudo-1.9.15p3/debian/changelog sudo-1.9.15p3/debian/changelog --- sudo-1.9.15p3/debian/changelog 2023-12-14 20:22:51.000000000 +0100 +++ sudo-1.9.15p3/debian/changelog 2023-12-18 00:14:29.000000000 +0100 @@ -1,3 +1,10 @@ +sudo (1.9.15p3-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use systemd.pc to place systemd unit mask. (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Mon, 18 Dec 2023 00:14:29 +0100 + sudo (1.9.15p3-1) unstable; urgency=medium * new upstream version 1.9.15p3 diff -Nru sudo-1.9.15p3/debian/control sudo-1.9.15p3/debian/control --- sudo-1.9.15p3/debian/control 2023-12-14 20:22:51.000000000 +0100 +++ sudo-1.9.15p3/debian/control 2023-12-18 00:14:29.000000000 +0100 @@ -6,7 +6,7 @@ Hanno Wagner <wag...@debian.org>, Hilko Bengen <ben...@debian.org>, Bastian Blank <wa...@debian.org> -Build-Depends: debhelper-compat (= 13), dh-sequence-installnss, libpam0g-dev, libldap2-dev, libsasl2-dev, libselinux1-dev [linux-any], autoconf, bison, flex, libaudit-dev [linux-any], zlib1g-dev, po-debconf +Build-Depends: debhelper-compat (= 13), dh-sequence-installnss, libpam0g-dev, libldap2-dev, libsasl2-dev, libselinux1-dev [linux-any], autoconf, bison, flex, libaudit-dev [linux-any], zlib1g-dev, po-debconf, pkgconf, systemd Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/sudo-team/sudo.git diff -Nru sudo-1.9.15p3/debian/rules sudo-1.9.15p3/debian/rules --- sudo-1.9.15p3/debian/rules 2023-12-14 20:22:51.000000000 +0100 +++ sudo-1.9.15p3/debian/rules 2023-12-18 00:13:28.000000000 +0100 @@ -42,6 +42,8 @@ # building on a usrmerge or non-usrmerge system. CONFIGURE_ARGS += MVPROG=/bin/mv +deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd) + %: dh $@ @@ -75,8 +77,8 @@ for pkg in sudo sudo-ldap; do \ mv debian/$$pkg/etc/sudoers.dist \ debian/$$pkg/usr/share/doc/$$pkg/examples/sudoers.dist; \ - mkdir -p debian/$$pkg/lib/systemd/system; \ - ln -s /dev/null debian/$$pkg/lib/systemd/system/sudo.service; \ + mkdir -p debian/$$pkg$(deb_systemdsystemunitdir)/; \ + ln -s /dev/null debian/$$pkg$(deb_systemdsystemunitdir)/sudo.service; \ done execute_after_dh_fixperms:
