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

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 4a93a8a3bc2d79297eacd426cebc97917dbf6357
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 10 23:11:13 2017 +0200

    Revert "gnu: libxfont2: Graft fixes for CVE-2017-13720, CVE-2017-13722."
    
    This reverts commit 565e24c4e4710a5b81cce5cfb619b3e474e7f65c.
---
 gnu/packages/xorg.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dea829b..143962a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4892,24 +4892,16 @@ 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")