commit: ea4abdb940d9bf2c63682f855ecb550d1c71fd66
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 3 00:32:42 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 3 00:34:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4abdb9
sys-libs/glibc: patchlevel bumps
glibc-2.42:
9f4dc61837 (HEAD -> gentoo/2.42, tag: gentoo/glibc-2.42-2, gentoo/gentoo/2.42)
nptl: Fix SYSCALL_CANCEL for return values larger than INT_MAX (BZ 33245)
b32e0caedd elf: Handle ld.so with LOAD segment gaps in _dl_find_object (bug
31943)
23e2f26dd5 elf: Extract rtld_setup_phdr function from dl_main
5ed2275170 stdlib: resolve a double lock init issue after fork [BZ #32994]
4fc972dd00 inet-fortified: fix namespace violation (bug 33227)
glibc-2.41:
cbe6e182ad (HEAD -> gentoo/2.41, tag: gentoo/glibc-2.41-7, gentoo/gentoo/2.41)
nptl: Fix SYSCALL_CANCEL for return values larger than INT_MAX (BZ 33245)
f74ed78171 elf: Handle ld.so with LOAD segment gaps in _dl_find_object (bug
31943)
fc88fc9543 elf: Extract rtld_setup_phdr function from dl_main
ed09e9e121 elf: Do not add a copy of _dl_find_object to libc.so
db4c71bc40 stdlib: resolve a double lock init issue after fork [BZ #32994]
3d75acbe05 iconv: iconv -o should not create executable files (bug 33164)
a0e48b7851 posix: Fix double-free after allocation failure in regcomp (bug
33185)
43ed5a9639 Fix error reporting (false negatives) in SGID tests
03c2274b6c support: Pick group in support_capture_subprogram_self_sgid if UID
== 0
8b37c99ef1 sparc: Fix sparc32 Fix argument passing to __libc_start_main (BZ
32981)
ccfae86ddd Revert "sparc: Fix argument passing to __libc_start_main on SPARC32"
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/glibc/Manifest | 3 ++-
.../glibc/{glibc-2.42.ebuild => glibc-2.41-r5.ebuild} | 19 +++++++++----------
sys-libs/glibc/glibc-2.42.ebuild | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 32e63b888834..33daeebbf7aa 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -26,8 +26,9 @@ DIST glibc-2.39.tar.xz 18520988 BLAKE2B
9d98459a2d58401e07c081e0d841935b23998da7
DIST glibc-2.40-patches-11.tar.xz 227044 BLAKE2B
2a8c799a88596f3fc28bc45fc206f231f628ff83aae242d69e216b65983def35d3aaab282287f1d77cb9d37d10bb71c483815ea83dfb2e47670a4cfcfbd1d92f
SHA512
e984e4842951c24cf079e9a6f88771ede0709949402dd9f734cbfdf21ff40ca3d7380c0b9cc0c0d89943b6481adf8c7db2ab4b0ffe57e2e1fa514d925f0db395
DIST glibc-2.40.tar.xz 18752204 BLAKE2B
8593cab5b2549b77159b6866fbb40b917e491fd5bc0814f7f85b6529166d78d4583436450c479b86cdfe468304fc4d2a9ba8294230a55dbc4c15e89c3ab6c000
SHA512
33caf91dbfddde6480b7cdf7a68b36aff8c522bfee56160af26af297f1b768668edb08bc4e1a7ff61c64721e3c1d49c347a5dd01c5edd3b914ee6479c8b27885
DIST glibc-2.41-patches-6.tar.xz 83980 BLAKE2B
ca689782db9f78751d5b5004ee9bf7bd6daf4cf071bb25507e53e4408fdd0331a9f4c82bbe7579e38540fc4d416bd858f76e5655f4e8a87048067fbc5e3c7a17
SHA512
bce972f5e036712e178d0adc97bef17b83a5c5cc3139d689bfc2847bc5e8126ee01250ce41033bc78919a7638965740d54eb431b240a9a32460c433335da968f
+DIST glibc-2.41-patches-7.tar.xz 96232 BLAKE2B
0d4d22eb467370e9e902278b223545c5a225c990a87b4c2f39db48677301d126d7e69ea2823822ced5c472a9abdf7679c6c0ede88b87e50123a7ac146a98249e
SHA512
00fc6f83a28dfae8f17ed50ba19f322d267f3f6d80e5545c317694ce1e2e0e4ebfb922b4fa1d7c854d035a457e968bf8281ccedca8e5347e380fa54b6755aedd
DIST glibc-2.41.tar.xz 19344868 BLAKE2B
4da62f489ba7a95bb069c2cfea8cf78e4d37e3a5f7e1736239670ba1dca12b69aa77bd00ced078c27d91b1e622c58cbd70258161a9d18c5b3bcc95863b8d744d
SHA512
894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169
-DIST glibc-2.42-patches-1.tar.xz 19368 BLAKE2B
2a010de9bc67ef20cc2ac9ad1ea0b812d957f7df1e1f1ef6d37f0f0ac7259b41db616f57844376c640d16852b4c7731d88134d4b27917dbc968dda4c82329c97
SHA512
04d38fff7bfcfe0f110d3ab05c4821e9e0e84edea60aa8c37c908e70a04aca00acd548aea3f583fbb30bf5f57f88af41d77c75c231d706fef88f07d744d036e9
+DIST glibc-2.42-patches-2.tar.xz 25856 BLAKE2B
26a5a3bdc7985c2193533e883445acac29ea695df30d72b6d9409aa9ec94d39a086eb6c41eb9adfc39e0de78f7ae84e0fa64a955f9866de262179ee40ce4a6b5
SHA512
1526613855b9ca65002c6853f88d77990a1fe9e6f4cc01aca51d67fc4592ed985da8c74a661d304eb8a27c6afc8592da259fe40fa08a824942a9b700942086e6
DIST glibc-2.42.tar.xz 19930508 BLAKE2B
6ffabfe7942034a5a4fb5097679cb47bc3431eb2a3864af07cea0cb6aa5db63fbaf6f026b3c9299e00268058a6762eb21e92499f012d552ed87d65c7ffbd0bbe
SHA512
73a617db8e0f0958c0575f7a1c5a35b72b7e070b6cbdd02a9bb134995ca7ca0909f1e50d7362c53d2572d72f1879bb201a61d5275bac16136895d9a34ef0c068
DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B
37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979
SHA512
efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B
10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1
SHA512
5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
diff --git a/sys-libs/glibc/glibc-2.42.ebuild
b/sys-libs/glibc/glibc-2.41-r5.ebuild
similarity index 99%
copy from sys-libs/glibc/glibc-2.42.ebuild
copy to sys-libs/glibc/glibc-2.41-r5.ebuild
index 8c57e3216423..c22f4082ed4f 100644
--- a/sys-libs/glibc/glibc-2.42.ebuild
+++ b/sys-libs/glibc/glibc-2.41-r5.ebuild
@@ -12,7 +12,7 @@ TMPFILES_OPTIONAL=1
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=1
+PATCH_VER=7
PATCH_DEV=dilfridge
# gcc mulitilib bootstrap files version
@@ -768,6 +768,11 @@ g_int_to_KV() {
echo ${major}.${minor}.${micro}
}
+eend_KV() {
+ [[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+ eend $?
+}
+
get_kheader_version() {
printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
$(tc-getCPP ${CTARGET}) -I "${ESYSROOT}$(alt_headers)" - | \
@@ -861,13 +866,11 @@ sanity_prechecks() {
if ! is_crosscompile && ! tc-is-cross-compiler ; then
# Building fails on an non-supporting kernel
ebegin "Checking running kernel version
(${run_kv} >= ${want_kv})"
- if ! [[ $(g_KV_to_int ${run_kv}) -ge
$(g_KV_to_int ${want_kv}) ]] ; then
- eend 1
+ if ! eend_KV ${run_kv} ${want_kv} ; then
echo
eerror "You need a kernel of at least
${want_kv}!"
die "Kernel version too low!"
fi
- eend 0
fi
# Do not run this check for pkg_pretend, just pkg_setup
and friends (if we ever get used there).
@@ -878,13 +881,11 @@ sanity_prechecks() {
# but let's leave it as-is for now.
if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
ebegin "Checking linux-headers version
(${build_kv} >= ${want_kv})"
- if ! [[ $(g_KV_to_int ${build_kv}) -ge
$(g_KV_to_int ${want_kv}) ]] ; then
- eend 1
+ if ! eend_KV ${build_kv} ${want_kv} ; then
echo
eerror "You need linux-headers of at
least ${want_kv}!"
die "linux-headers version too low!"
fi
- eend 0
fi
fi
fi
@@ -1301,7 +1302,7 @@ glibc_src_test() {
# we give the tests a bit more time to avoid spurious
# bug reports on slow arches
- SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 nonfatal emake
${myxfailparams} check
+ SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
}
src_test() {
@@ -1309,8 +1310,6 @@ src_test() {
return
fi
- # glibc_src_test uses nonfatal so that we can run tests for all ABIs
- # and fail at the end instead.
foreach_abi glibc_src_test || die "tests failed"
}
diff --git a/sys-libs/glibc/glibc-2.42.ebuild b/sys-libs/glibc/glibc-2.42.ebuild
index 8c57e3216423..2a15610af94d 100644
--- a/sys-libs/glibc/glibc-2.42.ebuild
+++ b/sys-libs/glibc/glibc-2.42.ebuild
@@ -12,7 +12,7 @@ TMPFILES_OPTIONAL=1
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=1
+PATCH_VER=2
PATCH_DEV=dilfridge
# gcc mulitilib bootstrap files version