Source: rauc Version: 1.11.3-2 Severity: normal Tags: patch User: [email protected] Usertags: dbus-launch dbus-launch-for-tests
rauc relies on dbus-launch (dbus-x11) to run its test suite, but it doesn't need to: dbus-daemon is sufficient. Please consider the attached patch, which avoids pulling in X11 libraries and various bits of historical backwards-compatibility glue around X11 autolaunching. See also <https://lists.debian.org/debian-devel/2016/08/msg00554.html>, a mass bug filing in 2016. The autopkgtests still pass with the attached patch (tested in qemu, lxc, podman). Thanks, smcv
>From 06e35ddbbcb5bc09df25c910bf95192ee825c88f Mon Sep 17 00:00:00 2001 From: Simon McVittie <[email protected]> Date: Sun, 25 Aug 2024 11:16:28 +0100 Subject: [PATCH] Start dbus-daemon directly instead of using dbus-launch This avoids pulling in backwards-compatibility baggage associated with dbus-launch and X11 autolaunching. Closes: #-1 --- debian/control | 1 - debian/patches/series | 1 + ...s-daemon-directly-instead-of-using-d.patch | 29 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 debian/patches/test-rauc.t-Start-dbus-daemon-directly-instead-of-using-d.patch diff --git a/debian/control b/debian/control index 5c61c93..a57beb6 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Uwe Kleine-König <[email protected]> Build-Depends: casync <!nocheck>, dbus <!nocheck>, - dbus-x11 <!nocheck>, debhelper-compat (= 13), e2fsprogs <!nocheck>, faketime <!nocheck>, diff --git a/debian/patches/series b/debian/patches/series index 8e2ef9d..f2c19ce 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ # upstream fixes faketime-broken.patch +test-rauc.t-Start-dbus-daemon-directly-instead-of-using-d.patch # local adaptions for Debian disable-network-tests.patch diff --git a/debian/patches/test-rauc.t-Start-dbus-daemon-directly-instead-of-using-d.patch b/debian/patches/test-rauc.t-Start-dbus-daemon-directly-instead-of-using-d.patch new file mode 100644 index 0000000..b8e478c --- /dev/null +++ b/debian/patches/test-rauc.t-Start-dbus-daemon-directly-instead-of-using-d.patch @@ -0,0 +1,29 @@ +From: Simon McVittie <[email protected]> +Date: Sun, 25 Aug 2024 11:15:04 +0100 +Subject: test/rauc.t: Start dbus-daemon directly instead of using dbus-launch + +This avoids pulling in backwards-compatibility baggage associated with +dbus-launch and X11 autolaunching. + +Signed-off-by: Simon McVittie <[email protected]> +--- + test/rauc.t | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/test/rauc.t b/test/rauc.t +index bc51d41..128641b 100755 +--- a/test/rauc.t ++++ b/test/rauc.t +@@ -19,7 +19,11 @@ fi + # Provide functions to start and stop a dedicated session bus + start_session_bus () + { +- eval $(dbus-launch --sh-syntax) ++ dbus-daemon --fork --session --print-address=3 --print-pid=4 \ ++ 3> "$TEST_TMPDIR/dbus-session-bus-address" \ ++ 4> "$TEST_TMPDIR/dbus-session-bus-pid" ++ export DBUS_SESSION_BUS_ADDRESS="$(cat "$TEST_TMPDIR/dbus-session-bus-address")" ++ DBUS_SESSION_BUS_PID="$(cat "$TEST_TMPDIR/dbus-session-bus-pid")" + } + stop_session_bus () + { -- 2.45.2
