diff --git a/backport-bus-Also-tell-systemd-before-we-shut-down.patch b/backport-bus-Also-tell-systemd-before-we-shut-down.patch deleted file mode 100644 index d8377a08bf88493970f4cbd24df7995ad1721361..0000000000000000000000000000000000000000 --- a/backport-bus-Also-tell-systemd-before-we-shut-down.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 03c0db9ff51dedeb98f42c715a70a1bd10c7f595 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 15 Jan 2018 15:31:55 +0000 -Subject: [PATCH] bus: Also tell systemd before we shut down - -Signed-off-by: Simon McVittie -Reviewed-by: Philip Withnall -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641 ---- - bus/main.c | 1 + - dbus/dbus-sysdeps-util-unix.c | 12 ++++++++++++ - dbus/dbus-sysdeps-util-win.c | 5 +++++ - dbus/dbus-sysdeps.h | 1 + - 4 files changed, 19 insertions(+) - -diff --git a/bus/main.c b/bus/main.c -index 578aa989..28223899 100644 ---- a/bus/main.c -+++ b/bus/main.c -@@ -320,6 +320,7 @@ handle_reload_watch (DBusWatch *watch, - loop = bus_context_get_loop (context); - if (loop != NULL) - { -+ _dbus_daemon_report_stopping (); - _dbus_loop_quit (loop); - } - } -diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c -index 8a7c9278..24eba4e3 100644 ---- a/dbus/dbus-sysdeps-util-unix.c -+++ b/dbus/dbus-sysdeps-util-unix.c -@@ -1556,3 +1556,15 @@ _dbus_daemon_report_reloaded (void) - _dbus_daemon_report_ready (); - #endif - } -+ -+/** -+ * Report to a service manager that the daemon calling this function is -+ * shutting down. This is currently only implemented for systemd. -+ */ -+void -+_dbus_daemon_report_stopping (void) -+{ -+#ifdef HAVE_SYSTEMD -+ sd_notify (0, "STOPPING=1"); -+#endif -+} -diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c -index 917dd05e..a5c3bba6 100644 ---- a/dbus/dbus-sysdeps-util-win.c -+++ b/dbus/dbus-sysdeps-util-win.c -@@ -1669,3 +1669,8 @@ void - _dbus_daemon_report_reloaded (void) - { - } -+ -+void -+_dbus_daemon_report_stopping (void) -+{ -+} -diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h -index d8e69589..0d1ff7c4 100644 ---- a/dbus/dbus-sysdeps.h -+++ b/dbus/dbus-sysdeps.h -@@ -690,6 +690,7 @@ void _dbus_rlimit_free (DBusRLimit *lim); - void _dbus_daemon_report_ready (void); - void _dbus_daemon_report_reloading (void); - void _dbus_daemon_report_reloaded (void); -+void _dbus_daemon_report_stopping (void); - - /** @} */ - --- -2.27.0 - diff --git a/backport-bus-Also-tell-systemd-when-we-re-reloading.patch b/backport-bus-Also-tell-systemd-when-we-re-reloading.patch deleted file mode 100644 index a51dcc6f314cba11274d79caa6572870ea3ac68f..0000000000000000000000000000000000000000 --- a/backport-bus-Also-tell-systemd-when-we-re-reloading.patch +++ /dev/null @@ -1,104 +0,0 @@ -From c937a39e4ba1e297518edbd78feeb6f1cc764bd1 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 15 Jan 2018 15:31:41 +0000 -Subject: [PATCH] bus: Also tell systemd when we're reloading - -Signed-off-by: Simon McVittie -Reviewed-by: Philip Withnall -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641 ---- - bus/bus.c | 4 ++++ - dbus/dbus-sysdeps-util-unix.c | 25 +++++++++++++++++++++++++ - dbus/dbus-sysdeps-util-win.c | 10 ++++++++++ - dbus/dbus-sysdeps.h | 2 ++ - 4 files changed, 41 insertions(+) - -diff --git a/bus/bus.c b/bus/bus.c -index abb2ea2f..9fd9820b 100644 ---- a/bus/bus.c -+++ b/bus/bus.c -@@ -1065,6 +1065,8 @@ bus_context_reload_config (BusContext *context, - DBusString config_file; - dbus_bool_t ret; - -+ _dbus_daemon_report_reloading (); -+ - /* Flush the user database cache */ - _dbus_flush_caches (); - -@@ -1095,6 +1097,8 @@ bus_context_reload_config (BusContext *context, - bus_context_log (context, DBUS_SYSTEM_LOG_INFO, "Unable to reload configuration: %s", error->message); - if (parser != NULL) - bus_config_parser_unref (parser); -+ -+ _dbus_daemon_report_reloaded (); - return ret; - } - -diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c -index 838cd932..8a7c9278 100644 ---- a/dbus/dbus-sysdeps-util-unix.c -+++ b/dbus/dbus-sysdeps-util-unix.c -@@ -1531,3 +1531,28 @@ _dbus_daemon_report_ready (void) - sd_notify (0, "READY=1"); - #endif - } -+ -+/** -+ * Report to a service manager that the daemon calling this function is -+ * reloading configuration. This is currently only implemented for systemd. -+ */ -+void -+_dbus_daemon_report_reloading (void) -+{ -+#ifdef HAVE_SYSTEMD -+ sd_notify (0, "RELOADING=1"); -+#endif -+} -+ -+/** -+ * Report to a service manager that the daemon calling this function is -+ * reloading configuration. This is currently only implemented for systemd. -+ */ -+void -+_dbus_daemon_report_reloaded (void) -+{ -+#ifdef HAVE_SYSTEMD -+ /* For systemd, this is the same code */ -+ _dbus_daemon_report_ready (); -+#endif -+} -diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c -index f613130e..917dd05e 100644 ---- a/dbus/dbus-sysdeps-util-win.c -+++ b/dbus/dbus-sysdeps-util-win.c -@@ -1659,3 +1659,13 @@ void - _dbus_daemon_report_ready (void) - { - } -+ -+void -+_dbus_daemon_report_reloading (void) -+{ -+} -+ -+void -+_dbus_daemon_report_reloaded (void) -+{ -+} -diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h -index b2943906..d8e69589 100644 ---- a/dbus/dbus-sysdeps.h -+++ b/dbus/dbus-sysdeps.h -@@ -688,6 +688,8 @@ dbus_bool_t _dbus_test_append_different_username (DBusString *username); - #endif /* DBUS_ENABLE_EMBEDDED_TESTS */ - - void _dbus_daemon_report_ready (void); -+void _dbus_daemon_report_reloading (void); -+void _dbus_daemon_report_reloaded (void); - - /** @} */ - --- -2.27.0 - diff --git a/backport-bus-Clear-INVOCATION_ID-when-carrying-out-traditiona.patch b/backport-bus-Clear-INVOCATION_ID-when-carrying-out-traditiona.patch deleted file mode 100644 index 8c1d14fa759d070ee1a14069dce9a79abdd5ff6c..0000000000000000000000000000000000000000 --- a/backport-bus-Clear-INVOCATION_ID-when-carrying-out-traditiona.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 66246fff2a0bd005817fb9d108544da86973a81e Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Tue, 20 Mar 2018 12:33:51 +0000 -Subject: [PATCH] bus: Clear INVOCATION_ID when carrying out traditional - activation - -We weren't sure whether this one should be inherited or not, so I -asked on systemd-devel, and Lennart thought it shouldn't. - -Signed-off-by: Simon McVittie -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641 -Reviewed-by: Philip Withnall ---- - bus/activation.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/bus/activation.c b/bus/activation.c -index 66640ba6..2a427d9c 100644 ---- a/bus/activation.c -+++ b/bus/activation.c -@@ -862,7 +862,6 @@ populate_environment (BusActivation *activation) - * - TERM, WATCHDOG_*: Should not be set for dbus-daemon, so not applicable - * - MAINPID, SERVICE_RESULT, EXIT_CODE, EXIT_STATUS: Not set for ExecStart, - * so not applicable -- * - INVOCATION_ID: TODO: Do we want to clear this or not? It isn't clear. - */ - - /* We give activated services their own Journal stream to avoid their -@@ -878,6 +877,13 @@ populate_environment (BusActivation *activation) - * (and NotifyAccess wouldn't let it write here anyway) */ - _dbus_hash_table_remove_string (activation->environment, "NOTIFY_SOCKET"); - -+ /* This identifies the dbus-daemon invocation. Whether it should be -+ * inherited by "smaller" services isn't entirely clear-cut, but not -+ * inheriting it makes traditional D-Bus activation under systemd a -+ * little more consistent with systemd activation. -+ * https://lists.freedesktop.org/archives/systemd-devel/2018-March/040467.html */ -+ _dbus_hash_table_remove_string (activation->environment, "INVOCATION_ID"); -+ - return retval; - } - --- -2.27.0 - diff --git a/backport-bus-Don-t-pass-systemd-environment-variables-to-acti.patch b/backport-bus-Don-t-pass-systemd-environment-variables-to-acti.patch deleted file mode 100644 index 0cdc14ac8686acb56a697351ad1be38672403481..0000000000000000000000000000000000000000 --- a/backport-bus-Don-t-pass-systemd-environment-variables-to-acti.patch +++ /dev/null @@ -1,57 +0,0 @@ -From be4670767377a08b0c6cabbca1000ca614174c2c Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 15 Jan 2018 15:26:33 +0000 -Subject: [PATCH] bus: Don't pass systemd environment variables to activated - services - -Signed-off-by: Simon McVittie -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641 -Reviewed-by: Philip Withnall ---- - bus/activation.c | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/bus/activation.c b/bus/activation.c -index edf96a2c..66640ba6 100644 ---- a/bus/activation.c -+++ b/bus/activation.c -@@ -848,6 +848,36 @@ populate_environment (BusActivation *activation) - retval = _dbus_hash_table_from_array (activation->environment, environment, '='); - dbus_free_string_array (environment); - -+ /* -+ * These environment variables are set by systemd for the dbus-daemon -+ * itself, and are not applicable to our child processes. -+ * -+ * Of the other environment variables listed in systemd.exec(5): -+ * -+ * - XDG_RUNTIME_DIR, XDG_SESSION_ID, XDG_SEAT, XDG_VTNR: Properties of -+ * the session and equally true for the activated service, should not -+ * be reset -+ * - PATH, LANG, USER, LOGNAME, HOME, SHELL, MANAGERPID: Equally true for -+ * the activated service, should not be reset -+ * - TERM, WATCHDOG_*: Should not be set for dbus-daemon, so not applicable -+ * - MAINPID, SERVICE_RESULT, EXIT_CODE, EXIT_STATUS: Not set for ExecStart, -+ * so not applicable -+ * - INVOCATION_ID: TODO: Do we want to clear this or not? It isn't clear. -+ */ -+ -+ /* We give activated services their own Journal stream to avoid their -+ * logging being attributed to dbus-daemon */ -+ _dbus_hash_table_remove_string (activation->environment, "JOURNAL_STREAM"); -+ -+ /* This is dbus-daemon's listening socket, not the activatable service's */ -+ _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDNAMES"); -+ _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDS"); -+ _dbus_hash_table_remove_string (activation->environment, "LISTEN_PID"); -+ -+ /* This is dbus-daemon's status notification, not the activatable service's -+ * (and NotifyAccess wouldn't let it write here anyway) */ -+ _dbus_hash_table_remove_string (activation->environment, "NOTIFY_SOCKET"); -+ - return retval; - } - --- -2.27.0 - diff --git a/backport-bus-Notify-systemd-when-we-are-ready.patch b/backport-bus-Notify-systemd-when-we-are-ready.patch deleted file mode 100644 index b100c22495d0bbfc04d9fec9c88079b3deb23c56..0000000000000000000000000000000000000000 --- a/backport-bus-Notify-systemd-when-we-are-ready.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 18a0a8892b99f235e3897d9e5c600da00c61ef0a Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 15 Jan 2018 15:15:52 +0000 -Subject: [PATCH] bus: Notify systemd when we are ready - -Signed-off-by: Simon McVittie -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641 -Reviewed-by: Philip Withnall ---- - bus/dbus.service.in | 2 ++ - bus/main.c | 1 + - bus/systemd-user/dbus.service.in | 2 ++ - dbus/dbus-sysdeps-util-unix.c | 12 ++++++++++++ - dbus/dbus-sysdeps-util-win.c | 5 +++++ - dbus/dbus-sysdeps.h | 2 ++ - 6 files changed, 24 insertions(+) - -diff --git a/bus/dbus.service.in b/bus/dbus.service.in -index ca0b7e96..3713810b 100644 ---- a/bus/dbus.service.in -+++ b/bus/dbus.service.in -@@ -4,6 +4,8 @@ Documentation=man:dbus-daemon(1) - Requires=dbus.socket - - [Service] -+Type=notify -+NotifyAccess=main - ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only - ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - OOMScoreAdjust=-900 -diff --git a/bus/main.c b/bus/main.c -index b3fcddd0..578aa989 100644 ---- a/bus/main.c -+++ b/bus/main.c -@@ -716,6 +716,7 @@ main (int argc, char **argv) - #endif /* DBUS_UNIX */ - - _dbus_verbose ("We are on D-Bus...\n"); -+ _dbus_daemon_report_ready (); - _dbus_loop_run (bus_context_get_loop (context)); - - bus_context_shutdown (context); -diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in -index 7ceffbee..b291b923 100644 ---- a/bus/systemd-user/dbus.service.in -+++ b/bus/systemd-user/dbus.service.in -@@ -4,5 +4,7 @@ Documentation=man:dbus-daemon(1) - Requires=dbus.socket - - [Service] -+Type=notify -+NotifyAccess=main - ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only - ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig -diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c -index b841bf63..838cd932 100644 ---- a/dbus/dbus-sysdeps-util-unix.c -+++ b/dbus/dbus-sysdeps-util-unix.c -@@ -1564,3 +1564,15 @@ _dbus_test_append_different_username (DBusString *username) - } - - #endif -+ -+/** -+ * Report to a service manager that the daemon calling this function is -+ * ready for use. This is currently only implemented for systemd. -+ */ -+void -+_dbus_daemon_report_ready (void) -+{ -+#ifdef HAVE_SYSTEMD -+ sd_notify (0, "READY=1"); -+#endif -+} -diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c -index 1ef4ae6c..f613130e 100644 ---- a/dbus/dbus-sysdeps-util-win.c -+++ b/dbus/dbus-sysdeps-util-win.c -@@ -1678,3 +1678,8 @@ _dbus_test_append_different_uid (DBusString *uid) - } - - #endif -+ -+void -+_dbus_daemon_report_ready (void) -+{ -+} -diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h -index b9b0c440..b2943906 100644 ---- a/dbus/dbus-sysdeps.h -+++ b/dbus/dbus-sysdeps.h -@@ -687,6 +687,8 @@ dbus_bool_t _dbus_test_append_different_username (DBusString *username); - #endif - #endif /* DBUS_ENABLE_EMBEDDED_TESTS */ - -+void _dbus_daemon_report_ready (void); -+ - /** @} */ - - DBUS_END_DECLS --- -2.27.0 - diff --git a/backport-tools-Use-Python3-for-GetAllMatchRules.patch b/backport-tools-Use-Python3-for-GetAllMatchRules.patch new file mode 100644 index 0000000000000000000000000000000000000000..38365344cb206a1923d891bf738b6e0cc8c571ec --- /dev/null +++ b/backport-tools-Use-Python3-for-GetAllMatchRules.patch @@ -0,0 +1,22 @@ +From 59ddde9e1ed5de03b060ff3ce27e35509707dff2 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 31 Jul 2018 12:33:59 -0400 +Subject: [PATCH] tools: Use Python3 for GetAllMatchRules + +--- + tools/GetAllMatchRules.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/GetAllMatchRules.py b/tools/GetAllMatchRules.py +index 6a7e4cd9..f7e340d6 100755 +--- a/tools/GetAllMatchRules.py ++++ b/tools/GetAllMatchRules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + import argparse +-- +2.17.1 + diff --git a/dbus-1.12.20-Changelog b/dbus-1.12.20-Changelog deleted file mode 100644 index 36617359d2d38646da37df1ee7051bc24ef5b4d7..0000000000000000000000000000000000000000 --- a/dbus-1.12.20-Changelog +++ /dev/null @@ -1,80 +0,0 @@ -dbus 1.12.20 (2020-07-02) -========================= - -The “temporary nemesis” release. - -Maybe security fixes: - -• On Unix, avoid a use-after-free if two usernames have the same - numeric uid. In older versions this could lead to a crash (denial of - service) or other undefined behaviour, possibly including incorrect - authorization decisions if is used. - Like Unix filesystems, D-Bus' model of identity cannot distinguish - between users of different names with the same numeric uid, so this - configuration is not advisable on systems where D-Bus will be used. - Thanks to Daniel Onaca. - (dbus#305, dbus!166; Simon McVittie) - -Other fixes: - -• On Solaris and its derivatives, if a cmsg header is truncated, ensure - that we do not overrun the buffer used for fd-passing, even if the - kernel tells us to. - (dbus#304, dbus!165; Andy Fiddaman) - -dbus 1.12.18 (2020-06-02) -========================= - -The “telepathic vines” release. - -Denial of service fixes: - -• CVE-2020-12049: If a message contains more file descriptors than can - be sent, close those that did get through before reporting error. - Previously, a local attacker could cause the system dbus-daemon (or - another system service with its own DBusServer) to run out of file - descriptors, by repeatedly connecting to the server and sending fds that - would get leaked. - Thanks to Kevin Backhouse of GitHub Security Lab. - (dbus#294, GHSL-2020-057; Simon McVittie) - -Other fixes: - -• Fix a crash when the dbus-daemon is terminated while one or more - monitors are active (dbus#291, dbus!140; Simon McVittie) - -• The dbus-send(1) man page now documents --bus and --peer instead of - the old --address synonym for --peer, which has been deprecated since - the introduction of --bus and --peer in 1.7.6 - (fd.o #48816, dbus!115; Chris Morin) - -• Fix a wrong environment variable name in dbus-daemon(1) - (dbus#275, dbus!122; Mubin, Philip Withnall) - -• Fix formatting of dbus_message_append_args example - (dbus!126, Felipe Franciosi) - -• Avoid a test failure on Linux when built in a container as uid 0, but - without the necessary privileges to increase resource limits - (dbus!58, Debian #908092; Simon McVittie) - -• When building with CMake, cope with libX11 in a non-standard location - (dbus!129, Tuomo Rinne) - -dbus 1.12.16 (2019-06-11) -========================= - -The “tree cat” release. - -Security fixes: - -• CVE-2019-12749: Do not attempt to carry out DBUS_COOKIE_SHA1 - authentication for identities that differ from the user running the - DBusServer. Previously, a local attacker could manipulate symbolic - links in their own home directory to bypass authentication and connect - to a DBusServer with elevated privileges. The standard system and - session dbus-daemons in their default configuration were immune to this - attack because they did not allow DBUS_COOKIE_SHA1, but third-party - users of DBusServer such as Upstart could be vulnerable. - Thanks to Joe Vennix of Apple Information Security. - (dbus#269, Simon McVittie) \ No newline at end of file diff --git a/dbus-1.12.20.tar.gz b/dbus-1.12.20.tar.gz deleted file mode 100644 index bb72ea6865c5bf5f4b314e53fe3ecf7a06421b18..0000000000000000000000000000000000000000 Binary files a/dbus-1.12.20.tar.gz and /dev/null differ diff --git a/dbus-1.14.0.tar.xz b/dbus-1.14.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..dfde2794399d6809d81ace2959d29d4ca895c4a1 Binary files /dev/null and b/dbus-1.14.0.tar.xz differ diff --git a/dbus.spec b/dbus.spec index 70bee3ba1c0e95c717094c161292ff72550b85f2..d09f79cb46637015320528874da1aa07037dccc6 100644 --- a/dbus.spec +++ b/dbus.spec @@ -1,22 +1,17 @@ Name: dbus Epoch: 1 -Version: 1.12.20 -Release: 6 +Version: 1.14.0 +Release: 1 Summary: System Message Bus License: AFLv3.0 or GPLv2+ URL: http://www.freedesktop.org/Software/dbus/ -Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz +Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz Source1: 00-start-message-bus.sh Patch0001: bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch Patch0002: print-load-average-when-activate-service-timeout.patch -Patch6000: backport-bus-Notify-systemd-when-we-are-ready.patch -Patch6001: backport-bus-Also-tell-systemd-when-we-re-reloading.patch -Patch6002: backport-bus-Also-tell-systemd-before-we-shut-down.patch -Patch6003: backport-bus-Don-t-pass-systemd-environment-variables-to-acti.patch -Patch6004: backport-bus-Clear-INVOCATION_ID-when-carrying-out-traditiona.patch - +Patch6000: backport-tools-Use-Python3-for-GetAllMatchRules.patch BuildRequires: systemd-devel expat-devel libselinux-devel audit-libs-devel doxygen xmlto cmake BuildRequires: autoconf-archive libtool libX11-devel libcap-ng-devel libxslt @@ -159,7 +154,7 @@ fi %files %defattr(-,root,root) %license COPYING -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS NEWS README %files libs %license COPYING @@ -167,7 +162,7 @@ fi %files daemon %license COPYING -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS NEWS README %ghost %dir /run/%{name} %dir %{_localstatedir}/lib/dbus/ %{_tmpfilesdir}/dbus.conf @@ -228,6 +223,9 @@ fi %exclude %{_pkgdocdir}/README %changelog +* Tue Jun 21 2022 fushanqing - 1:1.14.0-1 +- Update to 1.14.0 + * Sat Jan 29 2022 licunlong - 1:1.12.20-6 - Tell systemd when dbus is ready/shutting down/reloading config. diff --git a/print-load-average-when-activate-service-timeout.patch b/print-load-average-when-activate-service-timeout.patch index 89285591990a6de60d4bf148d73e73896655907f..7e09ce878f9882d152bd2465af4f5f191288114e 100644 --- a/print-load-average-when-activate-service-timeout.patch +++ b/print-load-average-when-activate-service-timeout.patch @@ -19,7 +19,7 @@ index 99404b9..e0db646 100644 #include "activation.h" #include "activation-exit-codes.h" #include "config-parser.h" -@@ -43,6 +44,8 @@ +@@ -46,6 +47,8 @@ #include #endif @@ -28,11 +28,10 @@ index 99404b9..e0db646 100644 struct BusActivation { int refcount; -@@ -1526,6 +1529,25 @@ toggle_babysitter_watch (DBusWatch *watch, - watch); - } +@@ -1575,12 +1578,32 @@ + #endif -+static dbus_bool_t + static dbus_bool_t +read_loadavg (char *load_avg) +{ + FILE *fp; @@ -51,10 +50,10 @@ index 99404b9..e0db646 100644 + return TRUE; +} + - static dbus_bool_t ++static dbus_bool_t pending_activation_timed_out (void *data) { -@@ -1533,6 +1555,7 @@ pending_activation_timed_out (void *data) + BusPendingActivation *pending_activation = data; BusContext *context; DBusError error; int timeout; @@ -62,7 +61,7 @@ index 99404b9..e0db646 100644 context = pending_activation->activation->context; timeout = bus_context_get_activation_timeout (context); -@@ -1546,11 +1569,13 @@ pending_activation_timed_out (void *data) +@@ -1596,11 +1619,13 @@ dbus_error_init (&error); @@ -78,6 +77,3 @@ index 99404b9..e0db646 100644 pending_activation_failed (pending_activation, &error); --- -2.23.0 -