diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-16 15:25:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-16 15:32:22 +0100 |
| commit | ca331eb849ef12eee627ff67775197cf503847f5 (patch) | |
| tree | 28d89d27b13dbf916d4112d371d50edcba0a6ec2 /gnu | |
| parent | ff19532fd545fd1b039d471155c2430c8efc1b27 (diff) | |
| download | guix-ca331eb849ef12eee627ff67775197cf503847f5.tar.gz guix-ca331eb849ef12eee627ff67775197cf503847f5.zip | |
gnu: glibc: Don't apply upstreamed patch in newer glibc versions.
* gnu/packages/base.scm (glibc/linux, glibc-2.25, glibc-2.24,
glibc-2.23)[source](patches): Remove 'glibc-o-largefile.patch'.
(glibc-2.22)[source](patches): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 783f2cabe7..c6b21e725d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -570,7 +570,6 @@ store.") (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" "glibc-allow-kernel-2.6.32.patch")))) (build-system gnu-build-system) @@ -867,7 +866,6 @@ GLIBC/HURD for a Hurd host" "1813dzkgw6v8q8q1m4v96yfis7vjqc9pslqib6j9mrwh6fxxjyq6")) (patches (search-patches "glibc-ldd-x86_64.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" "glibc-vectorized-strcspn-guards.patch" "glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt2.patch" @@ -886,7 +884,6 @@ GLIBC/HURD for a Hurd host" "1lxmprg9gm73gvafxd503x70z32phwjzcy74i0adfi6ixzla7m4r")) (patches (search-patches "glibc-ldd-x86_64.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" "glibc-vectorized-strcspn-guards.patch" "glibc-CVE-2015-5180.patch" "glibc-CVE-2017-1000366-pt1.patch" @@ -906,7 +903,6 @@ GLIBC/HURD for a Hurd host" "1s8krs3y2n6pzav7ic59dz41alqalphv7vww4138ag30wh0fpvwl")) (patches (search-patches "glibc-ldd-x86_64.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" "glibc-vectorized-strcspn-guards.patch" "glibc-CVE-2015-5180.patch" "glibc-CVE-2016-3075.patch" @@ -928,6 +924,7 @@ GLIBC/HURD for a Hurd host" (base32 "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb")) (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-o-largefile.patch" "glibc-vectorized-strcspn-guards.patch" "glibc-CVE-2015-5180.patch" "glibc-CVE-2015-7547.patch" |