diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-14 00:49:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-14 00:49:44 +0000 |
commit | 4828c25c25aacf399de429d381288982fd7e0d0e (patch) | |
tree | a265b5f79cf1b578c4e54483be1466f657f4baba /sys-apps | |
parent | f8d671851faf1ca201cec0490ead4642c8987bae (diff) |
gentoo auto-resync : 14:11:2022 - 00:49:44
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 49307 -> 49297 bytes | |||
-rw-r--r-- | sys-apps/dbus/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/dbus/files/dbus-daemon-optional.patch | 75 | ||||
-rw-r--r-- | sys-apps/dbus/files/dbus-enable-elogind.patch | 73 |
4 files changed, 0 insertions, 150 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 67c2e6df01bf..04a892409b5b 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 56dbaad42c4b..7ebeadd4ee3b 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -1,8 +1,6 @@ AUX 80-dbus-r1 346 BLAKE2B 96688534aa424e7683603f2ea9afb7a762fadcc62f7af13a6be315e3467c0ea29e628547242c8e1c76c4afbf14134eeaae021ce22e7d287c4add7b7acb2306dc SHA512 a7b1ede42fc1a544568b9d663ca4068fbf9a021c728d03f81b28c7ab66df958dc5f679996d37c1cc24225dd81df445b969d83ad34c4eb6cfadfac6e6a5735084 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.15.2.tar.xz 1395516 BLAKE2B fdfaf8a1a407ddcac23ce5d22497b975b4b95e62a8afaa1ed8f5f25933ad4a113aea4a39c686c1e4a046e2a05b83ab7bb9c063f77012caaa7ecbdc8ea522259c SHA512 486eab8c4f87d75e988558724bff1b0708c969341ecb62bcb9d0b0612a653ac2674aa7caa4d129dd81c00af7989b122ee7837599262c9a0c5c7f9335ed3dacaf EBUILD dbus-1.15.2.ebuild 8027 BLAKE2B 8afb9e613e47fc3a41dda1aad35005a07585c0a4f4580d45598b2f52d5151b615157c02c1fb47874e381d87a77277efb8bf4078639603a02188ff6f1e676b0bf SHA512 dd706239e88688a863827aa7d78a5e37b843a264e08f0dba6815103ff9d1ed58f42466c9fbd0dcdf22555d75379d05eadff5b9f4b459769a28e7687a1a4344a6 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 <asturm@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} |