GNU bug report logs - #69948
[PATCH gnome-team 0/3] Fix the lightdm testsuite with an older dbus

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69948 in the body.
You can then email your comments to 69948 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team 0/3] Fix the lightdm testsuite with an older dbus
Date: Fri, 22 Mar 2024 21:34:44 +0100

Dear Guix,

Lightdm has a custom test runner that runs its own dbus daemon.  Dbus 1.15.0
is unfortunately the latest version that can run the lightdm testsuite.  It
should not affect the behavior of the program, as this is just to launch a
dbus daemon to then run the tests.

We have 2 options: remove the tests until lightdm proposes a fix, or provide
an “older” dbus (it’s still newer than what’s on master). It seems that 1.15.2
fixes a CVE too, so maybe we don’t want to provide 1.15.0 actually.

I went with the latter option though because it preserves our test suite, and
I made it a hidden package to avoid exposing it too much.

What do you think?

Best regards,

Vivien

Vivien Kraus (3):
  gnu: Add dbus-1.15.0.
  gnu: lightdm: Update style.
  gnu: lightdm: Run tests with dbus-1.15.0.

 gnu/packages/display-managers.scm | 65 ++++++++++++++++---------------
 gnu/packages/glib.scm             | 15 +++++++
 2 files changed, 49 insertions(+), 31 deletions(-)


base-commit: a9951a74a591a9b22ee2d93d8efe0523c6c42c97
-- 
2.41.0

Message #8 received at 69948 <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 69948 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, vivien <at> planete-kraus.eu, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team 1/3] gnu: Add dbus-1.15.0.
Date: Fri, 22 Mar 2024 21:30:50 +0100

The NEWS file for 1.15.2 (the next release after 1.15.0) indicates a breaking
change.  This is the latest release that the lightdm testsuite can work with.

* gnu/packages/glib.scm (dbus-1.15.0): New variable.

Change-Id: I9c3553b315e6618fbbf19aade6b807ab7120364b
---
 gnu/packages/glib.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index bff8bec81f..cf066a8aa6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -209,6 +209,21 @@ (define-public dbus-for-jami
                   (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-local.conf")
                    "/var/run/jami/session-local.conf")))))))))))
 
+(define-public dbus-1.15.0
+  ;; Dbus 1.15.2 has a breaking change.
+  (hidden-package
+   (package/inherit dbus
+     (version "1.15.0")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://dbus.freedesktop.org/releases/dbus/dbus-"
+                     version ".tar.xz"))
+               (sha256
+                (base32
+                 "02k4zm5h24clwp4csp2r3xp2lxib31jlk3xkgdj2c0njkb5whwsh"))
+               (patches (search-patches "dbus-helper-search-path.patch")))))))
+
 ;;; The reason this is not enabled in the regular dbus package is because it
 ;;; impacts the performance of D-Bus (including its library) as a whole, even
 ;;; when the DBUS_VERBOSE environment variable is not set.
-- 
2.41.0

Message #11 received at 69948 <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 69948 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, vivien <at> planete-kraus.eu, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team 3/3] gnu: lightdm: Run tests with dbus-1.15.0.
Date: Fri, 22 Mar 2024 21:32:11 +0100

* gnu/packages/display-managers.scm (lightdm) [native-inputs]: Replace dbus
with dbus-1.15.0.

Change-Id: Icc3b3f7d4589b60220e15aaa02d2203af308d44c
---
 gnu/packages/display-managers.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 7b802f1b5f..e3381a1665 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -382,7 +382,9 @@ (define-public lightdm
            libtool
            vala                         ;for Vala bindings
            ;; For tests
-           dbus
+           ;; All tests fail with dbus >= 1.15.2, see
+           ;; https://github.com/canonical/lightdm/issues/346
+           dbus-1.15.0
            python-wrapper
            python-pygobject
            which
-- 
2.41.0

Message #14 received at 69948 <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 69948 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, vivien <at> planete-kraus.eu, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH gnome-team 2/3] gnu: lightdm: Update style.
Date: Fri, 22 Mar 2024 21:10:35 +0100

* gnu/packages/display-managers.scm [arguments]: Convert to list of G-Expressions.

Change-Id: I8d7beb73e636be066d2dbe2588a5ebcb2f5afec0
---
 gnu/packages/display-managers.scm | 61 ++++++++++++++++---------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 2df4e6311b..7b802f1b5f 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -330,36 +330,37 @@ (define-public lightdm
                                        "lightdm-vnc-ipv6.patch"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:parallel-tests? #f             ; fails when run in parallel
-       #:configure-flags
-       (list "--localstatedir=/var"
-             "--enable-gtk-doc"
-             ;; Otherwise the test suite fails on such a warning.
-             "CFLAGS=-Wno-error=missing-prototypes")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "src/shared-data-manager.c"
-               (("/bin/rm")
-                (search-input-file inputs "bin/rm")))
-             (substitute* '("data/users.conf"
-                            "common/user-list.c")
-               (("/bin/false")
-                (search-input-file inputs "bin/false"))
-               (("/usr/sbin/nologin")
-                (search-input-file inputs "sbin/nologin")))
-             (substitute* "src/seat.c"
-               (("/bin/sh")
-                (search-input-file inputs "bin/sh")))))
-         (add-before 'check 'pre-check
-           (lambda _
-             (wrap-program "tests/src/test-python-greeter"
-               `("GUIX_PYTHONPATH"      ":" prefix (,(getenv "GUIX_PYTHONPATH")))
-               `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
-             ;; Avoid printing locale warnings, which trip up the text
-             ;; matching tests.
-             (unsetenv "LC_ALL"))))))
+     (list
+      #:parallel-tests? #f             ; fails when run in parallel
+      #:configure-flags
+      #~(list "--localstatedir=/var"
+              "--enable-gtk-doc"
+              ;; Otherwise the test suite fails on such a warning.
+              "CFLAGS=-Wno-error=missing-prototypes")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/shared-data-manager.c"
+                (("/bin/rm")
+                 (search-input-file inputs "bin/rm")))
+              (substitute* '("data/users.conf"
+                             "common/user-list.c")
+                (("/bin/false")
+                 (search-input-file inputs "bin/false"))
+                (("/usr/sbin/nologin")
+                 (search-input-file inputs "sbin/nologin")))
+              (substitute* "src/seat.c"
+                (("/bin/sh")
+                 (search-input-file inputs "bin/sh")))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (wrap-program "tests/src/test-python-greeter"
+                `("GUIX_PYTHONPATH"      ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+                `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
+              ;; Avoid printing locale warnings, which trip up the text
+              ;; matching tests.
+              (unsetenv "LC_ALL"))))))
     (inputs
      (list audit
            bash-minimal                 ;for cross-compilation
-- 
2.41.0

Message #17 received at 69948 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Vivien Kraus <vivien <at> planete-kraus.eu>, 69948 <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com
Subject: Re: [PATCH gnome-team 3/3] gnu: lightdm: Run tests with dbus-1.15.0.
Date: Sat, 23 Mar 2024 11:13:39 +0100

Am Freitag, dem 22.03.2024 um 21:32 +0100 schrieb Vivien Kraus:
> * gnu/packages/display-managers.scm (lightdm) [native-inputs]:
> Replace dbus
> with dbus-1.15.0.
> 
> Change-Id: Icc3b3f7d4589b60220e15aaa02d2203af308d44c
LGTM

Message #22 received at 69948-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, guix-patches <at> gnu.org,
 Vivien Kraus <vivien <at> planete-kraus.eu>, 69948-done <at> debbugs.gnu.org,
 maxim.cournoyer <at> gmail.com
Subject: Re: [bug#69948] [PATCH gnome-team 3/3] gnu: lightdm: Run tests with
 dbus-1.15.0.
Date: Sun, 24 Mar 2024 10:34:21 +0000

[Message part 1 (text/plain, inline)]

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Am Freitag, dem 22.03.2024 um 21:32 +0100 schrieb Vivien Kraus:
>> * gnu/packages/display-managers.scm (lightdm) [native-inputs]:
>> Replace dbus
>> with dbus-1.15.0.
>> 
>> Change-Id: Icc3b3f7d4589b60220e15aaa02d2203af308d44c
> LGTM

Thanks both, I've pushed this to gnome-team as
da381e233453b746b77b899b0584a13c41202e4c.

I didn't realise that dbus is just used for the tests, and isn't
actually referenced. I'd assumed it must be a runtime dependency.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.