Merge ~bryce/ubuntu/+source/openssh:sru-lp1986521-jammy into ubuntu/+source/openssh:ubuntu/jammy-devel

Since I was involved in the initial triage, might as well review the final MP.

Thanks for the MP, Bryce.

Right from the start I noticed that you've decided to backport the patch directly from the bug, instead of the one that actually got pushed upstream. The two patches share the same approach, but have differences that I think are important.

Is there a reason I'm not seeing for this choice, or was it just a "thinko"? :-)

Huh, right you are. Not sure how that happened, I definitely meant to use the upstream one.

I've swapped the right patch in. It didn't apply directly, but the problem was just the RCS header updates (which I've dropped), and the debugging macro's code differed. The macro is probably irrelevant for production code but I've quilt edited it and replaced with the definition from the upstream patch.

The commit with the latest version of the patch changes is 6b01f86277b2c850c41fbe508054e5c741e6758a

I'm going to update the PPA and re-run the autopkgtests but for now am assuming those are fine. I'll report back here if not.

Thanks, Bryce.

Phew, it took me a while to properly review the patch as well. It's certainly on the long side for an SRU. But the good news is that the patch is not hard to understand; it just has a bunch of code reorganization that requires manual inspection and attention to detail.

The package built fine locally. I thought about running autopkgtest locally but gave up on the idea because it'd take hours to get a result. Before you updated the MP with the new version of the patch, I had also backported it locally and I confirm that both versions match.

I'm leaving minor comments below, but otherwise the MP LGTM. The SRU text also looks OK. +1 assuming that autopkgtest is OK.

Approvers: bryce, sergiodj
Uploaders: bryce, sergiodj
MP auto-approved

Thanks Sergio, the autopkgtests all passed, so I've uploaded to jammy:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-bryce-openssh-sru-lp1986521/?format=plain)
  openssh @ amd64:
    01.12.22 04:42:15 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy1
    02.12.22 06:36:46 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy2
  openssh @ arm64:
    01.12.22 04:41:39 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy1
    02.12.22 07:02:15 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy2
  openssh @ armhf:
    01.12.22 04:45:00 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy1
    02.12.22 06:51:56 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy2
  openssh @ ppc64el:
    01.12.22 04:48:19 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy1
    02.12.22 06:36:28 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy2
  openssh @ s390x:
    01.12.22 04:43:16 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy1
    02.12.22 06:37:01 Log 🗒️ ✅ Triggers: openssh/1:8.9p1-3ubuntu0.1~jammy2

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/openssh
Vcs-Git-Commit: 0d1dd76880d89993f83539a561596f33d1c78c1a
Vcs-Git-Ref: refs/heads/sru-lp1986521-jammy
$ dput ubuntu ../openssh_8.9p1-3ubuntu0.1_source.changes
gpg: ../openssh_8.9p1-3ubuntu0.1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../openssh_8.9p1-3ubuntu0.1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openssh_8.9p1-3ubuntu0.1.dsc: done.
  Uploading openssh_8.9p1-3ubuntu0.1.debian.tar.xz: done.
  Uploading openssh_8.9p1-3ubuntu0.1_source.buildinfo: done.
  Uploading openssh_8.9p1-3ubuntu0.1_source.changes: done.
Successfully uploaded packages.

The SRU has been accepted and this has successfully migrated:

openssh | 1:8.9p1-3 | jammy
openssh | 1:8.9p1-3ubuntu0.1 | jammy-updates

There's been one bug reported about this upload, LP: #2004035, however the triager marked it as likely just a local configuration issue, not an issue with the upload itself.