Update musl to 1.2.5

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 <https://github.com/schierlm/gnu-autogen-b
 project to rebuild those and create (slightly crippled) ``autogen`` that
 is then able to build a full-featured version.
 
-musl 1.2.4
+musl 1.2.5
 ==========
 
 With GCC and binutils supporting a musl-based toolchain natively, musl itself is rebuilt

steps/manifest

@@ -112,7 +112,7 @@ build: tcc-0.9.27
 improve: populate_device_nodes
 build: gcc-4.0.4
 build: findutils-4.2.33
-build: musl-1.2.4
+build: musl-1.2.5
 build: linux-headers-4.14.341-openela
 build: gcc-4.0.4
 build: util-linux-2.19.1
@@ -136,7 +136,7 @@ improve: finalize_job_count
 improve: finalize_fhs
 improve: open_console ( CONSOLES == True )
 improve: swap ( SWAP_SIZE != 0 )
-build: musl-1.2.4
+build: musl-1.2.5
 build: curl-8.5.0
 improve: get_network ( CHROOT == False )
 build: bash-5.2.15
@@ -181,7 +181,7 @@ build: which-2.21
 build: grep-3.7
 build: sed-4.8
 build: autogen-5.18.16
-build: musl-1.2.4
+build: musl-1.2.5
 build: python-2.0.1
 build: python-2.0.1
 build: python-2.3.7

steps/musl-1.2.4/pass1.sh → 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() {

steps/musl-1.2.4/pass3.sh → 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() {

steps/musl-1.2.4/patches/avoid_set_thread_area.patch → steps/musl-1.2.5/patches/avoid_set_thread_area.patch

@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]>
 # 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"
 

steps/musl-1.2.4/patches/avoid_sys_clone.patch → steps/musl-1.2.5/patches/avoid_sys_clone.patch

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]>
 # 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;
  	}

steps/musl-1.2.4/patches/mkcodepage_return.patch → steps/musl-1.2.5/patches/mkcodepage_return.patch

@@ -1,3 +1,8 @@
+SPDX-FileCopyrightText: 2024 fosslinux <[email protected]>
+
+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?
 

steps/musl-1.2.4/sources → 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