On 3/6/20 4:50 PM, Bernd Zeimetz wrote:
>
> I fail to understand the reason behind this: libiptc-dev still exists
> and collectd needs it to build successfully. Please convince me why
> there is a reason for this change.
>
My apologies: I for some reason thought I saw "pkg-config --exists libip4tc"
and "pkg-config --exists libip4tc" in the configure.ac file in the collectd
5.10 release---but my eyes must have been misled, because that is not the
case.
Because that is not the case, the pkg-config calls to get the path to
libip4tc{.h,.so} libip6tc{.h,.so} and libiptc.h fail. You can get around
that with the trivial patch I've attached.
As for the question "Why can't we just use libiptc-dev's version of the
pkg-config file that just works?" I don't know. But, if it becomes a
problem, this should work (it builds on my machine without libiptc-dev).
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>
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:
