Dear maintainer,

The existing xvfb path checking code is very brittle.  The attached,
revised patch is more robust.  I don't have an arm system to test on,
but I suspect this will help the situation.

Best,
Antonio
Description: Fix path to Xorg binary in /etc/xpra/conf.d/55_server_x11.conf
 We need the (absolute) path to the non-setuid binary and not to a possibly
 installed setuid-wrapper (which requires root or login on a tty).
 Auto-dection fails as Xorg is not installed in the build environment.
 .
 As the Xorg setuid wrapper is Debian specific (and might be removed in the
 future) there's no need to upstream this change.
Author: Simon Ruderich <si...@ruderich.org>
Author: Antonio Russo <aeru...@aerusso.net>
Bug-Debian: https://bugs.debian.org/863891
Forwarded: not-needed
Last-Update: 2020-12-18

Index: xpra-2.4.3+dfsg1/setup.py
===================================================================
--- xpra-2.4.3+dfsg1.orig/setup.py
+++ xpra-2.4.3+dfsg1/setup.py
@@ -785,6 +785,12 @@
 def build_xpra_conf(install_dir):
     #generates an actual config file from the template
     xvfb_command = detect_xorg_setup(install_dir)
+    xorg_unwrapped = '/usr/lib/xorg/Xorg'
+    import platform
+    if not platform.uname()[4].startswith("arm"):
+        if xvfb_command[0] != xorg_unwrapped:
+            assert xvfb_command[0] == 'Xorg'
+            xvfb_command[0] = xorg_unwrapped
     fake_xinerama = "no"
     if POSIX and not OSX and not (is_Debian() or is_Ubuntu()):
         from xpra.x11.fakeXinerama import find_libfakeXinerama

Attachment: OpenPGP_0xB01C53D5DED4A4EE.asc
Description: application/pgp-keys

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to