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

Merge pull request #281349 from K900/xorg-security

Browse Source 
Xorg security updates for 2024-01-16
This commit is contained in:
K900
2024-01-16 18:56:45 +03:00
committed by GitHub
parent e9ef35aac7 3b22cec460
commit b1ca453d65
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/x11/xorg/default.nix
+9 -9
View File
@@ -1450,7 +1450,7 @@ self: with self; {
buildInputs = [ libX11 libXext xorgproto libXt ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xmuu" "xmu" ];
pkgConfigModules = [ "xmu" "xmuu" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -1650,7 +1650,7 @@ self: with self; {
buildInputs = [ xorgproto libX11 libXext libXv ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xvmc-wrapper" "xvmc" ];
pkgConfigModules = [ "xvmc" "xvmc-wrapper" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -1811,7 +1811,7 @@ self: with self; {
buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-composite" "xcb-xtest" "xcb-record" "xcb-glx" "xcb-dpms" "xcb-xevie" "xcb-dri2" "xcb-shm" "xcb-sync" "xcb-xprint" "xcb-dri3" "xcb-screensaver" "xcb-render" "xcb-xkb" "xcb-xinput" "xcb-shape" "xcb-ge" "xcb-xfixes" "xcb" "xcb-damage" "xcb-present" "xcb-xf86dri" "xcb-xvmc" "xcb-randr" "xcb-xinerama" "xcb-xselinux" "xcb-xv" "xcb-res" ];
pkgConfigModules = [ "xcb" "xcb-composite" "xcb-damage" "xcb-dbe" "xcb-dpms" "xcb-dri2" "xcb-dri3" "xcb-ge" "xcb-glx" "xcb-present" "xcb-randr" "xcb-record" "xcb-render" "xcb-res" "xcb-screensaver" "xcb-shape" "xcb-shm" "xcb-sync" "xcb-xevie" "xcb-xf86dri" "xcb-xfixes" "xcb-xinerama" "xcb-xinput" "xcb-xkb" "xcb-xprint" "xcb-xselinux" "xcb-xtest" "xcb-xv" "xcb-xvmc" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -2271,7 +2271,7 @@ self: with self; {
buildInputs = [ gperf libxcb xorgproto ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-atom" "xcb-event" "xcb-aux" "xcb-util" ];
pkgConfigModules = [ "xcb-atom" "xcb-aux" "xcb-event" "xcb-util" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -2391,7 +2391,7 @@ self: with self; {
buildInputs = [ gperf libxcb xorgproto ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-icccm" "xcb-ewmh" ];
pkgConfigModules = [ "xcb-ewmh" "xcb-icccm" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -4151,7 +4151,7 @@ self: with self; {
buildInputs = [ libXt ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xf86vidmodeproto" "xineramaproto" "xproxymngproto" "glproto" "presentproto" "applewmproto" "xcmiscproto" "recordproto" "resourceproto" "printproto" "xcalibrateproto" "renderproto" "fontsproto" "dpmsproto" "kbproto" "videoproto" "dri2proto" "bigreqsproto" "dri3proto" "evieproto" "inputproto" "fixesproto" "lg3dproto" "xf86rushproto" "compositeproto" "xwaylandproto" "trapproto" "dmxproto" "xextproto" "xproto" "xf86dgaproto" "xf86miscproto" "xf86bigfontproto" "windowswmproto" "scrnsaverproto" "damageproto" "xf86driproto" "randrproto" "fontcacheproto" ];
pkgConfigModules = [ "applewmproto" "bigreqsproto" "compositeproto" "damageproto" "dmxproto" "dpmsproto" "dri2proto" "dri3proto" "evieproto" "fixesproto" "fontcacheproto" "fontsproto" "glproto" "inputproto" "kbproto" "lg3dproto" "presentproto" "printproto" "randrproto" "recordproto" "renderproto" "resourceproto" "scrnsaverproto" "trapproto" "videoproto" "windowswmproto" "xcalibrateproto" "xcmiscproto" "xextproto" "xf86bigfontproto" "xf86dgaproto" "xf86driproto" "xf86miscproto" "xf86rushproto" "xf86vidmodeproto" "xineramaproto" "xproto" "xproxymngproto" "xwaylandproto" ];
platforms = lib.platforms.unix;
};
})) {};
@@ -4159,11 +4159,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xorg-server";
version = "21.1.10";
version = "21.1.11";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz";
sha256 = "1l0iaq83vbl9jr34sa7v7630c5bnp64drlw8yg6c6yn5xyib7c6f";
url = "mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz";
sha256 = "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+1 -1
View File
@@ -332,7 +332,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
my $pcProvidesStr = "";
if (defined $pcProvides{$pkg}) {
$pcProvidesStr = join "", map { "\"" . $_ . "\" " } @{$pcProvides{$pkg}};
$pcProvidesStr = join "", map { "\"" . $_ . "\" " } (sort @{$pcProvides{$pkg}});
}
print OUT <<EOF
pkgs/servers/x11/xorg/tarballs.list
+1 -1
View File
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz
mirror://xorg/individual/util/makedepend-1.0.8.tar.xz
mirror://xorg/individual/util/util-macros-1.20.0.tar.xz
mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz
mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz
pkgs/servers/x11/xorg/xwayland.nix
+2 -2
View File
@@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "xwayland";
version = "23.2.3";
version = "23.2.4";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-652apyMsR0EsiDXsFal8V18DVjcmx4d1T/DAGb0H4wI=";
sha256 = "sha256-qZ4Vm20NMwmLO2qyKoi/zs4jyLnQynLFNcVdywaBtGs=";
};
depsBuildBuild = [