guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates-frozen updated: gnu: polkit: Fix elogind configurati


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: polkit: Fix elogind configuration.
Date: Fri, 19 Nov 2021 01:05:56 -0500

This is an automated email from the git hooks/post-receive script.

samplet pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new abc9a9b  gnu: polkit: Fix elogind configuration.
abc9a9b is described below

commit abc9a9b74549016bc749392d3cecf86386286145
Author: Timothy Sample <samplet@ngyro.com>
AuthorDate: Fri Nov 19 00:55:21 2021 -0500

    gnu: polkit: Fix elogind configuration.
    
    * gnu/packages/patches/polkit-configure-elogind.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/polkit.scm (polkit): Use it.
---
 gnu/local.mk                                        |  1 +
 gnu/packages/patches/polkit-configure-elogind.patch | 15 +++++++++++++++
 gnu/packages/polkit.scm                             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index f25548f..cc6d4fa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1599,6 +1599,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/plib-CVE-2011-4620.patch                \
   %D%/packages/patches/plib-CVE-2012-4552.patch                \
   %D%/packages/patches/plotutils-spline-test.patch             \
+  %D%/packages/patches/polkit-configure-elogind.patch          \
   %D%/packages/patches/polkit-use-duktape.patch                        \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
diff --git a/gnu/packages/patches/polkit-configure-elogind.patch 
b/gnu/packages/patches/polkit-configure-elogind.patch
new file mode 100644
index 0000000..8fefb7a
--- /dev/null
+++ b/gnu/packages/patches/polkit-configure-elogind.patch
@@ -0,0 +1,15 @@
+Even when the polkit configure script detects elogind, it does not use
+it.  This patch ensures that elogind is used when it is detected.
+
+diff -ruN a/configure b/configure
+--- a/configure        1969-12-31 19:00:01.000000000 -0500
++++ b/configure        2021-11-19 00:04:55.581385020 -0500
+@@ -20390,7 +20390,7 @@
+ 
+ 
+ 
+- if test "$have_libsystemd" = "yes"; then
++ if test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes"; then
+   HAVE_LIBSYSTEMD_TRUE=
+   HAVE_LIBSYSTEMD_FALSE='#'
+ else
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 38f8adf..c9edc53 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -60,6 +60,7 @@
              (sha256
               (base32
                "00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf"))
+             (patches (search-patches "polkit-configure-elogind.patch"))
              (modules '((guix build utils)))
              (snippet
               '(begin



reply via email to

[Prev in Thread] Current Thread [Next in Thread]