JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg.xorgserver: security 1.19.1 -> 1.19.2

Browse Source 
Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.
This commit is contained in:
Vladimír Čunát 2017-03-04 08:21:22 +01:00
parent f8e5b8dbe2
commit da3c0ac19c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/x11/xorg/default.nix
View File

@ -2364,11 +2364,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
xorgserver = (mkDerivation "xorgserver" { xorgserver = (mkDerivation "xorgserver" {
name = "xorg-server-1.19.1"; name = "xorg-server-1.19.2";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2; url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2;
sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"; sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg";
}; };
buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; 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; meta.platforms = stdenv.lib.platforms.unix;

5
pkgs/servers/x11/xorg/overrides.nix
View File

@ -394,6 +394,11 @@ in
let let
attrs = with args; attrs = with args;
if (args.abiCompat == null) then attrs_passed 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 { else if (args.abiCompat == "1.17") then {
name = "xorg-server-1.17.4"; name = "xorg-server-1.17.4";
builder = ./builder.sh; builder = ./builder.sh;