From 2661cc9b18e20293d860c575768c7bf24b5bc3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 5 Aug 2021 01:22:17 -0300
Subject: [PATCH] glibc: update to 2.34.

From release notes:

  Starting with glibc 2.34, the shared objects are installed under their
  ABI sonames directly, without symbolic links.

Therefore, we have to rename many of the nostrip entries. So we now have
to explicitly list the dynamic linkers. The list was taken from
common/shlibs.

Also from release notes:

  all functionality formerly implemented in the libraries libpthread,
  libdl, libutil, libanl has been integrated into libc.

Therefore, we can remove these libraries from the nostrip list entirely.

Finally, we also:
- remove from nostrip the obsolete entries which no longer exist
- remove the xbps.d special casing, which is now done in the xbps
  template for all archs
- update common/shlibs and remove outdated entry
---
 common/shlibs          | 59 ++++++++++++++++++++--------------------
 srcpkgs/glibc/template | 61 +++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..4d1a9d39d2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,36 +17,35 @@
 # one (order top->bottom) is preferred over the next ones.
 #
 libc.so musl-1.1.24_7
-libc.so.6 glibc-2.32_1
-libm.so.6 glibc-2.32_1
-libpthread.so.0 glibc-2.32_1
-librt.so.1 glibc-2.32_1
-libdl.so.2 glibc-2.32_1
-ld-linux-x86-64.so.2 glibc-2.32_1 x86_64
-ld-linux.so.2 glibc-2.32_1 i686
-ld-linux.so.3 glibc-2.32_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.32_1 aarch64
-ld64.so.2 glibc-2.32_1 ppc64
-ld.so.1 glibc-2.32_1 mips
-ld.so.1 glibc-2.32_1 ppc
-ld-linux-armhf.so.3 glibc-2.32_1
-libresolv.so.2 glibc-2.32_1
-libanl.so.1 glibc-2.32_1
-libthread_db.so.1 glibc-2.32_1
-libutil.so.1 glibc-2.32_1
-libnsl.so.1 glibc-2.32_1
-libnss_db.so.2 glibc-2.32_1
-libnss_files.so.2 glibc-2.32_1
-libnss_compat.so.2 glibc-2.32_1
-libnss_dns.so.2 glibc-2.32_1
-libnss_hesiod.so.2 glibc-2.32_1
-libcrypt.so.1 glibc-2.32_1
-libBrokenLocale.so.1 glibc-2.32_1
-libmemusage.so glibc-2.32_1
-libSegFault.so glibc-2.32_1
-libpcprofile.so glibc-2.32_1
-libcidn.so.1 glibc-2.32_1
-libmvec.so.1 glibc-2.32_1
+libc.so.6 glibc-2.34_1
+libm.so.6 glibc-2.34_1
+libpthread.so.0 glibc-2.34_1
+librt.so.1 glibc-2.34_1
+libdl.so.2 glibc-2.34_1
+ld-linux-x86-64.so.2 glibc-2.34_1 x86_64
+ld-linux.so.2 glibc-2.34_1 i686
+ld-linux.so.3 glibc-2.34_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.34_1 aarch64
+ld64.so.2 glibc-2.34_1 ppc64
+ld.so.1 glibc-2.34_1 mips
+ld.so.1 glibc-2.34_1 ppc
+ld-linux-armhf.so.3 glibc-2.34_1
+libresolv.so.2 glibc-2.34_1
+libanl.so.1 glibc-2.34_1
+libthread_db.so.1 glibc-2.34_1
+libutil.so.1 glibc-2.34_1
+libnsl.so.1 glibc-2.34_1
+libnss_db.so.2 glibc-2.34_1
+libnss_files.so.2 glibc-2.34_1
+libnss_compat.so.2 glibc-2.34_1
+libnss_dns.so.2 glibc-2.34_1
+libnss_hesiod.so.2 glibc-2.34_1
+libcrypt.so.1 glibc-2.34_1
+libBrokenLocale.so.1 glibc-2.34_1
+libmemusage.so glibc-2.34_1
+libSegFault.so glibc-2.34_1
+libpcprofile.so glibc-2.34_1
+libmvec.so.1 glibc-2.34_1
 libz.so.1 zlib-1.2.3_1
 libb2.so.1 libb2-0.98.1_1
 libbz2.so.1 bzip2-1.0.5_1
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index c62a4d2aedf1..2f570ee161aa 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,14 +1,14 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.32
-revision=2
+version=2.34
+revision=1
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
 homepage="http://www.gnu.org/software/libc"
 distfiles="${GNU_SITE}/glibc/glibc-${version}.tar.xz"
-checksum=1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
+checksum=44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2
 # Do not strip these files, objcopy errors out.
 nostrip_files="
 	XBS5_ILP32_OFFBIG
@@ -20,27 +20,28 @@ nostrip_files="
 	POSIX_V6_LP64_OFF64
 	POSIX_V7_LP64_OFF64
 	XBS5_LP64_OFF64
-	ld-${version}.so
-	libdl-${version}.so
-	libanl-${version}.so
-	libcidn-${version}.so
-	libresolv-${version}.so
-	libcrypt-${version}.so
-	libpthread-${version}.so
-	libm-${version}.so
-	libutil-${version}.so
-	libthread_db-1.0.so
-	librt-${version}.so
-	libnsl-${version}.so
-	libc-${version}.so
-	libBrokenLocale-${version}.so
-	libnss_compat-${version}.so
-	libnss_db-${version}.so
-	libnss_dns-${version}.so
-	libnss_files-${version}.so
-	libnss_hesiod-${version}.so
-	libnss_nisplus-${version}.so
-	libnss_nis-${version}.so"
+	ld-linux-x86-64.so.2
+	ld-linux.so.2
+	ld-linux.so.3
+	ld-linux-aarch64.so.1
+	ld64.so.2
+	ld.so.1
+	ld-linux-armhf.so.3
+	libresolv.so.2
+	libcrypt.so.1
+	libm.so.6
+	libthread_db.so.1
+	libnsl.so.1
+	libc.so.6
+	libc_malloc_debug.so.0
+	libmemusage.so
+	libmvec.so.1
+	libBrokenLocale.so.1
+	libnss_compat.so.2
+	libnss_db.so.2
+	libnss_dns.so.2
+	libnss_files.so.2
+	libnss_hesiod.so.2"
 
 conf_files="
 	/etc/rpc
@@ -163,18 +164,6 @@ do_install() {
 	rm -f ${DESTDIR}/usr/bin/z{dump,ic}
 
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
-
-	# Create xbps.d(5) arch override file for 32-bit architectures
-	# 32-bit userlands may be used with 64-bit kernels and then
-	# xbps will report an incorrect architecture by default
-	case "$XBPS_TARGET_MACHINE" in
-		i686|ppc|ppcle|armv*)
-			vmkdir usr/share/xbps.d
-			echo "architecture=${XBPS_TARGET_MACHINE}" > \
-				${DESTDIR}/usr/share/xbps.d/arch-32bit.conf
-			;;
-		*) ;;
-	esac
 }
 
 glibc-devel_package() {