Bug#1022723: remote-logon-service: FTBFS on usr-merged systems
Package: remote-logon-service
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
X-Debbugs-Cc: schopin@ubuntu.com
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/1001_usr-bin-merge.patch: Fix build on usr-merged buildds
(LP: #1994041)
We've noticed the failure at least in our last test rebuild, but it
might have been failing longer than that.
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers kinetic-updates
APT policy: (500, 'kinetic-updates'), (500, 'kinetic'), (400, 'kinetic-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.19.0-21-generic (SMP w/24 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru remote-logon-service-1.0.2.90/debian/patches/1001_usr-bin-merge.patch remote-logon-service-1.0.2.90/debian/patches/1001_usr-bin-merge.patch
--- remote-logon-service-1.0.2.90/debian/patches/1001_usr-bin-merge.patch 1970-01-01 01:00:00.000000000 +0100
+++ remote-logon-service-1.0.2.90/debian/patches/1001_usr-bin-merge.patch 2022-10-24 16:06:59.000000000 +0200
@@ -0,0 +1,33 @@
+From e8fe4c3f2c8f3c0a3159f4e56a5dfbcc8d4f5fcd Mon Sep 17 00:00:00 2001
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Mon, 24 Oct 2022 16:27:59 +0200
+Subject: [PATCH] tests/server-test: fix the tests on usr-merged systems
+
+The testsuite is failing on Ubuntu builders as they operate with /bin a
+symlink to /usr/bin. As a result, depending on how you resolve it, `ls`
+can either be `/bin/ls` or `/usr/bin/ls`. Since Debian also seems to
+transition to such a setup, it might be wise to simply relax the tests.
+---
+ tests/server-test.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Forwarded: yes, https://github.com/ArcticaProject/remote-logon-service/pull/4
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/remote-logon-service/+bug/1994041
+
+diff --git a/tests/server-test.c b/tests/server-test.c
+index 9b55246..d339499 100644
+--- a/tests/server-test.c
++++ b/tests/server-test.c
+@@ -107,7 +107,8 @@ test_uccs_exec (void)
+ g_assert(server != NULL);
+ g_assert(g_strcmp0(server->name, "My Server") == 0);
+ g_assert(g_strcmp0(server->uri, "http://my.domain.com";) == 0);
+- g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0);
++ g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0 ||
++ g_strcmp0(UCCS_SERVER(server)->exec, "/usr/bin/ls") == 0);
+
+ g_object_unref(server);
+ g_key_file_unref(keyfile);
+--
+2.37.2
+
diff -Nru remote-logon-service-1.0.2.90/debian/patches/series remote-logon-service-1.0.2.90/debian/patches/series
--- remote-logon-service-1.0.2.90/debian/patches/series 2019-02-06 14:39:19.000000000 +0100
+++ remote-logon-service-1.0.2.90/debian/patches/series 2022-10-24 16:06:59.000000000 +0200
@@ -1 +1,2 @@
0001_src-uccs-server.c-Inject-another-artificial-nm_state.patch
+1001_usr-bin-merge.patch
Reply to: