diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2024-09-25 14:48:55 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-09-30 17:00:41 +0100 |
| commit | 26fb4541ffb471fc5a2e2d1ad4c2f3534890fed7 (patch) | |
| tree | ef34aff7501c2627a25439341dadc2b97365974a | |
| parent | 292b015bae6fdd11f086dc30f385f45ef2f0eb8d (diff) | |
| download | openembedded-core-26fb4541ffb471fc5a2e2d1ad4c2f3534890fed7.tar.gz | |
openssh: upgrade 9.8p1 -> 9.9p1
License-Update:
include openbsd-compat/base64.c license in LICENSE
0001-Cast-to-sockaddr-in-systemd-interface.patch
removed since it's included in 9.9p1
Changelog:
http://www.openssh.com/releasenotes.html
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/0001-Cast-to-sockaddr-in-systemd-interface.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_9.9p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_9.8p1.bb) | 5 |
2 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Cast-to-sockaddr-in-systemd-interface.patch b/meta/recipes-connectivity/openssh/openssh/0001-Cast-to-sockaddr-in-systemd-interface.patch deleted file mode 100644 index c41642ae10..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Cast-to-sockaddr-in-systemd-interface.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a3068c6edb81c0b0b9a2ced82e8632c79314e409 Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker@dtucker.net> -Date: Sun, 7 Jul 2024 18:46:19 +1000 -Subject: [PATCH] Cast to sockaddr * in systemd interface. - -Fixes build with musl libx. bz#3707. - -Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/8b664df75966e5aed8dabea00b8838303d3488b8] - -Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> ---- - openbsd-compat/port-linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c -index 4c024c6d2..8adfec5a7 100644 ---- a/openbsd-compat/port-linux.c -+++ b/openbsd-compat/port-linux.c -@@ -366,7 +366,7 @@ ssh_systemd_notify(const char *fmt, ...) - error_f("socket \"%s\": %s", path, strerror(errno)); - goto out; - } -- if (connect(fd, &addr, sizeof(addr)) != 0) { -+ if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) { - error_f("socket \"%s\" connect: %s", path, strerror(errno)); - goto out; - } --- -2.45.2 - diff --git a/meta/recipes-connectivity/openssh/openssh_9.8p1.bb b/meta/recipes-connectivity/openssh/openssh_9.9p1.bb index 83145dbd18..6d9dac3497 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.8p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.9p1.bb @@ -6,7 +6,7 @@ and for executing commands on a remote machine." HOMEPAGE = "http://www.openssh.com/" SECTION = "console/network" LICENSE = "BSD-2-Clause & BSD-3-Clause & ISC & MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=072979064e691d342002f43cd89c0394" +LIC_FILES_CHKSUM = "file://LICENCE;md5=78ffb36e5a48c0d8c5648603a3b6c8eb" DEPENDS = "zlib openssl virtual/crypt" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -23,11 +23,10 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://volatiles.99_sshd \ file://run-ptest \ file://sshd_check_keys \ - file://0001-Cast-to-sockaddr-in-systemd-interface.patch \ 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] = "dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3" +SRC_URI[sha256sum] = "b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02" 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." |