From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][scarthgap 13/14] openssh: add backported header file include
Date: Wed, 4 Sep 2024 14:32:54 -0700 [thread overview]
Message-ID: <ae4064a8a60b60bee8a32a454e8784fcf1ecd318.1725456307.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1725456307.git.steve@sakoman.com>
From: Jon Mason <jdmason@kudzu.us>
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.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
| 27 +++++++++++++++++++
.../openssh/openssh_9.6p1.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Fix-missing-header-for-systemd-notification.patch
--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 @@
+From 88351eca17dcc55189991ba60e50819b6d4193c1 Mon Sep 17 00:00:00 2001
+From: 90 <hi@90.gripe>
+Date: Fri, 5 Apr 2024 19:36:06 +0100
+Subject: [PATCH] Fix missing header for systemd notification
+
+Upstream-Status: Backport [88351eca17dcc55189991ba60e50819b6d4193c1]
+Signed-off-by: Jon Mason <jdmason@kudzu.us>
+
+---
+ openbsd-compat/port-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
+index df7290246df6..4c024c6d2d61 100644
+--- a/openbsd-compat/port-linux.c
++++ b/openbsd-compat/port-linux.c
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <unistd.h>
+
+ #include "log.h"
+ #include "xmalloc.h"
+--
+2.39.2
+
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
file://0001-notify-systemd-on-listen-and-reload.patch \
file://CVE-2024-6387.patch \
file://CVE-2024-39894.patch \
+ file://0001-Fix-missing-header-for-systemd-notification.patch \
"
SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
--
2.34.1
next prev parent reply other threads:[~2024-09-04 21:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 21:32 [OE-core][scarthgap 00/14] Patch review Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 01/14] python3-setuptools: Fix CVE-2024-6345 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 02/14] python3: Fix CVE-2024-7592 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 03/14] python3: Fix CVE-2024-8088 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 04/14] xserver-xorg: fix CVE-2023-5574 status Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 05/14] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 06/14] apr: upgrade 1.7.4 -> 1.7.5 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 07/14] cups: upgrade 2.4.9 -> 2.4.10 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 08/14] wpa-supplicant: Upgrade 2.10 -> 2.11 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 09/14] libadwaita: upgrade 1.5.1 -> 1.5.2 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 10/14] libdnf: upgrade 0.73.1 -> 0.73.2 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 11/14] wireless-regdb: upgrade 2024.05.08 -> 2024.07.04 Steve Sakoman
2024-09-04 21:32 ` [OE-core][scarthgap 12/14] oeqa/runtime/ssh: increase the number of attempts Steve Sakoman
2024-09-04 21:32 ` Steve Sakoman [this message]
2024-09-04 21:32 ` [OE-core][scarthgap 14/14] mc: fix source URL Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae4064a8a60b60bee8a32a454e8784fcf1ecd318.1725456307.git.steve@sakoman.com \
--to=steve@sakoman.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox