diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-07-17 08:22:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-07-17 08:22:45 +0200 |
| commit | f888751efd9fb66e03e31c9ae761056e953f9747 (patch) | |
| tree | b78302dc1e86b8d13cf388d7c526d7c4541a3c80 /pkgs | |
| parent | c11601cdcd3ca4248906e2d06453076359b3280d (diff) | |
| parent | 98137b4db197b42b62d2f445255e88b36f73595f (diff) | |
| download | nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar.gz nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar.bz2 nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar.lz nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar.xz nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.tar.zst nixpkgs-f888751efd9fb66e03e31c9ae761056e953f9747.zip | |
Merge #181702: xorg.xorgserver: patch two CVEs
...into staging-next
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 743029a4fa7..e8c6caa721b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -805,6 +805,23 @@ self: super: url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff"; sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy"; }) + ] + # TODO: remove with xorgserver >= 21.1.4; https://lists.x.org/archives/xorg/2022-July/061035.html + ++ [ + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/f1070c01d616c5f21f939d5ebc533738779451ac.diff"; + sha256 = "5hcreV3ND8Lklvo7QMpB0VWQ2tifIamRlCr6J82qXt8="; + }) + (fetchpatch { + name = "CVE-2022-2319.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/6907b6ea2b4ce949cb07271f5b678d5966d9df42.diff"; + sha256 = "gWXCalWj2SF4U7wSFGIgK396B0Fs3EtA/EL+34m3FWY="; + }) + (fetchpatch { + name = "CVE-2022-2320.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.diff"; + sha256 = "rBiiXQRreMvexW9vOKblcfCYzul+9La01EAhir4FND8="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ |