From 3d86244b79823b552cca2cf54453576e30c6a163 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 2 May 2024 12:55:15 +0000
Subject: [PATCH] core/glibc to 2.39-3

---
 core/glibc/.SRCINFO      | 3 ++-
 core/glibc/PKGBUILD      | 6 +++---
 core/glibc/glibc.install | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/glibc/.SRCINFO b/core/glibc/.SRCINFO
index 7e8be27a2..be77df28e 100644
--- a/core/glibc/.SRCINFO
+++ b/core/glibc/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glibc
 	pkgver = 2.39
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.gnu.org/software/libc
 	arch = x86_64
 	license = GPL-2.0-or-later
@@ -39,6 +39,7 @@ pkgname = glibc
 
 pkgname = lib32-glibc
 	pkgdesc = GNU C Library (32-bit)
+	install = lib32-glibc.install
 	depends = glibc=2.39
 	options = staticlibs
 	options = !lto
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index f04621b25..3ee321077 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -18,7 +18,7 @@ pkgbase=glibc
 pkgname=(glibc glibc-locales)
 pkgver=2.39
 _commit=31da30f23cddd36db29d5b6a1c7619361b271fb4
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL-2.0-or-later LGPL-2.1-or-later)
@@ -77,7 +77,7 @@ build() {
     # Credits @allanmcrae
     # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
     # remove fortify for building libraries
-    # CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}
+    CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
 
     "${srcdir}"/glibc/configure \
         --libdir=/usr/lib \
@@ -145,7 +145,7 @@ package_glibc() {
 
   cd glibc
 
-  install -dm755 "${pkgdir}"/usr/lib/{locale,systemd/system,tmpfiles.d}
+  install -dm755 "${pkgdir}"/usr/lib/locale
 
   install -m644 posix/gai.conf "${pkgdir}"/etc/gai.conf
 
diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install
index 351f05b26..57029c3a7 100644
--- a/core/glibc/glibc.install
+++ b/core/glibc/glibc.install
@@ -2,4 +2,6 @@ post_upgrade() {
   locale-gen
 
   ldconfig -r .
+
+  iconvconfig
 }