From cb6ff3e1bdfab2fa5ea87ef57f61feedbe467504 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 8 May 2024 18:25:27 +0000
Subject: [PATCH] core/glibc to 2.39+r52+gf8e4623421-1

---
 core/glibc/.SRCINFO | 12 ++++++------
 core/glibc/PKGBUILD | 29 +++++++++++++++--------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/glibc/.SRCINFO b/core/glibc/.SRCINFO
index ac34c3016..1449f1978 100644
--- a/core/glibc/.SRCINFO
+++ b/core/glibc/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glibc
-	pkgver = 2.39
-	pkgrel = 4
+	pkgver = 2.39+r52+gf8e4623421
+	pkgrel = 1
 	url = https://www.gnu.org/software/libc
 	arch = x86_64
 	license = GPL-2.0-or-later
@@ -11,7 +11,7 @@ pkgbase = glibc
 	makedepends = python
 	options = staticlibs
 	options = !lto
-	source = git+https://sourceware.org/git/glibc.git#commit=31da30f23cddd36db29d5b6a1c7619361b271fb4
+	source = git+https://sourceware.org/git/glibc.git#commit=f8e462342189525e4605cf233b8f798d1c7f398d
 	source = locale.gen.txt
 	source = locale-gen
 	source = lib32-glibc.conf
@@ -19,7 +19,7 @@ pkgbase = glibc
 	source = sdt-config.h
 	validpgpkeys = 7273542B39962DF7B299931416792B4EA25340F8
 	validpgpkeys = BC7C7372637EC10C57D7AA6579C43DFBF1CF2187
-	b2sums = 2466e8da98fd97cce07cd55fb836a56209d0e2d4f7b05a308dfe848fd7fa1398c838659ab4e8f3500c2bc13af16a369e78525c79b976af172306421f8383c637
+	b2sums = a37822e85d99b01b289950bbc3a6ba3c9f88cf2aafe6510a4e3aa9666c35ab4279377b8c706976545a04d94aae888e48e084da54ae117b5f1220cea50e5092bb
 	b2sums = c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72
 	b2sums = 04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3
 	b2sums = 7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a
@@ -40,11 +40,11 @@ pkgname = glibc
 pkgname = lib32-glibc
 	pkgdesc = GNU C Library (32-bit)
 	install = lib32-glibc.install
-	depends = glibc=2.39
+	depends = glibc=2.39+r52+gf8e4623421
 	options = staticlibs
 	options = !lto
 	options = !emptydirs
 
 pkgname = glibc-locales
 	pkgdesc = Pregenerated locales for GNU C Library
-	depends = glibc=2.39
+	depends = glibc=2.39+r52+gf8e4623421
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 0b7687ea3..ef25b8db5 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -16,27 +16,32 @@ noautobuild=1
 
 pkgbase=glibc
 pkgname=(glibc glibc-locales)
-pkgver=2.39
-_commit=31da30f23cddd36db29d5b6a1c7619361b271fb4
-pkgrel=4
+pkgver=2.39+r52+gf8e4623421
+_commit=f8e462342189525e4605cf233b8f798d1c7f398d
+pkgrel=1
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL-2.0-or-later LGPL-2.1-or-later)
 makedepends=(git gd python)
 options=(staticlibs !lto !distcc)
-source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
+source=("git+https://sourceware.org/git/glibc.git#commit=${_commit}"
         locale.gen.txt
         locale-gen
         sdt.h sdt-config.h
 )
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
               BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
-b2sums=('2466e8da98fd97cce07cd55fb836a56209d0e2d4f7b05a308dfe848fd7fa1398c838659ab4e8f3500c2bc13af16a369e78525c79b976af172306421f8383c637'
+b2sums=('a37822e85d99b01b289950bbc3a6ba3c9f88cf2aafe6510a4e3aa9666c35ab4279377b8c706976545a04d94aae888e48e084da54ae117b5f1220cea50e5092bb'
         'c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72'
         '04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
         'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
         '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678')
 
+pkgver() {
+  cd glibc
+  git describe --tags | sed 's/[^-]*-//;s/[^-]*-/&r/;s/-/+/g'
+}
+
 prepare() {
   mkdir -p glibc-build
 
@@ -60,7 +65,9 @@ build() {
       --disable-werror
   )
 
-  cd "${srcdir}"/glibc-build
+  # _FORTIFY_SOURCE=3 causes testsuite build failure and is unnecessary during
+  # actual builds (support is built-in via --enable-fortify-source).
+  CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
 
   # ALARM: Specify build host types
   [[ $CARCH == "armv7h" ]] && _configure_flags+=(--host=armv7l-unknown-linux-gnueabihf --build=armv7l-unknown-linux-gnueabihf)
@@ -74,11 +81,6 @@ build() {
     echo "sbindir=/usr/bin" >> configparms
     echo "rootsbindir=/usr/bin" >> configparms
 
-    # Credits @allanmcrae
-    # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
-    # remove fortify for building libraries
-    CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
-
     "${srcdir}"/glibc/configure \
         --libdir=/usr/lib \
         --libexecdir=/usr/lib \
@@ -101,16 +103,15 @@ build() {
 _skip_test() {
   test=${1}
   file=${2}
-  sed -i "/\b${test} /d" "${srcdir}"/glibc/${file}
+  sed -i "/\b${test} /d" "${srcdir}/glibc/${file}"
 }
 
 check() (
   cd glibc-build
 
   # adjust/remove buildflags that cause false-positive testsuite failures
-  sed -i '/FORTIFY/d' configparms                                     # failure to build testsuite
   sed -i 's/-Werror=format-security/-Wformat-security/' config.make   # failure to build testsuite
-  sed -i '/CFLAGS/s/-fno-plt//' config.make                           # 16 failures
+  sed -i '/CFLAGS/s/-fno-plt//' config.make                           # 27 failures
   sed -i '/CFLAGS/s/-fexceptions//' config.make                       # 1 failure
 
   # The following tests fail due to restrictions in the Arch build system