From bb665c1a0a96fe040d57c44512db084e3d7eb080 Mon Sep 17 00:00:00 2001
From: Yingjie Wang <phywyj@gmail.com>
Date: Fri, 14 Mar 2025 23:49:33 -0400
Subject: [PATCH] update to 12.3: glibc

---
 ...libc-2.40.PKGBUILD => glibc-2.41.PKGBUILD} | 44 +++++++++----------
 lfs/{glibc-2.40 => glibc-2.41}/ld.so.conf     |  0
 lfs/{glibc-2.40 => glibc-2.41}/nsswitch.conf  |  0
 3 files changed, 20 insertions(+), 24 deletions(-)
 rename lfs/{glibc-2.40.PKGBUILD => glibc-2.41.PKGBUILD} (76%)
 rename lfs/{glibc-2.40 => glibc-2.41}/ld.so.conf (100%)
 rename lfs/{glibc-2.40 => glibc-2.41}/nsswitch.conf (100%)

diff --git a/lfs/glibc-2.40.PKGBUILD b/lfs/glibc-2.41.PKGBUILD
similarity index 76%
rename from lfs/glibc-2.40.PKGBUILD
rename to lfs/glibc-2.41.PKGBUILD
index 90c15ed..43394cb 100644
--- a/lfs/glibc-2.40.PKGBUILD
+++ b/lfs/glibc-2.41.PKGBUILD
@@ -1,16 +1,16 @@
 pkgname="glibc"
-pkgver=2.40
-sources=("glibc-2.40.tar.xz"
-  "glibc-2.40-fhs-1.patch"
-  "nsswitch.conf"
-  "ld.so.conf"
-  "tzdata2024a.tar.gz"
+pkgver=2.41
+sources=("${pkgname}-${pkgver}.tar.xz"
+  "${pkgname}-${pkgver}-fhs-1.patch"
+  "${pkgname}-${pkgver}/nsswitch.conf"
+  "${pkgname}-${pkgver}/ld.so.conf"
+  "${pkgname}-${pkgver}/tzdata2025a.tar.gz"
 )
-urls=("https://ftp.gnu.org/gnu/glibc/glibc-2.40.tar.xz"
-  "https://www.linuxfromscratch.org/patches/lfs/12.2/glibc-2.40-fhs-1.patch"
-  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs-12.2-systemd/glibc-2.40/nsswitch.conf"
-  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs-12.2-systemd/glibc-2.40/ld.so.conf"
-  "https://www.iana.org/time-zones/repository/releases/tzdata2024a.tar.gz"
+urls=("https://ftp.gnu.org/gnu/glibc/${sources[0]}"
+  "https://www.linuxfromscratch.org/patches/lfs/12.2/${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"
 )
 md5sums=("b390feef233022114950317f10c4fa97"
   "9a5997c3452909b1769918c759eff8a2"
@@ -29,12 +29,12 @@ src_build() {
   mkdir -pv build
   cd build
   echo "rootsbindir=/usr/sbin" > configparms
-  ../configure --prefix=/usr                          \
-             --disable-werror                         \
-             --enable-kernel=4.19                     \
-             --enable-stack-protector=strong          \
-             --disable-nscd                           \
-             libc_cv_slibdir=/usr/lib
+  ../configure --prefix=/usr                            \
+               --disable-werror                         \
+               --enable-kernel=5.4                      \
+               --enable-stack-protector=strong          \
+               --disable-nscd                           \
+               libc_cv_slibdir=/usr/lib
   make
 }
 
@@ -94,11 +94,9 @@ src_install() {
   localedef -i zh_TW -f UTF-8 zh_TW.UTF-8
   localedef -i zh_CN -f UTF-8 zh_CN.UTF-8
 
-  if [ ! -f /etc/nsswitch.conf ]; then
-    install -m644 "${distdir}/nsswitch.conf" "${pkgdir}/etc/nsswitch.conf"
-  fi
+  install -m644 "${distdir}/${sources[2]}" "${pkgdir}/etc/nsswitch.conf"
 
-  tar -xf "${distdir}/tzdata2024a.tar.gz"
+  tar -xf "${distdir}/${sources[4]}"
   ZONEINFO=${pkgdir}/usr/share/zoneinfo
   mkdir -pv $ZONEINFO/{posix,right}
   for tz in etcetera southamerica northamerica europe africa antarctica  \
@@ -111,9 +109,7 @@ src_install() {
   zic -d $ZONEINFO -p America/New_York
   unset ZONEINFO
 
-  if [ ! -f /etc/ld.so.conf ]; then
-    install -m644 "${distdir}/ld.so.conf" "${pkgdir}/etc/ld.so.conf"
-  fi
+  install -m644 "${distdir}/${sources[3]}" "${pkgdir}/etc/ld.so.conf"
 }
 
 src_preinstall() {
diff --git a/lfs/glibc-2.40/ld.so.conf b/lfs/glibc-2.41/ld.so.conf
similarity index 100%
rename from lfs/glibc-2.40/ld.so.conf
rename to lfs/glibc-2.41/ld.so.conf
diff --git a/lfs/glibc-2.40/nsswitch.conf b/lfs/glibc-2.41/nsswitch.conf
similarity index 100%
rename from lfs/glibc-2.40/nsswitch.conf
rename to lfs/glibc-2.41/nsswitch.conf