Bug#888772: xrdp FTCBFS: passes the empty string to -rpath

[Helmut Grohne]

Source: xrdp
Version: 0.9.5-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

xrdp fails to cross build from source, because it passes an empty string
to -rpath and libtool doesn't like that. It turns out that $moduledir
ends up being empty, because it uses the wrong pkg-config to query for
it and doesn't trap failure from pkg-config. After fixing the relevant
configure.ac, the build moves along until the install-data-hook fails
running host tools. It turns out the effects of the install-data-hook
are nullified by the packaging, so we can just skip the whole hook.
After doing so, xrdp cross builds successfully. You can find the
cumulative changes in the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru xrdp-0.9.5/debian/changelog xrdp-0.9.5/debian/changelog
--- xrdp-0.9.5/debian/changelog	2018-01-07 22:24:28.000000000 +0100
+++ xrdp-0.9.5/debian/changelog	2018-01-29 17:34:36.000000000 +0100
@@ -1,3 +1,12 @@
+xrdp (0.9.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + cross.patch: Fix pkg-config usage.
+    + Avoid useless install-data-hook running host programs.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 29 Jan 2018 17:34:36 +0100
+
 xrdp (0.9.5-1) unstable; urgency=medium
 
   * New upstream version.
diff --minimal -Nru xrdp-0.9.5/debian/patches/cross.patch xrdp-0.9.5/debian/patches/cross.patch
--- xrdp-0.9.5/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ xrdp-0.9.5/debian/patches/cross.patch	2018-01-29 17:34:16.000000000 +0100
@@ -0,0 +1,13 @@
+Index: xrdp-0.9.5/xorgxrdp/configure.ac
+===================================================================
+--- xrdp-0.9.5.orig/xorgxrdp/configure.ac
++++ xrdp-0.9.5/xorgxrdp/configure.ac
+@@ -29,7 +29,7 @@
+ if test "x$enable_strict_locations" = "xyes"; then
+   moduledir='${libdir}/xorg/modules'
+ else
+-  moduledir=`pkg-config xorg-server --variable=moduledir`
++  moduledir=`$PKG_CONFIG xorg-server --variable=moduledir`
+   sysconfdir="/etc"
+ fi
+ 
diff --minimal -Nru xrdp-0.9.5/debian/patches/series xrdp-0.9.5/debian/patches/series
--- xrdp-0.9.5/debian/patches/series	2018-01-07 15:55:20.000000000 +0100
+++ xrdp-0.9.5/debian/patches/series	2018-01-29 17:33:58.000000000 +0100
@@ -6,3 +6,4 @@
 systemd.diff
 lfs.diff
 pulse-debian.patch
+cross.patch
diff --minimal -Nru xrdp-0.9.5/debian/rules xrdp-0.9.5/debian/rules
--- xrdp-0.9.5/debian/rules	2018-01-07 17:07:53.000000000 +0100
+++ xrdp-0.9.5/debian/rules	2018-01-29 17:34:36.000000000 +0100
@@ -74,6 +74,10 @@
 	    xargs -0 perl -pi -e 's!XRDP_PID_PATH.*?/run!$$&/xrdp!g' --
 
 override_dh_auto_install:
+	# prevent install-data-hook from generating these
+	mkdir -p debian/xrdp/etc/xrdp
+	touch debian/xrdp/etc/xrdp/rsakeys.ini
+	touch debian/xrdp/etc/xrdp/cert.pem
 	dh_auto_install -v --destdir=debian/xrdp
 	# remove unused/confusing files
 	rm -f debian/xrdp/etc/xrdp/xrdp.sh