diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-03-19 01:15:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-20 11:29:04 +0000 |
commit | 687ebe86a9e6053220e674171161d7f3ef362b79 (patch) | |
tree | 8ebea499117b94fd729797b27d2561085eb68ecb /meta/recipes-connectivity | |
parent | b1df0e16b92fbbf1aee3bf9592de72a7107dcf12 (diff) | |
download | poky-687ebe86a9e6053220e674171161d7f3ef362b79.tar.gz |
ppp: Fix build when shadow is enabled
GCC-15 patch is not sufficient when shadow is enabled, therefore fix
the remaining issues.
(From OE-Core rev: 9143b23cecb505f130f86b03039c6c0aba5dcc2b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch | 33 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch new file mode 100644 index 0000000000..d95c72e96b --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 5edcb01f1d8d521c819d45df1f1bb87697252130 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 17 Mar 2025 14:38:26 -0700 | ||
4 | Subject: [PATCH] pppd/session: Fixed building with GCC 15 | ||
5 | |||
6 | Fixed building with GCC 15 which defaults to C23 | ||
7 | and find conflicting declration of getspnam() here | ||
8 | with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) | ||
9 | |||
10 | Fixes | ||
11 | ../../ppp-2.5.2/pppd/session.c: In function 'session_start': | ||
12 | ../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' | ||
13 | 185 | struct spwd *getspnam(); | ||
14 | | ^~~~~~~~ | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/ppp-project/ppp/pull/553] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | pppd/session.c | 1 - | ||
20 | 1 file changed, 1 deletion(-) | ||
21 | |||
22 | diff --git a/pppd/session.c b/pppd/session.c | ||
23 | index f08d8e1..9cc7538 100644 | ||
24 | --- a/pppd/session.c | ||
25 | +++ b/pppd/session.c | ||
26 | @@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char | ||
27 | char *cbuf; | ||
28 | #ifdef HAVE_SHADOW_H | ||
29 | struct spwd *spwd; | ||
30 | - struct spwd *getspnam(); | ||
31 | long now = 0; | ||
32 | #endif /* #ifdef HAVE_SHADOW_H */ | ||
33 | #endif /* #ifdef PPP_WITH_PAM */ | ||
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb index aed4a9a770..607678db8b 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ | |||
25 | file://ppp@.service \ | 25 | file://ppp@.service \ |
26 | file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ | 26 | file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ |
27 | file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ | 27 | file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ |
28 | file://0001-pppd-session-Fixed-building-with-GCC-15.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" | 31 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" |