Merge ~athos-ribeiro/ubuntu/+source/openssh:lp-1905285-socket-preserve-runtime-hirsute into ubuntu/+source/openssh:ubuntu/hirsute-devel

[Athos Ribeiro]

This patch fixes LP: #1905285 where openssh crashes when multiple instances of the socket activated systemd unit were spawned.

The fix was also forwarded to Debian in https://salsa.debian.org/ssh-team/openssh/-/merge_requests/12 and has been fixed in impish.

A PPA with the proposed fix is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/openssh-lp-1905285-socket-preserve-runtime/+packages

I also ran the autopkgtest test suite locally, here is the test run summary:

autopkgtest [12:11:09]: @@@@@@@@@@@@@@@@@@@@ summary
regress PASS

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

This has been reviewed and approved by others; it's also a very trivial change that LGTM. I have also verified that the version will not conflict with future Ubuntu releases. I'm approving and sponsoring the package:

$ git push pkg upload/1%8.4p1-5ubuntu1.1
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.33 KiB | 170.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/openssh
 * [new tag] upload/1%8.4p1-5ubuntu1.1 -> upload/1%8.4p1-5ubuntu1.1

$ dput openssh_8.4p1-5ubuntu1.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/openssh/openssh_8.4p1-5ubuntu1.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/openssh/openssh_8.4p1-5ubuntu1.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openssh_8.4p1-5ubuntu1.1.dsc: done.
  Uploading openssh_8.4p1-5ubuntu1.1.debian.tar.xz: done.
  Uploading openssh_8.4p1-5ubuntu1.1_source.buildinfo: done.
  Uploading openssh_8.4p1-5ubuntu1.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b88a0d3..25b1143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:8.4p1-5ubuntu1.1) hirsute; urgency=medium
+
+  * d/systemd/ssh@.service: preserve the systemd managed runtime directory to
+    ensure parallel processes will not disrupt one another when halting
+    (LP: #1905285)
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 28 Jul 2021 10:33:49 -0300
+
 openssh (1:8.4p1-5ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian; remaining changes:
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service
index f7fec1f..29864a8 100644
--- a/debian/systemd/ssh@.service
+++ b/debian/systemd/ssh@.service
@@ -8,4 +8,5 @@ EnvironmentFile=-/etc/default/ssh
 ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
 StandardInput=socket
 RuntimeDirectory=sshd
+RuntimeDirectoryPreserve=yes
 RuntimeDirectoryMode=0755