chore(glibc): backport from upstream/main

Author: jfroy

misc/glibc/pkg.yaml

@@ -14,8 +14,10 @@ steps:
   - env:
       CC: gcc-14
       CXX: g++-14
+      LD_LINUX_X86_64: ld-linux-x86-64.so.2
+      LD_LINUX_AARCH64: ld-linux-aarch64.so.1
     sources:
-      - url: https://src.fedoraproject.org/lookaside/pkgs/glibc/glibc-{{ .GLIBC_VERSION }}-8-g1e0e33e1b1.tar.xz/sha512/449e3d4f6b59bfde2175c5d1be71447b084e0b12b176518b65fd9b0ac8430766b25416a173fe3efd47462bc1719d59a051e7eed9544e0fba9165dd86f69ee0b9/glibc-{{ .GLIBC_VERSION }}-8-g1e0e33e1b1.tar.xz
+      - url: https://archive.ubuntu.com/ubuntu/pool/main/g/glibc/glibc_{{ .GLIBC_VERSION }}.orig.tar.xz
         destination: glibc.tar.xz
         sha256: {{ .GLIBC_SHA256 }}
         sha512: {{ .GLIBC_SHA512 }}
@@ -60,10 +62,16 @@ steps:
 
         # Talos has /lib{64} -> /usr/lib, /{s}bin -> /usr/bin.
         # Need to make '/sbin/ldconfig' and '/lib64/ld-linux-x86-64.so.2' work for compatibility.
+
+        ARCH_UPPER="${ARCH^^}"
+        LD_LINUX_PATH="LD_LINUX_${ARCH_UPPER}"
+        export LD_LINUX_PATH="${!LD_LINUX_PATH}"
+
         mkdir -p /rootfs/usr/lib /rootfs/usr/bin
-        ln -s /usr/local/glibc/usr/lib64/ld-linux-x86-64.so.2 /rootfs/usr/lib/ld-linux-x86-64.so.2
+        ln -s /usr/local/glibc/usr/lib64/${LD_LINUX_PATH} /rootfs/usr/lib/${LD_LINUX_PATH}
         ln -s /usr/local/glibc/usr/sbin/ldconfig /rootfs/usr/bin/ldconfig
 
+        # cleanup
         rm -rf /rootfs/usr/local/glibc/include
         rm -rf /rootfs/usr/local/glibc/share
         rm -rf /rootfs/usr/local/glibc/var

misc/glibc/vars.yaml

@@ -1,5 +1,5 @@
 # renovate: datasource=docker versioning=docker depName=cgr.dev/chainguard/wolfi-base
-WOLFI_BASE_REF: sha256:c15643c480330cc703bc100378c97b51dbc7c6480ab335b926945f2d24ed878b
+WOLFI_BASE_REF: sha256:9b359e55a1d5dcdcab3c0534a5184386ebaa2661f8e24bc27355bc6bdcd7e843
 
 VERSION: {{ .GLIBC_VERSION }}
 

misc/vars.yaml

@@ -1,4 +1,4 @@
 # renovate: datasource=git-tags extractVersion=^glibc-(?<version>.*)$ depName=https://sourceware.org/git/glibc.git
 GLIBC_VERSION: 2.41
-GLIBC_SHA256: af71d83f774c92c5ed11cb7904332041cf7cca15ff2e7b3d6c3e708e688fe400
-GLIBC_SHA512: 449e3d4f6b59bfde2175c5d1be71447b084e0b12b176518b65fd9b0ac8430766b25416a173fe3efd47462bc1719d59a051e7eed9544e0fba9165dd86f69ee0b9
+GLIBC_SHA256: a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901
+GLIBC_SHA512: 894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169