git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #105631 from TredwellGit/xorg.xorgserver

xorg.xorgserver: 1.20.9 -> 1.20.10 (CVE-2020-14360 CVE-2020-25712)

commit925640d499baa690426bfce55101f953454ffa1d authorTimo Kaufmann <timokau@zoho.com> dateFri 4 Dec 2020, 22:28 (6 years ago) parent9b7113f0309973
3 files changed+4−14
compare with master
unifiedsplit
pkgs/servers/x11/xorg/default.nix+3−3 pkgs/servers/x11/xorg/overrides.nix−10 pkgs/servers/x11/xorg/tarballs.list+1−1
pkgs/servers/x11/xorg/default.nix+3−3
@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
26922692 }) {};
26932693
26942694 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";
26962696 builder = ./builder.sh;
26972697 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";
27002700 };
27012701 hardeningDisable = [ "bindnow" "relro" ];
27022702 nativeBuildInputs = [ pkgconfig ];
pkgs/servers/x11/xorg/overrides.nix−10
@@ -630,16 +630,6 @@ self: super:
630630 propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
631631 udev
632632 ];
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− '';
643633 prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
644634 export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
645635 '';
pkgs/servers/x11/xorg/tarballs.list+1−1
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
218218mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
219219mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
220220mirror://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