Skip to contentSkip to conversation

openssh: upgrade 8.4p1 -> 8.5p1

PATCH In review Wang Mingyu 4 participants 8 messages Mar 17, 2021 – Mar 19, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openssh: upgrade 8.4p1 -> 8.5p1

0f90440ca70abab947acbd77795e9f130967956c.patch
removed since it is included in 8.5p1

License Updated :
2-clause BSD license and 4-clause BSD license added

---
 ...440ca70abab947acbd77795e9f130967956c.patch | 28 -------------------
 .../{openssh_8.4p1.bb => openssh_8.5p1.bb}    |  5 ++--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch
 rename meta/recipes-connectivity/openssh/{openssh_8.4p1.bb => openssh_8.5p1.bb} (97%)
meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch deleted +0 -28
deleted file mode 100644
index b88bc18f12..0000000000
@@ -1,28 +0,0 @@
-From 0f90440ca70abab947acbd77795e9f130967956c Mon Sep 17 00:00:00 2001
-From: Darren Tucker <[email protected]>
-Date: Fri, 20 Nov 2020 13:37:54 +1100
-Subject: [PATCH] Add new pselect6_time64 syscall on ARM.
-
-This is apparently needed on armhfp/armv7hl.  bz#3232, patch from
-jjelen at redhat.com.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-Upstream-Status: Backport
-[fixes issues on 32bit IA and probably other 32 bit platforms too with glibc 2.33]
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index e0768c063..5065ae7ef 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -267,6 +267,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_pselect6
- 	SC_ALLOW(__NR_pselect6),
- #endif
-+#ifdef __NR_pselect6_time64
-+	SC_ALLOW(__NR_pselect6_time64),
-+#endif
- #ifdef __NR_read
- 	SC_ALLOW(__NR_read),
- #endif
meta/recipes-connectivity/openssh/openssh_8.5p1.bb renamed from meta/recipes-connectivity/openssh/openssh_8.4p1.bb +2 -3
similarity index 97%
rename from meta/recipes-connectivity/openssh/openssh_8.4p1.bb
rename to meta/recipes-connectivity/openssh/openssh_8.5p1.bb
index 128e2e318a..61d9b95b9e 100644
@@ -6,7 +6,7 @@ and for executing commands on a remote machine."
 HOMEPAGE = "http://www.openssh.com/"
 SECTION = "console/network"
 LICENSE = "BSD & ISC & MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=18d9e5a8b3dd1790d73502f50426d4d3"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11"
 
 DEPENDS = "zlib openssl virtual/crypt"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -24,9 +24,8 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
            file://sshd_check_keys \
            file://add-test-support-for-busybox.patch \
-           file://0f90440ca70abab947acbd77795e9f130967956c.patch \
            "
-SRC_URI[sha256sum] = "5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24"
+SRC_URI[sha256sum] = "f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25"
 
 # This CVE is specific to OpenSSH server, as used in Fedora and Red Hat Enterprise Linux 7
 # and when running in a Kerberos environment. As such it is not relevant to OpenEmbedded
Signature · 1 line
2.25.1
#1 lore raw
Quoted 5 lines · Wang Mingyu

0f90440ca70abab947acbd77795e9f130967956c.patch
removed since it is included in 8.5p1

License Updated :
2-clause BSD license and 4-clause BSD license added

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

Cheers,

Richard

#2 lore raw
Quoted 1 line

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

I use spdx-tool to find out the following licenses. Do I need to clarify them all:

BSD
BSD-2-Clause
BSD-3-Clause
BSD-4-Clause
SSH-OpenSSH
Beerware
MIT
MIT-style
ISC

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 22 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Richard Purdie
Sent: Wednesday, March 17, 2021 8:23 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] openssh: upgrade 8.4p1 -> 8.5p1

Quoted 5 lines · Wang Mingyu

0f90440ca70abab947acbd77795e9f130967956c.patch
removed since it is included in 8.5p1

License Updated :
2-clause BSD license and 4-clause BSD license added

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

Cheers,

Richard

#3 lore raw
Quoted 4 lines · On Thu, 2021-03-18 at 06:27 +0000, [email protected] wrote:
Quoted 1 line

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

I use spdx-tool to find out the following licenses. Do I need to clarify them all:

Quoted 9 lines

BSD
BSD-2-Clause
BSD-3-Clause
BSD-4-Clause
SSH-OpenSSH
Beerware
MIT
MIT-style
ISC

I found it hard to answer this without knowing what had changed. I went and looked at the difference between the license file in 8.4p1 and 8.5p1 and the difference is an algorithm was removed in 8.5 and the associated license section was dropped. This doesn't change the license situation so LICENSE is unchanged.

We probably do separately need to update LICENSE so show that BSD-2-Clause, BSD-3-Clause and BSD-4-Clause are all present.

Cheers,

Richard

#4 lore raw
Quoted 16 lines · Richard Purdie
Quoted 4 lines · On Thu, 2021-03-18 at 06:27 +0000, [email protected] wrote:
Quoted 1 line

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

I use spdx-tool to find out the following licenses. Do I need to clarify them all:

Quoted 9 lines

BSD
BSD-2-Clause
BSD-3-Clause
BSD-4-Clause
SSH-OpenSSH
Beerware
MIT
MIT-style
ISC

Quoted 8 lines

I found it hard to answer this without knowing what had changed. I went and looked at the difference between the license file in 8.4p1 and 8.5p1 and the difference is an algorithm was removed in 8.5 and the associated license section was dropped. This doesn't change the license situation so LICENSE is unchanged.

We probably do separately need to update LICENSE so show that BSD-2-Clause, BSD-3-Clause and BSD-4-Clause are all present.

Right. I think we had this not captured in recipe before this,

Quoted 13 lines

Cheers,

Richard

#5 lore raw
In reply to Richard Purdie

I intend to make the following changes to specify BSD, is it OK?

Before:
BSD & ISC & MIT

After:
BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 39 lines

-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Friday, March 19, 2021 5:35 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] openssh: upgrade 8.4p1 -> 8.5p1

Quoted 4 lines · On Thu, 2021-03-18 at 06:27 +0000, [email protected] wrote:
Quoted 1 line

Doesn't that mean we should clarify "BSD" in the LICENSE field then?

I use spdx-tool to find out the following licenses. Do I need to clarify them all:

Quoted 9 lines

BSD
BSD-2-Clause
BSD-3-Clause
BSD-4-Clause
SSH-OpenSSH
Beerware
MIT
MIT-style
ISC

I found it hard to answer this without knowing what had changed. I went and looked at the difference between the license file in 8.4p1 and 8.5p1 and the difference is an algorithm was removed in 8.5 and the associated license section was dropped. This doesn't change the license situation so LICENSE is unchanged.

We probably do separately need to update LICENSE so show that BSD-2-Clause, BSD-3-Clause and BSD-4-Clause are all present.

Cheers,

Richard

#6 lore raw
Quoted 7 lines · On Fri, 2021-03-19 at 00:03 +0000, [email protected] wrote:

I intend to make the following changes to specify BSD, is it OK?

Before:
BSD & ISC & MIT

After:
BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT

Yes, as a separate change to the version upgrade which needs amending to explain the license change.

Cheers,

Richard

#7 lore raw

I am going to make a patch group.
The first patch will update the version of openssh,
the second one will update LICENSE so show that BSD-2-Clause, BSD-3-Clause and BSD-4-Clause and explain the reason for the modification. Is it OK?

Or, make the version update together with the change of license.

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 23 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Richard Purdie
Sent: Friday, March 19, 2021 8:10 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] openssh: upgrade 8.4p1 -> 8.5p1

Quoted 7 lines · On Fri, 2021-03-19 at 00:03 +0000, [email protected] wrote:

I intend to make the following changes to specify BSD, is it OK?

Before:
BSD & ISC & MIT

After:
BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT

Yes, as a separate change to the version upgrade which needs amending to explain the license change.

Cheers,

Richard