nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-03-16 15:25:15 +01:00
parent ff19532fd5
commit ca331eb849
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/base.scm
View File

@ -570,7 +570,6 @@ store.")
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-o-largefile.patch"
"glibc-allow-kernel-2.6.32.patch")))) "glibc-allow-kernel-2.6.32.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -867,7 +866,6 @@ GLIBC/HURD for a Hurd host"
"1813dzkgw6v8q8q1m4v96yfis7vjqc9pslqib6j9mrwh6fxxjyq6")) "1813dzkgw6v8q8q1m4v96yfis7vjqc9pslqib6j9mrwh6fxxjyq6"))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-o-largefile.patch"
"glibc-vectorized-strcspn-guards.patch" "glibc-vectorized-strcspn-guards.patch"
"glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt1.patch"
"glibc-CVE-2017-1000366-pt2.patch" "glibc-CVE-2017-1000366-pt2.patch"
@ -886,7 +884,6 @@ GLIBC/HURD for a Hurd host"
"1lxmprg9gm73gvafxd503x70z32phwjzcy74i0adfi6ixzla7m4r")) "1lxmprg9gm73gvafxd503x70z32phwjzcy74i0adfi6ixzla7m4r"))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-o-largefile.patch"
"glibc-vectorized-strcspn-guards.patch" "glibc-vectorized-strcspn-guards.patch"
"glibc-CVE-2015-5180.patch" "glibc-CVE-2015-5180.patch"
"glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt1.patch"
@ -906,7 +903,6 @@ GLIBC/HURD for a Hurd host"
"1s8krs3y2n6pzav7ic59dz41alqalphv7vww4138ag30wh0fpvwl")) "1s8krs3y2n6pzav7ic59dz41alqalphv7vww4138ag30wh0fpvwl"))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-o-largefile.patch"
"glibc-vectorized-strcspn-guards.patch" "glibc-vectorized-strcspn-guards.patch"
"glibc-CVE-2015-5180.patch" "glibc-CVE-2015-5180.patch"
"glibc-CVE-2016-3075.patch" "glibc-CVE-2016-3075.patch"
@ -928,6 +924,7 @@ GLIBC/HURD for a Hurd host"
(base32 (base32
"0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb")) "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb"))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-o-largefile.patch"
"glibc-vectorized-strcspn-guards.patch" "glibc-vectorized-strcspn-guards.patch"
"glibc-CVE-2015-5180.patch" "glibc-CVE-2015-5180.patch"
"glibc-CVE-2015-7547.patch" "glibc-CVE-2015-7547.patch"