diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
| commit | ca4fd41de892c7055ce140863382c332441b15d3 (patch) | |
| tree | 39872899c5bc649e11172dccb2f262a56f234661 /gnu/packages/base.scm | |
| parent | 7276eca4dcbe513922d5a778ee5fc8f2b2649642 (diff) | |
| parent | 648c896ad3b198a1742c1ee8f66a1922aa98c1d8 (diff) | |
| download | guix-ca4fd41de892c7055ce140863382c332441b15d3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7e1177db9d..16c6a15a58 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -509,6 +509,7 @@ store.") (package (name "glibc") (version "2.25") + (replacement glibc/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" @@ -812,6 +813,15 @@ GLIBC/HURD for a Hurd host" (define-syntax glibc (identifier-syntax (glibc-for-target))) +(define glibc/fixed + (package + (inherit glibc) + (source (origin + (inherit (package-source glibc)) + (patches (append + (origin-patches (package-source glibc)) + (search-patches "glibc-CVE-2017-15670-15671.patch"))))))) + ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) @@ -831,6 +841,7 @@ GLIBC/HURD for a Hurd host" "glibc-o-largefile.patch" "glibc-vectorized-strcspn-guards.patch" "glibc-CVE-2015-5180.patch" + "glibc-CVE-2017-15670-15671.patch" "glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt2.patch" "glibc-CVE-2017-1000366-pt3.patch")))))) @@ -854,6 +865,7 @@ GLIBC/HURD for a Hurd host" "glibc-CVE-2016-3075.patch" "glibc-CVE-2016-3706.patch" "glibc-CVE-2016-4429.patch" + "glibc-CVE-2017-15670-15671.patch" "glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt2.patch" "glibc-CVE-2017-1000366-pt3.patch")))))) @@ -876,6 +888,7 @@ GLIBC/HURD for a Hurd host" "glibc-CVE-2016-3075.patch" "glibc-CVE-2016-3706.patch" "glibc-CVE-2016-4429.patch" + "glibc-CVE-2017-15670-15671.patch" "glibc-CVE-2017-1000366-pt1.patch" "glibc-CVE-2017-1000366-pt2.patch" "glibc-CVE-2017-1000366-pt3.patch")))) |