Date: Thursday, November 19, 2020 @ 08:24:08 Author: andyrtr Revision: 401376
upgpkg: xorg-server 1.20.9+21+g5c400cae1-1: update to latest git commit from stable branch Modified: xorg-server/trunk/PKGBUILD Deleted: xorg-server/trunk/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch -----------------------------------------------------------------+ 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch | 34 ----- PKGBUILD | 65 ++++++---- 2 files changed, 39 insertions(+), 60 deletions(-) Deleted: 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch =================================================================== --- 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch 2020-11-19 07:59:35 UTC (rev 401375) +++ 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch 2020-11-19 08:24:08 UTC (rev 401376) @@ -1,34 +0,0 @@ -From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 31 Aug 2020 12:10:43 +0200 -Subject: [PATCH] xfree86: Take second reference for SavedCursor in - xf86CursorSetCursor - -The same pointer is kept in CurrentCursor as well, therefore two -RefCursor calls are needed. - -Fixes use-after-free after switching VTs. - -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 -Signed-off-by: Laurent Carlier <[email protected]> ---- - hw/xfree86/ramdac/xf86CursorRD.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c -index 9aa3de97b..c8362d169 100644 ---- a/hw/xfree86/ramdac/xf86CursorRD.c -+++ b/hw/xfree86/ramdac/xf86CursorRD.c -@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, - ScreenPriv->HotY = cursor->bits->yhot; - - if (!infoPtr->pScrn->vtSema) { -+ cursor = RefCursor(cursor); -+ if (ScreenPriv->SavedCursor) -+ FreeCursor(ScreenPriv->SavedCursor, None); - ScreenPriv->SavedCursor = cursor; - return; - } --- -2.28.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-19 07:59:35 UTC (rev 401375) +++ PKGBUILD 2020-11-19 08:24:08 UTC (rev 401376) @@ -4,8 +4,11 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.20.9 -pkgrel=3 + +_commit=5c400cae1f9817045378966effa6bca91e45aead # server-1.20-branch 2020-11-09 + +pkgver=1.20.9+21+g5c400cae1 +pkgrel=1 arch=('x86_64') license=('custom') groups=('xorg') @@ -15,12 +18,12 @@ 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' - 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson' 'git') +source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + "git+https://gitlab.freedesktop.org/xorg/xserver#commit=$_commit"; xserver-autobind-hotplug.patch 0001-v2-FS-58644.patch 0002-fix-libshadow-2.patch - 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch xvfb-run # with updates from FC master xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' @@ -28,17 +31,21 @@ 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' '' '3BB639E56F861FA2E86505690FDD682D974CA72A') -sha512sums=('d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6' - 'SKIP' - 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' - '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' - '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' - '7511af2aa99e2f6398987350ad0ff089c22c10017d40981ab610201b953ca4b29cd24aa1ff201ba792f03bdcca7d59d34c2809f4691f84bd86e8ec8016dd279d' - '4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514' - 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') +sha256sums=('SKIP' + 'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8' + '6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4' + 'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e' + 'd709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') +pkgver() { + cd xserver + git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g' +} + prepare() { - cd "${pkgbase}-${pkgver}" + #cd "${pkgbase}"-${pkgver}" + cd xserver # patch from Fedora, not yet merged patch -Np1 -i ../xserver-autobind-hotplug.patch @@ -49,9 +56,6 @@ # Fix libshadow.so: libfb.so => not found - merge in master patch -Np1 -i ../0002-fix-libshadow-2.patch - - # Fix FS#67774 - merged upstream - patch -Np1 -i ../0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch } build() { @@ -62,7 +66,8 @@ export CXXFLAGS=${CXXFLAGS/-fno-plt} export LDFLAGS=${LDFLAGS/,-z,now} - arch-meson ${pkgbase}-$pkgver build \ + #arch-meson ${pkgbase}-$pkgver build \ + arch-meson xserver build \ -D os_vendor="Arch Linux" \ -D ipv6=true \ -D xvfb=true \ @@ -104,9 +109,11 @@ _install fakeinstall/usr/lib/xorg/protocol.txt _install fakeinstall/usr/share/man/man1/Xserver.1 - install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled + #install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled + install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server() { @@ -135,7 +142,8 @@ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server-xephyr() { @@ -148,7 +156,8 @@ _install fakeinstall/usr/share/man/man1/Xephyr.1 # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server-xvfb() { @@ -163,7 +172,8 @@ install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server-xnest() { @@ -174,7 +184,8 @@ _install fakeinstall/usr/share/man/man1/Xnest.1 # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server-xwayland() { @@ -185,7 +196,8 @@ _install fakeinstall/usr/bin/Xwayland # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING } package_xorg-server-devel() { @@ -199,7 +211,8 @@ _install fakeinstall/usr/share/aclocal/xorg-server.m4 # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING # make sure there are no files left to install find fakeinstall -depth -print0 | xargs -0 rmdir
