summaryrefslogtreecommitdiff
path: root/gnu/packages/base.scm
diff options
context:
space:
mode:
authorZheng Junjie <z572@z572.online>2025-02-06 23:59:21 +0800
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:28 +0200
commit3ac9be2a5c1efa8fc994305232b00962e33d2dfb (patch)
treed55b949e19440872e8e4d16e39aa1cf48eb80a2b /gnu/packages/base.scm
parent700529a4e148a9db8f799e7818540d7732e66542 (diff)
gnu: glibc: update to 2.41.
* gnu/packages/base.scm (glibc): Update to 2.41. (%glibc-patches): update it. (glibc/hurd)[sources]<patches>: Adjust it. * gnu/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch: Rename to... glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch: ...this, and update. * gnu/packages/patches/glibc-2.28-ldd-x86_64.patch: Rename to ... * glibc-2.41-ldd-x86_64.patch: ...this, and update. * gnu/packages/patches/glibc-2.40-CVE-2025-0.patch, gnu/packages/patches/glibc-hurd64-fault.patch, gnu/packages/patches/glibc-hurd64-sgms-context.patch: Remove. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/patches/glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch: Update for glibc-2.41. * gnu/packages/make-bootstrap.scm (glibc-for-bootstrap): Update it. * gnu/packages/patches/glibc-2.39-bootstrap-system.patch: Rename to... * glibc-2.41-bootstrap-system.patch: ...this, and update. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: I51c12e3e8fa91dac340571e07a90d6220e0dc6ae
Diffstat (limited to 'gnu/packages/base.scm')
-rw-r--r--gnu/packages/base.scm10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index bb1161eedd2..608ba839fc7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -894,15 +894,14 @@ the store.")
(define %glibc-patches
(list "glibc-ldd-powerpc.patch"
- "glibc-2.38-ldd-x86_64.patch"
+ "glibc-2.41-ldd-x86_64.patch"
"glibc-2.40-dl-cache.patch"
"glibc-2.37-versioned-locpath.patch"
;; "glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"
- "glibc-2.40-CVE-2025-0.patch"
"glibc-2.37-hurd-clock_t_centiseconds.patch"
- "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
+ "glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch"
"glibc-hurd-mach-print.patch"
"glibc-hurd-gettyent.patch"
"glibc-hurd-getauxval.patch"))
@@ -912,13 +911,13 @@ the store.")
;; version 2.28, GNU/Hurd used a different glibc branch.
(package
(name "glibc")
- (version "2.40")
+ (version "2.41")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
(sha256
(base32
- "18h50b0zm8dkpzj81w033v99rbxiykk3v697yr4dfqwjbqbr1a0r"))
+ "00g95047sshv0zxk9ja3mi7lzwi8wh8qx0nxngbvgmj5yli6p8m5"))
(patches (map search-patch %glibc-patches))))
(properties `((lint-hidden-cve . ("CVE-2024-2961"
"CVE-2024-33601" "CVE-2024-33602"
@@ -1667,7 +1666,6 @@ command.")
(patches
(append (origin-patches (package-source glibc))
(search-patches "glibc-hurd-pthread_setcancelstate.patch"
- "glibc-hurd64-fault.patch"
"glibc-hurd64-intr-msg-clobber.patch"
"glibc-hurd64-gcc-14.2-tls-bug.patch")))))))