diff options
author | Platon Ryzhikov | 2020-12-31 20:04:00 +0300 |
---|---|---|
committer | Platon Ryzhikov | 2020-12-31 20:04:52 +0300 |
commit | 04e03922686c88a4137ff80537f372f5aab2d9ca (patch) | |
tree | cd6c4bb02336347994d13158d6738ae0157b4105 | |
parent | 3edef69d9b1b37de01bcba131050df4839c20c52 (diff) | |
download | aur-xorg-server-noudev.tar.gz |
update to 1.20.10-3
-rw-r--r-- | .SRCINFO | 41 | ||||
-rw-r--r-- | 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch | 34 | ||||
-rw-r--r-- | PKGBUILD | 86 |
3 files changed, 55 insertions, 106 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-server-noudev - pkgver = 1.20.9 - pkgrel = 2 + pkgver = 1.20.10 + pkgrel = 3 url = https://xorg.freedesktop.org arch = x86_64 arch = aarch64 @@ -33,30 +33,27 @@ pkgbase = xorg-server-noudev makedepends = xcb-util-keysyms makedepends = libxshmfence makedepends = libunwind + makedepends = meson + makedepends = git makedepends = wayland-protocols makedepends = egl-wayland - makedepends = meson - source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.9.tar.bz2 - source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.9.tar.bz2.sig + source = git+https://gitlab.freedesktop.org/xorg/xserver#commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 source = xserver-autobind-hotplug.patch source = 0001-v2-FS-58644.patch source = 0002-fix-libshadow-2.patch - source = 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch source = xvfb-run source = xvfb-run.1 validpgpkeys = 7B27A3F1A6E18CD9588B4AE8310180050905E40C validpgpkeys = C383B778255613DFDB409D91DB221A6900000011 validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3 - validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2 + validpgpkeys = validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A - sha512sums = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 - sha512sums = SKIP - sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22 - sha512sums = 74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363 - sha512sums = 3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1 - sha512sums = 7511af2aa99e2f6398987350ad0ff089c22c10017d40981ab610201b953ca4b29cd24aa1ff201ba792f03bdcca7d59d34c2809f4691f84bd86e8ec8016dd279d - sha512sums = 73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810 - sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22 + sha256sums = SKIP + sha256sums = cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8 + sha256sums = 6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4 + sha256sums = d07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e + sha256sums = 021e5d2d22fe7e707d5fe239433d828764ea8c141248b9a71fd4006286a4d275 + sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 pkgname = xorg-server-noudev pkgdesc = Xorg X server (without udev support) @@ -129,20 +126,6 @@ pkgname = xorg-server-xnest-noudev conflicts = xorg-server-xnest replaces = xorg-server-xnest -pkgname = xorg-server-xwayland-noudev - pkgdesc = run X clients under wayland (without udev support) - depends = libxfont2 - depends = libepoxy - depends = libunwind - depends = libgl - depends = pixman - depends = xorg-server-common-noudev - depends = nettle - depends = libtirpc - provides = xorg-server-xwayland - conflicts = xorg-server-xwayland - replaces = xorg-server-xwayland - pkgname = xorg-server-common-noudev pkgdesc = Xorg server common files (without udev support) depends = xkeyboard-config diff --git a/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch deleted file mode 100644 index 872259bb8093..000000000000 --- a/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com> -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 <lordheavym@gmail.com> ---- - 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 - @@ -9,9 +9,12 @@ pkgbase=xorg-server-noudev _pkgbase=xorg-server pkgname=('xorg-server-noudev' 'xorg-server-xephyr-noudev' 'xorg-server-xvfb-noudev' 'xorg-server-xnest-noudev' - 'xorg-server-xwayland-noudev' 'xorg-server-common-noudev' 'xorg-server-devel-noudev') -pkgver=1.20.9 -pkgrel=2 + 'xorg-server-common-noudev' 'xorg-server-devel-noudev') + +_commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10 + +pkgver=1.20.10 +pkgrel=3 arch=('x86_64' 'aarch64') license=('custom') groups=('xorg-noudev') @@ -21,30 +24,35 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans' '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' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig} + 'libxshmfence' 'libunwind' 'meson' 'git' + 'wayland-protocols' 'egl-wayland') +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' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' - '995ED5C8A6138EB0961F18474C09DD83CAAA50B2' + '' '3BB639E56F861FA2E86505690FDD682D974CA72A') -sha512sums=('d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6' - 'SKIP' - 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' - '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' - '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' - '7511af2aa99e2f6398987350ad0ff089c22c10017d40981ab610201b953ca4b29cd24aa1ff201ba792f03bdcca7d59d34c2809f4691f84bd86e8ec8016dd279d' - '73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810' - 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') +sha256sums=('SKIP' + 'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8' + '6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4' + 'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e' + '021e5d2d22fe7e707d5fe239433d828764ea8c141248b9a71fd4006286a4d275' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') + +pkgver() { + cd xserver + git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g' +} prepare() { - cd "${_pkgbase}-${pkgver}" + #cd "${_pkgbase}-${pkgver}" + cd xserver # patch from Fedora, not yet merged patch -Np1 -i ../xserver-autobind-hotplug.patch @@ -55,9 +63,6 @@ prepare() { # 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() { @@ -68,8 +73,9 @@ build() { export CXXFLAGS=${CXXFLAGS/-fno-plt} export LDFLAGS=${LDFLAGS/,-z,now} - arch-meson ${_pkgbase}-$pkgver build \ - -D os_vendor="Artix Linux" \ + #arch-meson ${_pkgbase}-$pkgver build \ + arch-meson xserver build \ + -D os_vendor="Artix Linux" \ -D ipv6=true \ -D xvfb=true \ -D xnest=true \ @@ -89,7 +95,7 @@ build() { # Print config meson configure build - ninja -C build -j2 + ninja -C build # fake installation to be seperated into packages DESTDIR="${srcdir}/fakeinstall" ninja -C build install @@ -115,9 +121,11 @@ package_xorg-server-common-noudev() { _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-noudev() { @@ -145,7 +153,8 @@ package_xorg-server-noudev() { 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 # SUID on Xorg to allow user to start it chmod u+s "${pkgdir}/usr/bin/Xorg" @@ -164,7 +173,8 @@ package_xorg-server-xephyr-noudev() { _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-noudev() { @@ -181,7 +191,8 @@ package_xorg-server-xvfb-noudev() { 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-noudev() { @@ -195,21 +206,8 @@ package_xorg-server-xnest-noudev() { _install fakeinstall/usr/share/man/man1/Xnest.1 # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING -} - -package_xorg-server-xwayland-noudev() { - pkgdesc="run X clients under wayland (without udev support)" - depends=(libxfont2 libepoxy libunwind libgl pixman xorg-server-common-noudev - nettle libtirpc) - provides=('xorg-server-xwayland') - conflicts=('xorg-server-xwayland') - replaces=('xorg-server-xwayland') - - _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-noudev() { @@ -226,8 +224,10 @@ package_xorg-server-devel-noudev() { _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 + rm fakeinstall/usr/bin/Xwayland find fakeinstall -depth -print0 | xargs -0 rmdir } |