[kirkstone,17/19] pseudo: Fix to work with glibc 2.40

Message ID	63d7c11b46119f0c97d08f2fa837c02e633ab75f.1731467662.git.steve@sakoman.com
State	RFC
Delegated to:	Steve Sakoman
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.210.53, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/19] pseudo: Fix to work with glibc 2.40 Date: Tue, 12 Nov 2024 19:16:10 -0800 Message-Id: <63d7c11b46119f0c97d08f2fa837c02e633ab75f.1731467662.git.steve@sakoman.com> In-Reply-To: <cover.1731467662.git.steve@sakoman.com> References: <cover.1731467662.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[kirkstone,01/19] ghostscript: fix CVE-2023-46361 \| expand [kirkstone,01/19] ghostscript: fix CVE-2023-46361 [kirkstone,02/19] curl: patch CVE-2024-9681 [kirkstone,03/19] gstreamer1.0: ignore CVE-2024-0444 [kirkstone,04/19] expat: patch CVE-2024-50602 [kirkstone,05/19] glib-2.0: patch regression of CVE-2023-32665 [kirkstone,06/19] patch.py: Use shlex instead of deprecated pipe [kirkstone,07/19] cmake: Fix sporadic issues when determining compiler internals [kirkstone,08/19] pseudo: Update to pull in linux-libc-headers race fix [kirkstone,09/19] pseudo: Disable LFS on 32bit arches [kirkstone,10/19] pseudo: Switch back to the master branch [kirkstone,11/19] pseudo: Update to include logic fix [kirkstone,12/19] pseudo: Update to pull in fd leak fix [kirkstone,13/19] pseudo: Update to pull in syncfs probe fix [kirkstone,14/19] pseudo: Update to pull in gcc14 fix and missing statvfs64 intercept [kirkstone,15/19] pseudo: Update to pull in fchmodat fix [kirkstone,16/19] pseudo: Update to pull in python 3.12+ fix [kirkstone,17/19] pseudo: Fix to work with glibc 2.40 [kirkstone,18/19] pseudo: Update to include open symlink handling bugfix [kirkstone,19/19] pseudo: Fix envp bug and add posix_spawn wrapper

Message ID

63d7c11b46119f0c97d08f2fa837c02e633ab75f.1731467662.git.steve@sakoman.com

State

RFC

Delegated to:

Steve Sakoman

Headers

From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][kirkstone 17/19] pseudo: Fix to work with glibc 2.40
Date: Tue, 12 Nov 2024 19:16:10 -0800
Message-Id: 
 <63d7c11b46119f0c97d08f2fa837c02e633ab75f.1731467662.git.steve@sakoman.com>
In-Reply-To: <cover.1731467662.git.steve@sakoman.com>
References: <cover.1731467662.git.steve@sakoman.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[kirkstone,01/19] ghostscript: fix CVE-2023-46361 | expand

Commit Message

Steve Sakoman Nov. 13, 2024, 3:16 a.m. UTC

From: Richard Purdie <richard.purdie@linuxfoundation.org>

glibc 2.40 renames some internal header variables. Update our hack to
work with the new version. These kinds of problems illustrate we need to
address the issue properly.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-devtools/pseudo/files/glibc238.patch | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/pseudo/files/glibc238.patch b/meta/recipes-devtools/pseudo/files/glibc238.patch
index da4b8caee3..dfb5c283f6 100644
--- a/meta/recipes-devtools/pseudo/files/glibc238.patch
+++ b/meta/recipes-devtools/pseudo/files/glibc238.patch
@@ -9,7 +9,7 @@  Index: git/pseudo_wrappers.c
 ===================================================================
 --- git.orig/pseudo_wrappers.c
 +++ git/pseudo_wrappers.c
-@@ -6,6 +6,15 @@
+@@ -6,6 +6,18 @@
   * SPDX-License-Identifier: LGPL-2.1-only
   *
   */
@@ -21,6 +21,9 @@  Index: git/pseudo_wrappers.c
 +#undef __GLIBC_USE_ISOC2X
 +#undef __GLIBC_USE_C2X_STRTOL
 +#define __GLIBC_USE_C2X_STRTOL 0
++#undef __GLIBC_USE_ISOC23
++#undef __GLIBC_USE_C23_STRTOL
++#define __GLIBC_USE_C23_STRTOL 0
 +
  #include <assert.h>
  #include <stdlib.h>
@@ -29,7 +32,7 @@  Index: git/pseudo_util.c
 ===================================================================
 --- git.orig/pseudo_util.c
 +++ git/pseudo_util.c
-@@ -8,6 +8,14 @@
+@@ -8,6 +8,17 @@
   */
  /* we need access to RTLD_NEXT for a horrible workaround */
  #define _GNU_SOURCE
@@ -41,6 +44,9 @@  Index: git/pseudo_util.c
 +#undef __GLIBC_USE_ISOC2X
 +#undef __GLIBC_USE_C2X_STRTOL
 +#define __GLIBC_USE_C2X_STRTOL 0
++#undef __GLIBC_USE_ISOC23
++#undef __GLIBC_USE_C23_STRTOL
++#define __GLIBC_USE_C23_STRTOL 0
  
  #include <ctype.h>
  #include <errno.h>

[kirkstone,17/19] pseudo: Fix to work with glibc 2.40

Commit Message

Patch