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

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 565e24c4e4710a5b81cce5cfb619b3e474e7f65c
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 10 20:09:20 2017 +0200

    gnu: libxfont2: Graft fixes for CVE-2017-13720, CVE-2017-13722.
    
    This is a followup to 97ecd75e289d96a8b4f9b1ae877d9d1a2f6774b4.
    
    * gnu/packages/xorg.scm (libxfont2)[source](patches): Remove.
    [replacement]: New field.
    (libxfont2/fixed): New variable.
---
 gnu/packages/xorg.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 850cc94..6a0835e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4893,16 +4893,24 @@ new API's in libXft, or the legacy API's in libX11.")
   (package
     (inherit libxfont)
     (version "2.0.1")
+    (replacement libxfont2/fixed)
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/lib/libXfont2-"
                                   version ".tar.bz2"))
-              (patches (search-patches "libxfont-CVE-2017-13720.patch"
-                                       "libxfont-CVE-2017-13722.patch"))
               (sha256
                (base32
                 "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
   (package
     (name "libxi")