diff options
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.15.0.ebuild | 294 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch | 65 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch | 75 |
4 files changed, 438 insertions, 0 deletions
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index d5ff9239c120..6990b6b93592 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -4,12 +4,16 @@ AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb537 AUX dbus-1.14.0-clang-15-configure.patch 1012 BLAKE2B ce1b640fbd2ba73ab67e776b301cfd32b5a0894401f4a13271a1bd769a309bc13c377efac33d3e63f7d737dc2870bed476954728d8332b0e80cc42e12bc2624f SHA512 e640f4f34e8791ac5c017e9787dae99c10b6d2d1414e92dd1f56ce9a17898bc6b28db7a1b66d45365d9ed3774307359c1f2b542e24938c9c0cc75bf8788faafd AUX dbus-1.14.0-oom_score_adj.patch 3882 BLAKE2B 9b5c55d8660c7de77976026b39b76dddbc88ddc3c4810bc6114faf038401faaf162f50f8014d26182a5d5a8b6a6ba44e517a864919152ae96e7b352ab8255df4 SHA512 353beed17bf788396828c1817703bed09f8e1fe48772dce6eb1f3c601859c593c23044e4e61ec503596790a56c64e0b4bdcd2be10e337ef9ad1ec9de0dbe027c AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54 +AUX dbus-1.15.0-daemon-optional.patch 2442 BLAKE2B 9fb08fc24f8a6ee1feba274b60c339fbb564a09bd16d084d36d6eb2d1518e808df9061f05c6f6db283cf4355761e74ba535ef899f56cd0ea5ddc283b86dbd657 SHA512 95449d8686586f22de4f317bc4057ee75afc047b1e4ec9fc4c930dbfc78b234efa665861977ea8ac82ddd1b69374a3a05015fb351d050cc286f4bac1d47129b7 +AUX dbus-1.15.0-enable-elogind.patch 3045 BLAKE2B 450a63270867b1c570af595492e90a8040195b6145e4f9463b186ebcec2f7128ee0b1d55d695fa81efda5391455dac69d67c4717e888ceab550763558f8eb929 SHA512 e24af56f6f7eb71d3c17a040e84a294a4cadd972bbc41010fdb79d6d541ec8cc271b25921d1c997550150b2e0c0dc5bb0c4df0ba300b22526de1fa1fb91c483f AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6 DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f +DIST dbus-1.15.0.tar.xz 1391044 BLAKE2B 50cd9e5fc27f8ff53350f426d29b0ee7dd17a791e82e9d0465789c095443826d14396045c8301e73996d054e2b723b09c1c28dd392a240ed74b6c49c1369d480 SHA512 6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c EBUILD dbus-1.14.0-r4.ebuild 7886 BLAKE2B 5a40cdda99f78c9a7a4d65130582960d37537bcf4c33f2a4de99331a254e297f8dface9c8bdd10d1875c48d9d78d8c88dfd0a7bf63515ce5ca01a92e0fba2824 SHA512 13023462e662c0fb261e26a61d450aa6a166d665cca12b9b33addb5effb77c635b54601952b01df456c402bd3f7fd8a047b9b591994e68fd607ff44c05d7206f EBUILD dbus-1.14.0-r6.ebuild 7970 BLAKE2B b8bd51db8f9d41384310706d61afcf0e48f0a572ea8dcf94b28df4e8c745f31cf1b1a2429c36c188c0e5e0a95edead7a582acbbeadf92f1af6394139bb698a0a SHA512 019cf6079cf3c2dea64a6d8e643302a5e11967179d88cd98943f80b74c0472a1baee6c64b15af72058b988afa3608e6b1f3c51ff8340003b04a8b23a5b047dad +EBUILD dbus-1.15.0.ebuild 8032 BLAKE2B fb09e07630834fa24d684d391630468d315dba2e00a448f96987fdbfba1ca580cd2889b7d2c25e5f72524ec5bcd5610db2f0a26235a2ffcfe76c3dd86f550f12 SHA512 487db25943ed32edea913d0dfd4b079e646bc587f063aac3ca3a7a815821d5914cbb0cede766332c4a5b7571a8e5ebfa620eb1f9cbc7bc6881e1ac54e06d5a6f MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e diff --git a/sys-apps/dbus/dbus-1.15.0.ebuild b/sys-apps/dbus/dbus-1.15.0.ebuild new file mode 100644 index 000000000000..fd178a8b873f --- /dev/null +++ b/sys-apps/dbus/dbus-1.15.0.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +TMPFILES_OPTIONAL=1 + +# From 1.15.0 release notes: +# "• Add a Meson build system. This is currently considered experimental, +# but the intention is for it to replace Autotools and/or CMake in future +# releases, preferably both. Please test!" +# We haven't migrated to it yet as it's experimental but our elogind +# patch needs adjusting too (and upstreaming, ideally!) +# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/NEWS#L31 +inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal + +DESCRIPTION="A message bus system, a simple way for applications to talk to each other" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/" +SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz" + +LICENSE="|| ( AFL-2.1 GPL-2 )" +SLOT="0" +# Needs testing on elogind system +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug doc elogind selinux static-libs systemd test X" +RESTRICT="!test? ( test )" + +REQUIRED_USE="?? ( elogind systemd )" + +BDEPEND=" + acct-user/messagebus + app-text/xmlto + app-text/docbook-xml-dtd:4.4 + sys-devel/autoconf-archive + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +COMMON_DEPEND=" + >=dev-libs/expat-2.1.0 + elogind? ( sys-auth/elogind ) + selinux? ( + sys-process/audit + sys-libs/libselinux + ) + systemd? ( sys-apps/systemd:0= ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/expat + test? ( + ${PYTHON_DEPS} + >=dev-libs/glib-2.40:2 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-user/messagebus + selinux? ( sec-policy/selinux-dbus ) + systemd? ( virtual/tmpfiles ) +" + +DOC_CONTENTS=" + Some applications require a session bus in addition to the system + bus. Please see \`man dbus-launch\` for more information. +" + +# out of sources build dir for make check +TBD="${WORKDIR}/${P}-tests-build" + +PATCHES=( + "${FILESDIR}/dbus-1.15.0-enable-elogind.patch" + "${FILESDIR}/dbus-1.15.0-daemon-optional.patch" # bug #653136 +) + +pkg_setup() { + use test && python-any-r1_pkg_setup + + if use kernel_linux; then + CONFIG_CHECK="~EPOLL" + linux-info_pkg_setup + fi +} + +src_prepare() { + default + + if [[ ${CHOST} == *-solaris* ]]; then + # fix standards conflict, due to gcc being c99 by default nowadays + sed -i \ + -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \ + configure.ac || die + fi + + # required for bug #263909, cross-compile so don't remove eautoreconf + eautoreconf +} + +src_configure() { + local rundir=$(usex kernel_linux /run /var/run) + + sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \ + > "${T}"/dbus.initd || die + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local docconf myconf testconf + + # so we can get backtraces from apps + case ${CHOST} in + *-mingw*) + # error: unrecognized command line option '-rdynamic', bug #488036 + ;; + *) + append-flags -rdynamic + ;; + esac + + # libaudit is *only* used in DBus wrt SELinux support, so disable it, if + # not on an SELinux profile. + myconf=( + --localstatedir="${EPREFIX}/var" + $(use_enable static-libs static) + $(use_enable debug verbose-mode) + --disable-asserts + --disable-checks + $(use_enable selinux) + $(use_enable selinux libaudit) + --disable-apparmor + $(use_enable kernel_linux inotify) + --disable-kqueue + $(use_enable elogind) + $(use_enable systemd) + $(use_enable systemd user-session) + --disable-embedded-tests + --disable-modular-tests + $(use_enable debug stats) + --with-session-socket-dir="${EPREFIX}"/tmp + --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid + --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-systemduserunitdir="$(systemd_get_userunitdir)" + --with-dbus-user=messagebus + $(use_with X x) + ) + + if [[ ${CHOST} == *-darwin* ]]; then + myconf+=( + --enable-launchd + --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents + ) + fi + + if multilib_is_native_abi; then + docconf=( + --enable-xml-docs + $(use_enable doc doxygen-docs) + ) + else + docconf=( + --disable-xml-docs + --disable-doxygen-docs + ) + myconf+=( + --disable-daemon + --disable-selinux + --disable-libaudit + --disable-elogind + --disable-systemd + --without-x + ) + fi + + einfo "Running configure in ${BUILD_DIR}" + ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" + + if multilib_is_native_abi && use test; then + mkdir "${TBD}" || die + cd "${TBD}" || die + testconf=( + $(use_enable test asserts) + $(use_enable test checks) + $(use_enable test embedded-tests) + $(use_enable test stats) + $(has_version dev-libs/dbus-glib && echo --enable-modular-tests) + ) + einfo "Running configure in ${TBD}" + ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}" + fi +} + +multilib_src_compile() { + if multilib_is_native_abi; then + # After the compile, it uses a selinuxfs interface to + # check if the SELinux policy has the right support + use selinux && addwrite /selinux/access + + einfo "Running make in ${BUILD_DIR}" + emake + + if use test; then + einfo "Running make in ${TBD}" + emake -C "${TBD}" + fi + else + emake -C dbus libdbus-1.la + fi +} + +src_test() { + # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs + # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231 + DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check + +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" install + else + emake DESTDIR="${D}" install-pkgconfigDATA + emake DESTDIR="${D}" -C dbus \ + install-libLTLIBRARIES install-dbusincludeHEADERS \ + install-nodist_dbusarchincludeHEADERS + fi +} + +multilib_src_install_all() { + newinitd "${T}"/dbus.initd dbus + + if use X; then + # dbus X session script (bug #77504) + # turns out to only work for GDM (and startx). has been merged into + # other desktop (kdm and such scripts) + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}"/80-dbus-r1 80-dbus + fi + + # Needs to exist for dbus sessions to launch + keepdir /usr/share/dbus-1/services + keepdir /etc/dbus-1/{session,system}.d + # machine-id symlink from pkg_postinst() + keepdir /var/lib/dbus + # Let the init script create the /var/run/dbus directory + rm -rf "${ED}"/var/run + + # bug #761763 + rm -rf "${ED}"/usr/lib/sysusers.d + + dodoc AUTHORS NEWS README doc/TODO + readme.gentoo_create_doc + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + readme.gentoo_print_elog + + if use systemd; then + tmpfiles_process dbus.conf + fi + + # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink + # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse + # dependencies with hardcoded paths (although the known ones got fixed already) + # TODO: should be safe to remove at least the ln because of the above tmpfiles_process? + dbus-uuidgen --ensure="${EROOT}"/etc/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id + + if [[ ${CHOST} == *-darwin* ]]; then + local plist="org.freedesktop.dbus-session.plist" + elog + elog + elog "For MacOS/Darwin we now ship launchd support for dbus." + elog "This enables autolaunch of dbus at session login and makes" + elog "dbus usable under MacOS/Darwin." + elog + elog "The launchd plist file ${plist} has been" + elog "installed in ${EPREFIX}/Library/LaunchAgents." + elog "For it to be used, you will have to do all of the following:" + elog " + cd ~/Library/LaunchAgents" + elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}" + elog " + logout and log back in" + elog + elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS" + elog "specified and refused to start otherwise, then export the" + elog "the following to your environment:" + elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\"" + fi +} diff --git a/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch b/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch new file mode 100644 index 000000000000..2b9cd03472d8 --- /dev/null +++ b/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch @@ -0,0 +1,65 @@ +https://bugs.gentoo.org/653136 + +From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 21 Feb 2019 23:53:19 +0100 +Subject: [PATCH] Make dbus daemon build optional + +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -76,6 +76,7 @@ agentdir=$(LAUNCHD_AGENT_DIR) + agent_DATA=org.freedesktop.dbus-session.plist + endif + ++if DBUS_DAEMON + if DBUS_BUS_ENABLE_KQUEUE + DIR_WATCH_SOURCE=dir-watch-kqueue.c + else +@@ -230,6 +231,7 @@ EXTRA_DIST += \ + tmpfiles.d/dbus.conf.in \ + tmpfiles.d/meson.build \ + $(NULL) ++endif DBUS_DAEMON + + if HAVE_SYSTEMD + systemdsystemunit_DATA = \ +--- a/configure.ac ++++ b/configure.ac +@@ -211,6 +211,7 @@ AC_ARG_ENABLE([apparmor], + [enable_apparmor=$enableval], + [enable_apparmor=auto]) + AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto) ++AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[build with the dbus daemon]),enable_daemon=$enableval,enable_daemon=yes) + AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto) + 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) +@@ -658,7 +659,20 @@ AC_CHECK_MEMBER([struct unpcbid.unp_pid], + [], + [[#include <sys/un.h>]]) + +-PKG_CHECK_MODULES([EXPAT], [expat]) ++# dbusdaemon checks ++if test x$enable_daemon = xno ; then ++ have_daemon=no ++else ++ have_daemon=yes ++fi ++ ++dnl check if daemon shall be built ++if test x$have_daemon = xyes; then ++ AC_DEFINE(DBUS_DAEMON,1,[Use daemon]) ++ PKG_CHECK_MODULES([EXPAT], [expat]) ++fi ++ ++AM_CONDITIONAL(DBUS_DAEMON, test x$have_daemon = xyes) + + save_cflags="$CFLAGS" + save_libs="$LIBS" +@@ -1748,6 +1762,7 @@ echo " + Building bus stats API: ${enable_stats} + Building SELinux support: ${have_selinux} + Building AppArmor support: ${have_apparmor} ++ Building daemon: ${have_daemon} + Building inotify support: ${have_inotify} + Building kqueue support: ${have_kqueue} + Building elogind support: ${have_elogind} diff --git a/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch b/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch new file mode 100644 index 000000000000..a6c0e1bd2153 --- /dev/null +++ b/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch @@ -0,0 +1,75 @@ +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} +--- 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) + { |