From bd4051d110fe9f307166a61f19dac707f83b015c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 22 Dec 2024 14:50:59 +1100 Subject: [PATCH] Update musl to 1.2.5 --- parts.rst | 8 +- steps/SHA256SUMS.pkgs | 134 +++++++++--------- steps/manifest | 6 +- .../musl-1.2.4/files/__stack_chk_fail_local.c | 8 -- steps/musl-1.2.4/sources | 1 - .../files/ld-musl-i386.path | 0 .../files/ld-musl-i386.path.license | 0 steps/{musl-1.2.4 => musl-1.2.5}/pass1.sh | 0 steps/{musl-1.2.4 => musl-1.2.5}/pass2.sh | 0 steps/{musl-1.2.4 => musl-1.2.5}/pass3.sh | 0 .../patches-pass2/.keep | 0 .../{musl-1.2.4 => musl-1.2.5}/patches-pass3 | 0 .../patches/avoid_set_thread_area.patch | 12 +- .../patches/avoid_sys_clone.patch | 4 +- steps/musl-1.2.5/sources | 1 + 15 files changed, 83 insertions(+), 91 deletions(-) delete mode 100644 steps/musl-1.2.4/files/__stack_chk_fail_local.c delete mode 100644 steps/musl-1.2.4/sources rename steps/{musl-1.2.4 => musl-1.2.5}/files/ld-musl-i386.path (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/files/ld-musl-i386.path.license (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass1.sh (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass2.sh (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass3.sh (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches-pass2/.keep (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches-pass3 (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches/avoid_set_thread_area.patch (78%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches/avoid_sys_clone.patch (73%) create mode 100644 steps/musl-1.2.5/sources diff --git a/parts.rst b/parts.rst index fb187b2b..310ee466 100644 --- a/parts.rst +++ b/parts.rst @@ -286,7 +286,7 @@ patch 2.5.9 ``patch`` is a very useful tool at this stage, allowing us to make significantly more complex edits, including just changes to lines. -gzip 1.2.4 +gzip 1.2.5 ========== ``gzip`` is the most common compression format used for software source @@ -732,7 +732,7 @@ findutils 4.2.33 GNU Find Utilities can be used to search for files. We are mainly interested in ``find`` and ``xargs`` that are often used in scripts. -musl 1.2.4 +musl 1.2.5 ========== GCC can build the latest as of the time of writing musl version. @@ -889,7 +889,7 @@ swap If enabled in ``bootstrap.cfg``, creates and activates a swap file under the name ``/swapfile``. -musl 1.2.4 +musl 1.2.5 ========== At this point, it is guaranteed that we are running on Linux with thread support, @@ -1183,7 +1183,7 @@ We use the `gnu-autogen-bootstrapping - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -extern void __stack_chk_fail(void); -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/steps/musl-1.2.4/sources b/steps/musl-1.2.4/sources deleted file mode 100644 index 3c0a41b9..00000000 --- a/steps/musl-1.2.4/sources +++ /dev/null @@ -1 +0,0 @@ -https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 diff --git a/steps/musl-1.2.4/files/ld-musl-i386.path b/steps/musl-1.2.5/files/ld-musl-i386.path similarity index 100% rename from steps/musl-1.2.4/files/ld-musl-i386.path rename to steps/musl-1.2.5/files/ld-musl-i386.path diff --git a/steps/musl-1.2.4/files/ld-musl-i386.path.license b/steps/musl-1.2.5/files/ld-musl-i386.path.license similarity index 100% rename from steps/musl-1.2.4/files/ld-musl-i386.path.license rename to steps/musl-1.2.5/files/ld-musl-i386.path.license diff --git a/steps/musl-1.2.4/pass1.sh b/steps/musl-1.2.5/pass1.sh similarity index 100% rename from steps/musl-1.2.4/pass1.sh rename to steps/musl-1.2.5/pass1.sh diff --git a/steps/musl-1.2.4/pass2.sh b/steps/musl-1.2.5/pass2.sh similarity index 100% rename from steps/musl-1.2.4/pass2.sh rename to steps/musl-1.2.5/pass2.sh diff --git a/steps/musl-1.2.4/pass3.sh b/steps/musl-1.2.5/pass3.sh similarity index 100% rename from steps/musl-1.2.4/pass3.sh rename to steps/musl-1.2.5/pass3.sh diff --git a/steps/musl-1.2.4/patches-pass2/.keep b/steps/musl-1.2.5/patches-pass2/.keep similarity index 100% rename from steps/musl-1.2.4/patches-pass2/.keep rename to steps/musl-1.2.5/patches-pass2/.keep diff --git a/steps/musl-1.2.4/patches-pass3 b/steps/musl-1.2.5/patches-pass3 similarity index 100% rename from steps/musl-1.2.4/patches-pass3 rename to steps/musl-1.2.5/patches-pass3 diff --git a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch b/steps/musl-1.2.5/patches/avoid_set_thread_area.patch similarity index 78% rename from steps/musl-1.2.4/patches/avoid_set_thread_area.patch rename to steps/musl-1.2.5/patches/avoid_set_thread_area.patch index c5a51874..b79c301d 100644 --- a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch +++ b/steps/musl-1.2.5/patches/avoid_set_thread_area.patch @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread_arch.h ---- musl-1.2.4/arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 +--- musl-1.2.5/arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 @@ -1,8 +1,7 @@ +extern uintptr_t g_pthread; static inline uintptr_t __get_tp() @@ -15,16 +15,16 @@ diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread #define MC_PC gregs[REG_EIP] diff -r -u musl-1.2.3.orig/arch/i386/syscall_arch.h musl-1.2.3/arch/i386/syscall_arch.h ---- musl-1.2.4/arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 +--- musl-1.2.5/arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 @@ -1,3 +1,4 @@ +#define SYSCALL_NO_TLS 1 #define __SYSCALL_LL_E(x) \ ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] diff -r -u musl-1.2.3.orig/src/env/__init_tls.c musl-1.2.3/src/env/__init_tls.c ---- musl-1.2.4/src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 +--- musl-1.2.5/src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 @@ -10,20 +10,19 @@ #include "syscall.h" diff --git a/steps/musl-1.2.4/patches/avoid_sys_clone.patch b/steps/musl-1.2.5/patches/avoid_sys_clone.patch similarity index 73% rename from steps/musl-1.2.4/patches/avoid_sys_clone.patch rename to steps/musl-1.2.5/patches/avoid_sys_clone.patch index b3631254..246d2462 100644 --- a/steps/musl-1.2.4/patches/avoid_sys_clone.patch +++ b/steps/musl-1.2.5/patches/avoid_sys_clone.patch @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT ---- musl-1.2.4/src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 +--- musl-1.2.5/src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 @@ -190,8 +190,11 @@ goto fail; } diff --git a/steps/musl-1.2.5/sources b/steps/musl-1.2.5/sources new file mode 100644 index 00000000..b42bb196 --- /dev/null +++ b/steps/musl-1.2.5/sources @@ -0,0 +1 @@ +https://musl.libc.org/releases/musl-1.2.5.tar.gz a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4