Re: [PR PATCH] [Updated] binutils 2.40, glibc 2.37

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

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

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

https://github.com/paper42/void-packages binutils-2.40-glibc-2.37
https://github.com/void-linux/void-packages/pull/43444

binutils 2.40, glibc 2.37
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly** more testing and a world rebuild report is needed

<!--
#### 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**
-->

[ci skip]

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

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

From ee69e51fb5c5c3fe735c3f6a7eeae69c076ba111 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 21 Feb 2023 09:01:38 +0100
Subject: [PATCH 01/37] binutils: update to 2.40.

---
 .../fix-libcollector-without-java.patch       | 53 -------------------
 srcpkgs/binutils/template                     |  6 +--
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/binutils/patches/fix-libcollector-without-java.patch

diff --git a/srcpkgs/binutils/patches/fix-libcollector-without-java.patch b/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
deleted file mode 100644
index 54384875f358..000000000000
--- a/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 49ddd814ac1071af7c4f45d5f8398b91862f2c7f Mon Sep 17 00:00:00 2001
-From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
-Date: Wed, 17 Aug 2022 19:55:23 -0700
-Subject: [PATCH] gprofng: fix bug 29479 Collection fails when built without
- java support
-
-gprofng/ChangeLog
-2022-08-17  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>
-
-	PR gprofng/29479
-	* libcollector/collector.c: Add #if defined(GPROFNG_JAVA_PROFILING) for
-	java specific code.
-	* libcollector/unwind.c: Likewise.
----
- gprofng/libcollector/collector.c | 2 ++
- gprofng/libcollector/unwind.c    | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
-index 93c9d3330de5..ceff2c1caccb 100644
---- a/gprofng/libcollector/collector.c
-+++ b/gprofng/libcollector/collector.c
-@@ -913,8 +913,10 @@ __collector_open_experiment (const char *exp, const char *params, sp_origin_t or
-   __collector_ext_unwind_key_init (1, NULL);
- 
-   /* start java attach if suitable */
-+#if defined(GPROFNG_JAVA_PROFILING)
-   if (exp_origin == SP_ORIGIN_DBX_ATTACH)
-     __collector_jprofile_start_attach ();
-+#endif
-   start_sec_time = CALL_UTIL (time)(NULL);
-   __collector_start_time = collector_interface.getHiResTime ();
-   TprintfT (DBG_LT0, "\t__collector_open_experiment; resetting start_time\n");
-diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c
-index 119243788020..f8e11823c81e 100644
---- a/gprofng/libcollector/unwind.c
-+++ b/gprofng/libcollector/unwind.c
-@@ -557,6 +557,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
-   int size = max_frame_size;
- 
- #define MIN(a,b) ((a)<(b)?(a):(b))
-+#if defined(GPROFNG_JAVA_PROFILING)
-   /* get Java info */
-   if (__collector_java_mode && __collector_java_asyncgetcalltrace_loaded && context && !pseudo_context)
-     {
-@@ -569,6 +570,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
- 	  size -= sz;
- 	}
-     }
-+#endif
- 
-   /* get native stack */
-   if (context)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 441e43553904..c4cdbea912dc 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.39
-revision=2
+version=2.40
+revision=1
 bootstrap=yes
 hostmakedepends="pkgconf"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
-checksum=645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum=0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
 
 subpackages="binutils-doc"
 if [ "$CHROOT_READY" ]; then

From 275d6da817ea5ece1fe5c7aee1b357c4a2b1bfb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 21 Feb 2023 09:01:56 +0100
Subject: [PATCH 02/37] glibc: update to 2.37.

---
 common/shlibs          | 60 +++++++++++++++++++++---------------------
 srcpkgs/glibc/template |  9 ++++---
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..55337aa3d976 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,38 +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
-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.37_1
+libm.so.6 glibc-2.37_1
+libpthread.so.0 glibc-2.37_1
+librt.so.1 glibc-2.37_1
+libdl.so.2 glibc-2.37_1
+ld-linux-x86-64.so.2 glibc-2.37_1 x86_64
+ld-linux.so.2 glibc-2.37_1 i686
+ld-linux.so.3 glibc-2.37_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.37_1 aarch64
+ld64.so.2 glibc-2.37_1 ppc64
+ld.so.1 glibc-2.37_1 mips
+ld.so.1 glibc-2.37_1 ppc
+ld-linux-armhf.so.3 glibc-2.37_1
+libresolv.so.2 glibc-2.37_1
+libanl.so.1 glibc-2.37_1
+libthread_db.so.1 glibc-2.37_1
+libutil.so.1 glibc-2.37_1
+libnsl.so.1 glibc-2.37_1
+libnss_db.so.2 glibc-2.37_1
+libnss_files.so.2 glibc-2.37_1
+libnss_compat.so.2 glibc-2.37_1
+libnss_dns.so.2 glibc-2.37_1
+libnss_hesiod.so.2 glibc-2.37_1
+libcrypt.so.1 glibc-2.37_1
+libBrokenLocale.so.1 glibc-2.37_1
+libmemusage.so glibc-2.37_1
+libSegFault.so glibc-2.37_1
+libpcprofile.so glibc-2.37_1
+libcidn.so.1 glibc-2.37_1
+libmvec.so.1 glibc-2.37_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
 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/template b/srcpkgs/glibc/template
index 452b55c12762..4c76ed3d94a1 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,15 +1,16 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.36
+version=2.37
 revision=1
-_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 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="https://ftp.gnu.org/gnu/libc/glibc-${version}.tar.xz"
+distfiles="https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
+checksum=979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
 # Do not strip these files, objcopy errors out.
 nostrip_files="
 	XBS5_ILP32_OFFBIG

From c3276826bbf5a09a066ec2fb2428a924d9996d84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 03/37] cross-aarch64-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 8038b28d70ad..f59645637bd9 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-aarch64-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-aarch64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -23,7 +23,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 6342e47cf6ee9ae63cb40a9b95958f702ef1414e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 04/37] cross-arm-linux-musleabi: update for binutils 2.40

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

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index ee59931d6d93..b7e22494754e 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-arm-linux-musleabi'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -23,7 +23,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From ccfcd4100110905d748ba5c5462eaf6f0ebd1827 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 05/37] cross-arm-linux-musleabihf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 333db95425dd..9fd8c91cf5fc 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-arm-linux-musleabihf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -23,7 +23,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From c8d4138c900f1817a412a6c8bf420c4fceabb4e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 06/37] cross-armv7l-linux-musleabihf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 3c4ea2357661..8bc9e045e1d7 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-armv7l-linux-musleabihf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -23,7 +23,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 10b779d387314b7c20e53b43d6123c412b423e1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 07/37] cross-i686-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6dc3fdcba07a..ca19a8600d74 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-i686-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 7de972b8476a48e302915f31f6e4d9b74ff491ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:10 +0200
Subject: [PATCH 08/37] cross-mips-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index f783961d70d2..fd266b8fa292 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-mips-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 62413c3f909983b97ee66366bf41068ddbb4b360 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 09/37] cross-mips-linux-muslhf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index fe41bc80d808..7fae363a635e 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-mips-linux-muslhf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 1098a85b391cdf3ab2f803602b9f2cd0990b19f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 10/37] cross-mipsel-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 23247d5bc972..101acbabebe6 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-mipsel-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 5f1fde132ce267bf09b695cadf64658f3cc58d03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 11/37] cross-mipsel-linux-muslhf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 8cc208c7e86d..3ada2436ce16 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-mipsel-linux-muslhf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 91bf67e120b7522162e52a2544df0047d18e2dc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 12/37] cross-powerpc-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index e06970d76b9e..623dc41550bf 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-powerpc-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 70e7dde5ef64982efa4b3f1d2ce15433754ce415 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 13/37] cross-powerpc64-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index b081a136ef29..a150d33aff8f 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-powerpc64-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -24,7 +24,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 425a8b38a168971198a01e647dd3e358f9c80e24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 14/37] cross-powerpc64le-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index a863233b5b32..f360991a8224 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-powerpc64le-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -24,7 +24,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 7fc6ce77c3f7fc7c71b44f5611f2f7a5a1c35eb3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 15/37] cross-powerpcle-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 2f483e1f1ee5..676cfd569e6c 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-powerpcle-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 17a40f53b397101c617575966a2d46809db169ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:11 +0200
Subject: [PATCH 16/37] cross-x86_64-linux-musl: update for binutils 2.40

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

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 4984cd77f149..7823a3868c4c 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-x86_64-linux-musl'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _musl_version=1.1.24
 _linux_version=5.10.4
@@ -22,7 +22,7 @@ distfiles="
  https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
  https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec

From 109913ed4de9847c92f2292b786de66d0d4a33f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 19:49:54 +0200
Subject: [PATCH 17/37] cross-x86_64-w64-mingw32: update for binutils 2.40

---
 srcpkgs/cross-x86_64-w64-mingw32/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index 72b14bb584a7..abc7e104e514 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -1,9 +1,9 @@
 # Template file for 'cross-x86_64-w64-mingw32'
 pkgname=cross-x86_64-w64-mingw32
 version=10.0.0
-revision=1
+revision=2
 _gcc_version=12.2.0
-_binutils_version=2.39
+_binutils_version=2.40
 _gmp_version=6.2.1
 _mpfr_version=4.1.0
 _mpc_version=1.2.1
@@ -28,7 +28,7 @@ distfiles="
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
  ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
  fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2

From 59c1271654f5c37b351be90a8633c3f8db317d08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:14 +0200
Subject: [PATCH 18/37] cross-aarch64-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 17ba4ec677a6..6a6b87174862 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-aarch64-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -22,7 +22,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 68b2c0ed172bbb10b959018a35d39e65a6f56f53 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:14 +0200
Subject: [PATCH 19/37] cross-arm-linux-gnueabi: update for binutils 2.40

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

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 5aa1383aa8f9..a565c38fd017 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-arm-linux-gnueabi'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -22,7 +22,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 513fd155e8abed1d0b25531dc7a53cbbb1c48829 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 20/37] cross-arm-linux-gnueabihf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 13a780794378..d573578dc775 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-arm-linux-gnueabihf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _linux_version=5.10.4
 _glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -22,7 +22,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From cd49f71d66fd99722e8c14e0cfdb97c7f4dc98a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 21/37] cross-armv7l-linux-gnueabihf: update for binutils 2.40

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

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index ffb71af5b454..cd37a0e43d64 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-armv7l-linux-gnueabihf'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 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"
@@ -22,7 +22,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 89357f0437a4da2140b6450610551898695e039d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 22/37] cross-i686-pc-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c6f2579c645d..edb86060ca65 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-i686-pc-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
@@ -21,7 +21,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 60ca915d4eb2be3b4a36b666867c88625d8c8156 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 23/37] cross-powerpc-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index c759eda4505a..bacc89b88408 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-powerpc-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -22,7 +22,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 512d4a9755eeff4e2c57a56adf48aeeee65d9fe2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 24/37] cross-powerpc64-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 95e6ce653c3d..c62976412070 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-powerpc64-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"
@@ -23,7 +23,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 2fc844267e196abc55c74e967e4bf77d09d97721 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 25/37] cross-powerpc64le-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index f4486e3f229c..37dde9df60e9 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"
@@ -23,7 +23,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 8c78c421bc7b97f04c6e87793e581e47f994a484 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 26/37] cross-powerpcle-linux-gnu: update for binutils 2.40

---
 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 32337f1c37cc..96ca93e90d41 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
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -21,7 +21,7 @@ distfiles="
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From c5f3160c16df5f4eab945d130efa0db46945ebb7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:02:15 +0200
Subject: [PATCH 27/37] cross-x86_64-linux-gnu: update for binutils 2.40

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

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 0f6daea7229c..3debd068741f 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,12 +1,12 @@
 # Template file for 'cross-x86_64-linux-gnu'
-_binutils_version=2.39
+_binutils_version=2.40
 _gcc_version=12.2.0
 _glibc_version=2.36
 _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
@@ -21,7 +21,7 @@ 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+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
  656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"

From 845849b85bb49d86e75a05d96ad91c55e856e93f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 28/37] cross-aarch64-linux-gnu: update for glibc 2.37

---
 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 6a6b87174862..11090f412da8 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 2fcd066232f7d248a37ba4460f1fd01d8a612aa0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 29/37] cross-arm-linux-gnueabi: update for glibc 2.37

---
 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 a565c38fd017..6eb1c1a59212 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 409601894693a44e9471b3cf520bda372ef02484 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 30/37] cross-arm-linux-gnueabihf: update for glibc 2.37

---
 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 d573578dc775..cbad27f5d58b 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
-_glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From b33ab14538a2149bcb78a720e3a01f3d0b7d552c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 31/37] cross-armv7l-linux-gnueabihf: update for glibc 2.37

---
 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 cd37a0e43d64..f00f7cf74781 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=4
+revision=5
 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"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From f739f61e46fa256008d4aebee95d8345313fbed3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 32/37] cross-i686-pc-linux-gnu: update for glibc 2.37

---
 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 edb86060ca65..abcfbfc575e0 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 6864f3ed7ae54faab849098f4445ca996d4c877e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 33/37] cross-powerpc-linux-gnu: update for glibc 2.37

---
 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 bacc89b88408..7368d80ed1b9 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 03bc4e28bea97d8badb94e9b0332ba9cc23c1cfd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 34/37] cross-powerpc64-linux-gnu: update for glibc 2.37

---
 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 c62976412070..a0527ca8c07d 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 124978221f6fbcb2bfdc27ffabfd97144c01d8cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 35/37] cross-powerpc64le-linux-gnu: update for glibc 2.37

---
 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 37dde9df60e9..daf0a6dceb1a 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"
@@ -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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 69f52f825ae38c854b9e85d2fdc279bc21e4d5a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:05 +0200
Subject: [PATCH 36/37] cross-powerpcle-linux-gnu: update for glibc 2.37

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

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 96ca93e90d41..be495bb7bd5f 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -19,11 +19,11 @@ homepage="https://www.voidlinux.org/"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
+ https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz
  ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 

From 5826634d2a25890507fffd17cffdc9163bfd8438 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 14 Apr 2023 20:18:06 +0200
Subject: [PATCH 37/37] cross-x86_64-linux-gnu: update for glibc 2.37

---
 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 3debd068741f..7ef3bfa2987a 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.40
 _gcc_version=12.2.0
-_glibc_version=2.36
-_glibc_patchver="72-g0f90d6204d"
+_glibc_commit="1d63573f81945a489ea169636fa11850bc74716b"
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=4
+revision=5
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-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+=" https://git.vuxu.org/mirror/glibc/snapshot/glibc-${_glibc_commit}.tar.xz"
 distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
 checksum="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
  e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+ 979c02ca1f4505d9577899d3b3485329dc3bdde028a45ef4e51cacd428750158
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes