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

[git-ubuntu bot]

You have been requested to review the proposed merge of ~mirespace/ubuntu/+source/openssh:merge-lp2040406-noble into ubuntu/+source/openssh:debian/sid.

For more details, see:
https://code.launchpad.net/~mirespace/ubuntu/+source/openssh/+git/openssh/+merge/459366

Hi team,

PPA for this merge is (the builds are OK there for all archs):

ppa:mirespace/merge-openssh-9.6p1-3-noble-lp2040406
https://launchpad.net/~mirespace/+archive/ubuntu/merge-openssh-9.6p1-3-noble-lp2040406

Usual tags are there:

❯ git tag | grep mirespace
mirespace/logical/1%9.4p1-1ubuntu2
mirespace/new/debian
mirespace/old/debian
mirespace/old/ubuntu
mirespace/reconstruct/1%9.4p1-1ubuntu2
mirespace/split/1%9.4p1-1ubuntu2

Test passed, except for i386 (but it has the same problem since focal):

* Results:
  - openssh/1:9.6p1-3ubuntu1
    + ✅ openssh on noble for amd64   @ 24.01.24 12:55:50  Log️ 🗒️ 
    + ✅ openssh on noble for amd64   @ 24.01.24 13:00:46  Log️ 🗒️ 
    + ✅ openssh on noble for amd64   @ 24.01.24 13:03:13  Log️ 🗒️ 
    + ✅ openssh on noble for arm64   @ 24.01.24 13:43:16  Log️ 🗒️ 
    + ✅ openssh on noble for arm64   @ 24.01.24 14:12:20  Log️ 🗒️ 
    + ✅ openssh on noble for armhf   @ 24.01.24 13:08:54  Log️ 🗒️ 
    + ❌ openssh on noble for i386    @ 24.01.24 12:38:10  Log️ 🗒️ 
      • regress                   FAIL   🟥
      • systemd-socket-activation PASS   🟩
    + ❌ openssh on noble for i386    @ 24.01.24 12:41:43  Log️ 🗒️ 
      • regress                   FAIL   🟥
      • systemd-socket-activation PASS   🟩
    + ✅ openssh on noble for ppc64el @ 24.01.24 12:48:35  Log️ 🗒️ 
    + ✅ openssh on noble for s390x   @ 24.01.24 12:54:23  Log️ 🗒️ 
* Running: (none)

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mirespace-merge-openssh-9.6p1-3-noble-lp2040406/?format=plain

Upgrade from previous package well went too:

root at Nopenssh-merge:~# apt list --upgradable
Listing... Done
openssh-client/noble 1:9.6p1-3ubuntu1 amd64 [upgradable from: 1:9.4p1-1ubuntu1]
openssh-server/noble 1:9.6p1-3ubuntu1 amd64 [upgradable from: 1:9.4p1-1ubuntu1]
openssh-sftp-server/noble 1:9.6p1-3ubuntu1 amd64 [upgradable from: 1:9.4p1-1ubuntu1]

root at Nopenssh-merge:~# dpkg -l | grep openssh
ii  openssh-client                  1:9.6p1-3ubuntu1                        amd64        secure shell (SSH) client, for secure access to remote machines
ii  openssh-server                  1:9.6p1-3ubuntu1                        amd64        secure shell (SSH) server, for secure access from remote machines
ii  openssh-sftp-server             1:9.6p1-3ubuntu1                        amd64        secure shell (SSH) sftp server module, for SFTP access from remote machines
root at Nopenssh-merge:~#

and ssh.server status is the same that in previus package version:

root at Nopenssh-merge:~# systemctl status ssh.service
○ ssh.service - OpenBSD Secure Shell server
     Loaded: loaded (/lib/systemd/system/ssh.service; disabled; preset: enabled)
    Drop-In: /etc/systemd/system/ssh.service.d
             └─00-socket.conf
     Active: inactive (dead)
TriggeredBy: ● ssh.socket
       Docs: man:sshd(8)
             man:sshd_config(5)

Regarding to this, I have doubts about the change in d/rules, in override_dh_installsystemd, about shh.socket activation for the openssh-server unit service: we have two commits that touch this (and conflicts), one from upstream:

https://salsa.debian.org/ssh-team/openssh/-/commit/da06b7ef32c20de4dd18cd578025d96a9221984b

and one from us:

https://git.launchpad.net/ubuntu/+source/openssh/commit/debian/rules?h=ubuntu/noble-devel&id=693deb935fd5042bbde98d6ee9344f4800612eef

Upstream commit fix LP: #2047082 and I didn’t find a clear motivation for our commit between our bugs, except this discussion:

https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1991592

I finally decided to take upstream changes, but this is open for discussion and redone if necessary.

About other bugs that can be fixed with this merge, we have a fix from upstream with this merge for bug 2047082 and bug 2049552. As a low priority bug,  maybe the bug 2037703 can be considered to be included here, adding the info in the README.Debian file.

P.S. I'm uploading the packages again for some cosmetic changes in the changelog.

-- 
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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 67527 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-sponsors/attachments/20240124/22bf5f4d/attachment-0001.diff>