Re: [PR PATCH] [Updated] [RFC] glibc: update to 2.38.

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages glibc
https://github.com/void-linux/void-packages/pull/45501

[RFC] glibc: update to 2.38. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

[ci skip]
https://sourceware.org/glibc/wiki/Release/2.38
glibc 2.38 disables libcrypt by default with a recommendation for distros to switch to [libxcrypt](https://github.com/besser82/libxcrypt) (as they intend to remove it entirely).
libxcrypt can be built as either libcrypt.so.1 or libcrypt.so.2.
Debian and SUSE only build libcrypt.so.1.
Arch Linux and Fedora build libcrypt.so.2 along with a libxcrypt-compat package.
The rationale for that decision is explained here:
https://fedoraproject.org/wiki/Changes/FullyRemoveDeprecatedAndUnsafeFunctionsFromLibcrypt
https://fedoraproject.org/wiki/Changes/libcrypt_so_1_Let_encrypt_encrypt_r_setkey_setkey_r_and_fcrypt_return_ENOSYS_instead_of_performing_any_real_operation

My inclination is to build libcrypt.so.2 with a libxcrypt-compat package without enosys but I am open to handling it differently.
Keep in mind that packages compiled against libxcrypt's libcrypt.so.1 will not run with glibc's libcrypt.so.1 (but applications compiled with glibc's libcrypt.so.1 will run with libxcrypt's libcrypt.so.1).

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45501.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-45501.patch --]
[-- Type: text/x-diff, Size: 58857 bytes --]

From a1d5b4a0d51365839a541ec19c9fafba868b9fc1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:48:15 -0700
Subject: [PATCH 01/28] glibc: update to 2.38.

Remove obsolete flags.

https://github.com/bminor/glibc/commit/92963737c4376bcfd65235d5c325fa7f48302f89
https://github.com/bminor/glibc/commit/644d38570a860f3ed7d478c4ed8965a91e4621a1
https://github.com/bminor/glibc/commit/07ed18d26a342741cb25a4739158c65ed9dd4d09
https://github.com/bminor/glibc/commit/f294306ba1385b096f4e4cac9146a989f1e6d1c0
---
 common/shlibs                                 | 61 +++++++++----------
 ...e-hash-style-both-for-building-glibc.patch | 51 ----------------
 srcpkgs/glibc/template                        | 16 ++---
 3 files changed, 35 insertions(+), 93 deletions(-)
 delete mode 100644 srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch

diff --git a/common/shlibs b/common/shlibs
index 3c3defa53d1b2..046ad0823d76b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,39 +17,38 @@
 # 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
 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.3_1
 libcddgmp.so.0 cddlib-0.94m_1
 libcdd.so.0 cddlib-0.94m_1
 libz.so.1 zlib-1.2.3_1
diff --git a/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch b/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch
deleted file mode 100644
index 9c5553e92609d..0000000000000
--- a/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Temporary workaround for EAC bug.
-
-See: https://sourceware.org/bugzilla/show_bug.cgi?id=29456
-
-From 8e90e2cc5e57d7ca3a40602d278e9642a8b66716 Mon Sep 17 00:00:00 2001
-From: oreo639 <oreo6391@gmail.com>
-Date: Tue, 13 Sep 2022 14:30:35 -0700
-Subject: [PATCH] Revert "Do not use --hash-style=both for building glibc
- shared objects"
-
-This reverts commit e47de5cb2d4dbecb58f569ed241e8e95c568f03c.
----
- Makeconfig     |  9 +++++++++
- Makerules      |  7 +++++++
- 5 files changed, 61 insertions(+)
-
-diff --git a/Makeconfig b/Makeconfig
-index ba70321af1..e2131d4389 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -371,6 +371,13 @@ dt-relr-ldflag =
- no-dt-relr-ldflag =
- endif
- 
-+# For the time being we unconditionally use 'both'.  At some time we
-+# should declare statically linked code as 'out of luck' and compile
-+# with --hash-style=gnu only.
-+hashstyle-LDFLAGS = -Wl,--hash-style=both
-+LDFLAGS.so += $(hashstyle-LDFLAGS)
-+LDFLAGS-rtld += $(hashstyle-LDFLAGS)
-+
- ifeq (no,$(build-pie-default))
- pie-default = $(no-pie-ccflag)
- else # build-pie-default
-diff --git a/Makerules b/Makerules
-index d1e139d03c..44134e37ce 100644
---- a/Makerules
-+++ b/Makerules
-@@ -558,6 +558,9 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
- 		  -Wl,--verbose 2>/dev/null | \
- 	  sed > $@T \
- 	      -e '/^=========/,/^=========/!d;/^=========/d' \
-+		   -e 's/^.*\.gnu\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
-+		   -e '/^[ 	]*\.hash[ 	]*:.*$$/{h;d;}' \
-+		   -e '/DATA_SEGMENT_ALIGN/{H;g}' \
- 	      -e 's/^.*\*(\.dynbss).*$$/& \
- 		 PROVIDE(__start___libc_freeres_ptrs = .); \
- 		 *(__libc_freeres_ptrs) \
--- 
-2.37.3
-
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 452b55c127624..20805fb52e816 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,15 +1,14 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.36
+version=2.38
 revision=1
-_patchver="72-g0f90d6204d"
 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="https://vasilek.cz/paste/glibc-${version}-${_patchver}.tar.xz"
-checksum=656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+distfiles="${GNU_SITE}/libc/glibc-${version}.tar.xz"
+checksum=fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
 # Do not strip these files, objcopy errors out.
 nostrip_files="
 	XBS5_ILP32_OFFBIG
@@ -29,7 +28,6 @@ nostrip_files="
 	ld.so.1
 	ld-linux-armhf.so.3
 	libresolv.so.2
-	libcrypt.so.1
 	libm.so.6
 	libthread_db.so.1
 	libnsl.so.1
@@ -98,14 +96,10 @@ do_configure() {
 	SHELL=/bin/bash ../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/bin \
 		--libdir=${_libdir} --libexecdir=${_libdir} \
-		--enable-add-ons=libidn \
 		--enable-multi-arch --enable-bind-now \
-		--disable-profile --enable-kernel=3.2.0 \
-		--enable-stack-guard-randomization \
-		--without-selinux --without-cvs --without-gd \
-		--disable-lock-elision \
 		--enable-stack-protector=strong \
-		--with-headers=${XBPS_CROSS_BASE}/usr/include \
+		--disable-profile --enable-kernel=3.2.0 \
+		--without-selinux --without-gd \
 		--disable-werror \
 		libc_cv_rootsbindir=/usr/bin \
 		libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir}

From 5ee7d2710be47a4e5458bda798e8c05e62d21a10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:49:45 -0700
Subject: [PATCH 02/28] New package: perl-bootstrap-5.36.1

---
 srcpkgs/perl-bootstrap/patches  |   1 +
 srcpkgs/perl-bootstrap/template | 106 ++++++++++++++++++++++++++++++++
 srcpkgs/perl-bootstrap/update   |   1 +
 3 files changed, 108 insertions(+)
 create mode 120000 srcpkgs/perl-bootstrap/patches
 create mode 100644 srcpkgs/perl-bootstrap/template
 create mode 100644 srcpkgs/perl-bootstrap/update

diff --git a/srcpkgs/perl-bootstrap/patches b/srcpkgs/perl-bootstrap/patches
new file mode 120000
index 0000000000000..7af8bac63558f
--- /dev/null
+++ b/srcpkgs/perl-bootstrap/patches
@@ -0,0 +1 @@
+../perl/patches
\ No newline at end of file
diff --git a/srcpkgs/perl-bootstrap/template b/srcpkgs/perl-bootstrap/template
new file mode 100644
index 0000000000000..8549cde82c83a
--- /dev/null
+++ b/srcpkgs/perl-bootstrap/template
@@ -0,0 +1,106 @@
+# Template file for 'perl-bootstrap'
+# This is needed to prevent build cycle between libxcrypt and perl
+pkgname=perl-bootstrap
+version=5.36.1
+revision=1
+_perl_cross_version=1.4.1
+build_style=gnu-configure
+hostmakedepends="less"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
+depends="less"
+short_desc="Practical Extraction and Report Language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://www.perl.org"
+distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
+ https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
+checksum="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1
+ 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca"
+repository=bootstrap
+conflicts="perl"
+skiprdeps="/usr/bin/perl"
+
+skip_extraction=perl-cross-${_perl_cross_version}.tar.gz
+
+post_extract() {
+	local TAR=$(command -v bsdtar || command -v tar)
+	$TAR --strip-components=1 -xf \
+		${XBPS_SRCDISTDIR}/${pkgname}-${version}/perl-cross-$_perl_cross_version.tar.gz
+
+	[ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH patchlevel.h
+}
+
+do_configure() {
+	local _args="-Dusethreads -Duseshrplib -Dusesoname -Dusevendorprefix
+		-Dprefix=/usr -Dvendorprefix=/usr
+		-Dprivlib=/usr/share/perl5/core_perl
+		-Darchlib=/usr/lib/perl5/core_perl
+		-Dsitelib=/usr/share/perl5/site_perl
+		-Dsitearch=/usr/lib/perl5/site_perl
+		-Dvendorlib=/usr/share/perl5/vendor_perl
+		-Dvendorarch=/usr/lib/perl5/vendor_perl
+		-Dscriptdir=/usr/bin -Dvendorscript=/usr/bin
+		-Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p
+		-Dman1dir=/usr/share/man/man1
+		-Dman3dir=/usr/share/man/man3
+		-Dd_sockaddr_in6=define
+		-Dd_crypt=undef"
+
+	if [ "$CROSS_BUILD" ]; then
+		_args+=" --target=$XBPS_CROSS_TRIPLET"
+	fi
+
+	LDFLAGS+=" -Wl,-z,stack-size=2097152 -pthread"
+	export HOSTLDFLAGS+=" -pthread"
+
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		export HOSTCFLAGS+=" -D_GNU_SOURCE"
+		export CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
+	else
+		export CFLAGS+=" -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT64"
+	fi
+
+	export LD="$CC"
+	./configure --prefix=/usr $_args \
+		-Dcccdlflags="-fPIC" \
+		-Doptimize=" -Wall ${CFLAGS} " -Dccflags=" ${CFLAGS} " \
+		-Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" \
+		-Dperl_static_inline='static __inline__' -Dd_static_inline ||
+	{
+		cat ./config.log
+		return 42
+	}
+}
+
+do_check() {
+	export LD="$CC"
+	export PERL_BUILD_PACKAGING=1
+	TEST_JOBS=${XBPS_MAKEJOBS} make test
+}
+
+post_install() {
+	find ${DESTDIR}/usr/share -type f -exec chmod 644 {} \;
+	find ${DESTDIR}/usr/lib -type f -exec chmod 644 {} \;
+
+	# Make a symbolic link from perl to perl${version}.
+	ln -sf perl ${DESTDIR}/usr/bin/perl${version}
+
+	# Remove all pod files *except* those under
+	# /usr/share/perl5/core_perl/pod/ (FS#16488)
+	rm -f ${DESTDIR}/usr/share/perl5/core_perl/*.pod
+	for d in ${DESTDIR}/usr/share/perl5/core_perl/*; do
+		if [ -d $d -a $(basename $d) != "pod" ]; then
+			find $d -name *.pod -delete
+		fi
+	done
+	find ${DESTDIR}/usr/lib -name *.pod -delete
+	find ${DESTDIR} -name .packlist -delete
+
+	# Remove references to hardening -specs.
+	sed -e "s|-specs=.*hardened-ld||g" -e "s|-specs=.*hardened-cc1||g" \
+		-i ${DESTDIR}/usr/lib/perl5/core_perl/Config_heavy.pl
+
+	# HOTFIX
+	# ln -sfr ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version} ${DESTDIR}/usr/lib/
+	# ln -sfr ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version} ${DESTDIR}/usr/lib/libperl.so.
+}
diff --git a/srcpkgs/perl-bootstrap/update b/srcpkgs/perl-bootstrap/update
new file mode 100644
index 0000000000000..2693e54070bef
--- /dev/null
+++ b/srcpkgs/perl-bootstrap/update
@@ -0,0 +1 @@
+ignore="*.[13579].* *.[1-9][13579].*"

From a75ac61d97d961f747f04a9d78b9972ea0a1658d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:50:18 -0700
Subject: [PATCH 03/28] libxcrypt: update to 4.4.36.

---
 common/shlibs              |   2 +
 srcpkgs/libxcrypt-compat   |   1 +
 srcpkgs/libxcrypt-devel    |   1 +
 srcpkgs/libxcrypt/template | 103 +++++++++++++++++++++++++++++++++++++
 4 files changed, 107 insertions(+)
 create mode 120000 srcpkgs/libxcrypt-compat
 create mode 120000 srcpkgs/libxcrypt-devel
 create mode 100644 srcpkgs/libxcrypt/template

diff --git a/common/shlibs b/common/shlibs
index 046ad0823d76b..45f634d6c0a72 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -42,6 +42,8 @@ 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.1 libxcrypt-compat-4.4.36_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.38_1
diff --git a/srcpkgs/libxcrypt-compat b/srcpkgs/libxcrypt-compat
new file mode 120000
index 0000000000000..4ed34b8a6a49e
--- /dev/null
+++ b/srcpkgs/libxcrypt-compat
@@ -0,0 +1 @@
+libxcrypt
\ No newline at end of file
diff --git a/srcpkgs/libxcrypt-devel b/srcpkgs/libxcrypt-devel
new file mode 120000
index 0000000000000..4ed34b8a6a49e
--- /dev/null
+++ b/srcpkgs/libxcrypt-devel
@@ -0,0 +1 @@
+libxcrypt
\ No newline at end of file
diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template
new file mode 100644
index 0000000000000..d9809a3773324
--- /dev/null
+++ b/srcpkgs/libxcrypt/template
@@ -0,0 +1,103 @@
+# Template file for 'libxcrypt'
+pkgname=libxcrypt
+version=4.4.36
+revision=1
+archs="~*-musl"
+configure_args="--enable-hashes=all --disable-failure-tokens"
+hostmakedepends="perl-bootstrap"
+checkdepends="python3-passlib"
+short_desc="Modern library for one-way hashing of passwords"
+maintainer="oreo639 <oreo639@gmail.com>"
+license="LGPL-2.1-or-later, BSD-3-Clause, BSD-2-Clause, 0BSD, Public Domain"
+homepage="https://github.com/besser82/libxcrypt"
+distfiles="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz"
+checksum=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943
+subpackages="libxcrypt-devel"
+
+build_options="compat"
+build_options_default="compat"
+desc_option_compat="Enable glibc compatibility library"
+
+if [ "$build_option_compat" ]; then
+	subpackages+=" libxcrypt-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	broken="musl already provides libcrypt"
+fi
+
+do_configure() {
+if [ "$build_option_compat" ]; then
+	(
+		mkdir compat-build
+		cd compat-build
+		../configure --prefix=/usr --enable-obsolete-api=glibc ${configure_args}
+	)
+fi
+
+	(
+		mkdir build
+		cd build
+		../configure --prefix=/usr --enable-obsolete-api=no ${configure_args}
+	)
+}
+
+do_build() {
+if [ "$build_option_compat" ]; then
+	(
+		cd compat-build
+		make ${makejobs} ${make_build_args} ${make_build_target}
+	)
+fi
+
+	(
+		cd build
+		make ${makejobs} ${make_build_args} ${make_build_target}
+	)
+}
+
+do_install() {
+if [ "$build_option_compat" ]; then
+	(
+		cd compat-build
+		make DESTDIR=${DESTDIR} install ${make_install_target}
+		rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share}
+	)
+fi
+
+	(
+		cd build
+		make DESTDIR=${DESTDIR} install ${make_install_target}
+	)
+}
+
+post_install() {
+	vlicense LICENSING
+}
+
+do_check() {
+	: ${make_check_target:=check}
+if [ "$build_option_compat" ]; then
+	${make_check_pre} make -C compat-build ${makejobs} ${make_check_args} ${make_check_target}
+fi
+	${make_check_pre} make -C build ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+libxcrypt-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}
+
+libxcrypt-compat_package() {
+	short_desc+=" - legacy compatibility"
+	pkg_install() {
+		vmove usr/lib/libcrypt.so.1*
+	}
+}

From 8673aead9c3219ce2a131130cff8b0a77d06382d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:37 -0700
Subject: [PATCH 04/28] musl: provides libxcrypt-devel

---
 ...fee27f4a293728dd15b659170e7b9c7db9bc.patch | 247 ++++++++++++++++++
 srcpkgs/musl/template                         |   3 +-
 2 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/25e6fee27f4a293728dd15b659170e7b9c7db9bc.patch

diff --git a/srcpkgs/musl/patches/25e6fee27f4a293728dd15b659170e7b9c7db9bc.patch b/srcpkgs/musl/patches/25e6fee27f4a293728dd15b659170e7b9c7db9bc.patch
new file mode 100644
index 0000000000000..3e8a5426a294c
--- /dev/null
+++ b/srcpkgs/musl/patches/25e6fee27f4a293728dd15b659170e7b9c7db9bc.patch
@@ -0,0 +1,247 @@
+From 25e6fee27f4a293728dd15b659170e7b9c7db9bc Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 27 Sep 2022 15:04:05 -0400
+Subject: [PATCH] remove LFS64 programming interfaces (macro-only) from
+ _GNU_SOURCE
+
+these badly pollute the namespace with macros whenever _GNU_SOURCE is
+defined, which is always the case with g++, and especially tends to
+interfere with C++ constructs.
+
+as our implementation of these was macro-only, their removal cannot
+affect any existing binaries. at the source level, portable software
+should be prepared for them not to exist.
+
+for now, they are left in place with explicit _LARGEFILE64_SOURCE.
+this provides an easy temporary path for integrators/distributions to
+get packages building again right away if they break while working on
+a proper, upstreamable fix. the intent is that this be a very
+short-term measure and that the macros be removed entirely in the next
+release cycle.
+---
+ include/aio.h          | 2 +-
+ include/dirent.h       | 2 +-
+ include/fcntl.h        | 2 +-
+ include/ftw.h          | 2 +-
+ include/glob.h         | 2 +-
+ include/stdio.h        | 2 +-
+ include/stdlib.h       | 2 +-
+ include/sys/mman.h     | 2 +-
+ include/sys/resource.h | 2 +-
+ include/sys/sendfile.h | 2 +-
+ include/sys/stat.h     | 2 +-
+ include/sys/statfs.h   | 2 +-
+ include/sys/statvfs.h  | 2 +-
+ include/sys/types.h    | 2 +-
+ include/sys/uio.h      | 2 +-
+ include/unistd.h       | 2 +-
+ 16 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/include/aio.h b/include/aio.h
+index 453c41b74..a938fcad5 100644
+--- a/include/aio.h
++++ b/include/aio.h
+@@ -49,7 +49,7 @@ int aio_fsync(int, struct aiocb *);
+ 
+ int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sigevent *__restrict);
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define aiocb64 aiocb
+ #define aio_read64 aio_read
+ #define aio_write64 aio_write
+diff --git a/include/dirent.h b/include/dirent.h
+index 650ecf646..2d8fffb23 100644
+--- a/include/dirent.h
++++ b/include/dirent.h
+@@ -56,7 +56,7 @@ int getdents(int, struct dirent *, size_t);
+ int versionsort(const struct dirent **, const struct dirent **);
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define dirent64 dirent
+ #define readdir64 readdir
+ #define readdir64_r readdir_r
+diff --git a/include/fcntl.h b/include/fcntl.h
+index b664cdc44..515f255d4 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -195,7 +195,7 @@ ssize_t tee(int, int, size_t, unsigned);
+ #define loff_t off_t
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define F_GETLK64 F_GETLK
+ #define F_SETLK64 F_SETLK
+ #define F_SETLKW64 F_SETLKW
+diff --git a/include/ftw.h b/include/ftw.h
+index b15c062a8..d0445e8ad 100644
+--- a/include/ftw.h
++++ b/include/ftw.h
+@@ -29,7 +29,7 @@ struct FTW {
+ int ftw(const char *, int (*)(const char *, const struct stat *, int), int);
+ int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int);
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define ftw64 ftw
+ #define nftw64 nftw
+ #endif
+diff --git a/include/glob.h b/include/glob.h
+index 4a562a206..fed067453 100644
+--- a/include/glob.h
++++ b/include/glob.h
+@@ -39,7 +39,7 @@ void globfree(glob_t *);
+ #define GLOB_NOMATCH 3
+ #define GLOB_NOSYS   4
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define glob64 glob
+ #define globfree64 globfree
+ #define glob64_t glob_t
+diff --git a/include/stdio.h b/include/stdio.h
+index d1ed01f03..cb8586185 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -205,7 +205,7 @@ typedef struct _IO_cookie_io_functions_t {
+ FILE *fopencookie(void *, const char *, cookie_io_functions_t);
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define tmpfile64 tmpfile
+ #define fopen64 fopen
+ #define freopen64 freopen
+diff --git a/include/stdlib.h b/include/stdlib.h
+index b507ca33b..b117a4527 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -163,7 +163,7 @@ double strtod_l(const char *__restrict, char **__restrict, struct __locale_struc
+ long double strtold_l(const char *__restrict, char **__restrict, struct __locale_struct *);
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define mkstemp64 mkstemp
+ #define mkostemp64 mkostemp
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+diff --git a/include/sys/mman.h b/include/sys/mman.h
+index 80a3baae2..3d5d0f9c2 100644
+--- a/include/sys/mman.h
++++ b/include/sys/mman.h
+@@ -141,7 +141,7 @@ int mincore (void *, size_t, unsigned char *);
+ int shm_open (const char *, int, mode_t);
+ int shm_unlink (const char *);
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define mmap64 mmap
+ #define off64_t off_t
+ #endif
+diff --git a/include/sys/resource.h b/include/sys/resource.h
+index 3068328d0..e8bfbe1f0 100644
+--- a/include/sys/resource.h
++++ b/include/sys/resource.h
+@@ -95,7 +95,7 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
+ 
+ #define RLIM_NLIMITS RLIMIT_NLIMITS
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define RLIM64_INFINITY RLIM_INFINITY
+ #define RLIM64_SAVED_CUR RLIM_SAVED_CUR
+ #define RLIM64_SAVED_MAX RLIM_SAVED_MAX
+diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h
+index e7570d8e5..253a041b1 100644
+--- a/include/sys/sendfile.h
++++ b/include/sys/sendfile.h
+@@ -10,7 +10,7 @@ extern "C" {
+ 
+ ssize_t sendfile(int, int, off_t *, size_t);
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define sendfile64 sendfile
+ #define off64_t off_t
+ #endif
+diff --git a/include/sys/stat.h b/include/sys/stat.h
+index 10d446c46..e6d0049c3 100644
+--- a/include/sys/stat.h
++++ b/include/sys/stat.h
+@@ -98,7 +98,7 @@ int lchmod(const char *, mode_t);
+ #define S_IEXEC S_IXUSR
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define stat64 stat
+ #define fstat64 fstat
+ #define lstat64 lstat
+diff --git a/include/sys/statfs.h b/include/sys/statfs.h
+index 6f4c6230f..7a2e11cd5 100644
+--- a/include/sys/statfs.h
++++ b/include/sys/statfs.h
+@@ -18,7 +18,7 @@ typedef struct __fsid_t {
+ int statfs (const char *, struct statfs *);
+ int fstatfs (int, struct statfs *);
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define statfs64 statfs
+ #define fstatfs64 fstatfs
+ #define fsblkcnt64_t fsblkcnt_t
+diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
+index 793490b6d..57a6b8068 100644
+--- a/include/sys/statvfs.h
++++ b/include/sys/statvfs.h
+@@ -42,7 +42,7 @@ int fstatvfs (int, struct statvfs *);
+ #define ST_NODIRATIME  2048
+ #define ST_RELATIME    4096
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define statvfs64 statvfs
+ #define fstatvfs64 fstatvfs
+ #define fsblkcnt64_t fsblkcnt_t
+diff --git a/include/sys/types.h b/include/sys/types.h
+index 0c35541da..3363374fd 100644
+--- a/include/sys/types.h
++++ b/include/sys/types.h
+@@ -71,7 +71,7 @@ typedef unsigned long long u_quad_t;
+ #include <sys/select.h>
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define blkcnt64_t blkcnt_t
+ #define fsblkcnt64_t fsblkcnt_t
+ #define fsfilcnt64_t fsfilcnt_t
+diff --git a/include/sys/uio.h b/include/sys/uio.h
+index 00f73a2f0..90e5939ed 100644
+--- a/include/sys/uio.h
++++ b/include/sys/uio.h
+@@ -29,7 +29,7 @@ ssize_t writev (int, const struct iovec *, int);
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+ ssize_t preadv (int, const struct iovec *, int, off_t);
+ ssize_t pwritev (int, const struct iovec *, int, off_t);
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define preadv64 preadv
+ #define pwritev64 pwritev
+ #define off64_t off_t
+diff --git a/include/unistd.h b/include/unistd.h
+index 0e8149e4e..5bc7f7982 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -198,7 +198,7 @@ ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned);
+ pid_t gettid(void);
+ #endif
+ 
+-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
++#if defined(_LARGEFILE64_SOURCE)
+ #define lseek64 lseek
+ #define pread64 pread
+ #define pwrite64 pwrite
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index e0e05c2df0995..ab010939c47fe 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=17
+revision=18
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -52,6 +52,7 @@ musl-devel_package() {
 	depends="kernel-libc-headers ${sourcepkg}-${version}_${revision}"
 	replaces="libssp-devel<=12.2.0_1"
 	conflicts="libssp-devel<=12.2.0_1"
+	provides="libxcrypt-devel-0_1"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 0e822f0ee02ee9f204f87878b06d78ce757bc571 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:49 -0700
Subject: [PATCH 05/28] perl: rebuild with libxcrypt

---
 srcpkgs/perl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index d507855d3d1f6..3f466c79caa32 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,11 +1,11 @@
 # Template file for 'perl'
 pkgname=perl
 version=5.36.1
-revision=1
+revision=2
 _perl_cross_version=1.4.1
 build_style=gnu-configure
 hostmakedepends="less"
-makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel libxcrypt-devel"
 depends="less"
 checkdepends="iana-etc perl-AnyEvent perl-Test-Pod procps-ng"
 short_desc="Practical Extraction and Report Language"
@@ -16,6 +16,7 @@ distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
 checksum="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1
  3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca"
+conflicts="perl-bootstrap"
 
 skip_extraction=perl-cross-${_perl_cross_version}.tar.gz
 

From 1ebd275fcaf84d5a4e06963f691692c6558db0e9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:33:23 -0700
Subject: [PATCH 06/28] python: rebuild with libxcrypt

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 52b2b4532e62d..8b5b21955897f 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,12 +4,12 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=3
+revision=4
 _commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
+ sqlite-devel bzip2-devel zlib-devel libxcrypt-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2f5c1ec5f5c8b1cee18897719d256b0e08027862 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:42:25 -0700
Subject: [PATCH 07/28] python3: rebuild for libxcrypt

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index ef07cb7d2f396..3abb389200fea 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,7 +4,7 @@
 #
 pkgname=python3
 version=3.11.4
-revision=1
+revision=2
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
  --enable-loadable-sqlite-extensions --with-computed-gotos
@@ -13,7 +13,7 @@ configure_args="--enable-shared --enable-ipv6
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
- expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
+ expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel libxcrypt-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc"
 short_desc="Python programming language (${version%.*} series)"

From 830d66eaea9032b59efa1c50468ceb9f4650156a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 11:43:37 -0700
Subject: [PATCH 08/28] ruby: rebuild for libxcrypt

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 23a9fdd17ebbb..688653ed16eee 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,14 +3,14 @@ _ruby_abiver=3.2.0
 
 pkgname=ruby
 version=3.2.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
 makedepends="zlib-devel readline-devel libffi-devel openssl-devel
- gdbm-devel libyaml-devel pango-devel"
+ gdbm-devel libyaml-devel pango-devel libxcrypt-devel"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 8cb633a40a5881bc33892bfe157d337f3376913a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 14:51:38 -0700
Subject: [PATCH 09/28] mariadb: rebuild for libxcrypt

---
 srcpkgs/mariadb/patches/fix-gcc13.patch | 53 +++++++++++++++++++++++++
 srcpkgs/mariadb/template                |  4 +-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mariadb/patches/fix-gcc13.patch

diff --git a/srcpkgs/mariadb/patches/fix-gcc13.patch b/srcpkgs/mariadb/patches/fix-gcc13.patch
new file mode 100644
index 0000000000000..26d8686d83c44
--- /dev/null
+++ b/srcpkgs/mariadb/patches/fix-gcc13.patch
@@ -0,0 +1,53 @@
+From cf4a16b5557be5fb3568c1de0d6cc0a18291afc9 Mon Sep 17 00:00:00 2001
+From: Sergei Golubchik <serg@mariadb.org>
+Date: Thu, 4 May 2023 16:05:08 +0200
+Subject: [PATCH] MDEV-31057 rocksdb does not compile with gcc-13
+
+RocksDB (in a submodule) has to include <cstdint> to use uint64_t
+but it doesn't. Until the submodule is upgraded, let's replace
+problematic types with something that's available
+---
+ storage/rocksdb/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
+index 15fc4dc735a8a..71259703e5a6f 100644
+--- a/storage/rocksdb/CMakeLists.txt
++++ b/storage/rocksdb/CMakeLists.txt
+@@ -30,6 +30,11 @@ IF(WITH_VALGRIND)
+   ADD_DEFINITIONS(-DROCKSDB_VALGRIND_RUN=1)
+ ENDIF()
+ 
++ADD_DEFINITIONS(-Duint64_t=u_int64_t)
++ADD_DEFINITIONS(-Duint32_t=u_int32_t)
++ADD_DEFINITIONS(-Duint16_t=u_int16_t)
++ADD_DEFINITIONS(-Duint8_t=u_int8_t)
++
+ # We've had our builders hang during the build process. This prevents MariaRocks
+ # to be built on 32 bit intel OS kernels.
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i[36]86")
+From 75bbf645a66db797be2abd3a348dce32eb753acc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing include <cstdio>
+
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tpool/aio_linux.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
+index 8a6688e6775fc..6997cbcccaba8 100644
+--- a/tpool/aio_linux.cc
++++ b/tpool/aio_linux.cc
+@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
+ #ifdef LINUX_NATIVE_AIO
+ # include <thread>
+ # include <atomic>
++# include <cstdio>
+ # include <libaio.h>
+ # include <sys/syscall.h>
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index f8987e06ed1c6..5ac0a7e643d67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.5.10
-revision=5
+revision=6
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_CONFIG=mysql_release
@@ -19,7 +19,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
 hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- pcre2-devel"
+ pcre2-devel libxcrypt-devel"
 depends="perl"
 checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 47f2089a2a6baf3d8cf46c558a5d38093fbde215 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 14:52:52 -0700
Subject: [PATCH 10/28] apr-util: update to 1.6.3.

---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 42 +++++++++----------
 3 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..496fb7d692fcc 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,24 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:"
+	fi
+	vsed -i build/rules.mk \
+		-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+		-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS}:" \
+		-e '/^LTFLAGS/s:--silent::'
 }
 
 post_install() {

From eea128c3803ee9913bf936ca5b15ba8a724edf43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:04:12 -0700
Subject: [PATCH 11/28] php8.0: rebuild for libxcrypt

---
 srcpkgs/php8.0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index c8c0045252290..b413e9e6987e3 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,14 +1,14 @@
 # Template file for 'php8.0'
 pkgname=php8.0
 version=8.0.29
-revision=1
+revision=2
 _php_version=8.0
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel libxcrypt-devel"
 short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"

From 241b31678c57602be2ce73a38b2dc9158935a4d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:05:07 -0700
Subject: [PATCH 12/28] php8.1: rebuild for libxcrypt

---
 srcpkgs/php8.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..ea144a2bdc4c4 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,14 +1,14 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.21
-revision=1
+revision=2
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel libxcrypt-devel"
 short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"

From cb4c5c575155b3c9e50ca2eb5b131b115d73f8ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:07:16 -0700
Subject: [PATCH 13/28] accountsservice: rebuild for libxcrypt

---
 srcpkgs/accountsservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index f298248158312..a957926a5a564 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,13 +1,13 @@
 # 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
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
 hostmakedepends="glib-devel pkg-config polkit gettext"
-makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
+makedepends="polkit-devel $(vopt_if elogind elogind-devel) libxcrypt-devel"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From b16989ab3f26b5c3149d5fb2a7273b590989a708 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:09 -0700
Subject: [PATCH 14/28] pam: rebuild for libxcrypt

---
 srcpkgs/pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 6ae5d7c91bebb..b93b64c824469 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,14 +1,14 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib --sbindir=/usr/bin --docdir=/usr/share/doc/pam
  --disable-nis --disable-audit --disable-selinux
  --disable-regenerate-docu BUILD_CFLAGS=-Os BUILD_LDFLAGS="
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libfl-devel db-devel"
+makedepends="libfl-devel db-devel libxcrypt-devel"
 # version of pam-base that doesn't include removed modules
 depends="pam-base>=0.4_1"
 checkdepends="pam-base"

From 1f3d9cc7e1c4387aee04a8434a0e612256be0d62 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:35 -0700
Subject: [PATCH 15/28] libpam-policycache: rebuild for libxcrypt

---
 srcpkgs/libpam-policycache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template
index 6777b0856dd67..e454b0d564b07 100644
--- a/srcpkgs/libpam-policycache/template
+++ b/srcpkgs/libpam-policycache/template
@@ -1,10 +1,10 @@
 # Template file for 'libpam-policycache'
 pkgname=libpam-policycache
 version=0.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
-makedepends="glib-devel libscrypt-devel pam-devel"
+makedepends="glib-devel libscrypt-devel pam-devel libxcrypt-devel"
 short_desc="Password caching module with advanced policies for PAM"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"

From fadd65c90d277f6883b15685eecba9a1d55a77fd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:21:28 -0700
Subject: [PATCH 16/28] openssh: rebuild for libxcrypt

---
 srcpkgs/openssh/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index a5c920fb10b2e..9cad425ba790d 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.3p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
  $(vopt_if fido2 --with-security-key-builtin)
  LD=$CC ac_cv_header_sys_cdefs_h=false"
 hostmakedepends="automake"
-makedepends="libedit-devel pam-devel zlib-devel
+makedepends="libedit-devel pam-devel zlib-devel libxcrypt-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
  $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
@@ -42,7 +42,7 @@ if [ "$build_option_ldns" -a -z "$build_option_ssl" ]; then
 	broken="option 'ldns' requires option 'ssl'"
 fi
 
-CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized"
+CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-use-after-free"
 
 case $XBPS_TARGET_MACHINE in
 	i686-musl)

From 2887412cf03d13e03771724ea16647b03e5b2902 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:24:55 -0700
Subject: [PATCH 17/28] util-linux: rebuild for libxcrypt

---
 srcpkgs/util-linux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 99819d02068b3..0e197014eceea 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.38.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -10,7 +10,7 @@ configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-
  --with-udev --without-python --enable-write"
 hostmakedepends="gettext pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
- eudev-libudev-devel"
+ eudev-libudev-devel libxcrypt-devel"
 depends="libfdisk>=${version}_1<=${version}_9999
  libblkid>=${version}_1<=${version}_9999
  libmount>=${version}_1<=${version}_9999

From 176efecb41157f4cd3bf53cea047ffe995719ccf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:26:21 -0700
Subject: [PATCH 18/28] shadow: rebuild for libxcrypt

---
 srcpkgs/shadow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index c59d92bfeb54a..6f41bc34c4858 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.8.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/bin
  --enable-shared --disable-static
@@ -9,7 +9,7 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/bin
  --disable-nls --enable-subordinate-ids --disable-account-tools-setuid
  --with-group-name-max-length=32"
 hostmakedepends="libtool"
-makedepends="acl-devel pam-devel"
+makedepends="acl-devel pam-devel libxcrypt-devel"
 depends="pam"
 short_desc="Shadow password file utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b7e8c012e25d4a7ef35f04339beefa7067f54583 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:28:06 -0700
Subject: [PATCH 19/28] cups: rebuild for libxcrypt

---
 srcpkgs/cups/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 584a12d0ebf0d..6431fe557530a 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,13 +1,14 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
  $(vopt_if avahi avahi-libs-devel)"
 makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
- zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)"
+ zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)
+ libxcrypt-devel"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 549ab568fcd7033e826d5e7528de71beacf3d95a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:36:44 -0700
Subject: [PATCH 20/28] apache: rebuild for libxcrypt

---
 srcpkgs/apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..3da731a7fa7a6 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.56
-revision=1
+revision=2
 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
@@ -25,7 +25,7 @@ conf_files="
 	/etc/${pkgname}/magic
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
-makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel
+makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel libxcrypt-devel
  openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"

From c05f895415047df820b17f3b118a6b925087c555 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:51:04 -0700
Subject: [PATCH 21/28] plasma-workspace: rebuild for libxcrypt

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9033ad55ac17e..088045947ade3 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.27.6
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -14,7 +14,7 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d
  kcmutils-devel kidletime-devel kdelibs4support-devel libksysguard-devel
  baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
  libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
- libXft-devel libkscreen-devel kactivities5-stats-devel
+ libXft-devel libkscreen-devel kactivities5-stats-devel libxcrypt-devel
  $(vopt_if pipewire kpipewire-devel)"
 depends="kactivitymanagerd kwin iso-codes milou plasma-integration
  kquickcharts qt5-wayland xorg-server-xwayland"

From 6677898f7fe76ffa40b264fa3ce0fabede3f794b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:53:05 -0700
Subject: [PATCH 22/28] openldap: rebuild for libxcrypt

---
 srcpkgs/openldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..9f0dfb2aeac8f 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.58
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff"
-makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libxcrypt-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From a53f094b75fd7cd6ce3a868656cb322ca721f465 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:55:55 -0700
Subject: [PATCH 23/28] guile: rebuild for libxcrypt

---
 srcpkgs/guile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f0f917b1c4eea..115b2a07d4b7f 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,12 +1,12 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config texinfo"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
- libunistring-devel readline-devel"
+ libunistring-devel readline-devel libxcrypt-devel"
 short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"

From 8435615220b90db6df3e7e55dd7b65295ea10ecd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:03:17 -0700
Subject: [PATCH 24/28] libfilezilla: rebuild for libxcrypt

---
 srcpkgs/libfilezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index ada549cb23f35..782dabc09c172 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -2,11 +2,11 @@
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
 version=0.44.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="gettext pkg-config"
-makedepends="nettle-devel gnutls-devel"
+makedepends="nettle-devel gnutls-devel libxcrypt-devel"
 short_desc="Small and modern C++ library, which offers some basic functionalities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 725e7b4849c434dd444d926537c34f494c29db56 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:04:32 -0700
Subject: [PATCH 25/28] x11vnc: rebuild for libxcrypt

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 1fdc9f8fb8c6d..3b65842ee0601 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
- libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
+ libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel libxcrypt-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, x11vnc-openssl-exception"

From 14425a07ab28390548b0cd9ad44313fea1416639 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:05:16 -0700
Subject: [PATCH 26/28] tcsh: rebuild for libxcrypt

---
 srcpkgs/tcsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index d736217b7e0b5..4a66d24fe9cf8 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,10 +1,10 @@
 # Template file for 'tcsh'
 pkgname=tcsh
 version=6.24.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/csh.login /etc/csh.cshrc"
-makedepends="ncurses-devel automake"
+makedepends="ncurses-devel automake libxcrypt-devel"
 short_desc="Enhanced but compatible version of the Berkeley C shell"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 43471b8e56d79aa84d3cc33cbf3a5382ac5da511 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:09 -0700
Subject: [PATCH 27/28] xdm: rebuild for libxcrypt

---
 srcpkgs/xdm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 282b8fe7a5401..09f52e3c0eae9 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
 version=1.1.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -15,7 +15,7 @@ conf_files="/etc/pam.d/xdm
  /etc/X11/xdm/Xresources
  /etc/X11/xdm/Xservers"
 hostmakedepends="pkg-config"
-makedepends="pam-devel libXaw-devel libXft-devel"
+makedepends="pam-devel libXaw-devel libXft-devel libxcrypt-devel"
 depends="sessreg xconsole xsm"
 short_desc="X Display Manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 78d740ad46903a867eba308db15c962eac71bb1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:36 -0700
Subject: [PATCH 28/28] lua54-luaposix: rebuild for libxcrypt

---
 srcpkgs/lua54-luaposix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template
index 04f5fb8477987..375887cdfe28c 100644
--- a/srcpkgs/lua54-luaposix/template
+++ b/srcpkgs/lua54-luaposix/template
@@ -1,9 +1,9 @@
 # Template file for 'lua54-luaposix'
 pkgname=lua54-luaposix
 version=35.0
-revision=1
+revision=2
 hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
-makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libxcrypt-devel"
 depends="lua54 lua54-stdlib-normalize"
 _desc="POSIX library for Lua programming language"
 short_desc="${_desc} (5.4.x)"