summary refs log tree commit diff
path: root/gnu/packages/base.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-30 13:57:40 -0500
committerMark H Weaver <mhw@netris.org>2014-12-30 13:57:40 -0500
commit26804e1351a86bfcde1b8bebeb984b9c79e6fe6f (patch)
treebcd2d8fdef5198a27595bc776a34a53e1b2cfed9 /gnu/packages/base.scm
parent8cbb67e04509f0854762269e46a65ee4344388f7 (diff)
downloadguix-26804e1351a86bfcde1b8bebeb984b9c79e6fe6f.tar.gz
gnu: glibc: Add fixes for CVE-2014-7817 and CVE-2012-3406.
* gnu/packages/patches/glibc-CVE-2012-3406.patch,
  gnu/packages/patches/glibc-CVE-2014-7817.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/base.scm (glibc): Add patches.
Diffstat (limited to 'gnu/packages/base.scm')
-rw-r--r--gnu/packages/base.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 5bf27c9ef1..117ee74b97 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -375,7 +375,9 @@ included.")
                 (("use_ldconfig=yes")
                  "use_ldconfig=no")))
             (modules '((guix build utils)))
-            (patches (list (search-patch "glibc-ldd-x86_64.patch")))))
+            (patches (list (search-patch "glibc-CVE-2014-7817.patch")
+                           (search-patch "glibc-CVE-2012-3406.patch")
+                           (search-patch "glibc-ldd-x86_64.patch")))))
    (build-system gnu-build-system)
 
    ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc