pyrox.dev
Merge pull request #105631 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.9 -> 1.20.10 (CVE-2020-14360 CVE-2020-25712)
authored by
Timo Kaufmann
and committed by
GitHub
925640d4
9b7113f4
+3
-3
pkgs/servers/x11/xorg/default.nix
+3
-3
pkgs/servers/x11/xorg/default.nix
···
2692
2692
}) {};
2693
2693
2694
2694
xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
2695
-
name = "xorg-server-1.20.9";
2695
+
name = "xorg-server-1.20.10";
2696
2696
builder = ./builder.sh;
2697
2697
src = fetchurl {
2698
-
url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2";
2699
-
sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2";
2698
+
url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2";
2699
+
sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p";
2700
2700
};
2701
2701
hardeningDisable = [ "bindnow" "relro" ];
2702
2702
nativeBuildInputs = [ pkgconfig ];
-10
pkgs/servers/x11/xorg/overrides.nix
-10
pkgs/servers/x11/xorg/overrides.nix
···
630
630
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
631
631
udev
632
632
];
633
-
# patchPhase is not working, this is a hack but we can remove it in the next xorg-server release
634
-
preConfigure = let
635
-
# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
636
-
headerFix = fetchpatch {
637
-
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch";
638
-
sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq";
639
-
};
640
-
in ''
641
-
patch -p1 < ${headerFix}
642
-
'';
643
633
prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
644
634
export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
645
635
'';
+1
-1
pkgs/servers/x11/xorg/tarballs.list
+1
-1
pkgs/servers/x11/xorg/tarballs.list
···
218
218
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
219
219
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
220
220
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
221
-
mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2
221
+
mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2