mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/xorg-server to 1.20.9.r21.g5c400cae1-2
This commit is contained in:
Kevin Mihelich
parent
75c42551cd
commit
746929fe80
2 changed files with 40 additions and 61 deletions
|
|
@ -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
|
||||
|
||||
|
|
@ -7,8 +7,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.r21.g5c400cae1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
groups=('xorg')
|
||||
|
|
@ -18,12 +21,12 @@ 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' '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
|
||||
0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
|
||||
xvfb-run # with updates from FC master
|
||||
xvfb-run.1)
|
||||
|
|
@ -32,18 +35,22 @@ validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
|
|||
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
|
||||
''
|
||||
'3BB639E56F861FA2E86505690FDD682D974CA72A')
|
||||
sha512sums=('d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6'
|
||||
'SKIP'
|
||||
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
|
||||
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
|
||||
'3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1'
|
||||
'7511af2aa99e2f6398987350ad0ff089c22c10017d40981ab610201b953ca4b29cd24aa1ff201ba792f03bdcca7d59d34c2809f4691f84bd86e8ec8016dd279d'
|
||||
'9df57f5f00df22865880b726a835b0a68c6e460bcb7481418b83ee0521d93b329dbbbab278ef70c4b577e75bb46fe23535949eeba44fc41107d0726495ca77a7'
|
||||
'4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514'
|
||||
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
|
||||
sha256sums=('SKIP'
|
||||
'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8'
|
||||
'6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4'
|
||||
'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e'
|
||||
'12e2a4a330e3e253aa1064414e222deed3653b2da93963d85c9f58b0be993e03'
|
||||
'd709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845'
|
||||
'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 +62,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
|
||||
|
||||
# Fix segfault on probing a non-PCI platform device on a system with PCI
|
||||
patch -Np1 -i ../0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
|
||||
}
|
||||
|
|
@ -70,7 +74,8 @@ build() {
|
|||
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 \
|
||||
|
|
@ -112,9 +117,11 @@ package_xorg-server-common() {
|
|||
_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() {
|
||||
|
|
@ -143,7 +150,8 @@ package_xorg-server() {
|
|||
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() {
|
||||
|
|
@ -156,7 +164,8 @@ package_xorg-server-xephyr() {
|
|||
_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() {
|
||||
|
|
@ -171,7 +180,8 @@ package_xorg-server-xvfb() {
|
|||
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() {
|
||||
|
|
@ -182,7 +192,8 @@ package_xorg-server-xnest() {
|
|||
_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() {
|
||||
|
|
@ -193,7 +204,8 @@ package_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() {
|
||||
|
|
@ -207,7 +219,8 @@ package_xorg-server-devel() {
|
|||
_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
|
||||
|
|
|
|||
Loading…
Reference in a new issue