summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2024-08-28 23:39:58 -0400
committerSteve Sakoman <steve@sakoman.com>2024-09-09 06:08:10 -0700
commit6191a86bbe4e7317ba8d128f30dd66f6de69b95f (patch)
tree4bed4a95573a47fb5bbe4de20e682535382c0a6c
parent40d43dd8f4516aa6c2280e98cd4853336e3f1ec4 (diff)
downloadpoky-6191a86bbe4e7317ba8d128f30dd66f6de69b95f.tar.gz
openssh: add backported header file include
Backport upstream patch to add a missing header. The patch says it is for systemd, but I am seeing build issues when building openssh with clang and musl. The issue being seen is: #warning usage of non-standard #include <sys/cdefs.h> is deprecated And similar deprecated warnings. This patch resolves the issue. Original patch can be found at https://github.com/openssh/openssh-portable/commit/88351eca17dcc55189991ba60e50819b6d4193c1 This issue was introduced with OE-Core 1c9d3c22718bf49ae85c2d06e0ee60ebdc2fd0c1 https://github.com/openembedded/openembedded-core/commit/1c9d3c22718bf49ae85c2d06e0ee60ebdc2fd0c1 Patch suggested by Khem Raj. (From OE-Core rev: ae4064a8a60b60bee8a32a454e8784fcf1ecd318) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-connectivity/openssh/openssh/0001-Fix-missing-header-for-systemd-notification.patch27
-rw-r--r--meta/recipes-connectivity/openssh/openssh_9.6p1.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Fix-missing-header-for-systemd-notification.patch b/meta/recipes-connectivity/openssh/openssh/0001-Fix-missing-header-for-systemd-notification.patch
new file mode 100644
index 0000000000..2baa4a6fe5
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0001-Fix-missing-header-for-systemd-notification.patch
@@ -0,0 +1,27 @@
1From 88351eca17dcc55189991ba60e50819b6d4193c1 Mon Sep 17 00:00:00 2001
2From: 90 <hi@90.gripe>
3Date: Fri, 5 Apr 2024 19:36:06 +0100
4Subject: [PATCH] Fix missing header for systemd notification
5
6Upstream-Status: Backport [88351eca17dcc55189991ba60e50819b6d4193c1]
7Signed-off-by: Jon Mason <jdmason@kudzu.us>
8
9---
10 openbsd-compat/port-linux.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
14index df7290246df6..4c024c6d2d61 100644
15--- a/openbsd-compat/port-linux.c
16+++ b/openbsd-compat/port-linux.c
17@@ -33,6 +33,7 @@
18 #include <stdio.h>
19 #include <stdlib.h>
20 #include <time.h>
21+#include <unistd.h>
22
23 #include "log.h"
24 #include "xmalloc.h"
25--
262.39.2
27
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index 042acffe6a..3c507cf911 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
28 file://0001-notify-systemd-on-listen-and-reload.patch \ 28 file://0001-notify-systemd-on-listen-and-reload.patch \
29 file://CVE-2024-6387.patch \ 29 file://CVE-2024-6387.patch \
30 file://CVE-2024-39894.patch \ 30 file://CVE-2024-39894.patch \
31 file://0001-Fix-missing-header-for-systemd-notification.patch \
31 " 32 "
32SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c" 33SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
33 34