BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xorg.xorgserver: 1.20.13 -> 1.20.14

Browse source 
https://lists.x.org/archives/xorg-announce/2021-December/003124.html
This commit is contained in:
Vladimír Čunát 2022-05-23 18:08:39 +02:00
parent 43b7c9611c
commit 1e65cb9c88
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
pname = "xorg-server";
version = "1.20.13";
version = "1.20.14";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz";
sha256 = "003371ad64bz7i2hx7idnh90yw12dbh116ssy40s70balnb4xaj0";
url = "mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz";
sha256 = "0sx18vsxr0dg9z7b9ph1gz6q4pmxc1n6b4sbb7i47578kc5vgiaw";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];

10
pkgs/servers/x11/xorg/overrides.nix
View file

@ -686,16 +686,6 @@ self: super:
then {
outputs = [ "out" "dev" ];
patches = [
# https://lists.x.org/archives/xorg-announce/2021-December/003122.html
(fpgit "ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60"
"sNi16FqN4rS4s8j5+PUVeOQBasccCkB5KvywP7xl28M=" "CVE-2021-4008")
(fpgit "b5196750099ae6ae582e1f46bd0a6dad29550e02"
"5hgzQXBBaJfhSTa9hs8K2N1fQ6+Vp8TTkertmQhkw8Y=" "CVE-2021-4009")
(fpgit "6c4c53010772e3cb4cb8acd54950c8eec9c00d21"
"1gGG9RpjLMi7Emwh13/z5CN1+ISLsPL3hJXP5gQcNkE=" "CVE-2021-4010")
(fpgit "e56f61c79fc3cee26d83cda0f84ae56d5979f768"
"e1KgSXGwwI3GgcYeWaF3KHPmkE4tf9VTqvfTYqRpysY=" "CVE-2021-4011")
# The build process tries to create the specified logdir when building.
#
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail