[Merge] ~mirespace/ubuntu/+source/openssh:merge-lp2040406-noble into ubuntu/+source/openssh:debian/sid

[Nick Rosbrook]

Review: Needs Fixing

This change needs to be restored:

- debian/rules: modify dh_installsystemd invocations for
  socket-activated sshd.

The conflict with the upstream change is actually very straight forward; just take their invocations for rescue-ssh.target, and keeps ours for ssh.{service,socket}. I.e., our delta with Debian against debian/rules would now look like:

diff --git a/debian/rules b/debian/rules
index c921ece2..dff47135 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,8 +189,8 @@ override_dh_installinit:
        dh_installinit -R --name ssh
 
 override_dh_installsystemd:
-       dh_installsystemd -popenssh-server ssh.service
-       dh_installsystemd -popenssh-server --no-enable ssh.socket
+       dh_installsystemd -popenssh-server --no-start ssh.socket
+       dh_installsystemd -popenssh-server --no-enable --no-start ssh.service
        dh_installsystemd -popenssh-server --no-start rescue-ssh.target
 
 debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in

-- 
https://code.launchpad.net/~mirespace/ubuntu/+source/openssh/+git/openssh/+merge/459366
Your team Ubuntu Sponsors is requested to review the proposed merge of ~mirespace/ubuntu/+source/openssh:merge-lp2040406-noble into ubuntu/+source/openssh:debian/sid.