diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-25 20:58:17 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-25 21:56:22 -0400 |
| commit | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (patch) | |
| tree | 0386ba824424b7c64b9adf5845e1ba93e9fcf626 /gnu/local.mk | |
| parent | afc9d8ec2b724b67f85b05011725bb636f209a1a (diff) | |
| download | guix-ffc015bea26f24d862e7e877d907fbe1ab9a9967.tar.gz | |
gnu: glibc: Fix replacement on i686.
This is followup to 665d6a59161769e10b52ffcbcd5cd2db22f32681. Fixes <https://bugs.gnu.org/27489>. * gnu/packages/base.scm (glibc-2.25-patched, glibc-2.24, glibc-2.23) (glibc-2.22): Add glibc-vectorized-strcspn-guards.patch to patches. Move a comment where it belongs. * gnu/packages/patches/glibc-CVE-2017-1000366-pt2.patch: Swap with ... * gnu/packages/patches/glibc-CVE-2017-1000366-pt3.patch: ... this. * gnu/packages/patches/glibc-vectorized-strcspn-guards.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Fix formatting.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 102fe98e60..5d024de07e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -630,14 +630,15 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-runpath.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \ - %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ - %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ + %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \ + %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ + %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-memchr-overflow-i686.patch \ %D%/packages/patches/glibc-o-largefile.patch \ + %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ |