Date: Monday, May 21, 2018 @ 17:45:17 Author: lcarlier Revision: 324698
upgpkg: xorg-server 1.20.0-4 fix FS#58644 - [xorg-server] xorg.wrap broken in 1.20.0-2 Added: xorg-server/trunk/0001-v2-FS-58644.patch Modified: xorg-server/trunk/PKGBUILD ------------------------+ 0001-v2-FS-58644.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 19 ++++++--------- 2 files changed, 65 insertions(+), 11 deletions(-) Added: 0001-v2-FS-58644.patch =================================================================== --- 0001-v2-FS-58644.patch (rev 0) +++ 0001-v2-FS-58644.patch 2018-05-21 17:45:17 UTC (rev 324698) @@ -0,0 +1,57 @@ +From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001 +From: fafryd <[email protected]> +Date: Sun, 20 May 2018 14:30:43 +0200 +Subject: [PATCH] v2 FS#58644 + +--- + hw/xfree86/common/meson.build | 13 +++++++++++++ + hw/xfree86/meson.build | 12 +++++++----- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build +index 514999ff6..0eff6e488 100644 +--- a/hw/xfree86/common/meson.build ++++ b/hw/xfree86/common/meson.build +@@ -1,3 +1,16 @@ ++if get_option('suid_wrapper') ++ x_sh = configure_file( ++ input: '../Xorg.sh.in', ++ output: 'Xorg', ++ configuration: conf_data, ++ ) ++ install_data( ++ x_sh, ++ install_mode: 'rwxr-xr-x', ++ install_dir: join_paths(get_option('prefix'), get_option('bindir')), ++ ) ++endif ++ + srcs_xorg_common = [ + 'xf86fbBus.c', + 'xf86noBus.c', +diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build +index cacf56d4c..d1295d404 100644 +--- a/hw/xfree86/meson.build ++++ b/hw/xfree86/meson.build +@@ -145,11 +145,13 @@ if get_option('suid_wrapper') + install_dir: get_option('libexecdir'), + # install_mode: ['r-sr-xr-x', 0, 0], + ) +- configure_file( +- input: 'Xorg.sh.in', +- output: 'Xorg', +- configuration: conf_data, +- install_dir: join_paths(get_option('prefix'), get_option('bindir')), ++ meson.add_install_script( ++ 'sh', '-c', ++ 'chmod u+s @0@@1@/@2@'.format( ++ '${DESTDIR}', ++ join_paths(get_option('prefix'), get_option('libexecdir')), ++ 'Xorg.wrap' ++ ) + ) + endif + +-- +2.17.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-21 16:51:09 UTC (rev 324697) +++ PKGBUILD 2018-05-21 17:45:17 UTC (rev 324698) @@ -6,7 +6,7 @@ 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=3 +pkgrel=4 arch=('x86_64') license=('custom') groups=('xorg') @@ -17,12 +17,10 @@ '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') -#_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19 - -#source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit"; source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} 'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0' xserver-autobind-hotplug.patch + 0001-v2-FS-58644.patch xvfb-run # with updates from FC master xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' @@ -33,23 +31,22 @@ 'SKIP' 'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e' 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' + '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') -#pkgver() { -# cd xserver -# git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g' -#} - prepare() { # missing from tarball cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/ - #cd xserver cd "${pkgbase}-${pkgver}" # patch from Fedora, not yet merged patch -Np1 -i ../xserver-autobind-hotplug.patch + + # Fix rootless xorg - FS#58644 + # https://bugs.freedesktop.org/show_bug.cgi?id=106588 + patch -Np1 -i ../0001-v2-FS-58644.patch } build() { @@ -152,7 +149,7 @@ package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl which nettle) + depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle) _install fakeinstall/usr/bin/Xvfb _install fakeinstall/usr/share/man/man1/Xvfb.1.gz
