commit: ba0af321b32d067cf6f79ff0b6449d0db74b91ce Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Nov 12 08:08:12 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Nov 13 18:33:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0af321
sys-apps/dbus: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28242 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> sys-apps/dbus/files/dbus-daemon-optional.patch | 75 -------------------------- sys-apps/dbus/files/dbus-enable-elogind.patch | 73 ------------------------- 2 files changed, 148 deletions(-) diff --git a/sys-apps/dbus/files/dbus-daemon-optional.patch b/sys-apps/dbus/files/dbus-daemon-optional.patch deleted file mode 100644 index 353dcb5761be..000000000000 --- a/sys-apps/dbus/files/dbus-daemon-optional.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <ast...@gentoo.org> -Date: Thu, 21 Feb 2019 23:53:19 +0100 -Subject: [PATCH] Make dbus daemon build optional - ---- - bus/Makefile.am | 2 ++ - configure.ac | 17 ++++++++++++++++- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/bus/Makefile.am b/bus/Makefile.am -index 9ae3071..26a770c 100644 ---- a/bus/Makefile.am -+++ b/bus/Makefile.am -@@ -70,6 +70,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 -@@ -241,6 +242,7 @@ test_bus_LDADD = \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(DBUS_BUS_LIBS) \ - $(NULL) -+endif DBUS_DAEMON - - install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d -diff --git a/configure.ac b/configure.ac -index be6b065..854e846 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,6 +202,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) -@@ -830,7 +831,20 @@ AC_CHECK_FUNCS(getpeerucred getpeereid) - - AC_CHECK_FUNCS(pipe2 accept4) - --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" -@@ -1824,6 +1838,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 systemd support: ${have_systemd} --- -2.20.1 - diff --git a/sys-apps/dbus/files/dbus-enable-elogind.patch b/sys-apps/dbus/files/dbus-enable-elogind.patch deleted file mode 100644 index 5cb5d649cd91..000000000000 --- a/sys-apps/dbus/files/dbus-enable-elogind.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200 -+++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100 -@@ -32,6 +32,9 @@ - #if HAVE_SYSTEMD - #include <systemd/sd-login.h> - #endif -+#if HAVE_ELOGIND -+#include <elogind/sd-login.h> -+#endif - - /** - * @addtogroup DBusInternalsUtils -@@ -54,7 +57,7 @@ - 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) - { ---- a/configure.ac 2016-11-03 11:13:58.286528265 +0100 -+++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100 -@@ -185,6 +185,7 @@ - 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_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) -@@ -1184,6 +1185,24 @@ - - 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; -@@ -1290,7 +1309,7 @@ - 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 -@@ -1949,6 +1968,7 @@ - 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} - Building X11 code: ${have_x11} - Building Doxygen docs: ${enable_doxygen_docs}
