From 0e193fc4641731e60653d618aa2ddcbcf64c69a7 Mon Sep 17 00:00:00 2001
From: Yingjie Wang <phywyj@gmail.com>
Date: Sat, 20 Dec 2025 17:40:23 -0500
Subject: [PATCH] update to 12.4: glibc-2.42

---
 ...{glibc-2.41.PKGBUILD => glibc-2.42.PKGBUILD} | 17 +++++++++++------
 lfs/{glibc-2.41 => glibc-2.42}/ld.so.conf       |  0
 lfs/{glibc-2.41 => glibc-2.42}/nsswitch.conf    |  0
 3 files changed, 11 insertions(+), 6 deletions(-)
 rename lfs/{glibc-2.41.PKGBUILD => glibc-2.42.PKGBUILD} (90%)
 rename lfs/{glibc-2.41 => glibc-2.42}/ld.so.conf (100%)
 rename lfs/{glibc-2.41 => glibc-2.42}/nsswitch.conf (100%)

diff --git a/lfs/glibc-2.41.PKGBUILD b/lfs/glibc-2.42.PKGBUILD
similarity index 90%
rename from lfs/glibc-2.41.PKGBUILD
rename to lfs/glibc-2.42.PKGBUILD
index bd47a2f..fef7683 100644
--- a/lfs/glibc-2.41.PKGBUILD
+++ b/lfs/glibc-2.42.PKGBUILD
@@ -1,28 +1,33 @@
 pkgname="glibc"
-pkgver=2.41
+pkgver=2.42
 sources=("${pkgname}-${pkgver}.tar.xz"
   "${pkgname}-${pkgver}-fhs-1.patch"
   "${pkgname}-${pkgver}/nsswitch.conf"
   "${pkgname}-${pkgver}/ld.so.conf"
-  "${pkgname}-${pkgver}/tzdata2025a.tar.gz"
+  "${pkgname}-${pkgver}/tzdata2025b.tar.gz"
 )
 urls=("https://ftp.gnu.org/gnu/glibc/${sources[0]}"
-  "https://www.linuxfromscratch.org/patches/lfs/12.3/${pkgname}-${pkgver}-fhs-1.patch"
+  "https://www.linuxfromscratch.org/patches/lfs/12.4/${pkgname}-${pkgver}-fhs-1.patch"
   "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs/${pkgname}-${pkgver}/nsswitch.conf"
   "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs/${pkgname}-${pkgver}/ld.so.conf"
-  "https://www.iana.org/time-zones/repository/releases/tzdata2025a.tar.gz"
+  "https://www.iana.org/time-zones/repository/releases/tzdata2025b.tar.gz"
 )
-md5sums=("19862601af60f73ac69e067d3e9267d4"
+md5sums=("23c6f5a27932b435cae94e087cb8b1f5"
   "9a5997c3452909b1769918c759eff8a2"
   "4caf37ca10aacf7f7bfabddf915e9d25"
   "79220f5a36182b7160e0cf567dc64129"
-  "404229390c06b7440f5e48d12c1a3251"
+  "ad65154c48c74a9b311fe84778c5434f"
 )
 license=(GPL-2.0-or-later LGPL-2.1-or-later)
 
 src_prepare() {
   tar -xf ${distdir}/${sources[0]} --strip-components=1
   patch -Np1 -i "${distdir}/${sources[1]}"
+  sed -e '/unistd.h/i #include <string.h>' \
+      -e '/libc_rwlock_init/c\
+    __libc_rwlock_define_initialized (, reset_lock);\
+    memcpy (&lock, &reset_lock, sizeof (lock));' \
+      -i stdlib/abort.c
 }
 
 src_build() {
diff --git a/lfs/glibc-2.41/ld.so.conf b/lfs/glibc-2.42/ld.so.conf
similarity index 100%
rename from lfs/glibc-2.41/ld.so.conf
rename to lfs/glibc-2.42/ld.so.conf
diff --git a/lfs/glibc-2.41/nsswitch.conf b/lfs/glibc-2.42/nsswitch.conf
similarity index 100%
rename from lfs/glibc-2.41/nsswitch.conf
rename to lfs/glibc-2.42/nsswitch.conf