Date: Thursday, August 9, 2018 @ 18:39:54 Author: lcarlier Revision: 331308
upgpkg: xorg-server 1.20.1-1 upstream update 1.20.1 Modified: xorg-server/trunk/PKGBUILD Deleted: xorg-server/trunk/0001-Xext-shm-Refuse-to-work-for-remote-clients.patch xorg-server/trunk/0003_Use_PictureMatchFormat_for_source-only_picture_format.diff xorg-server/trunk/meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch xorg-server/trunk/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch xorg-server/trunk/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch xorg-server/trunk/xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch ------------------------------------------------------------------------------------------+ 0001-Xext-shm-Refuse-to-work-for-remote-clients.patch | 60 ---------- 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff | 34 ----- PKGBUILD | 35 ----- meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch | 36 ------ xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch | 28 ---- xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch | 29 ---- xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch | 18 --- 7 files changed, 3 insertions(+), 237 deletions(-) Deleted: 0001-Xext-shm-Refuse-to-work-for-remote-clients.patch =================================================================== --- 0001-Xext-shm-Refuse-to-work-for-remote-clients.patch 2018-08-09 18:38:04 UTC (rev 331307) +++ 0001-Xext-shm-Refuse-to-work-for-remote-clients.patch 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,60 +0,0 @@ -From ec7e2b54c5b4a34b2a077082967bc3ead30e227e Mon Sep 17 00:00:00 2001 -From: Alexander Volkov <a.vol...@rusbitech.ru> -Date: Tue, 5 Jun 2018 13:05:39 +0300 -Subject: [PATCH] Xext/shm: Refuse to work for remote clients - -Avoid access to System V shared memory segment on the X server side -for clients forwarded via SSH. Also prevent them from hanging while -waiting for the reply from the ShmCreateSegment request. - -v2: Allow ShmQueryVersion request even for remote clients - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=11080 -Signed-off-by: Alexander Volkov <a.vol...@rusbitech.ru> -Reviewed-by: Adam Jackson <a...@redhat.com> -Signed-off-by: Laurent Carlier <lordhea...@gmail.com> ---- - Xext/shm.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index fc8441c..896a966 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -1302,9 +1302,14 @@ static int - ProcShmDispatch(ClientPtr client) - { - REQUEST(xReq); -- switch (stuff->data) { -- case X_ShmQueryVersion: -+ -+ if (stuff->data == X_ShmQueryVersion) - return ProcShmQueryVersion(client); -+ -+ if (!client->local) -+ return BadRequest; -+ -+ switch (stuff->data) { - case X_ShmAttach: - return ProcShmAttach(client); - case X_ShmDetach: -@@ -1461,9 +1466,14 @@ static int _X_COLD - SProcShmDispatch(ClientPtr client) - { - REQUEST(xReq); -- switch (stuff->data) { -- case X_ShmQueryVersion: -+ -+ if (stuff->data == X_ShmQueryVersion) - return SProcShmQueryVersion(client); -+ -+ if (!client->local) -+ return BadRequest; -+ -+ switch (stuff->data) { - case X_ShmAttach: - return SProcShmAttach(client); - case X_ShmDetach: --- -2.17.1 - Deleted: 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff =================================================================== --- 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff 2018-08-09 18:38:04 UTC (rev 331307) +++ 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,34 +0,0 @@ -From 3ebef6ab850675e1091df2125ebdfbb147436e6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daen...@amd.com> -Date: Fri, 1 Jun 2018 11:57:15 +0200 -Subject: exa: Use PictureMatchFormat for source-only picture format - description - -Their pFormat member is NULL, which resulted in a crash in -miRenderColorToPixel. - -Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for - solid pixels (v2.1)" -Reviewed-by: Adam Jackson <a...@redhat.com> ---- - exa/exa_render.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/exa/exa_render.c b/exa/exa_render.c -index 50a9a65..9fbfdfc 100644 ---- a/exa/exa_render.c -+++ b/exa/exa_render.c -@@ -291,7 +291,8 @@ exaTryDriverSolidFill(PicturePtr pSrc, - pixel = exaGetPixmapFirstPixel(pSrcPix); - } - else -- miRenderColorToPixel(pSrc->pFormat, -+ miRenderColorToPixel(PictureMatchFormat(pDst->pDrawable->pScreen, 32, -+ pSrc->format), - &pSrc->pSourcePict->solidFill.fullcolor, - &pixel); - --- -cgit v1.1 - - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-09 18:38:04 UTC (rev 331307) +++ PKGBUILD 2018-08-09 18:39:54 UTC (rev 331308) @@ -5,8 +5,8 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.20.0 -pkgrel=9 +pkgver=1.20.1 +pkgrel=1 arch=('x86_64') license=('custom') groups=('xorg') @@ -22,12 +22,6 @@ xserver-autobind-hotplug.patch 0001-v2-FS-58644.patch 0002-fix-libshadow-2.patch - 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff - xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch - xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch - meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch - xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch - 0001-Xext-shm-Refuse-to-work-for-remote-clients.patch xvfb-run # with updates from FC master xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' @@ -34,18 +28,12 @@ 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' '995ED5C8A6138EB0961F18474C09DD83CAAA50B2') -sha512sums=('1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde' +sha512sums=('ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b' 'SKIP' 'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e' 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271' - 'afe5c58d86089f02d4f3b7d0e6912cd3d75a17522b40e9cd7d4c69611740174884de3455940c6a565ffaad0f4e7e4f7ebeab72b79e8c6ef15da57418fbedcf0d' - 'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7' - 'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631' - '1990daa38f2eba161ecc2f310711af85e3d76c78ca45e002dff3697da2f8a2dc53d9371b1e7e55be80a002ef9cb095c6675e19021f270d06cf2b4ea728407aea' - 'e6339cb1c41e26a43caae7f3e991e9f528000676c29f5bc5a29c99bab2a5f5529efba2b9226a63d138700e6228b234eccd2982d40052b4ee41cfdff96dcc1521' - '8192f5ace7cb3780afaf06211c8a294fc3a1de27884432670f96a1f1cb0354e01a61a9e599097c9ac660b171f97f75632a7ef799df9df817425466ba5fb3c4f0' '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') @@ -62,26 +50,9 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=106588 patch -Np1 -i ../0001-v2-FS-58644.patch - # Fix XWayland hangs - FS#58705 - # https://patchwork.freedesktop.org/series/43618/ - patch -Np1 -i ../xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch - patch -Np1 -i ../xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch - # Fix libshadow.so: libfb.so => not found - FS#58731 # https://bugs.freedesktop.org/show_bug.cgi?id=106656 patch -Np1 -i ../0002-fix-libshadow-2.patch - - # FS#58662 - patch -Np1 -i ../0003_Use_PictureMatchFormat_for_source-only_picture_format.diff - - # Display incorrect when rotated 90 degree - FS#58637 - patch -Np1 -i ../xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch - - # xserver by default listens on tcp sockets - FS#59025 - patch -Np1 -i ../meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch - - # SSH X11 forwarding no longer works for Qt apps - FS#58962 - patch -Np1 -i ../0001-Xext-shm-Refuse-to-work-for-remote-clients.patch } build() { Deleted: meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch =================================================================== --- meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch 2018-08-09 18:38:04 UTC (rev 331307) +++ meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,36 +0,0 @@ -diff --git a/include/meson.build b/include/meson.build -index f76f557..dfca3c3 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -153,10 +153,10 @@ conf_data.set('BUSFAULT', conf_data.get('HAVE_SIGACTION')) - conf_data.set('_XTYPEDEF_POINTER', '1') - conf_data.set('_XITYPEDEF_POINTER', '1') - -+conf_data.set('LISTEN_TCP', get_option('listen_tcp')) -+conf_data.set('LISTEN_UNIX', get_option('listen_unix')) -+conf_data.set('LISTEN_LOCAL', get_option('listen_local')) - # XXX: Configurable? --conf_data.set('LISTEN_TCP', '1') --conf_data.set('LISTEN_UNIX', '1') --conf_data.set('LISTEN_LOCAL', '1') - conf_data.set('XTRANS_SEND_FDS', '1') - - conf_data.set('TCPCONN', '1') -diff --git a/meson_options.txt b/meson_options.txt -index 86fca46..3453b8d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -45,6 +45,13 @@ option('vendor_name_short', type: 'string', value: 'X.Org') - option('vendor_web', type: 'string', value: 'http://wiki.x.org') - option('os_vendor', type: 'string', value: '') - -+option('listen_tcp', type: 'boolean', value: false, -+ description: 'Listen on TCP by default') -+option('listen_unix', type: 'boolean', value: true, -+ description: 'Listen on Unix by default') -+option('listen_local', type: 'boolean', value: true, -+ description: 'Listen on local by default') -+ - option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'], - value: 'auto', - description: 'Xorg int10 backend (default: usually x86emu)') Deleted: xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch =================================================================== --- xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch 2018-08-09 18:38:04 UTC (rev 331307) +++ xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,28 +0,0 @@ -diff --git a/glamor/glamor.c b/glamor/glamor.c -index d984d20f3..e2c74d17a 100644 ---- a/glamor/glamor.c -+++ b/glamor/glamor.c -@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, - glamor_get_screen_private(pixmap->drawable.pScreen); - - if (!glamor_priv->dri3_enabled) -- return -1; -+ return 0; - switch (pixmap_priv->type) { - case GLAMOR_TEXTURE_DRM: - case GLAMOR_TEXTURE_ONLY: - if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ? - GL_RGB10_A2 : GL_RGBA, 0)) -- return -1; -+ return 0; - return glamor_egl_fds_from_pixmap(screen, pixmap, fds, - strides, offsets, - modifier); - default: - break; - } -- return -1; -+ return 0; - } - - _X_EXPORT int Deleted: xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch =================================================================== --- xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch 2018-08-09 18:38:04 UTC (rev 331307) +++ xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,29 +0,0 @@ -diff --git a/glamor/glamor.c b/glamor/glamor.c -index e2c74d17a..63f0947fa 100644 ---- a/glamor/glamor.c -+++ b/glamor/glamor.c -@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen, - &modifier); - - /* Pixmaps with multi-planes/modifier are not supported in this interface */ -- if (ret > 1) { -- while (ret > 0) -- close(fds[--ret]); -- return -1; -+ if (ret == 1 && offsets[0] == 0) { -+ *stride = strides[0]; -+ *size = pixmap->drawable.height * *stride; -+ return fds[0]; - } - -- ret = fds[0]; -- *stride = strides[0]; -- *size = pixmap->drawable.height * *stride; -- -- return ret; -+ while (ret > 0) -+ close(fds[--ret]); -+ return -1; - } - - _X_EXPORT int Deleted: xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch =================================================================== --- xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch 2018-08-09 18:38:04 UTC (rev 331307) +++ xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch 2018-08-09 18:39:54 UTC (rev 331308) @@ -1,18 +0,0 @@ -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 859a21a9d..ec11b3f56 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height) - return NULL; - } - -- ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth, -- drmmode->kbpp, -- drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo), -- drmmode_bo_get_handle(&drmmode_crtc->rotate_bo), -- &drmmode_crtc->rotate_fb_id); -+ ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo, -+ &drmmode_crtc->rotate_fb_id); - - if (ret) { - ErrorF("failed to add rotate fb\n");