glibc: update to 2.38.

common/build-style/void-cross.sh

@@ -264,9 +264,10 @@ _void_cross_build_glibc() {
 
 	CC="${tgt}-gcc" CXX="${tgt}-g++" CPP="${tgt}-cpp" LD="${tgt}-ld" \
 	AR="${tgt}-ar" AS="${tgt}-as" NM="${tgt}-nm" \
+	OBJDUMP="${tgt}-objdump" OBJCOPY="${tgt}-objcopy" \
 	CFLAGS="-pipe ${cross_glibc_cflags}" \
 	CXXFLAGS="-pipe ${cross_glibc_cflags}" \
-	CPPFLAGS="${cross_glibc_cflags}" \
+	CPPFLAGS="" \
 	LDFLAGS="${cross_glibc_ldflags}" \
 	../glibc-${ver}/configure \
 		--prefix=/usr \

common/shlibs

@@ -17,39 +17,39 @@
 # one (order top->bottom) is preferred over the next ones.
 #
 libc.so musl-1.1.24_7
-libc.so.6 glibc-2.36_1
-libm.so.6 glibc-2.36_1
-libpthread.so.0 glibc-2.36_1
-librt.so.1 glibc-2.36_1
-libdl.so.2 glibc-2.36_1
-ld-linux-x86-64.so.2 glibc-2.36_1 x86_64
-ld-linux.so.2 glibc-2.36_1 i686
-ld-linux.so.3 glibc-2.36_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.36_1 aarch64
-ld-linux-riscv64-lp64d.so.1 glibc-2.36_1 riscv64
-ld64.so.2 glibc-2.36_1 ppc64
-ld.so.1 glibc-2.36_1 mips
-ld.so.1 glibc-2.36_1 ppc
-ld-linux-armhf.so.3 glibc-2.36_1
-libresolv.so.2 glibc-2.36_1
-libanl.so.1 glibc-2.36_1
-libthread_db.so.1 glibc-2.36_1
-libutil.so.1 glibc-2.36_1
-libnsl.so.1 glibc-2.36_1
-libnss_db.so.2 glibc-2.36_1
-libnss_files.so.2 glibc-2.36_1
-libnss_compat.so.2 glibc-2.36_1
-libnss_dns.so.2 glibc-2.36_1
-libnss_hesiod.so.2 glibc-2.36_1
-libcrypt.so.1 glibc-2.36_1
-libBrokenLocale.so.1 glibc-2.36_1
+libc.so.6 glibc-2.38_1
+libm.so.6 glibc-2.38_1
+libpthread.so.0 glibc-2.38_1
+librt.so.1 glibc-2.38_1
+libdl.so.2 glibc-2.38_1
+ld-linux-x86-64.so.2 glibc-2.38_1 x86_64
+ld-linux.so.2 glibc-2.38_1 i686
+ld-linux.so.3 glibc-2.38_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.38_1 aarch64
+ld-linux-riscv64-lp64d.so.1 glibc-2.38_1 riscv64
+ld64.so.2 glibc-2.38_1 ppc64
+ld.so.1 glibc-2.38_1 mips
+ld.so.1 glibc-2.38_1 ppc
+ld-linux-armhf.so.3 glibc-2.38_1
+libresolv.so.2 glibc-2.38_1
+libanl.so.1 glibc-2.38_1
+libthread_db.so.1 glibc-2.38_1
+libutil.so.1 glibc-2.38_1
+libnsl.so.1 glibc-2.38_1
+libnss_db.so.2 glibc-2.38_1
+libnss_files.so.2 glibc-2.38_1
+libnss_compat.so.2 glibc-2.38_1
+libnss_dns.so.2 glibc-2.38_1
+libnss_hesiod.so.2 glibc-2.38_1
+libBrokenLocale.so.1 glibc-2.38_1
+libcrypt.so.2 libxcrypt-4.4.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
-libmemusage.so glibc-2.36_1
-libSegFault.so glibc-2.36_1
-libpcprofile.so glibc-2.36_1
-libcidn.so.1 glibc-2.36_1
-libmvec.so.1 glibc-2.36_1
+libmemusage.so glibc-2.38_1
+libSegFault.so glibc-2.38_1
+libpcprofile.so glibc-2.38_1
+libcidn.so.1 glibc-2.38_1
+libmvec.so.1 glibc-2.38_1
 libcddgmp.so.0 cddlib-0.94m_1
 libcdd.so.0 cddlib-0.94m_1
 libz.so.1 zlib-1.2.3_1

srcpkgs/FreeRADIUS/template

@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.26
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
@@ -15,6 +15,10 @@ nocross=yes # Not supported by upstream
 system_accounts="_freeradius"
 make_dirs="/etc/raddb 0750 _freeradius _freeradius"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 pre_install() {
 	# FreeRADIUS uses 'R' instead of 'DESTDIR'
 	export R=${DESTDIR}

srcpkgs/Gauche/template

@@ -1,7 +1,7 @@
 # Template file for 'Gauche'
 pkgname=Gauche
 version=0.9.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="texinfo"
 makedepends="libticonv-devel libatomic_ops-devel"
@@ -17,6 +17,10 @@ alternatives="
  scheme:scheme.1:/usr/share/man/man1/gosh.1
 "
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 if [ -n "$CROSS_BUILD" ]; then
 	# Gauche needs itself to bootstrap for cross compilation.
 	hostmakedepends+=" Gauche"

srcpkgs/Ice/template

@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.8
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp OPTIMIZE=yes USR_DIR_INSTALL=yes CONFIGS=shared
  CONFIGS+=cpp11-shared"
@@ -16,6 +16,10 @@ changelog="https://doc.zeroc.com/ice/latest/release-notes"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
 checksum=f2ab6b151ab0418fab30bafc2524d9ba4c767a1014f102df88d735fc775f9824
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp
 	hostmakedepends+=" Ice"

srcpkgs/accountsservice/template

@@ -1,7 +1,7 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
 version=0.6.55
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no -Duser_heuristics=false
@@ -18,6 +18,10 @@ make_dirs="
  /var/lib/AccountsService/users 755 root root
  /var/lib/AccountsService/icons 755 root root"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 # Package build options
 build_options="elogind gir"
 build_options_default="elogind gir"

srcpkgs/alpine/template

@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.26
-revision=3
+revision=4
 _githash=9726c098a739edfdca6218bc5dee104c310957e9
 _gitshort="${_githash:0:7}"
 build_style=gnu-configure
@@ -20,6 +20,10 @@ checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
 # weird fail with openssl3 otherwise
 disable_parallel_build=yes
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 post_extract() {
 	sed -i -e '/run test program/s/^/: /' \
 		-e 's/linux-gnu/linux-/g' ${wrksrc}/configure

srcpkgs/anjuta/template

@@ -1,7 +1,7 @@
 # Template file for 'anjuta'
 pkgname=anjuta
 version=3.34.0
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir qemu"
 configure_args="--disable-compile-warnings --disable-schemas-compile
@@ -23,6 +23,10 @@ homepage="https://projects.gnome.org/anjuta"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 build_options="gir"
 build_options_default="gir"
 

srcpkgs/apache/template

@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.56
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
@@ -36,6 +36,10 @@ changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
 

srcpkgs/apr-util/template

@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
@@ -22,6 +22,10 @@ checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 pre_configure() {
 	autoreconf -fi
 }

srcpkgs/bacula-common/template

@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
@@ -17,6 +17,10 @@ checksum=a40d04d2c48135972cecb6578405e835c4b9d798c0950017de0fad40ca94e8a0
 alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so"
 shlib_provides="libbaccats-${version}.so"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 CFLAGS="-Wno-narrowing"
 
 post_install() {

srcpkgs/bftpd/template

@@ -1,7 +1,7 @@
 # Template file for 'bftpd'
 pkgname=bftpd
 version=6.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-libz"
 makedepends="zlib-devel"
@@ -12,6 +12,10 @@ homepage="https://bftpd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz"
 checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 CFLAGS="-fcommon"
 make_build_args=V=1
 make_dirs="/var/run/bftpd 0755 root root"

srcpkgs/bitchx/template

@@ -1,7 +1,7 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=18
+revision=19
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
 makedepends="openssl-devel ncurses-devel"
@@ -12,6 +12,10 @@ homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 disable_parallel_build=yes
 
 CFLAGS="-fcommon"

srcpkgs/burp2-server/template

@@ -3,7 +3,7 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
@@ -26,6 +26,8 @@ make_dirs="/var/spool/burp 0755 root root"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
+elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
 fi
 
 pre_configure() {

srcpkgs/busybox/template

@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.34.1
-revision=4
+revision=5
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -11,6 +11,10 @@ homepage="https://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
 checksum=415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 _alternatives_core="
  ash:ash:/usr/bin/busybox
  awk:awk:/usr/bin/busybox

srcpkgs/ccrypt/template

@@ -1,11 +1,15 @@
 # Template file for 'ccrypt'
 pkgname=ccrypt
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Symmetric encryption utility using Rijndael cipher"
 maintainer="Evan Deaubl <[email protected]>"
 license="GPL-2.0-or-later"
 homepage="https://ccrypt.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/ccrypt/ccrypt-${version}.tar.gz"
 checksum=b19c47500a96ee5fbd820f704c912f6efcc42b638c0a6aa7a4e3dc0a6b51a44f
+
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi

srcpkgs/clisp/template

@@ -1,7 +1,7 @@
 # Template file for 'clisp'
 pkgname=clisp
 version=2.49.92
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --disable-mmap --disable-rpath
  --without-dynamic-modules $(vopt_with readline)"
@@ -20,6 +20,10 @@ disable_parallel_build=yes
 build_options="readline"
 build_options_default="readline"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;
 esac

srcpkgs/collectd/template

@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -24,6 +24,10 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
 checksum=5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6
 LDFLAGS="-lgcrypt"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 build_options="rrdtool perl notify prometheus"
 desc_option_rrdtool="Enable support for RRDTool"
 desc_option_prometheus="Enable write_prometheus plugin"