Bug#1043420: orphan-sysvinit-scripts: triggers will be broken by /usr-merge

[Helmut Grohne]

Package: orphan-sysvinit-scripts
Version: 0.14
Tags: patch

Hi Matthew,

orphan-sysvinit-scripts happes to declare trigger interest in a way that
is affected by the /usr-merge. As packages move their unit files from /
to /usr, dpkg will cease activating orphan-sysvinit-scripts's trigger.
This is not a problem now, because the file move moratorium prevents
such moves, but when we lift the moratorium, this issue will become
release critical. The problem is described in DEP17-P2 (draft available
at https://subdivi.de/~helmut/dep17.html). Even though we are still in
the process of selecting mitigations, the mitigation for this already is
pretty clear: Duplicating triggers (M12). I'm attaching a patch for your
convenience.

This change is compatible with the moratorium and can be applied right
away. It would be good to have this change in trixie within two months
from now.

Maintaining this duplication may be annoying due to the number of
interests. If you prefer, we can try generating the trigger file at
build to enforce the duplication rule. Let me know if you want me to do
that.

Let me know if you have any questions.

Helmut
-------------- next part --------------
diff --minimal -Nru orphan-sysvinit-scripts-0.14/debian/changelog orphan-sysvinit-scripts-0.14+nmu1/debian/changelog
--- orphan-sysvinit-scripts-0.14/debian/changelog	2023-02-24 11:01:40.000000000 +0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/changelog	2023-08-10 18:40:24.000000000 +0200
@@ -1,3 +1,10 @@
+orphan-sysvinit-scripts (0.14+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Duplicate triggers for /usr-merge. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 10 Aug 2023 18:40:24 +0200
+
 orphan-sysvinit-scripts (0.14) unstable; urgency=medium
 
   * Divert rsyslog-rotate with a portable version (Closes: #1031854)
diff --minimal -Nru orphan-sysvinit-scripts-0.14/debian/orphan-sysvinit-scripts.triggers orphan-sysvinit-scripts-0.14+nmu1/debian/orphan-sysvinit-scripts.triggers
--- orphan-sysvinit-scripts-0.14/debian/orphan-sysvinit-scripts.triggers	2023-02-24 11:01:40.000000000 +0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/orphan-sysvinit-scripts.triggers	2023-08-10 18:40:21.000000000 +0200
@@ -1,11 +1,25 @@
+# According to DEP17-P2/M12, triggers for locations affected by /usr-merge
+# should be duplicated until forky is released. Then, the non-/usr variants may
+# be deleted.
+interest-noawait /usr/lib/systemd/system/NetworkManager.service
 interest-noawait /lib/systemd/system/NetworkManager.service
+interest-noawait /usr/lib/systemd/system/avahi-daemon.service
 interest-noawait /lib/systemd/system/avahi-daemon.service
+interest-noawait /usr/lib/systemd/system/avahi-dnsconfd.service
 interest-noawait /lib/systemd/system/avahi-dnsconfd.service
+interest-noawait /usr/lib/systemd/system/dirsrv.service
 interest-noawait /lib/systemd/system/dirsrv.service
+interest-noawait /usr/lib/systemd/system/dnscrypt-proxy.service
 interest-noawait /lib/systemd/system/dnscrypt-proxy.service
+interest-noawait /usr/lib/systemd/system/firewalld.service
 interest-noawait /lib/systemd/system/firewalld.service
+interest-noawait /usr/lib/systemd/system/gpsd.service
 interest-noawait /lib/systemd/system/gpsd.service
+interest-noawait /usr/lib/systemd/system/nftables.service
 interest-noawait /lib/systemd/system/nftables.service
+interest-noawait /usr/lib/systemd/system/pdns.service
 interest-noawait /lib/systemd/system/pdns.service
+interest-noawait /usr/lib/systemd/system/rsyslog.service
 interest-noawait /lib/systemd/system/rsyslog.service
+interest-noawait /usr/lib/systemd/system/tomcat9.service
 interest-noawait /lib/systemd/system/tomcat9.service