Github messages for voidlinux
 help / color / mirror / Atom feed
From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [RFC] glibc: update to 2.38. 
Date: Mon, 16 Oct 2023 19:29:18 +0200	[thread overview]
Message-ID: <20231016172918.QhNkklY4JDpZ0FVRLdrghdAE5zC0Wet1f32DW426YU0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45501@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 2855 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**

The following packages must be removed from the repo before merging this PR:
- [ ] php8.0-apache-8.0.29_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] php8.0-embed-8.0.29_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] burp-client-1.4.40_12: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] user-manager-5.19.5_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)

[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).

You can get the packages using libcrypt using `xbps-query -Rs libcrypt.so -p shlib-requires`.

<!--
#### 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: 144225 bytes --]

From 8b1b634bc21ee4c3e17af33fe760a73afe1f84fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:48:15 -0700
Subject: [PATCH 01/97] 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 ---
 ...4f10b504bc4564e9f22f00907093f1ab9338.patch | 335 ++++++++++++++++++
 ...08dd774b617f99419bdc3cf2ace4560cd2d6.patch | 192 ++++++++++
 ...te-GLIBC_TUNABLES-in-setxid-binaries.patch |  33 +-
 srcpkgs/glibc/template                        |  18 +-
 6 files changed, 576 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch
 create mode 100644 srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch
 create mode 100644 srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch

diff --git a/common/shlibs b/common/shlibs
index 67ecffb1effa3..9473ab5af4f8d 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/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch b/srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch
new file mode 100644
index 0000000000000..ff538767809b8
--- /dev/null
+++ b/srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch
@@ -0,0 +1,335 @@
+From 00ae4f10b504bc4564e9f22f00907093f1ab9338 Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date: Fri, 15 Sep 2023 13:51:12 -0400
+Subject: [PATCH] getaddrinfo: Fix use after free in getcanonname
+ (CVE-2023-4806)
+
+When an NSS plugin only implements the _gethostbyname2_r and
+_getcanonname_r callbacks, getaddrinfo could use memory that was freed
+during tmpbuf resizing, through h_name in a previous query response.
+
+The backing store for res->at->name when doing a query with
+gethostbyname3_r or gethostbyname2_r is tmpbuf, which is reallocated in
+gethosts during the query.  For AF_INET6 lookup with AI_ALL |
+AI_V4MAPPED, gethosts gets called twice, once for a v6 lookup and second
+for a v4 lookup.  In this case, if the first call reallocates tmpbuf
+enough number of times, resulting in a malloc, th->h_name (that
+res->at->name refers to) ends up on a heap allocated storage in tmpbuf.
+Now if the second call to gethosts also causes the plugin callback to
+return NSS_STATUS_TRYAGAIN, tmpbuf will get freed, resulting in a UAF
+reference in res->at->name.  This then gets dereferenced in the
+getcanonname_r plugin call, resulting in the use after free.
+
+Fix this by copying h_name over and freeing it at the end.  This
+resolves BZ #30843, which is assigned CVE-2023-4806.
+
+Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
+(cherry picked from commit 973fe93a5675c42798b2161c6f29c01b0e243994)
+---
+ nss/Makefile                                  | 15 ++++-
+ nss/nss_test_gai_hv2_canonname.c              | 56 +++++++++++++++++
+ nss/tst-nss-gai-hv2-canonname.c               | 63 +++++++++++++++++++
+ nss/tst-nss-gai-hv2-canonname.h               |  1 +
+ .../postclean.req                             |  0
+ .../tst-nss-gai-hv2-canonname.script          |  2 +
+ sysdeps/posix/getaddrinfo.c                   | 25 +++++---
+ 7 files changed, 152 insertions(+), 10 deletions(-)
+ create mode 100644 nss/nss_test_gai_hv2_canonname.c
+ create mode 100644 nss/tst-nss-gai-hv2-canonname.c
+ create mode 100644 nss/tst-nss-gai-hv2-canonname.h
+ create mode 100644 nss/tst-nss-gai-hv2-canonname.root/postclean.req
+ create mode 100644 nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
+
+diff --git a/nss/Makefile b/nss/Makefile
+index 06fcdc450f1..8a5126ecf34 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -82,6 +82,7 @@ tests-container := \
+   tst-nss-test3 \
+   tst-reload1 \
+   tst-reload2 \
++  tst-nss-gai-hv2-canonname \
+ # tests-container
+ 
+ # Tests which need libdl
+@@ -145,7 +146,8 @@ libnss_compat-inhibit-o	= $(filter-out .os,$(object-suffixes))
+ ifeq ($(build-static-nss),yes)
+ tests-static		+= tst-nss-static
+ endif
+-extra-test-objs		+= nss_test1.os nss_test2.os nss_test_errno.os
++extra-test-objs		+= nss_test1.os nss_test2.os nss_test_errno.os \
++			   nss_test_gai_hv2_canonname.os
+ 
+ include ../Rules
+ 
+@@ -180,12 +182,16 @@ rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
+ libof-nss_test1 = extramodules
+ libof-nss_test2 = extramodules
+ libof-nss_test_errno = extramodules
++libof-nss_test_gai_hv2_canonname = extramodules
+ $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
+ 	$(build-module)
+ $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
+ 	$(build-module)
+ $(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps)
+ 	$(build-module)
++$(objpfx)/libnss_test_gai_hv2_canonname.so: \
++  $(objpfx)nss_test_gai_hv2_canonname.os $(link-libc-deps)
++	$(build-module)
+ $(objpfx)nss_test2.os : nss_test1.c
+ # Use the nss_files suffix for these objects as well.
+ $(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so
+@@ -195,10 +201,14 @@ $(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so
+ $(objpfx)/libnss_test_errno.so$(libnss_files.so-version): \
+   $(objpfx)/libnss_test_errno.so
+ 	$(make-link)
++$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \
++  $(objpfx)/libnss_test_gai_hv2_canonname.so
++	$(make-link)
+ $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
+ 	$(objpfx)/libnss_test1.so$(libnss_files.so-version) \
+ 	$(objpfx)/libnss_test2.so$(libnss_files.so-version) \
+-	$(objpfx)/libnss_test_errno.so$(libnss_files.so-version)
++	$(objpfx)/libnss_test_errno.so$(libnss_files.so-version) \
++	$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version)
+ 
+ ifeq (yes,$(have-thread-library))
+ $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
+@@ -215,3 +225,4 @@ LDFLAGS-tst-nss-test3 = -Wl,--disable-new-dtags
+ LDFLAGS-tst-nss-test4 = -Wl,--disable-new-dtags
+ LDFLAGS-tst-nss-test5 = -Wl,--disable-new-dtags
+ LDFLAGS-tst-nss-test_errno = -Wl,--disable-new-dtags
++LDFLAGS-tst-nss-test_gai_hv2_canonname = -Wl,--disable-new-dtags
+diff --git a/nss/nss_test_gai_hv2_canonname.c b/nss/nss_test_gai_hv2_canonname.c
+new file mode 100644
+index 00000000000..4439c83c9f4
+--- /dev/null
++++ b/nss/nss_test_gai_hv2_canonname.c
+@@ -0,0 +1,56 @@
++/* NSS service provider that only provides gethostbyname2_r.
++   Copyright The GNU Toolchain Authors.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <nss.h>
++#include <stdlib.h>
++#include <string.h>
++#include "nss/tst-nss-gai-hv2-canonname.h"
++
++/* Catch misnamed and functions.  */
++#pragma GCC diagnostic error "-Wmissing-prototypes"
++NSS_DECLARE_MODULE_FUNCTIONS (test_gai_hv2_canonname)
++
++extern enum nss_status _nss_files_gethostbyname2_r (const char *, int,
++						    struct hostent *, char *,
++						    size_t, int *, int *);
++
++enum nss_status
++_nss_test_gai_hv2_canonname_gethostbyname2_r (const char *name, int af,
++					      struct hostent *result,
++					      char *buffer, size_t buflen,
++					      int *errnop, int *herrnop)
++{
++  return _nss_files_gethostbyname2_r (name, af, result, buffer, buflen, errnop,
++				      herrnop);
++}
++
++enum nss_status
++_nss_test_gai_hv2_canonname_getcanonname_r (const char *name, char *buffer,
++					    size_t buflen, char **result,
++					    int *errnop, int *h_errnop)
++{
++  /* We expect QUERYNAME, which is a small enough string that it shouldn't fail
++     the test.  */
++  if (memcmp (QUERYNAME, name, sizeof (QUERYNAME))
++      || buflen < sizeof (QUERYNAME))
++    abort ();
++
++  strncpy (buffer, name, buflen);
++  *result = buffer;
++  return NSS_STATUS_SUCCESS;
++}
+diff --git a/nss/tst-nss-gai-hv2-canonname.c b/nss/tst-nss-gai-hv2-canonname.c
+new file mode 100644
+index 00000000000..d5f10c07d6a
+--- /dev/null
++++ b/nss/tst-nss-gai-hv2-canonname.c
+@@ -0,0 +1,63 @@
++/* Test NSS query path for plugins that only implement gethostbyname2
++   (#30843).
++   Copyright The GNU Toolchain Authors.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <nss.h>
++#include <netdb.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/xstdio.h>
++#include "nss/tst-nss-gai-hv2-canonname.h"
++
++#define PREPARE do_prepare
++
++static void do_prepare (int a, char **av)
++{
++  FILE *hosts = xfopen ("/etc/hosts", "w");
++  for (unsigned i = 2; i < 255; i++)
++    {
++      fprintf (hosts, "ff01::ff02:ff03:%u:2\ttest.example.com\n", i);
++      fprintf (hosts, "192.168.0.%u\ttest.example.com\n", i);
++    }
++  xfclose (hosts);
++}
++
++static int
++do_test (void)
++{
++  __nss_configure_lookup ("hosts", "test_gai_hv2_canonname");
++
++  struct addrinfo hints = {};
++  struct addrinfo *result = NULL;
++
++  hints.ai_family = AF_INET6;
++  hints.ai_flags = AI_ALL | AI_V4MAPPED | AI_CANONNAME;
++
++  int ret = getaddrinfo (QUERYNAME, NULL, &hints, &result);
++
++  if (ret != 0)
++    FAIL_EXIT1 ("getaddrinfo failed: %s\n", gai_strerror (ret));
++
++  TEST_COMPARE_STRING (result->ai_canonname, QUERYNAME);
++
++  freeaddrinfo(result);
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nss/tst-nss-gai-hv2-canonname.h b/nss/tst-nss-gai-hv2-canonname.h
+new file mode 100644
+index 00000000000..14f2a9cb086
+--- /dev/null
++++ b/nss/tst-nss-gai-hv2-canonname.h
+@@ -0,0 +1 @@
++#define QUERYNAME "test.example.com"
+diff --git a/nss/tst-nss-gai-hv2-canonname.root/postclean.req b/nss/tst-nss-gai-hv2-canonname.root/postclean.req
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
+new file mode 100644
+index 00000000000..31848b4a285
+--- /dev/null
++++ b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
+@@ -0,0 +1,2 @@
++cp $B/nss/libnss_test_gai_hv2_canonname.so $L/libnss_test_gai_hv2_canonname.so.2
++su
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 0356b622be6..b2236b105c1 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -120,6 +120,7 @@ struct gaih_result
+ {
+   struct gaih_addrtuple *at;
+   char *canon;
++  char *h_name;
+   bool free_at;
+   bool got_ipv6;
+ };
+@@ -165,6 +166,7 @@ gaih_result_reset (struct gaih_result *res)
+   if (res->free_at)
+     free (res->at);
+   free (res->canon);
++  free (res->h_name);
+   memset (res, 0, sizeof (*res));
+ }
+ 
+@@ -203,9 +205,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
+   return 0;
+ }
+ 
+-/* Convert struct hostent to a list of struct gaih_addrtuple objects.  h_name
+-   is not copied, and the struct hostent object must not be deallocated
+-   prematurely.  The new addresses are appended to the tuple array in RES.  */
++/* Convert struct hostent to a list of struct gaih_addrtuple objects.  The new
++   addresses are appended to the tuple array in RES.  */
+ static bool
+ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
+ 				   struct hostent *h, struct gaih_result *res)
+@@ -238,6 +239,15 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
+   res->at = array;
+   res->free_at = true;
+ 
++  /* Duplicate h_name because it may get reclaimed when the underlying storage
++     is freed.  */
++  if (res->h_name == NULL)
++    {
++      res->h_name = __strdup (h->h_name);
++      if (res->h_name == NULL)
++	return false;
++    }
++
+   /* Update the next pointers on reallocation.  */
+   for (size_t i = 0; i < old; i++)
+     array[i].next = array + i + 1;
+@@ -262,7 +272,6 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
+ 	}
+       array[i].next = array + i + 1;
+     }
+-  array[0].name = h->h_name;
+   array[count - 1].next = NULL;
+ 
+   return true;
+@@ -324,15 +333,15 @@ gethosts (nss_gethostbyname3_r fct, int family, const char *name,
+    memory allocation failure.  The returned string is allocated on the
+    heap; the caller has to free it.  */
+ static char *
+-getcanonname (nss_action_list nip, struct gaih_addrtuple *at, const char *name)
++getcanonname (nss_action_list nip, const char *hname, const char *name)
+ {
+   nss_getcanonname_r *cfct = __nss_lookup_function (nip, "getcanonname_r");
+   char *s = (char *) name;
+   if (cfct != NULL)
+     {
+       char buf[256];
+-      if (DL_CALL_FCT (cfct, (at->name ?: name, buf, sizeof (buf),
+-			      &s, &errno, &h_errno)) != NSS_STATUS_SUCCESS)
++      if (DL_CALL_FCT (cfct, (hname ?: name, buf, sizeof (buf), &s, &errno,
++			      &h_errno)) != NSS_STATUS_SUCCESS)
+ 	/* If the canonical name cannot be determined, use the passed
+ 	   string.  */
+ 	s = (char *) name;
+@@ -771,7 +780,7 @@ get_nss_addresses (const char *name, const struct addrinfo *req,
+ 		  if ((req->ai_flags & AI_CANONNAME) != 0
+ 		      && res->canon == NULL)
+ 		    {
+-		      char *canonbuf = getcanonname (nip, res->at, name);
++		      char *canonbuf = getcanonname (nip, res->h_name, name);
+ 		      if (canonbuf == NULL)
+ 			{
+ 			  __resolv_context_put (res_ctx);
diff --git a/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch b/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch
new file mode 100644
index 0000000000000..039d7e9f04ba5
--- /dev/null
+++ b/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch
@@ -0,0 +1,192 @@
+From b25508dd774b617f99419bdc3cf2ace4560cd2d6 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 13 Sep 2023 14:10:56 +0200
+Subject: [PATCH] CVE-2023-4527: Stack read overflow with large TCP responses
+ in no-aaaa mode
+
+Without passing alt_dns_packet_buffer, __res_context_search can only
+store 2048 bytes (what fits into dns_packet_buffer).  However,
+the function returns the total packet size, and the subsequent
+DNS parsing code in _nss_dns_gethostbyname4_r reads beyond the end
+of the stack-allocated buffer.
+
+Fixes commit f282cdbe7f436c75864e5640a4 ("resolv: Implement no-aaaa
+stub resolver option") and bug 30842.
+
+(cherry picked from commit bd77dd7e73e3530203be1c52c8a29d08270cb25d)
+---
+ NEWS                          |   9 +++
+ resolv/Makefile               |   2 +
+ resolv/nss_dns/dns-host.c     |   2 +-
+ resolv/tst-resolv-noaaaa-vc.c | 129 ++++++++++++++++++++++++++++++++++
+ 4 files changed, 141 insertions(+), 1 deletion(-)
+ create mode 100644 resolv/tst-resolv-noaaaa-vc.c
+
+diff --git a/resolv/Makefile b/resolv/Makefile
+index 054b1fa36c..2f99eb3862 100644
+--- a/resolv/Makefile
++++ b/resolv/Makefile
+@@ -102,6 +102,7 @@ tests += \
+   tst-resolv-invalid-cname \
+   tst-resolv-network \
+   tst-resolv-noaaaa \
++  tst-resolv-noaaaa-vc \
+   tst-resolv-nondecimal \
+   tst-resolv-res_init-multi \
+   tst-resolv-search \
+@@ -293,6 +294,7 @@ $(objpfx)tst-resolv-res_init-thread: $(objpfx)libresolv.so \
+ $(objpfx)tst-resolv-invalid-cname: $(objpfx)libresolv.so \
+   $(shared-thread-library)
+ $(objpfx)tst-resolv-noaaaa: $(objpfx)libresolv.so $(shared-thread-library)
++$(objpfx)tst-resolv-noaaaa-vc: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library)
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index 1d60c51f5e..5d0ab30de6 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -427,7 +427,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
+     {
+       n = __res_context_search (ctx, name, C_IN, T_A,
+ 				dns_packet_buffer, sizeof (dns_packet_buffer),
+-				NULL, NULL, NULL, NULL, NULL);
++				&alt_dns_packet_buffer, NULL, NULL, NULL, NULL);
+       if (n >= 0)
+ 	status = gaih_getanswer_noaaaa (alt_dns_packet_buffer, n,
+ 					&abuf, pat, errnop, herrnop, ttlp);
+diff --git a/resolv/tst-resolv-noaaaa-vc.c b/resolv/tst-resolv-noaaaa-vc.c
+new file mode 100644
+index 0000000000..9f5aebd99f
+--- /dev/null
++++ b/resolv/tst-resolv-noaaaa-vc.c
+@@ -0,0 +1,129 @@
++/* Test the RES_NOAAAA resolver option with a large response.
++   Copyright (C) 2022-2023 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <netdb.h>
++#include <resolv.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <support/check.h>
++#include <support/check_nss.h>
++#include <support/resolv_test.h>
++#include <support/support.h>
++#include <support/xmemstream.h>
++
++/* Used to keep track of the number of queries.  */
++static volatile unsigned int queries;
++
++/* If true, add a large TXT record at the start of the answer section.  */
++static volatile bool stuff_txt;
++
++static void
++response (const struct resolv_response_context *ctx,
++          struct resolv_response_builder *b,
++          const char *qname, uint16_t qclass, uint16_t qtype)
++{
++  /* If not using TCP, just force its use.  */
++  if (!ctx->tcp)
++    {
++      struct resolv_response_flags flags = {.tc = true};
++      resolv_response_init (b, flags);
++      resolv_response_add_question (b, qname, qclass, qtype);
++      return;
++    }
++
++  /* The test needs to send four queries, the first three are used to
++     grow the NSS buffer via the ERANGE handshake.  */
++  ++queries;
++  TEST_VERIFY (queries <= 4);
++
++  /* AAAA queries are supposed to be disabled.  */
++  TEST_COMPARE (qtype, T_A);
++  TEST_COMPARE (qclass, C_IN);
++  TEST_COMPARE_STRING (qname, "example.com");
++
++  struct resolv_response_flags flags = {};
++  resolv_response_init (b, flags);
++  resolv_response_add_question (b, qname, qclass, qtype);
++
++  resolv_response_section (b, ns_s_an);
++
++  if (stuff_txt)
++    {
++      resolv_response_open_record (b, qname, qclass, T_TXT, 60);
++      int zero = 0;
++      for (int i = 0; i <= 15000; ++i)
++        resolv_response_add_data (b, &zero, sizeof (zero));
++      resolv_response_close_record (b);
++    }
++
++  for (int i = 0; i < 200; ++i)
++    {
++      resolv_response_open_record (b, qname, qclass, qtype, 60);
++      char ipv4[4] = {192, 0, 2, i + 1};
++      resolv_response_add_data (b, &ipv4, sizeof (ipv4));
++      resolv_response_close_record (b);
++    }
++}
++
++static int
++do_test (void)
++{
++  struct resolv_test *obj = resolv_test_start
++    ((struct resolv_redirect_config)
++     {
++       .response_callback = response
++     });
++
++  _res.options |= RES_NOAAAA;
++
++  for (int do_stuff_txt = 0; do_stuff_txt < 2; ++do_stuff_txt)
++    {
++      queries = 0;
++      stuff_txt = do_stuff_txt;
++
++      struct addrinfo *ai = NULL;
++      int ret;
++      ret = getaddrinfo ("example.com", "80",
++                         &(struct addrinfo)
++                         {
++                           .ai_family = AF_UNSPEC,
++                           .ai_socktype = SOCK_STREAM,
++                         }, &ai);
++
++      char *expected_result;
++      {
++        struct xmemstream mem;
++        xopen_memstream (&mem);
++        for (int i = 0; i < 200; ++i)
++          fprintf (mem.out, "address: STREAM/TCP 192.0.2.%d 80\n", i + 1);
++        xfclose_memstream (&mem);
++        expected_result = mem.buffer;
++      }
++
++      check_addrinfo ("example.com", ai, ret, expected_result);
++
++      free (expected_result);
++      freeaddrinfo (ai);
++    }
++
++  resolv_test_end (obj);
++  return 0;
++}
++
++#include <support/test-driver.c>
diff --git a/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch b/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch
index 31e1a2048eaf4..31dcbd03009ba 100644
--- a/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch
+++ b/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch
@@ -1,6 +1,7 @@
+From 0d5f9ea97f1b39f2a855756078771673a68497e1 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Subject: [committed 1/2] Propagate GLIBC_TUNABLES in setxid binaries
-Date: Tue,  3 Oct 2023 13:08:10 -0400
+Date: Tue, 19 Sep 2023 13:25:40 -0400
+Subject: [PATCH] Propagate GLIBC_TUNABLES in setxid binaries
 
 GLIBC_TUNABLES scrubbing happens earlier than envvar scrubbing and some
 tunables are required to propagate past setxid boundary, like their
@@ -17,28 +18,20 @@ diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h
 index 81397fb90b..8278c50a84 100644
 --- a/sysdeps/generic/unsecvars.h
 +++ b/sysdeps/generic/unsecvars.h
-@@ -1,16 +1,9 @@
--#if !HAVE_TUNABLES
--# define GLIBC_TUNABLES_ENVVAR "GLIBC_TUNABLES\0"
--#else
--# define GLIBC_TUNABLES_ENVVAR
--#endif
--
- /* Environment variable to be removed for SUID programs.  The names are
-    all stuffed in a single string which means they have to be terminated
-    with a '\0' explicitly.  */
+@@ -4,7 +4,6 @@
  #define UNSECURE_ENVVARS \
    "GCONV_PATH\0"							      \
    "GETCONF_DIR\0"							      \
--  GLIBC_TUNABLES_ENVVAR							      \
+-  "GLIBC_TUNABLES\0"							      \
    "HOSTALIASES\0"							      \
    "LD_AUDIT\0"								      \
    "LD_DEBUG\0"								      \
-
+-- 
+From 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Subject: [committed 2/2] tunables: Terminate if end of input is reached
+Date: Tue, 19 Sep 2023 18:39:32 -0400
+Subject: [PATCH] tunables: Terminate if end of input is reached
  (CVE-2023-4911)
-Date: Tue,  3 Oct 2023 13:08:11 -0400
 
 The string parsing routine may end up writing beyond bounds of tunestr
 if the input tunable string is malformed, of the form name=name=val.
@@ -134,10 +127,10 @@ index 7dfb0e073a..f0b92c97e7 100644
    "",
    "",
    "",
-@@ -88,11 +88,18 @@ test_child (int off)
+@@ -81,11 +85,18 @@ test_child (int off)
+ {
    const char *val = getenv ("GLIBC_TUNABLES");
  
- #if HAVE_TUNABLES
 +  printf ("    [%d] GLIBC_TUNABLES is %s\n", off, val);
 +  fflush (stdout);
    if (val != NULL && strcmp (val, resultstrings[off]) == 0)
@@ -146,14 +139,14 @@ index 7dfb0e073a..f0b92c97e7 100644
    if (val != NULL)
 -    printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val);
 +    printf ("    [%d] Unexpected GLIBC_TUNABLES VALUE %s, expected %s\n",
-+           off, val, resultstrings[off]);
++	    off, val, resultstrings[off]);
 +  else
 +    printf ("    [%d] GLIBC_TUNABLES environment variable absent\n", off);
 +
 +  fflush (stdout);
  
    return 1;
- #else
+ }
 @@ -106,21 +117,26 @@ do_test (int argc, char **argv)
        if (ret != 0)
  	exit (1);
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 98de6ad7412ed..20805fb52e816 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,15 +1,14 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.36
-revision=2
-_patchver="72-g0f90d6204d"
+version=2.38
+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="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 c936ae8353fd44f2ff2314758d2f834cc0572c3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:49:45 -0700
Subject: [PATCH 02/97] New package: perl-bootstrap-5.36.1

---
 srcpkgs/perl-bootstrap/patches  |   1 +
 srcpkgs/perl-bootstrap/template | 105 ++++++++++++++++++++++++++++++++
 srcpkgs/perl-bootstrap/update   |   1 +
 3 files changed, 107 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..8ccfcb025a2fa
--- /dev/null
+++ b/srcpkgs/perl-bootstrap/template
@@ -0,0 +1,105 @@
+# Template file for 'perl-bootstrap'
+# This is needed to prevent build cycle between libxcrypt and perl
+pkgname=perl-bootstrap
+version=5.38.0
+revision=1
+_perl_cross_version=1.5
+build_style=gnu-configure
+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="213ef58089d2f2c972ea353517dc60ec3656f050dcc027666e118b508423e517
+ d744a390939e2ebb9a12f6725b4d9c19255a141d90031eff90ea183fdfcbf211"
+repository=bootstrap
+conflicts="perl>=0"
+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 9140ff3cf843a945915dbd1784753018f9b0a178 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:50:18 -0700
Subject: [PATCH 03/97] New package: libxcrypt-4.4.36

---
 common/shlibs              |  2 ++
 srcpkgs/libxcrypt-compat   |  1 +
 srcpkgs/libxcrypt-devel    |  1 +
 srcpkgs/libxcrypt/template | 72 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 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 9473ab5af4f8d..f1256643d33d6 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..0b7b6fc5bfdd3
--- /dev/null
+++ b/srcpkgs/libxcrypt/template
@@ -0,0 +1,72 @@
+# Template file for 'libxcrypt'
+pkgname=libxcrypt
+version=4.4.36
+revision=1
+archs="~*-musl"
+build_style=gnu-configure
+configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no"
+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
+make_cmd="make -C build"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	broken="musl already provides libcrypt"
+fi
+
+do_configure() {
+	[ ! -d ${configure_builddir:=build} ] && mkdir -p ${configure_builddir}
+	cd ${configure_builddir}
+	../configure ${configure_args}
+}
+
+post_configure() {
+	configure_args="${configure_args/--enable-obsolete-api=no/} --enable-obsolete-api=glibc"
+	configure_builddir="compat-build"
+	do_configure
+}
+
+post_build() {
+	make_cmd="make -C compat-build"
+	do_build
+}
+
+post_check() {
+	make_cmd="make -C compat-build"
+	do_check
+}
+
+pre_install() {
+	make -C compat-build DESTDIR=${DESTDIR} install
+
+	# Don't install development files from the compat library
+	rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share}
+}
+
+post_install() {
+	vlicense LICENSING
+}
+
+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 8df4f3d4c342e932fc7b394f706ad7c83833a49e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:37 -0700
Subject: [PATCH 04/97] musl: provides libxcrypt-devel

---
 srcpkgs/musl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 6c98fac0962e9..ab010939c47fe 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -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 0e965059ebd74f9d484ea86ade922e2d703fb960 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:49 -0700
Subject: [PATCH 05/97] perl: rebuild with libxcrypt

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

diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index c8e0d113e429f..507725814ba5b 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,10 +1,10 @@
 # Template file for 'perl'
 pkgname=perl
 version=5.38.0
-revision=1
+revision=2
 _perl_cross_version=1.5
 build_style=gnu-configure
-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"

From a0c9c9d3101010bd1a0f119a04e9c471fcb7d70e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:33:23 -0700
Subject: [PATCH 06/97] 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 21739fcd4ff53..dbd6dce5b8633 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,12 +4,12 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=4
+revision=5
 _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 5a40b036b7e3cadddd08f28db9faa36e2c531a8c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:42:25 -0700
Subject: [PATCH 07/97] 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 970eb5dbf96a4..afc7a28f65956 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,7 +4,7 @@
 #
 pkgname=python3
 version=3.12.0
-revision=1
+revision=2
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6 --enable-optimizations
  --enable-loadable-sqlite-extensions --with-computed-gotos
@@ -13,7 +13,7 @@ configure_args="--enable-shared --enable-ipv6 --enable-optimizations
 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 5fe27647dd907c0483e60e93bf3e84c89493c8bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 11:43:37 -0700
Subject: [PATCH 08/97] 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 30039707619dd..7ab92833cf028 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=2
+revision=3
 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 9152fb5f2ba7c885aa935cc1b1e19f0598ef34c7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 14:51:38 -0700
Subject: [PATCH 09/97] mariadb: rebuild for libxcrypt

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

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index ccaca61fdc3e6..5eaace93a6204 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.5.22
-revision=1
+revision=2
 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 96adf1e2a9d5677aae72c6e874bd7344aaacfa24 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 10:03:37 -0700
Subject: [PATCH 10/97] apr-util: rebuild for libxcrypt

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

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index bc216965d6f63..32911dced6422 100644
--- a/srcpkgs/apr-util/template
+++ b/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
@@ -12,7 +12,7 @@ configure_args="
 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"
+ postgresql-libs-devel sqlite-devel libxcrypt-devel"
 short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From faa9f972f0eeda853080f1752a8fdb0de4a746c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:05:07 -0700
Subject: [PATCH 11/97] 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 9e4cbfef1d4b9..9bb603b7d4e01 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=3
+revision=4
 _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 78685dc17dab7ecb21443f15ef37b258a816b1e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:07:16 -0700
Subject: [PATCH 12/97] 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 22e9290c2f5713e36bc39d18a0d42525f6b41c1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:09 -0700
Subject: [PATCH 13/97] 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 87a375699e7b3..f841abaeceb7e 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,14 +1,14 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.5.3
-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 --enable-lastlog
  --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 0c145b3621a90e8eae377b051ca31256993622ba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:35 -0700
Subject: [PATCH 14/97] 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 2b6f4fe74302a1f083262e409b5fb2d4e7ff1275 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:21:28 -0700
Subject: [PATCH 15/97] 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 875bd7d553675..05eda77a93fc3 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.5p1
-revision=1
+revision=2
 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"
@@ -44,7 +44,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 -Wno-deprecated-declarations"
+CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-use-after-free"
 
 case $XBPS_TARGET_MACHINE in
 	i686-musl)

From 901628c2a987a64e1a9b5ddd2554c562badefc30 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:24:55 -0700
Subject: [PATCH 16/97] 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 566a4c23df869dba2364a31c59c62932af8cf70d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:26:21 -0700
Subject: [PATCH 17/97] 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 81e9d54a7f36fbfb9428413d801cc7e93e541935 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:28:06 -0700
Subject: [PATCH 18/97] 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 510ef3dcbba4a..98c3e890beb4b 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,13 +1,14 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.7
-revision=2
+revision=3
 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 0c0dc97052fbf9e82706e4418fa4a457e5d02f4f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:36:44 -0700
Subject: [PATCH 19/97] 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 ad9b3e23a722c..ef4eed09cff2d 100644
--- a/srcpkgs/apache/template
+++ b/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
@@ -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 7bcc95172a0a32e12727c895c09fefc9806bb7c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:51:04 -0700
Subject: [PATCH 20/97] 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 88cff0e6d6e0e..d84d9aa44c393 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.8
-revision=1
+revision=2
 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 22d038eb8e08fab8fd509cf542d61cabe47780d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:53:05 -0700
Subject: [PATCH 21/97] 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 d10daef834a75..85da37e89fbd4 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.6.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-overlays=yes --enable-meta=yes
  --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 /etc/openldap/slapd.ldif"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From 242d2f86961c45b389f995850591678a7741cba1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:55:55 -0700
Subject: [PATCH 22/97] 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 649b683f1b8fc7c03b8020abb4689d7df8266d85 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:03:17 -0700
Subject: [PATCH 23/97] 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 d37802b7a2c87..ea431a1bdd8f1 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.45.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 30247d492c8d72559f6efa4ce1dd40079a18a9aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:04:32 -0700
Subject: [PATCH 24/97] 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 723f2e8a6e65c..2a2617429f5d5 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=5
+revision=6
 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 c324ece403e2bc84682ca3c4654bbbba3fd2c716 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:05:16 -0700
Subject: [PATCH 25/97] 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 78580f340d31d33bc6c21e7ce7555ae098400750 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:09 -0700
Subject: [PATCH 26/97] 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 22e45e385da5dfa55d4394929f680828d1005394 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:36 -0700
Subject: [PATCH 27/97] 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)"

From 4346d9fed70a41e23b1de9a1ee5bbb72d8e06f71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:01:47 -0700
Subject: [PATCH 28/97] FreeRADIUS: rebuild for libxcrypt

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

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 90a4c662bc994..e3102866b2521 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # 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"
+ libmariadbclient-devel postgresql-libs-devel json-c-devel libxcrypt-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From cc6774016a83456bad0e8caad1455be5b599d2b4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:03:50 -0700
Subject: [PATCH 29/97] Gauche: rebuild for libxcrypt

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

diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template
index fd087256ff7a8..54bdfbd98d187 100644
--- a/srcpkgs/Gauche/template
+++ b/srcpkgs/Gauche/template
@@ -1,10 +1,10 @@
 # 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"
+makedepends="libticonv-devel libatomic_ops-devel libxcrypt-devel"
 checkdepends="iana-etc"
 short_desc="Practical Scheme R7RS implementation"
 maintainer="rc-05 <rc23@email.it>"

From 21e0513edd7a7cc77ec802ab615382cf93edac16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:05:00 -0700
Subject: [PATCH 30/97] alpine: rebuild for libxcrypt

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

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index ed46e3bf5b2e2..946d114ed69f1 100644
--- a/srcpkgs/alpine/template
+++ b/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
@@ -10,7 +10,7 @@ configure_args="--with-passfile=.pine-passfile --without-tcl --disable-shared
  --with-system-pinerc=/etc/${pkgname}.d/pine.conf
  --with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed"
 hostmakedepends="hunspell"
-makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
+makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel libxcrypt-devel"
 short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-4-Clause"

From c9d034eed53bef6a383a737d24636decf2fe202e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:08:29 -0700
Subject: [PATCH 31/97] anjuta: rebuild for libxcrypt

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

diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 8a43a32673951..4c5cdb64f9261 100644
--- a/srcpkgs/anjuta/template
+++ b/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
@@ -13,7 +13,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
  vala-devel $(vopt_if gir gobject-introspection)"
 makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
  libxslt-devel glade3-devel graphviz-devel vala-devel
- libgda-devel devhelp-devel sqlite-devel apr-util-devel
+ libgda-devel devhelp-devel sqlite-devel apr-util-devel libxcrypt-devel
  neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
 depends="autogen"
 short_desc="GNOME Integrated Development Environment"

From bb2a1fee99da9d0c2bec998ba6c37730ce0d5626 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:14:02 -0700
Subject: [PATCH 32/97] bacula-common: rebuild for libxcrypt

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

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index b3064e54bd4ea..0c7e4db37d974 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,13 +1,13 @@
 # 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
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- openssl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel libxcrypt-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From 4551046bd0ad605cc1fc915f5b190d34f50d8f07 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:15:27 -0700
Subject: [PATCH 33/97] bitchx: rebuild for libxcrypt

---
 srcpkgs/bftpd/template  | 4 ++--
 srcpkgs/bitchx/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template
index 225438a341ac1..cb69616f4b847 100644
--- a/srcpkgs/bftpd/template
+++ b/srcpkgs/bftpd/template
@@ -1,10 +1,10 @@
 # Template file for 'bftpd'
 pkgname=bftpd
 version=6.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-libz"
-makedepends="zlib-devel"
+makedepends="zlib-devel libxcrypt-devel"
 short_desc="Simple FTP server"
 maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 1172d810d44ea..6d819792fcd66 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,10 +1,10 @@
 # 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"
+makedepends="openssl-devel ncurses-devel libxcrypt-devel"
 short_desc="Simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From d97a08dbc3ed6670320ef01ca03ee02f48db4c4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:17:08 -0700
Subject: [PATCH 34/97] burp2-server: rebuild for libxcrypt

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

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 11678ac289ad2..45e5a78ddf366 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _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"
 hostmakedepends="automake libtool pkg-config"
 makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
- yajl-devel zlib-devel"
+ yajl-devel zlib-devel libxcrypt-devel"
 # server depends on client (same binary)
 depends="burp2-client"
 checkdepends="check-devel"

From 2fe4dfb51ed73ad8f2eb7c822d4409a3631d1c7d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:19:16 -0700
Subject: [PATCH 35/97] busybox: rebuild for libxcrypt

---
 srcpkgs/busybox/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index f647e3066b3ba..70fc70bb50c5b 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,8 +1,9 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.34.1
-revision=4
+revision=5
 hostmakedepends="perl"
+makedepends="libxcrypt-devel"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
 maintainer="Cameron Nemo <cam@nohom.org>"

From 13a26ac28cdacfde690bc0f999c2d51557a9dc0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:20:45 -0700
Subject: [PATCH 36/97] ccrypt: rebuild for libxcrypt

---
 srcpkgs/ccrypt/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ccrypt/template b/srcpkgs/ccrypt/template
index 94208eb831cd6..994dbb6c2b612 100644
--- a/srcpkgs/ccrypt/template
+++ b/srcpkgs/ccrypt/template
@@ -1,8 +1,9 @@
 # Template file for 'ccrypt'
 pkgname=ccrypt
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
+makedepends="libxcrypt-devel"
 short_desc="Symmetric encryption utility using Rijndael cipher"
 maintainer="Evan Deaubl <evan@deaubl.name>"
 license="GPL-2.0-or-later"

From bb93b12e47ef4ba307e8735a3c43e5da88af28eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:22:05 -0700
Subject: [PATCH 37/97] clisp: rebuild for libxcrypt

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

diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index af9546f7faa77..7475bd878ce66 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,12 +1,13 @@
 # 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)"
 hostmakedepends="ffcall"
-makedepends="libsigsegv-devel $(vopt_if readline readline-devel)"
+makedepends="libsigsegv-devel libxcrypt-devel
+ $(vopt_if readline readline-devel)"
 short_desc="ANSI Common Lisp Interpreter, Compiler and Debugger"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-only"

From d83ca586edbb4e2b277b54297c8e33ab636e4081 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:23:06 -0700
Subject: [PATCH 38/97] collectd: rebuild for libxcrypt

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

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 91a10df4e308e..9bb8e9d16d3d1 100644
--- a/srcpkgs/collectd/template
+++ b/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
@@ -13,7 +13,7 @@ conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
 makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
- libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
+ libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel libxcrypt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
  $(vopt_if prometheus 'protobuf-c-devel libmicrohttpd-devel')"
 short_desc="Daemon which collects system performance statistics periodically"

From f92df0adcc1192168ffbced2156467c782c7b578 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:24:42 -0700
Subject: [PATCH 39/97] cvm: rebuild for libxcrypt

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

diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index e4663ecaf43ef..4f7899af5e06b 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,10 +1,10 @@
 # Template file for 'cvm'
 pkgname=cvm
 version=0.97
-revision=3
+revision=4
 build_style=gnu-makefile
 hostmakedepends="libtool"
-makedepends="bglibs-devel"
+makedepends="bglibs-devel libxcrypt-devel"
 short_desc="Credential Validation Modules"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From fcf98ffa9dea1982b5f3112ed23e652538c6f956 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:27:28 -0700
Subject: [PATCH 40/97] cvs: rebuild for libxcrypt

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

diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index c37384b543024..190a5d7776af2 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -1,12 +1,12 @@
 # Template file for 'cvs'
 pkgname=cvs
 version=1.12.13
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-editor=/usr/bin/vi --with-external-zlib
  ac_cv_func_working_mktime=yes"  # broken test upstream
 hostmakedepends="nvi openssh"
-makedepends="mit-krb5-devel openssh"
+makedepends="mit-krb5-devel openssh libxcrypt-devel"
 depends="openssh>=6.1p1"
 short_desc="Concurrent Versions System"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 932e186dd68980c11d7eea8d5a6279b477dc2f82 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:27:54 -0700
Subject: [PATCH 41/97] cyrus-sasl: rebuild for libxcrypt

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

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index e6c0ee16532ca..17e5f5475551d 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
 # keep in sync with libsasl
 pkgname=cyrus-sasl
 version=2.1.28
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -16,7 +16,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
 hostmakedepends="automake libtool groff pkg-config"
 makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
- libmariadbclient-devel"
+ libmariadbclient-devel libxcrypt-devel"
 depends="libsasl>=${version}"
 short_desc="Cyrus SASL - auth daemon and administration tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9eccc84c5b92ed9fe53e4bf3d7f595720fd04655 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:29:13 -0700
Subject: [PATCH 42/97] dante: rebuild for libxcrypt

---
 srcpkgs/dante/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template
index 17fe0f69ae608..80ee82ee2aec0 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,9 +1,10 @@
 # Template file for 'dante'
 pkgname=dante
 version=1.4.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="tar automake libtool"
+makedepends="libxcrypt-devel"
 short_desc="SOCKS server and client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT-CMU"

From f55f03a0a7c000f334ae49e81979f256b844858c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:30:07 -0700
Subject: [PATCH 43/97] dovecot: rebuild for libxcrypt

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

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 0b8f470c1723a..71aa82f21adc7 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.21
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -13,7 +13,7 @@ hostmakedepends="pkg-config perl"
 makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
  mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
- libsodium-devel"
+ libsodium-devel libxcrypt-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From d44f3c288be005d4b707e7c00ea17ae416160dc7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:31:06 -0700
Subject: [PATCH 44/97] dropbear: rebuild for libxcrypt

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

diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 5a8f80c6c7e50..4cc20d8224e07 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,10 +1,11 @@
 # Template file for 'dropbear'
 pkgname=dropbear
 version=2022.83
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zlib --disable-bundled-libtom"
-makedepends="zlib-devel libtommath-devel libtomcrypt-devel"
+makedepends="zlib-devel libtommath-devel libtomcrypt-devel
+ libxcrypt-devel"
 checkdepends="python3-pytest python3-parsing python3-psutil openssh"
 short_desc="Small SSH server and client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1ace32e9a7f7d79b4ace616f27278fdd59f8c6a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:34:41 -0700
Subject: [PATCH 45/97] fcron: rebuild for libxcrypt

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

diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index d3f8567f89274..5e20abe0c140b 100644
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@@ -1,7 +1,7 @@
 # Template file for 'fcron'
 pkgname=fcron
 version=3.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
 	--sysconfdir=/etc/fcron
@@ -23,7 +23,7 @@ make_dirs="
 	/etc/cron.monthly 0755 root root
 	/etc/cron.weekly 0755 root root"
 hostmakedepends="autoconf perl"
-makedepends="pam-devel readline-devel"
+makedepends="pam-devel readline-devel libxcrypt-devel"
 depends="run-parts"
 short_desc="Feature-rich cron implementation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From ac93ac2b7fd5dadee02d034cf83c975bf8434677 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:34:52 -0700
Subject: [PATCH 46/97] frr: rebuild for libxcrypt

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

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 5ca26352fdc83..2b77946654f32 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.5
-revision=5
+revision=6
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
 configure_args="--disable-doc
@@ -14,7 +14,7 @@ make_dirs="/var/log/frr 0700 _frr _frr"
 hostmakedepends="pkg-config flex bison autoconf automake libtool
  python3 python3-Sphinx python3-devel libyang-tools"
 makedepends="pcre-devel libcap-devel json-c-devel pam-devel c-ares-devel
- readline-devel python3-devel libyang-devel"
+ readline-devel python3-devel libyang-devel libxcrypt-devel"
 checkdepends="python3-pytest"
 short_desc="IP routing protocol suite"
 maintainer="Cameron Nemo <cam@nohom.org>"

From 0ce985b21ac78ad38c9ba160d73b0a2840142ace Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:35:09 -0700
Subject: [PATCH 47/97] gatling: rebuild for libxcrypt

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

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 13ae68e98b1c5..b59917c60251e 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,11 +1,11 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.16
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_target="gatling dl getlinks"
 make_install_args="MANDIR=/usr/share/man"
-makedepends="libowfat openssl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel libxcrypt-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 60006744796bb7ac165fb8b138f271964d38707b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:37:15 -0700
Subject: [PATCH 48/97] haproxy: rebuild for libxcrypt

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

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index fba153e7b57a6..83046c6dc27fd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.6.15
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="openssl-devel lua53-devel pcre2-devel"
+makedepends="openssl-devel lua53-devel pcre2-devel libxcrypt-devel"
 checkdepends="curl varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 4548bd5cb8ad008aa5b3537a769a8f734b29d35d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:37:29 -0700
Subject: [PATCH 49/97] hiawatha: rebuild for libxcrypt

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

diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 9c2500430dcb8..d4839142392fa 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,13 +1,13 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
 version=10.12
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
  -DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
  -DUSE_SYSTEM_MBEDTLS=ON -DUSE_SYSTEM_NGHTTP2=ON
  -DCMAKE_INSTALL_SYSCONFDIR=/etc"
-makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
+makedepends="libxslt-devel mbedtls-devel nghttp2-devel libxcrypt-devel"
 short_desc="Advanced and secure webserver for Unix"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From f19d96d2f8dc54eb2b205e7ccb5f2013804ec80d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:38:34 -0700
Subject: [PATCH 50/97] inetutils: rebuild for libxcrypt

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

diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index c45de47f30e39..685a44e4d732d 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,10 +1,10 @@
 # Template file for 'inetutils'
 pkgname=inetutils
 version=2.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-wrap --with-pam"
-makedepends="pam-devel readline-devel"
+makedepends="pam-devel readline-devel libxcrypt-devel"
 checkdepends="iana-etc net-tools"
 short_desc="GNU network utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d3aafc48e7a31d107ff3c8f57789fd937c353244 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:39:30 -0700
Subject: [PATCH 51/97] john: rebuild for libxcrypt

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

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index b40b2250f1d19..929c0615ed80c 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,12 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=6
+revision=7
 _jumbover=1
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel
+ zlib-devel libxcrypt-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <mail@piraty.dev>"
 license="custom:GPL-2.0-or-later with OpenSSL-exception"

From c4a36dc595accc612fa4490b40dcaf2328b611b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:40:32 -0700
Subject: [PATCH 52/97] ldapvi: rebuild for libxcrypt

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

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 14a5d12044dd5..95317d9d6bccf 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,11 +1,12 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--with-sha"
 hostmakedepends="pkg-config"
-makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
+makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel
+ glib-devel libxcrypt-devel"
 short_desc="Interactive LDAP client for Unix terminals"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 79e64a7fa648c6825e80850694ed07ea100493fb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:42:41 -0700
Subject: [PATCH 53/97] Ice: rebuild for libxcrypt

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

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 13163d9035d78..52d69795e5bfa 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,13 +1,13 @@
 # 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"
 make_install_args="LANGUAGES=cpp lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- openssl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel libxcrypt-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"

From d6a81f4ec42167453df9aba20037ff415c483316 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:43:39 -0700
Subject: [PATCH 54/97] libcli: rebuild for libxcrypt

---
 srcpkgs/libcli/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcli/template b/srcpkgs/libcli/template
index 0d6b769fd3b5c..42ef3a3d76894 100644
--- a/srcpkgs/libcli/template
+++ b/srcpkgs/libcli/template
@@ -2,8 +2,9 @@
 pkgname=libcli
 version=1.9.8.4
 _distver="${version%.*}-${version##*.}"
-revision=1
+revision=2
 build_style=gnu-makefile
+makedepends="libxcrypt-devel"
 short_desc="Library for cisco style telnet interfaces"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-2.0-or-later"

From f90725fa5f20fa0c848e0d76df96a8a2c60b9ea3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:46:38 -0700
Subject: [PATCH 55/97] lighttpd: rebuild for libxcrypt

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

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 07875c1099eca..64e3a24e786c9 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.71
-revision=3
+revision=4
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
  -Dwith_krb5=enabled -Dwith_ldap=enabled
@@ -12,7 +12,7 @@ configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
  -Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
-makedepends="
+makedepends="libxcrypt-devel
  libxml2-devel lua53-devel mit-krb5-devel pcre2-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Secure, fast, compliant and very flexible web-server"

From 38c5d8f8a737786359c3c64fc18595e9f3e48a5f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:02:42 -0700
Subject: [PATCH 56/97] whois: rebuild for libxcrypt

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

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 1466cc07d7db6..b92fb178dcf0f 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,13 +1,13 @@
 # Template file for 'whois'
 pkgname=whois
 version=5.5.19
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
 make_install_args="BASEDIR=\${DESTDIR}"
 make_install_target="install-whois"
 hostmakedepends="perl pkg-config gettext"
-makedepends="libidn2-devel"
+makedepends="libidn2-devel libxcrypt-devel"
 short_desc="Improved whois client"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 80a475d58333779e260beb2f81ef40e3947590ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:04:19 -0700
Subject: [PATCH 57/97] mokutil: rebuild for libxcrypt

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

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
index db4a9c7d93c70..f7366a3a637d7 100644
--- a/srcpkgs/mokutil/template
+++ b/srcpkgs/mokutil/template
@@ -1,10 +1,10 @@
 # Template file for 'mokutil'
 pkgname=mokutil
 version=0.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
-makedepends="keyutils-devel libefivar-devel openssl-devel"
+makedepends="keyutils-devel libefivar-devel openssl-devel libxcrypt-devel"
 short_desc="Utility to manipulate machine owner keys"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From adc724bf1f0b0b0d9b693aa0725c2c56017ecde2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:04:34 -0700
Subject: [PATCH 58/97] monit: rebuild for libxcrypt

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

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 02cecde59bb8a..3ea4396505bc3 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.33.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel openssl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel libxcrypt-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From cf7fe5e76f21b4f3f8ae2f2340f9764b2147e7e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:07:01 -0700
Subject: [PATCH 59/97] open-vm-tools: rebuild for libxcrypt

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

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index cd507b729bf6b..6fe30b815987b 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
 version=12.3.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
- libxerces-c-devel $(vopt_if pam 'pam-devel')
+ libxerces-c-devel libxcrypt-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <mail@piraty.dev>"

From 7b47c3261ae3d6858707b2299de82e1dc463dabf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:08:11 -0700
Subject: [PATCH 60/97] nginx: rebuild for libxcrypt

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

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 3811ea15a9e14..2e7848469e426 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -4,7 +4,7 @@
 # See comments in mime-types template
 pkgname=nginx
 version=1.24.0
-revision=3
+revision=4
 _tests_commit=36a4563f7f00
 _njs_version=0.7.12
 create_wrksrc=yes
@@ -53,7 +53,7 @@ configure_args="--prefix=${_cfgdir}
  --with-threads
  --add-dynamic-module=../njs-${_njs_version}/nginx"
 hostmakedepends="geoip geoip-devel openssl-devel pcre2-devel perl libxslt-devel
- which"
+ which libxcrypt-devel"
 makedepends="${hostmakedepends}"
 checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which uwsgi uwsgi-python3"
 short_desc="High performance web and reverse proxy server"

From 2764db9c46f24c66c341c192e1ad1a8347c8b2b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:08:29 -0700
Subject: [PATCH 61/97] opensmtpd: rebuild for libxcrypt

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

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 7dd513a118353..5906afad90b8a 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=7.3.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -14,7 +14,8 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel
+ libxcrypt-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From 97af6bfa77c7b693e28b8ec369f13a531c978648 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:13:42 -0700
Subject: [PATCH 62/97] otpw: rebuild for libxcrypt

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

diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template
index 03c9c86d6a198..c42ed75a6f89a 100644
--- a/srcpkgs/otpw/template
+++ b/srcpkgs/otpw/template
@@ -1,9 +1,9 @@
 # Template file for 'otpw'
 pkgname=otpw
 version=1.5
-revision=5
+revision=6
 conf_files="/etc/pam.d/ssh-otpw"
-makedepends="pam-devel"
+makedepends="pam-devel libxcrypt-devel"
 short_desc="A one-time password login package"
 maintainer="Duncan Overbruck <mail@duncano.de>"
 license="GPL-3"

From 68d307d0648894ede3a9685c31c19f1e2d28659b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:15:19 -0700
Subject: [PATCH 63/97] parrot: rebuild for libxcrypt

---
 srcpkgs/parrot/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template
index ec36cbd2afdb4..aebad8d8eac77 100644
--- a/srcpkgs/parrot/template
+++ b/srcpkgs/parrot/template
@@ -1,16 +1,17 @@
-# Template build file for 'parrot'.
+# Template file for 'parrot'
 pkgname=parrot
 version=6.9.0
-revision=5
+revision=6
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
+configure_script="perl Configure.pl"
+hostmakedepends="perl perl-Pod-Parser"
+makedepends="libxcrypt-devel"
 short_desc="Virtual machine designed for dynamic languages"
 maintainer="pancake <pancake@nopcode.org>"
+license="Artistic-2.0"
 homepage="http://www.parrot.org"
-hostmakedepends="perl perl-Pod-Parser"
-configure_script="perl Configure.pl"
-license="Artistic"
-distfiles="ftp://ftp.parrot.org/pub/parrot/releases/supported/${version}/parrot-${version}.tar.bz2"
+distfiles="http://ftp.parrot.org/releases/supported/${version}/parrot-${version}.tar.bz2"
 checksum=ad5f3723c216675b9ebc2e3d3807d24fd13aa55e1eb3e7ffcad4062e0026f482
 nopie=yes
 

From 143f2d92e2a8b140f63ddff4f1652fed6ece5ac8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:16:40 -0700
Subject: [PATCH 64/97] passwdqc: rebuild for libxcrypt

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

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index 180af752b570b..005ebd798c8eb 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,11 +1,11 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
 conf_files="/etc/passwdqc.conf"
-makedepends="pam-devel"
+makedepends="pam-devel libxcrypt-devel"
 short_desc="Password strength checking and policy enforcement toolset"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"

From af1f2a0f7d940b5c7549f7956c9eca217b22e971 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:17:40 -0700
Subject: [PATCH 65/97] pounce: rebuild for libxcrypt

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

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 1e14ef5b8431a..54794b88b2fed 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,12 +1,12 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-notify --enable-palaver"
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libtls-devel libcurl-devel sqlite-devel"
+makedepends="libtls-devel libcurl-devel sqlite-devel libxcrypt-devel"
 depends="openssl"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 38adb8c903e381516539763604e5baace18cf448 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:18:52 -0700
Subject: [PATCH 66/97] ppp: rebuild for libxcrypt

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

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 7368879f494fc..76fa7dc7d6b66 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.9
-revision=3
-makedepends="libpcap-devel openssl-devel"
+revision=4
+makedepends="libpcap-devel openssl-devel libxcrypt-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From fb137f6e0ef70d8466488ec2c2e72a277062fe73 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:20:08 -0700
Subject: [PATCH 67/97] proftpd: rebuild for libxcrypt

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

diff --git a/srcpkgs/proftpd/template b/srcpkgs/proftpd/template
index 8e9985cc0b127..e81533bd8be7c 100644
--- a/srcpkgs/proftpd/template
+++ b/srcpkgs/proftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'proftpd'
 pkgname=proftpd
 version=1.3.7e
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libcap-devel"
+makedepends="libcap-devel libxcrypt-devel"
 short_desc="Highly configurable GPL-licensed FTP server software"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 865584c787b7cd8bba09908f9b389e99eca0cfd9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:24:23 -0700
Subject: [PATCH 68/97] xrootd: rebuild for libxcrypt

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

diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index ceff8fe182309..ce60f34024619 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,13 +1,13 @@
 # Template file for 'xrootd'
 pkgname=xrootd
 version=5.5.5
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="pkgconf"
 makedepends="zlib-devel openssl-devel libuuid-devel readline-devel
  libcurl-devel mit-krb5-devel libxml2-devel tinyxml-devel libcppunit-devel
- fuse-devel json-c-devel"
+ fuse-devel json-c-devel libxcrypt-devel"
 short_desc="Low latency, scalable and fault tolerant access to data"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"

From ec39a05fd4ce88d62b6ee0ff38ad387f2ecd5272 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:27:42 -0700
Subject: [PATCH 69/97] root: rebuild for libxcrypt

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

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 9652152b2980b..3207d7894b335 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
 # Template file for 'root'
 pkgname=root
 version=6.28.06
-revision=2
+revision=3
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
 build_style=cmake
@@ -20,7 +20,7 @@ makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel
  openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel
  pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel
  libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside
- xrootd gtest-devel"
+ xrootd gtest-devel libxcrypt-devel"
 depends="gcc"
 short_desc="C++ framework for data processing created by CERN"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"

From 70542d2d5241c14b086e9687a709d3b871392817 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:30:30 -0700
Subject: [PATCH 70/97] screen: rebuild for libxcrypt

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

diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 607d2514e45ae..4c294c525dedd 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,13 +1,13 @@
 # Template file for 'screen'
 pkgname=screen
 version=4.9.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam
  --enable-colors256 --enable-rxvt_osc --enable-telnet
  --enable-use-locale --with-socket-dir=/run/screens --with-pty-group=5"
 hostmakedepends="automake"
-makedepends="libutempter-devel ncurses-devel pam-devel"
+makedepends="libutempter-devel ncurses-devel pam-devel libxcrypt-devel"
 conf_files="/etc/screenrc /etc/skel/.screenrc"
 short_desc="GNU screen manager with VT100/ANSI terminal emulation"
 maintainer="Frank Steinborn <steinex@nognu.de>"

From 053f913471a2968e8510f8896c7341fd5f48ec8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:31:11 -0700
Subject: [PATCH 71/97] slock: rebuild for libxcrypt

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

diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index aa7890a499735..3a85bb3c31204 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -1,9 +1,9 @@
 # Template file for 'slock'
 pkgname=slock
 version=1.5
-revision=1
+revision=2
 hostmakedepends="pkg-config"
-makedepends="libXrandr-devel"
+makedepends="libXrandr-devel libxcrypt-devel"
 short_desc="Simple screen locker for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From f76653a4502591ee68247ef446609309e56aee13 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:32:02 -0700
Subject: [PATCH 72/97] sqmail: rebuild for libxcrypt

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

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index d10e1ba62772c..a005ff56a2df7 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,10 +1,10 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
-makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
+makedepends="fehQlibs libidn2-devel ucspi-ssl-devel libxcrypt-devel"
 depends="ucspi-ssl ucspi-tcp6"
 short_desc="Fast, secure, and reliable email transmission (s/qmail)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 649f252a68b45c456ff84c309d4d494bd4e122db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:34:39 -0700
Subject: [PATCH 73/97] squid: rebuild for libxcrypt

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

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 58ef243c8c5f8..c8e01c2ca1b21 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=5.7
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --sysconfdir=/etc/squid
@@ -45,7 +45,7 @@ make_dirs="/var/log/squid 750 squid squid
  /var/cache/squid 750 squid squid"
 hostmakedepends="perl pkg-config"
 makedepends="libldap-devel libnetfilter_conntrack-devel pam-devel
- libcap-devel libltdl-devel libxml2-devel"
+ libcap-devel libltdl-devel libxml2-devel libxcrypt-devel"
 depends="perl"
 checkdepends="libcppunit-devel"
 short_desc="Caching proxy for the Web"

From a85ac4822fcccab0ed0da2bbe680d7cc2f1acaf1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:34:53 -0700
Subject: [PATCH 74/97] stress-ng: rebuild for libxcrypt

---
 srcpkgs/stress-ng/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 421094cd2cbff..611b4085e1350 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,9 +1,10 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
 version=0.17.00
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=1
+makedepends="libxcrypt-devel"
 short_desc="Load and stress a computer system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 39266fd1ab260cc34caecf0c38903f16e3110188 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:36:16 -0700
Subject: [PATCH 75/97] swi-prolog: rebuild for libxcrypt

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

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 416206e8d15f0..eeffdc0c4e380 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=9.0.4
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
  libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
- unixodbc-devel zlib-devel pcre-devel libyaml-devel"
+ unixodbc-devel zlib-devel pcre-devel libyaml-devel libxcrypt-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 4a97fe81030749934ce4d869411ea7bd4fd0d200 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:37:35 -0700
Subject: [PATCH 76/97] tacacs: rebuild for libxcrypt

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

diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index 179fc1fa161ee..0422244e122f1 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -1,11 +1,11 @@
 # Template file for 'tacacs'
 pkgname=tacacs
 version=4.0.4.28
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-libwrap=no"
 hostmakedepends="flex perl"
-makedepends="libnsl-devel"
+makedepends="libnsl-devel libxcrypt-devel"
 short_desc="Modified version of Cisco's tacacs+ (tac_plus) developer's kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Cisco"

From 8acf624addd08467d67fd82ed51123920a4d72e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:38:46 -0700
Subject: [PATCH 77/97] thttpd: rebuild for libxcrypt

---
 srcpkgs/thttpd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index 13de3fbef35ef..66dbc9c4b517d 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,8 +1,9 @@
 # Template file for 'thttpd'
 pkgname=thttpd
 version=2.29
-revision=2
+revision=3
 build_style=gnu-configure
+makedepends="libxcrypt-devel"
 short_desc="Tiny/turbo/throttling HTTP server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 64f1297790b26684025b6662beb8c0ea50b30fe0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:40:22 -0700
Subject: [PATCH 78/97] toybox: rebuild for libxcrypt

---
 srcpkgs/toybox/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index d3b984241038e..777d8bdb05f3f 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,8 +1,9 @@
 # Template file for 'toybox'
 pkgname=toybox
 version=0.8.10
-revision=1
+revision=2
 create_wrksrc=yes
+makedepends="libxcrypt-devel"
 short_desc="BSD-licensed alternative to busybox"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="0BSD"

From 3922e339c84d87ccfeb1b69c31603818779cb29b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:40:34 -0700
Subject: [PATCH 79/97] txr: rebuild for libxcrypt

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

diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index d9b0e96ebe5ac..7d0f149a5f0d4 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,12 +1,12 @@
 # Template file for 'txr'
 pkgname=txr
 version=282
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm* ppc64* mips*"
 build_style=configure
 configure_args="--prefix=/usr"
 make_check_target=tests
-makedepends="libffi-devel"
+makedepends="libffi-devel libxcrypt-devel"
 short_desc="Programming language for convenient data munging"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 549014904a0bff546d6edb650590526dac522764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:42:48 -0700
Subject: [PATCH 80/97] vile: rebuild for libxcrypt

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

diff --git a/srcpkgs/vile/template b/srcpkgs/vile/template
index 03be247701fb9..5e24e7b58d30c 100644
--- a/srcpkgs/vile/template
+++ b/srcpkgs/vile/template
@@ -1,11 +1,11 @@
 # Template file for 'vile'
 pkgname=vile
 version=9.8x
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-stripping"
 hostmakedepends="flex"
-makedepends="ncurses-devel"
+makedepends="ncurses-devel libxcrypt-devel"
 short_desc="Text editor which is extremely compatible with vi like emacs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From fe7d43ce5bc656a6be44c4e7a60c1353e7066521 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:43:27 -0700
Subject: [PATCH 81/97] vsftpd: rebuild for libxcrypt

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

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 599b25bf6d24f..0971b2d61ba5b 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.5
-revision=2
+revision=3
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel libxcrypt-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 0822503fb14e48430db11029bb2dfbfcf0fc0cf1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:44:41 -0700
Subject: [PATCH 82/97] wvstreams: rebuild for libxcrypt

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

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 515b160c9cfac..7ef176c2e33b9 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,10 +1,10 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--without-dbus --without-tcl --without-qt"
-makedepends="openssl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel libxcrypt-devel"
 short_desc="Library for doing network in C++"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-only"

From 6495ed8d476bda411a566f3ca9bff4233b323f0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:45:16 -0700
Subject: [PATCH 83/97] xlockmore: rebuild for libxcrypt

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

diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index 9439b0b02e54f..9dc9881ddddbb 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,12 +1,12 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
 version=5.73
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel libXt-devel libXext-devel libXinerama-devel
- $(vopt_if opengl 'MesaLib-devel glu-devel')"
+ libxcrypt-devel $(vopt_if opengl 'MesaLib-devel glu-devel')"
 short_desc="Provides the 'xlock' X screen locker"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 9d38b452926efae0473ec91ccdbdca417bb14a64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:46:27 -0700
Subject: [PATCH 84/97] xscreensaver: rebuild for libxcrypt

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

diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index e2cdb7eb95e26..a4ac547d46c3b 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'xscreensaver'
 pkgname=xscreensaver
 version=6.08
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
  --includedir=${XBPS_CROSS_BASE}/include
@@ -9,7 +9,8 @@ configure_args="--with-pam --with-login-manager
 conf_files="/etc/pam.d/xscreensaver"
 hostmakedepends="bc glib-devel intltool pkg-config"
 makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
- libXrandr-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel gtk+3-devel"
+ libXrandr-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel gtk+3-devel
+ libxcrypt-devel"
 depends="perl perl-LWP"
 short_desc="Screen saver and locker for the X Window System"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 035babbce51e6952e392599228846d980c10bf9f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 22:22:09 -0700
Subject: [PATCH 85/97] build-style/void-cross.sh: fix building for glibc 2.38

---
 common/build-style/void-cross.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 2e8ebb52ceaf9..9193b7cf64bad 100644
--- a/common/build-style/void-cross.sh
+++ b/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 \

From b20aa9dcb8bbc850b82e4c0ff0eb5308ff80e3b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 15:04:59 -0700
Subject: [PATCH 86/97] cross-vpkg-dummy: glibc does not provide libcrypt
 anymore

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

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 9325168acb4cd..feaccd4dc265d 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
 version=0.39
-revision=5
+revision=6
 build_style=meta
 depends="base-files>=0.126"
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -75,7 +75,7 @@ else
 	provides+=" glibc-9999_1 glibc-devel-9999_1"
 	conflicts+=" glibc>=0"
 	shlib_provides+=" libc.so.6 libm.so.6 librt.so.1 libpthread.so.0"
-	shlib_provides+=" libcrypt.so.1 libdl.so.2 libresolv.so.2"
+	shlib_provides+=" libdl.so.2 libresolv.so.2"
 	shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1"
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"

From d061685a42a7c1dcc189e39c3881423a79520e5f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 87/97] cross-aarch64-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-aarch64-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 6d65a56033177..690e27b8adc15 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-aarch64-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From b30ef73b731e03aa75b264cafe85265ec6b7c0d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 88/97] cross-arm-linux-gnueabi: rebuild for glibc 2.38

---
 srcpkgs/cross-arm-linux-gnueabi/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index c11560ff2a223..7cf232218eedb 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-arm-linux-gnueabi'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft
  --enable-autolink-libatomic"
@@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From a636097b930e42596ae35392c5fd1848b696ffcd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 89/97] cross-arm-linux-gnueabihf: rebuild for glibc 2.38

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 2c055324e8524..6cd9d50f7f459 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-arm-linux-gnueabihf'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
+_glibc_version=2.38
 _linux_version=5.10.4
-_glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard
  --enable-autolink-libatomic"
@@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From efd78f292efe28bd659d0a89c011396ded80f72b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 90/97] cross-armv7l-linux-gnueabihf: rebuild for glibc 2.38

---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 1bdaf59cf7421..e50363fcb4f75 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-armv7l-linux-gnueabihf'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 475d28cd6589e4fb35eda87bae5964b8245173ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 91/97] cross-i686-pc-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-i686-pc-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 869501426cd29..c6b5319ac5d78 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-i686-pc-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
 makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -18,12 +17,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 475971adf3714c759f29e5fbce9915e99645dbe8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 92/97] cross-powerpc-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-powerpc-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 035dc50571a65..31578760f17e5 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-powerpc-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --enable-autolink-libatomic"
@@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 8e083589e139245e349bd55b60e0e0774ebf53bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:40 -0700
Subject: [PATCH 93/97] cross-powerpc64-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-powerpc64-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 0719663f235a0..cdbd1e26f725d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-powerpc64-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux --enable-autolink-libatomic"
@@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 4f96fa15391b992d81d08f41fc805a2489ff6562 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:41 -0700
Subject: [PATCH 94/97] cross-powerpc64le-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 8e6967c4e2e1b..82dc196a247d5 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux --enable-autolink-libatomic"
@@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From bbeec96fabdb22f6561b39bca4ec846a11d40c78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:41 -0700
Subject: [PATCH 95/97] cross-powerpcle-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-powerpcle-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 9e9d30b9faf98..7576278738d95 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -1,11 +1,11 @@
 # Template file for 'cross-powerpcle-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --enable-autolink-libatomic"
@@ -24,7 +24,7 @@ distfiles="
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 49522c3f3855c9fed911684d175daa4d707569bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:41 -0700
Subject: [PATCH 96/97] cross-riscv64-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-riscv64-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-riscv64-linux-gnu/template b/srcpkgs/cross-riscv64-linux-gnu/template
index 2eb8a05eded18..5cd6da69c32e8 100644
--- a/srcpkgs/cross-riscv64-linux-gnu/template
+++ b/srcpkgs/cross-riscv64-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-riscv64-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-riscv64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic --disable-multilib"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 233549df7d84a38187984bcc71faf412b1cae530 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 19:09:41 -0700
Subject: [PATCH 97/97] cross-x86_64-linux-gnu: rebuild for glibc 2.38

---
 srcpkgs/cross-x86_64-linux-gnu/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index becd902c84bf3..7eabe1625b23e 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,12 +1,11 @@
 # Template file for 'cross-x86_64-linux-gnu'
 _binutils_version=2.39
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_version=2.38
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=5
+revision=6
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
 makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -18,12 +17,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
 distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
-# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz"
+distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

  parent reply	other threads:[~2023-10-16 17:29 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-09  0:09 [PR PATCH] " oreo639
2023-08-09  0:21 ` [PR PATCH] [Updated] " oreo639
2023-08-09  0:49 ` oreo639
2023-08-09 13:46 ` ahesford
2023-08-09 21:55 ` [PR PATCH] [Updated] " oreo639
2023-08-09 21:57 ` oreo639
2023-08-30 17:06 ` [PR PATCH] [Updated] " oreo639
2023-08-30 17:14 ` oreo639
2023-08-30 17:15 ` oreo639
2023-08-30 19:42 ` oreo639
2023-08-30 19:47 ` oreo639
2023-08-31  2:10 ` oreo639
2023-08-31  5:22 ` oreo639
2023-08-31  5:27 ` oreo639
2023-09-14 21:28 ` oreo639
2023-09-14 22:20 ` oreo639
2023-09-14 22:21 ` oreo639
2023-09-19 22:19 ` [PR PATCH] [Updated] " oreo639
2023-09-20  5:25 ` oreo639
2023-09-20 17:29 ` oreo639
2023-09-27 17:13 ` oreo639
2023-09-27 17:28 ` oreo639
2023-09-29 19:59 ` oreo639
2023-10-04 17:36 ` oreo639
2023-10-05 21:07 ` oreo639
2023-10-08 18:54 ` oreo639
2023-10-09 21:15 ` oreo639
2023-10-09 21:15 ` oreo639
2023-10-11 18:23 ` oreo639
2023-10-14 21:16 ` oreo639
2023-10-16 17:29 ` oreo639 [this message]
2023-10-20 21:28 ` oreo639
2023-10-27 23:35 ` oreo639
2023-10-28  3:17 ` [PR PATCH] [Updated] " oreo639
2023-10-28  3:48 ` oreo639
2023-10-28  3:48 ` oreo639
2023-10-31  2:43 ` oreo639
2023-11-01 19:57 ` oreo639
2023-11-03 23:06 ` oreo639
2023-11-06  6:32 ` oreo639
2023-11-13 19:29 ` oreo639
2023-11-14  2:32 ` oreo639
2023-11-14 22:19 ` oreo639
2023-11-25  0:16 ` oreo639
2023-11-29 18:29 ` oreo639
2023-12-02 22:03 ` oreo639
2023-12-06 20:47 ` oreo639
2023-12-07  4:49 ` oreo639
2023-12-11  9:26 ` classabbyamp
2023-12-11  9:26 ` classabbyamp
2023-12-11  9:30 ` oreo639
2023-12-11  9:31 ` oreo639
2023-12-11  9:31 ` oreo639
2023-12-11  9:32 ` oreo639
2023-12-11  9:46 ` classabbyamp
2023-12-11  9:50 ` oreo639
2023-12-11 12:39 ` oreo639
2023-12-11 13:02 ` [PR PATCH] [Updated] " oreo639
2023-12-11 13:02 ` oreo639
2023-12-11 13:59 ` leahneukirchen
2023-12-11 15:25 ` oreo639
2023-12-11 15:26 ` oreo639
2023-12-11 15:30 ` oreo639
2023-12-11 15:34 ` leahneukirchen
2023-12-11 15:36 ` oreo639
2023-12-20  0:32 ` [PR PATCH] [Updated] " oreo639
2023-12-21  3:24 ` oreo639
2023-12-22  2:10 ` oreo639
2023-12-23 11:37 ` [PR REVIEW] " leahneukirchen
2023-12-23 11:40 ` leahneukirchen
2023-12-23 22:10 ` oreo639
2023-12-23 22:12 ` oreo639
2023-12-23 22:15 ` oreo639
2023-12-23 22:17 ` oreo639
2023-12-23 22:19 ` oreo639
2023-12-23 22:21 ` oreo639
2023-12-24  2:02 ` oreo639
2023-12-25  3:03 ` [PR PATCH] [Updated] " oreo639
2023-12-25  3:32 ` [PR REVIEW] " oreo639
2023-12-25  3:33 ` oreo639
2023-12-25 19:09 ` [PR PATCH] [Merged]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231016172918.QhNkklY4JDpZ0FVRLdrghdAE5zC0Wet1f32DW426YU0@z \
    --to=oreo639@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).