[[PATCH,v2,15/25] ppp: Fix build when shadow is enabled

Message ID	20250319081610.3536475-18-raj.khem@gmail.com
State	New
Headers	show Return-Path: <raj.khem@gmail.com> ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) From: Khem Raj <raj.khem@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Khem Raj <raj.khem@gmail.com> Subject: [[PATCH v2 15/25] ppp: Fix build when shadow is enabled Date: Wed, 19 Mar 2025 01:15:46 -0700 Message-ID: <20250319081610.3536475-18-raj.khem@gmail.com> In-Reply-To: <20250319081610.3536475-1-raj.khem@gmail.com> References: <20250319081610.3536475-1-raj.khem@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 \| expand [v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 [v3,02/27] webkitgtk: Fix build with clang-20 [v3,03/27] webkitgtk: Fix assertion options with clang [v3,04/27] libpam: add ptest cases back [v3,05/27] gdbm: Use C11 standard [v3,06/27] bluez: Fix build with GCC-15 [v3,07/27] readline: Fixed build with GCC-15 [v3,08/27] bash: Stick to C17 std [v3,09/27] tcp-wrappers: Stick to C17 standard [v3,10/27] libsndfile1: Include <stdbool.h> instead of redefining bool true and false [v3,11/27] e2fsprogs: Fix build failure with gcc 15 [v3,12/27] dbus-glib: Fix build with GCC 15 [v3,13/27] libmatchbox: Fix build with gcc-15 [[PATCH,v2,14/25] libmatchbox: Fix build with gcc-15 [[PATCH,v2,15/25] ppp: Fix build when shadow is enabled [[PATCH,v2,16/25] unzip: Fix build with GCC-15 [v3,17/27] cpio: Pin to use C17 std [v3,18/27] expect: Fix build with GCC 15 [[PATCH,v2,19/25] expect: Fix build with GCC 15 [[PATCH,v2,20/25] cronie: Resolve build failure with GCC15 [v3,21/27] psplash: Fix build with GCC 15 [[PATCH,v2,22/25] psplash: Fix build with GCC 15 [[PATCH,v2,23/25] at: Remove mktime signature from posixtm.c [[PATCH,v2,24/25] time: Fix build with musl [v3,25/27] oeqa: Build cpio with C17 std [v3,26/27] man-db: Add missing rdep for col utility [v3,27/27] man-db: Fix musl build with NLS

Message ID

20250319081610.3536475-18-raj.khem@gmail.com

State

New

Headers

From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [[PATCH v2 15/25] ppp: Fix build when shadow is enabled
Date: Wed, 19 Mar 2025 01:15:46 -0700
Message-ID: <20250319081610.3536475-18-raj.khem@gmail.com>
In-Reply-To: <20250319081610.3536475-1-raj.khem@gmail.com>
References: <20250319081610.3536475-1-raj.khem@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 | expand

Commit Message

Khem Raj March 19, 2025, 8:15 a.m. UTC

GCC-15 patch is not sufficient when shadow is enabled, therefore fix
the remaining issues.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...d-session-Fixed-building-with-GCC-15.patch | 33 +++++++++++++++++++
 meta/recipes-connectivity/ppp/ppp_2.5.2.bb    |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch

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 00000000000..d95c72e96ba
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch
@@ -0,0 +1,33 @@ 
+From 5edcb01f1d8d521c819d45df1f1bb87697252130 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Mar 2025 14:38:26 -0700
+Subject: [PATCH] pppd/session: Fixed building with GCC 15
+
+Fixed building with GCC 15 which defaults to C23
+and find conflicting declration of getspnam() here
+with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);)
+
+Fixes
+../../ppp-2.5.2/pppd/session.c: In function 'session_start':
+../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)'
+  185 |     struct spwd *getspnam();
+      |                  ^~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/ppp-project/ppp/pull/553]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ pppd/session.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pppd/session.c b/pppd/session.c
+index f08d8e1..9cc7538 100644
+--- a/pppd/session.c
++++ b/pppd/session.c
+@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char
+     char *cbuf;
+ #ifdef HAVE_SHADOW_H
+     struct spwd *spwd;
+-    struct spwd *getspnam();
+     long now = 0;
+ #endif /* #ifdef HAVE_SHADOW_H */
+ #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 5565ce51cff..602f98991dc 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
@@ -24,6 +24,7 @@  SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
            file://provider \
            file://ppp@.service \
            file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \
+           file://0001-pppd-session-Fixed-building-with-GCC-15.patch \
            "
 
 SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2"

[[PATCH,v2,15/25] ppp: Fix build when shadow is enabled

Commit Message

Patch