diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 11:53:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 19:25:54 +0200 |
| commit | f7b1bf41bb04bb60cc55886797d6e026585a8f51 (patch) | |
| tree | afa8cd6a3a6765847ccf749f78fcab321821ced6 | |
| parent | unrar: 5.5.7 -> 5.5.8 (diff) | |
| download | nixpkgs-f7b1bf41bb04bb60cc55886797d6e026585a8f51.tar.gz | |
xorg libXfont2, libXres: security updates
CVE-2013-1988, CVE-2017-{13720,13722}
(cherry picked from commit 6328c76e7785791c0397f43eaace1f85cbf33164)
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3e81a0e4260c..b22f18f6bc45 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -790,11 +790,11 @@ let }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXfont2 = (mkDerivation "libXfont2" { - name = "libXfont2-2.0.1"; + name = "libXfont2-2.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; - sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; + url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2; + sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; @@ -900,11 +900,11 @@ let }) // {inherit renderproto libX11 xproto ;}; libXres = (mkDerivation "libXres" { - name = "libXres-1.0.7"; + name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; - sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; + url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; + sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4c10eec667c2..aecdff45a58b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -69,7 +69,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -79,7 +79,7 @@ mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 -mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 |