From f6aa4bd9608bb4d1a2acae7ce000bca4bfb220b6 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Wed, 21 Feb 2024 20:52:29 +0100 Subject: gnu: glibc-2.33: Fix source build. * gnu/packages/base.scm (glibc-2.33)[source]: Use patches from glibc-2.35. Change-Id: Idfcad60a39bdfd54d6126c1b440c8915ec2d4df2 --- gnu/packages/base.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0c4a9a08ed..b82f2e3142 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner -;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017, 2020 Mathieu Othacehe @@ -1201,12 +1201,14 @@ with the Linux kernel.") "1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f")) (patches (cons (search-patch "glibc-2.33-riscv64-miscompilation.patch") - ;; Remove a patch that's become irrelevant and that does not - ;; apply to this version. - (remove (lambda (patch) - (string=? (basename patch) - "glibc-hurd-clock_gettime_monotonic.patch")) - (origin-patches (package-source glibc))))))) + ;; Remove patches that are irrelevant or do not apply to + ;; this version. + (remove + (lambda (patch) + (member (basename patch) + '("glibc-2.35-CVE-2023-4911.patch" + "glibc-hurd-clock_gettime_monotonic.patch"))) + (origin-patches (package-source glibc-2.35))))))) (arguments (substitute-keyword-arguments (package-arguments glibc) ((#:configure-flags flags ''()) -- cgit 1.4.1