From patchwork Sat Jul 29 17:05:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52398 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A934A27BBE9; Sat, 29 Jul 2023 18:16:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 08C6927BBE2 for ; Sat, 29 Jul 2023 18:16:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPnPJ-0007Uf-7M; Sat, 29 Jul 2023 13:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPnPE-0007Sz-IO for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPnPC-0006LU-SF for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPnPC-0005jQ-Nv for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64938] [elogind-updates PATCH 2/2] gnu: elogind: Update to 252.9. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Jul 2023 17:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 64938@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 64938-submit@debbugs.gnu.org id=B64938.169065039221988 (code B ref 64938); Sat, 29 Jul 2023 17:07:02 +0000 Received: (at 64938) by debbugs.gnu.org; 29 Jul 2023 17:06:32 +0000 Received: from localhost ([127.0.0.1]:48970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPnOh-0005ia-95 for submit@debbugs.gnu.org; Sat, 29 Jul 2023 13:06:31 -0400 Received: from mail-oo1-xc2d.google.com ([2607:f8b0:4864:20::c2d]:49498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPnOe-0005iB-VC for 64938@debbugs.gnu.org; Sat, 29 Jul 2023 13:06:30 -0400 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-55b8f1c930eso2130478eaf.3 for <64938@debbugs.gnu.org>; Sat, 29 Jul 2023 10:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690650383; x=1691255183; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EbQOGX3FblVMa7BwO23LKTF7kOSlNKsEm4nFDdgiKuQ=; b=OnFFMehgC1G+KSz/yxJxwx9vE3F6AfKK5Haj3LmNzW3vagFFcaIYRtaK3wdJ8ZuUW6 LJLFtQcxI8lXEmNgngCGJmlX3JykNisz6An/c5tJhjWuE+NHu2xo/flCR72FPlg7FRUD z5tSR4PGLNuH40rQNUL1x8b5DPH8C+a2e6mFoHco6FATwQPG6HKytmrKRvwomZr+6H60 viTk3gCGNMoWZvTQKoarDBEaX8HPENz3hczgetGUleJeBHABrpOoqcVioRwZ2qBrvCcL d8YnzFgnHHAtsIs07OtSoQzgYE33Q2gg/rtvrQLKILu75mNTR6ez4VOCaBZttL4UL935 x2NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690650383; x=1691255183; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EbQOGX3FblVMa7BwO23LKTF7kOSlNKsEm4nFDdgiKuQ=; b=V6MmNpgltGnQgGvFMA5EdKRxWRYTQhvNieYy3dR9BePaTCfbJrAMORkHuUNfuFJLwM 4TGmRmQlrqNkbq4vELb6BtWJEQAJJcm1lxcNGtJaG8mlkI2jL2t75txg6MxZAMxLea+G 7+2dax5fpXpH+rTXHF5GPH+ttDK0eGxtm289FWfJVokMG/D0H4gZ2FGR0SoViLkfNX4W MF1uoTYvFvLPnBY1rcxzzkUigjpojbkFQGLU8RoRBoDsHsEdUHMCjiXJZzqqqp6/fYgy 1D079I3/FfI9YtY4NpYuaoiHaTWMPBxxH9xUXiNkXsfMWcC1zMjUFLif/Wds0CeMEbw/ TITA== X-Gm-Message-State: ABy/qLZbOp3i6e5UAXYJQ1+0lB8F+1iE6xn6nogngRpotIDyNsKYpgHZ E3Wr2j2zucJepvRBX1H58MzUtxyaJTo= X-Google-Smtp-Source: APBJJlHyHVQN6CHLOUp2uAibmaqRPBsPTRQcq1FyRO3IHaYgauqV/N35kwKSr2ZnCR///W2TJPAupw== X-Received: by 2002:a05:6358:5922:b0:134:c37f:4b5c with SMTP id g34-20020a056358592200b00134c37f4b5cmr5152563rwf.22.1690650382625; Sat, 29 Jul 2023 10:06:22 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-150.b2b2c.ca. [205.236.230.150]) by smtp.gmail.com with ESMTPSA id a17-20020a0c8bd1000000b0063c6c7f4b92sm2185544qvc.1.2023.07.29.10.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 10:06:22 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Jul 2023 13:05:33 -0400 Message-ID: <02e4a7c4ac64ba0e438513c121ca0c68f9f73c1d.1690650333.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (elogind): Update to 252.9. [source]: Replace elogind-revert-polkit-detection.patch with elogind-fix-rpath.patch in patches. [configure-flags]: Add the dbussystemservicedir, dbussessionservicedir, dbussystemservicedir and dbus-interfaces-dir flags. [phases] Update list of patched files. Update substitutions, and skip the copy_holes test. [native-inputs]: Add python-jinja2. [inputs]: Add util-linux:lib. * gnu/packages/patches/elogind-revert-polkit-detection.patch: Delete file. * gnu/packages/patches/elogind-fix-rpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Update. --- gnu/local.mk | 2 +- gnu/packages/freedesktop.scm | 54 ++++++++++------- gnu/packages/patches/elogind-fix-rpath.patch | 60 +++++++++++++++++++ .../elogind-revert-polkit-detection.patch | 41 ------------- 4 files changed, 94 insertions(+), 63 deletions(-) create mode 100644 gnu/packages/patches/elogind-fix-rpath.patch delete mode 100644 gnu/packages/patches/elogind-revert-polkit-detection.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae2f3dd49f..1b3860c613 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,7 +1082,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-ghc9.2.patch \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ - %D%/packages/patches/elogind-revert-polkit-detection.patch \ + %D%/packages/patches/elogind-fix-rpath.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8a894b7e1e..2a8f2c2d1a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -643,7 +643,7 @@ (define-public libxdg-basedir (define-public elogind (package (name "elogind") - (version "246.10") + (version "252.9") (source (origin (method git-fetch) (uri (git-reference @@ -652,16 +652,21 @@ (define-public elogind (file-name (git-file-name name version)) (sha256 (base32 - "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq")) - (patches (search-patches - "elogind-revert-polkit-detection.patch")))) + "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw")) + (patches (search-patches "elogind-fix-rpath.patch")))) (build-system meson-build-system) (arguments `(#:configure-flags ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) - (dbuspolicy (string-append out "/etc/dbus-1/system.d")) + (dbus-data (string-append out "/share/dbus-1")) + (dbuspolicy (string-append dbus-data "/system.d")) + (dbussessionservice (string-append dbus-data "/services")) + (dbussystemservice (string-append dbus-data + "/system-services")) + (dbusinterfaces (string-append dbus-data "/interfaces")) + #$@(if (not (target-riscv64?)) #~((kexec-tools #$(this-package-input "kexec-tools"))) #~()) @@ -679,6 +684,10 @@ (define-public elogind (string-append "-Dsysconfdir=" sysconf) (string-append "-Drootlibexecdir=" libexec) (string-append "-Ddbuspolicydir=" dbuspolicy) + (string-append "-Ddbussystemservicedir=" dbuspolicy) + (string-append "-Ddbussessionservicedir=" dbussessionservice) + (string-append "-Ddbussystemservicedir=" dbussystemservice) + (string-append "-Ddbus-interfaces-dir=" dbusinterfaces) (string-append "-Dc_link_args=-Wl,-rpath=" libexec) (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) (string-append "-Dhalt-path=" halt-path) @@ -703,21 +712,28 @@ (define-public elogind ;; XXX There is no run-time setting to set this per-process, only a ;; build-time, hard-coded list of global directories. (lambda _ - (substitute* (list "src/login/elogind-dbus.c" - "src/sleep/sleep.c") + (substitute* (list "src/login/logind-core.c" + "src/login/logind-dbus.c" + "src/sleep/sleep.c" + "src/shared/sleep-config.c") (("PKGSYSCONFDIR") "\"/etc/elogind\"")))) (add-after 'unpack 'adjust-tests (lambda _ - ;; Skip the following test, which depends on users such as 'root' - ;; existing in the build environment. - (invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g" - "-i" "src/test/meson.build") + ;; Skip the user-util tests, which depends on users such as + ;; 'root' existing in the build environment. + (substitute* "src/test/meson.build" + ((".*'test-user-util.c'.*") "") + ((".*'test-cgroup.c'.*") "")) ;; This test tries to copy some bytes from /usr/lib/os-release, ;; which does not exist in the build container. Choose something ;; more likely to be available. (substitute* "src/test/test-copy.c" (("/usr/lib/os-release") - "/etc/passwd")) + "/etc/passwd") + ;; Skip the copy_holes test, which fails for unknown reasons + ;; (see: https://github.com/elogind/elogind/issues/261). + (("TEST_RET\\(copy_holes).*" all) + (string-append all " return 77;\n"))) ;; Use a shebang that works in the build container. (substitute* "src/test/test-exec-util.c" (("#!/bin/sh") @@ -742,12 +758,6 @@ (define-public elogind ;; loopback device, but that fails because /sys is unavailable. (substitute* "src/libelogind/sd-device/test-sd-device-thread.c" ((".*sd_device_new_from_syspath.*/sys/class/net/lo.*") - "return 77;")) - ;; Most of these tests require cgroups or an actual live - ;; logind system so that it can flicker the monitor, etc. - ;; Just skip it until a more narrow selection can be made. - (substitute* "src/libelogind/sd-login/test-login.c" - (("test_login\\(\\);") "return 77;")))) (add-after 'unpack 'change-pid-file-path (lambda _ @@ -763,6 +773,7 @@ (define-public elogind m4 pkg-config python + python-jinja2 libxslt)) (inputs (append @@ -771,9 +782,10 @@ (define-public elogind '()) (list linux-pam libcap - shadow ; for 'nologin' - shepherd ; for 'halt' and 'reboot', invoked - ; when pressing the power button + `(,util-linux "lib") ;for 'libmount' + shadow ;for 'nologin' + shepherd ;for 'halt' and 'reboot', invoked + ;when pressing the power button dbus eudev acl))) ; to add individual users to ACLs on /dev nodes diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch new file mode 100644 index 0000000000..2a76cc467f --- /dev/null +++ b/gnu/packages/patches/elogind-fix-rpath.patch @@ -0,0 +1,60 @@ +Retrieved from https://github.com/elogind/elogind/issues/258 + +From: Mark Hindley +Date: Wed, 24 May 2023 10:39:41 +0100 +Subject: Fixup_executable_rpath + +./meson.build sets + + install_rpath : rootlibexecdir + +however src/shared/meson.build sets + +libshared = shared_library( + [snip] + install_dir : rootpkglibdir + ) +--- + meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 694a2fd..a575f69 100644 +--- a/meson.build ++++ b/meson.build +@@ -2903,7 +2903,7 @@ executable('elogind', + dependencies : [threads, + libacl, + libudev], +- install_rpath : rootlibexecdir, ++ install_rpath : rootpkglibdir, + install : true, + install_dir : rootlibexecdir) + +@@ -2913,7 +2913,7 @@ exe = executable('loginctl', + link_with : [libshared], + dependencies : [threads, + libudev], +- install_rpath : rootlibexecdir, ++ install_rpath : rootpkglibdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] +@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit', + include_directories : includes, + link_with : [libshared], + dependencies : [threads], +- install_rpath : rootlibexecdir, ++ install_rpath : rootpkglibdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] +@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command', + libshared], + dependencies: [libacl, + libudev], +- install_rpath : rootlibexecdir, ++ install_rpath : rootpkglibdir, + install : true, + install_dir : rootlibexecdir) + #endif // 0 diff --git a/gnu/packages/patches/elogind-revert-polkit-detection.patch b/gnu/packages/patches/elogind-revert-polkit-detection.patch deleted file mode 100644 index 43dd1684b6..0000000000 --- a/gnu/packages/patches/elogind-revert-polkit-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001 -From: Sven Eden -Date: Mon, 8 Mar 2021 08:40:08 +0100 -Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed" - -This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e. - -Removing polkit support with -Dpolkit=auto when libpolkit is not -installed, removes the whole interface. This makes it impossible to -add polkit support as a runtime dependency. - -Bug: #167 -Closes: #206 -Signed-off-by: Sven Eden ---- - meson.build | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/meson.build b/meson.build -index 2dd05db3c..f38551f55 100644 ---- a/meson.build -+++ b/meson.build -@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps - message('Old polkit detected, will install pkla files') - install_polkit_pkla = true - endif --#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167 -- if not libpolkit.found() -- if want_polkit != 'auto' -- error('Polkit requested but libpolkit was not found.') -- endif -- install_polkit = false -- want_polkit = false -- endif --#endif // 1 - endif - conf.set10('ENABLE_POLKIT', install_polkit) - --- -2.33.1 -