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/patches-pass2/.keep b/steps/musl-1.2.4/patches-pass2/.keep deleted file mode 100644 index e69de29b..00000000 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 89% rename from steps/musl-1.2.4/pass1.sh rename to steps/musl-1.2.5/pass1.sh index e8106755..88666b1e 100755 --- a/steps/musl-1.2.4/pass1.sh +++ b/steps/musl-1.2.5/pass1.sh @@ -20,12 +20,12 @@ src_prepare() { cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b cd ctype CC=gcc make - cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/ cd ../iconv CC=gcc make cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ - ../../musl-1.2.4/src/locale/ - cd ../../musl-1.2.4 + ../../musl-1.2.5/src/locale/ + cd ../../musl-1.2.5 } src_configure() { 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 92% rename from steps/musl-1.2.4/pass3.sh rename to steps/musl-1.2.5/pass3.sh index 31d5d981..02866deb 100755 --- a/steps/musl-1.2.4/pass3.sh +++ b/steps/musl-1.2.5/pass3.sh @@ -11,12 +11,12 @@ src_prepare() { cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b cd ctype CC=gcc make - cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/ cd ../iconv CC=gcc make cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ - ../../musl-1.2.4/src/locale/ - cd ../../musl-1.2.4 + ../../musl-1.2.5/src/locale/ + cd ../../musl-1.2.5 } src_configure() { diff --git a/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch b/steps/musl-1.2.5/patches-pass2/mkcodepage_return.patch similarity index 100% rename from steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch rename to steps/musl-1.2.5/patches-pass2/mkcodepage_return.patch 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.4/patches/mkcodepage_return.patch b/steps/musl-1.2.5/patches/mkcodepage_return.patch similarity index 71% rename from steps/musl-1.2.4/patches/mkcodepage_return.patch rename to steps/musl-1.2.5/patches/mkcodepage_return.patch index 03804893..5547a4c3 100644 --- a/steps/musl-1.2.4/patches/mkcodepage_return.patch +++ b/steps/musl-1.2.5/patches/mkcodepage_return.patch @@ -1,3 +1,8 @@ +SPDX-FileCopyrightText: 2024 fosslinux + +SPDX-License-Identifier: MIT +(as per https://github.com/richfelker/musl-chartable-tools/issues/3) + Inexplicable problem, where mkcodepage returns 3 instead of 0 on some inputs. Compilation error? diff --git a/steps/musl-1.2.4/sources b/steps/musl-1.2.5/sources similarity index 60% rename from steps/musl-1.2.4/sources rename to steps/musl-1.2.5/sources index cbc5e9be..63edef8e 100644 --- a/steps/musl-1.2.4/sources +++ b/steps/musl-1.2.5/sources @@ -1,2 +1,2 @@ -https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 +https://musl.libc.org/releases/musl-1.2.5.tar.gz a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4 https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6