diff mbox series

[33/56] openssh: upgrade 9.9p2 -> 10.0p1

Message ID 1747040619-7566-33-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/56] appstream: upgrade 1.0.4 -> 1.0.5 | expand

Commit Message

Wang Mingyu May 12, 2025, 9:03 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
refreshed for 10.0p1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...gress-test-exec-use-the-absolute-path-in-the-SSH-e.patch | 6 +++---
 .../openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb}         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-connectivity/openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb} (99%)

Comments

Richard Purdie May 12, 2025, 1:22 p.m. UTC | #1
On Mon, 2025-05-12 at 17:03 +0800, wangmy via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> 0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
> refreshed for 10.0p1
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...gress-test-exec-use-the-absolute-path-in-the-SSH-e.patch | 6 +++---
>  .../openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb}         | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta/recipes-connectivity/openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb} (99%)


https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1579

(and many more)

The ssh server doesn't work after this change as per the other similar patches sent.

Cheers,

Richard
Peter Kjellerstedt May 13, 2025, 2:29 p.m. UTC | #2
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Richard Purdie via lists.openembedded.org
> Sent: den 12 maj 2025 15:23
> To: wangmy@fujitsu.com; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 33/56] openssh: upgrade 9.9p2 -> 10.0p1
> 
> On Mon, 2025-05-12 at 17:03 +0800, wangmy via lists.openembedded.org wrote:
> > From: Wang Mingyu <wangmy@fujitsu.com>
> >
> > 0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
> > refreshed for 10.0p1
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> >  ...gress-test-exec-use-the-absolute-path-in-the-SSH-e.patch | 6 +++---
> >  .../openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb}         | 2 +-
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >  rename meta/recipes-connectivity/openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb} (99%)
> 
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1579
> 
> (and many more)
> 
> The ssh server doesn't work after this change as per the other similar
> patches sent.
> 
> Cheers,
> 
> Richard

Not sure if it is related, but we have this in our bbappend that lifts 
the version of openssh from 9.9p2 to 10.0p1:

FILES:${PN}-sshd += "${libexecdir}/sshd-auth"

//Peter
Richard Purdie May 14, 2025, 2:07 p.m. UTC | #3
On Tue, 2025-05-13 at 14:29 +0000, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From:
> > openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org
> > > On Behalf Of Richard Purdie via lists.openembedded.org
> > Sent: den 12 maj 2025 15:23
> > To: wangmy@fujitsu.com; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH 33/56] openssh: upgrade 9.9p2 ->
> > 10.0p1
> > 
> > On Mon, 2025-05-12 at 17:03 +0800, wangmy via
> > lists.openembedded.org wrote:
> > > From: Wang Mingyu <wangmy@fujitsu.com>
> > > 
> > > 0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
> > > refreshed for 10.0p1
> > > 
> > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > > ---
> > >  ...gress-test-exec-use-the-absolute-path-in-the-SSH-e.patch | 6
> > > +++---
> > >  .../openssh/{openssh_9.9p2.bb => openssh_10.0p1.bb}         | 2
> > > +-
> > >  2 files changed, 4 insertions(+), 4 deletions(-)
> > >  rename meta/recipes-connectivity/openssh/{openssh_9.9p2.bb =>
> > > openssh_10.0p1.bb} (99%)
> > 
> > 
> > https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1579
> > 
> > (and many more)
> > 
> > The ssh server doesn't work after this change as per the other
> > similar
> > patches sent.
> > 
> > Cheers,
> > 
> > Richard
> 
> Not sure if it is related, but we have this in our bbappend that
> lifts the version of openssh from 9.9p2 to 10.0p1:
> 
> FILES:${PN}-sshd += "${libexecdir}/sshd-auth"

Thanks, that does indeed fix it. I wish you'd sent the upgrade if you
had it working!

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch b/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
index b90cd2e69d..360b62af34 100644
--- a/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
+++ b/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
@@ -1,4 +1,4 @@ 
-From fb762172fb678fe29327b667f8fe7380962a4540 Mon Sep 17 00:00:00 2001
+From 9dcccafe44ea17e972e7cddea205bbe9fe71d8d6 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <jose.quaresma@foundries.io>
 Date: Mon, 15 Jul 2024 18:43:08 +0100
 Subject: [PATCH] regress/test-exec: use the absolute path in the SSH env
@@ -18,10 +18,10 @@  Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
  1 file changed, 5 insertions(+)
 
 diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index 7afc2807..175f554b 100644
+index 8a00c72..2891f27 100644
 --- a/regress/test-exec.sh
 +++ b/regress/test-exec.sh
-@@ -175,6 +175,11 @@ if [ "x$TEST_SSH_OPENSSL" != "x" ]; then
+@@ -179,6 +179,11 @@ if [ "x$TEST_SSH_OPENSSL" != "x" ]; then
  fi
  
  # Path to sshd must be absolute for rexec
diff --git a/meta/recipes-connectivity/openssh/openssh_9.9p2.bb b/meta/recipes-connectivity/openssh/openssh_10.0p1.bb
similarity index 99%
rename from meta/recipes-connectivity/openssh/openssh_9.9p2.bb
rename to meta/recipes-connectivity/openssh/openssh_10.0p1.bb
index 5191725796..21e1e50759 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.9p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_10.0p1.bb
@@ -26,7 +26,7 @@  SRC_URI = "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.ta
            file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
            file://0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch \
            "
-SRC_URI[sha256sum] = "91aadb603e08cc285eddf965e1199d02585fa94d994d6cae5b41e1721e215673"
+SRC_URI[sha256sum] = "021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c"
 
 CVE_STATUS[CVE-2007-2768] = "not-applicable-config: This CVE is specific to OpenSSH with the pam opie which we don't build/use here."