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

gnu: libxfont2: Graft fixes for CVE-2017-13720, CVE-2017-13722. 

This is a followup to 97ecd75e28.

* gnu/packages/xorg.scm (libxfont2)[source](patches): Remove.
[replacement]: New field.
(libxfont2/fixed): New variable.
This commit is contained in:
Marius Bakke 2017-10-10 20:09:20 +02:00
parent 8cf892e6cd
commit 565e24c4e4
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/xorg.scm
View File

@ -4893,16 +4893,24 @@ new API's in libXft, or the legacy API's in libX11.")
(package (package
(inherit libxfont) (inherit libxfont)
(version "2.0.1") (version "2.0.1")
(replacement libxfont2/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://xorg/individual/lib/libXfont2-" (uri (string-append "mirror://xorg/individual/lib/libXfont2-"
version ".tar.bz2")) version ".tar.bz2"))
(patches (search-patches "libxfont-CVE-2017-13720.patch"
"libxfont-CVE-2017-13722.patch"))
(sha256 (sha256
(base32 (base32
"0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9")))))) "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"))))))
(define libxfont2/fixed
(package
(inherit libxfont2)
(source
(origin
(inherit (package-source libxfont2))
(patches (search-patches "libxfont-CVE-2017-13720.patch"
"libxfont-CVE-2017-13722.patch"))))))
(define-public libxi (define-public libxi
(package (package
(name "libxi") (name "libxi")