summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-10-10 23:11:13 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-10-10 23:11:13 +0200
commit4a93a8a3bc2d79297eacd426cebc97917dbf6357 (patch)
treeeff893f03b5ef18d6e01c30d7a21dba089b2b64e /gnu
parent128ea172b258c341e4b24cd7a567969ee9d045a2 (diff)
downloadguix-4a93a8a3bc2d79297eacd426cebc97917dbf6357.tar.gz
Revert "gnu: libxfont2: Graft fixes for CVE-2017-13720, CVE-2017-13722."
This reverts commit 565e24c4e4710a5b81cce5cfb619b3e474e7f65c.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/xorg.scm12
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dea829b569..143962a67d 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")