Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0693a65a0644151a42c6bfecae4da8d20fc3092f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0693a65a0644151a42c6bfecae4da8d20fc3092f)
  • Date: Sat, 22 Apr 2023 16:23:01 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/dbus/DEPENDS |
11 +-
utils/dbus/DETAILS |
1
utils/dbus/HISTORY |
7 +
utils/dbus/PRE_BUILD |
8 +
utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch |
23 ++++
utils/dbus/patches-1.15/dbus-1.15.0-enable-elogind-dbus-userdb-util.patch |
23 ++++
utils/dbus/patches/dbus-enable-elogind.patch |
54 ++++++++++
7 files changed, 126 insertions(+), 1 deletion(-)

New commits:
commit 0693a65a0644151a42c6bfecae4da8d20fc3092f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/dbus: added elogind as optional dependency

diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 092fc68..13e6864 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -25,4 +25,13 @@ optional_depends doxygen \
optional_depends xmlto \
'--enable-xml-docs' \
'--disable-xml-docs' \
- 'to build docs in XML format'
+ 'to build docs in XML format' &&
+
+optional_depends elogind \
+ '--enable-elogind' \
+ '--disable-elogind' \
+ 'for elogind support' &&
+if is_depends_enabled "${SPELL}" "elogind"; then
+ depends autoconf &&
+ depends automake
+fi
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 3505788..9861fc6 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -8,6 +8,7 @@ fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dbus.freedesktop.org/releases/dbus/$SOURCE
+# Watch: https://dbus.freedesktop.org/releases/dbus/
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
SOURCE_GPG=freedesktop.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 65b4d55..0a8de47 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,10 @@
+2023-04-22 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: added Watch line
+ * DEPENDS, PRE_BUILD, patches/dbus-enable-elogind.patch,
+ patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch,
+ patches-1.15/dbus-1.15.0-enable-elogind-dbus-userdb-util.patch:
added
+ elogind as optional dependency
+
2023-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.14.6

diff --git a/utils/dbus/PRE_BUILD b/utils/dbus/PRE_BUILD
new file mode 100755
index 0000000..2016890
--- /dev/null
+++ b/utils/dbus/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if is_depends_enabled "${SPELL}" "elogind"; then
+ apply_patch_dir patches &&
+ apply_patch_dir "patches-${VERSION%.*}" &&
+ NOCONFIGURE=1 ./autogen.sh
+fi
diff --git
a/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch
b/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch
new file mode 100644
index 0000000..e16fcce
--- /dev/null
+++
b/utils/dbus/patches-1.14/dbus-1.14.0-enable-elogind-dbus-userdb-util.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
+https://bugs.gentoo.org/599494
+--- a/dbus/dbus-userdb-util.c
++++ b/dbus/dbus-userdb-util.c
+@@ -39,6 +39,9 @@
+ #ifdef HAVE_SYSTEMD
+ #include <systemd/sd-login.h>
+ #endif
++#if HAVE_ELOGIND
++#include <elogind/sd-login.h>
++#endif
+
+ /**
+ * @addtogroup DBusInternalsUtils
+@@ -70,7 +73,7 @@ _dbus_is_console_user (dbus_uid_t uid,
+ const DBusUserInfo *info;
+ dbus_bool_t result = FALSE;
+
+-#ifdef HAVE_SYSTEMD
++#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
+ /* check if we have logind */
+ if (access ("/run/systemd/seats/", F_OK) >= 0)
+ {
diff --git
a/utils/dbus/patches-1.15/dbus-1.15.0-enable-elogind-dbus-userdb-util.patch
b/utils/dbus/patches-1.15/dbus-1.15.0-enable-elogind-dbus-userdb-util.patch
new file mode 100644
index 0000000..4ddf701
--- /dev/null
+++
b/utils/dbus/patches-1.15/dbus-1.15.0-enable-elogind-dbus-userdb-util.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
+https://bugs.gentoo.org/599494
+--- a/dbus/dbus-userdb-util.c
++++ b/dbus/dbus-userdb-util.c
+@@ -39,6 +39,9 @@
+ #ifdef HAVE_SYSTEMD
+ #include <systemd/sd-login.h>
+ #endif
++#if HAVE_ELOGIND
++#include <elogind/sd-login.h>
++#endif
+
+ /**
+ * @addtogroup DBusInternalsUtils
+@@ -65,7 +68,7 @@ dbus_bool_t
+ _dbus_is_console_user (dbus_uid_t uid,
+ DBusError *error)
+ {
+-#ifdef HAVE_SYSTEMD
++#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
+ /* check if we have logind */
+ if (access ("/run/systemd/seats/", F_OK) >= 0)
+ {
diff --git a/utils/dbus/patches/dbus-enable-elogind.patch
b/utils/dbus/patches/dbus-enable-elogind.patch
new file mode 100644
index 0000000..2721fe4
--- /dev/null
+++ b/utils/dbus/patches/dbus-enable-elogind.patch
@@ -0,0 +1,54 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
+https://bugs.gentoo.org/599494
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,6 +215,7 @@ AC_ARG_ENABLE(inotify,
AS_HELP_STRING([--enable-inotify],[build with inotify sup
+ AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue
support]),enable_kqueue=$enableval,enable_kqueue=auto)
+ AC_ARG_ENABLE(console-owner-file,
AS_HELP_STRING([--enable-console-owner-file],[enable console owner
file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
+ AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with
launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
++AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with
elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
+ AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with
systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
+ AC_ARG_ENABLE(traditional-activation,
AS_HELP_STRING([--disable-traditional-activation], [Do not build support for
service activation without using SystemdService]),
enable_traditional_activation="$enableval", enable_traditional_activation=yes)
+
+@@ -904,6 +905,24 @@ fi
+
+ AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file =
xyes)
+
++dnl elogind detection
++if test x$enable_elogind = xno ; then
++ have_elogind=no;
++else
++ PKG_CHECK_MODULES([ELOGIND],
++ [libelogind >= 209],
++ [have_elogind=yes],
++ [have_elogind=no])
++fi
++
++if test x$have_elogind = xyes; then
++ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
++fi
++
++if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
++ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not
found])
++fi
++
+ dnl systemd detection
+ if test x$enable_systemd = xno ; then
+ have_systemd=no;
+@@ -1024,7 +1043,7 @@ if test x$with_valgrind != xno; then
+ fi
+
+ #### Set up final flags
+-LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"
++LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
+ AC_SUBST([LIBDBUS_LIBS])
+
+ ### X11 detection
+@@ -1731,6 +1750,7 @@ echo "
+ Building AppArmor support: ${have_apparmor}
+ Building inotify support: ${have_inotify}
+ Building kqueue support: ${have_kqueue}
++ Building elogind support: ${have_elogind}
+ Building systemd support: ${have_systemd}
+ Traditional activation: ${enable_traditional_activation}
+ Building X11 code: ${have_x11}



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0693a65a0644151a42c6bfecae4da8d20fc3092f), Pavel Vinogradov, 04/22/2023

Archive powered by MHonArc 2.6.24.

Top of Page