about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-01-07 17:50:01 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-01-07 17:51:22 +0100
commite01af040ed970371d0e0342dc89a9a5525fdef52 (patch)
tree86e2d5e80c1945c97cb63e759049e6d9e02d85e6 /pkgs/servers
parent20ab97773653893a60f7e8dce43cd39f637c3d4b (diff)
downloadnixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar.gz
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar.bz2
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar.lz
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar.xz
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.tar.zst
nixlib-e01af040ed970371d0e0342dc89a9a5525fdef52.zip
xorg.libXfont: bugfix update, CVE-2013-6462
This lib is deprecated and almost unused, but still...
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1be17e623f7d..a663f1435a3e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -680,11 +680,11 @@ let
   })) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
-    name = "libXfont-1.4.6";
+    name = "libXfont-1.4.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2;
-      sha256 = "17vy2p8myxx8644yd05qsl2qvv9m3mhdbniw87mcw5ywai2zxjyh";
+      url = mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2;
+      sha256 = "0hqm3nainxpc0922i4zbwzc768f69zkdf1gvkjqrdlim31aa6vni";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 4cf9c0362e0f..3814400c6675 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -65,7 +65,7 @@ mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
-mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2
+mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2