xorg-server: security 1.19.2 -> 1.19.4

CVE-2017-{13721,13723} https://lists.x.org/archives/xorg-announce/2017-October/002808.html (cherry picked from commits 07efaaa and 35b4c8b)
NixOS · Oct 8, 2017 · ab269d8 · ab269d8
1 parent 3824456
commit ab269d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
@@ -2364,11 +2364,11 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.19.2";
+    name = "xorg-server-1.19.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2;
-      sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2;
+      sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
@@ -394,11 +394,6 @@ in
     let
       attrs = with args;
         if (args.abiCompat == null) then attrs_passed
-            # All this just for 1.19.2, as the tarball is incorrectly autotoolized.
-            // {
-              nativeBuildInputs = [ utilmacros fontutil ];
-              preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi";
-            }
         else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;

diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2