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

gnu: glibc: Incorporate grafted changes. 

* gnu/packages/base.scm (glibc/linux)[source](patches): Add
'glibc-CVE-2017-15670-15671.patch'.
(glibc/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2017-10-24 22:04:29 +02:00
parent a9c4f1ba51
commit 2cce5fc598
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/base.scm
View File

@ -509,7 +509,6 @@ store.")
(package (package
(name "glibc") (name "glibc")
(version "2.25") (version "2.25")
(replacement glibc/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" (uri (string-append "mirror://gnu/glibc/glibc-"
@ -530,6 +529,7 @@ store.")
"glibc-o-largefile.patch" "glibc-o-largefile.patch"
"glibc-memchr-overflow-i686.patch" "glibc-memchr-overflow-i686.patch"
"glibc-vectorized-strcspn-guards.patch" "glibc-vectorized-strcspn-guards.patch"
"glibc-CVE-2017-15670-15671.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"
"glibc-CVE-2017-1000366-pt3.patch")))) "glibc-CVE-2017-1000366-pt3.patch"))))
@ -813,15 +813,6 @@ GLIBC/HURD for a Hurd host"
(define-syntax glibc (define-syntax glibc
(identifier-syntax (glibc-for-target))) (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 ;; Below are old libc versions, which we use mostly to build locale data in
;; the old format (which the new libc cannot cope with.) ;; the old format (which the new libc cannot cope with.)