Package: xpra
Version: 2.4.3+dfsg1-1
Severity: serious
Tags: patch
--- Please enter the report below this line. ---
At least on my setup, detect_xorg_setup(install_dir) in setup.py already
produces
xvfb_command[0] == '/usr/lib/xorg/Xorg'
(around line 822 in setup.py).
The assertion installed by our Debian specific patch does not consider
that as a possibility. The attached updated patch relaxes the assertion,
resolving the FTBFS.
--- System information. ---
Architecture: Kernel: Linux 4.19.0-2-amd64
Debian Release: buster/sid
--- Package information. ---
Depends (Version) | Installed
==============================================-+-==================
init-system-helpers (>= 1.51) | 1.56+nmu1
python (<< 2.8) | 2.7.15-4
python (>= 2.7~) | 2.7.15-4
python:any (<< 2.8) | python:any
(>= 2.7~) | libavcodec58 (>= 7:4.0)
| libavformat58 (>= 7:4.1) | 7:4.1-1
libavutil56 (>= 7:4.0) | libc6
(>= 2.14) | libglib2.0-0 (>= 2.12.0)
| libgtk2.0-0 (>= 2.24.0) | libpam0g
(>= 0.99.7.1) | libswscale5 (>=
7:4.0) | libsystemd0 | libturbojpeg0
(>= 1.4.0) | libvpx5
(>= 1.6.0) | libwebp6 (>= 0.5.1) | libx11-6
(>= 2:1.2.99.901) | libx264-155
| libx265-165 (>= 2.9) | libxcomposite1
(>= 1:0.3-1) | libxdamage1
(>= 1:1.1) | libxext6 | libxfixes3
| libxi6
(>= 2:1.2.99.4) | libxkbfile1 |
libxrandr2 (>= 2:1.2.99.2) | libxtst6
| adduser |
python-gi-cairo | python-gtk2
| x11-xserver-utils |
xserver-xorg-input-void |
xserver-xorg-video-dummy | python-rencode
|
Recommends (Version) | Installed
=====================================-+-===========
keyboard-configuration | 1.188
python-paramiko | 2.4.2-0.1
openssh-client | 1:7.9p1-5
ssh-askpass | 1:1.2.4.1-10
python-lz4 | 1.1.0+dfsg-1
python-lzo | 1.12-2
python-pil | 5.4.1-1
OR python-imaging | python-gtkglext1 |
1.1.0-9.1
python-dbus | 1.2.8-3
python-uritools | 2.1.0-1
Suggests (Version) | Installed
========================================-+-===========
openssh-server | 1:7.9p1-5
python-pyopencl | gstreamer1.0-plugins-base
| gstreamer1.0-plugins-good | OR
gstreamer1.0-plugins-ugly | OR gstreamer1.0-plugins-bad
| python-gst-1.0 | pulseaudio
| pulseaudio-utils | python-avahi
| python-netifaces
| cups-client | cups-common
| cups-filters |
cups-pdf | python-cups
| python-opencv |
v4l2loopback-dkms | python-yaml
| python-uinput |
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>
Bug-Debian: https://bugs.debian.org/863891
Forwarded: not-needed
Last-Update: 2019-02-07
Index: xpra-2.4.3+dfsg1/setup.py
===================================================================
--- xpra-2.4.3+dfsg1.orig/setup.py
+++ xpra-2.4.3+dfsg1/setup.py
@@ -819,6 +819,12 @@ def detect_xorg_setup(install_dir=None):
def build_xpra_conf(install_dir):
#generates an actual config file from the template
xvfb_command = detect_xorg_setup(install_dir)
+ xorg_call = '/usr/lib/xorg/Xorg'
+ if xvfb_command[0] != xorg_call:
+ assert xvfb_command[0] == 'Xorg'
+ xvfb_command[0] = xorg_call
+
+ xvfb_command[0] = '/usr/lib/xorg/Xorg'
from xpra.platform.features import DEFAULT_ENV
def bstr(b):
if b is None:
