From b4c33f49091bcdcc0aa584377c83c1639d84ca7a Mon Sep 17 00:00:00 2001 From: h30032433 Date: Fri, 24 May 2024 16:41:01 +0800 Subject: [PATCH] fix enable-dbus-broker-to-reexecute.patch (cherry picked from commit 91e0ecf55f40b40a7e70eefaada2ee03290bc053) --- dbus-broker.spec | 5 ++++- enable-dbus-broker-to-reexecute.patch | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dbus-broker.spec b/dbus-broker.spec index 7052772..3f46bbf 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -1,6 +1,6 @@ Name: dbus-broker Version: 35 -Release: 1 +Release: 2 Summary: Linux D-Bus Message Broker License: Apache-2.0 URL: https://github.com/bus1/dbus-broker @@ -88,6 +88,9 @@ fi %{_userunitdir}/dbus-broker.service %changelog +* Fri May 24 2024 huyubiao - 35-2 +- fix enable-dbus-broker-to-reexecute.patch + * Tue Feb 27 2024 hongjinghao - 35-1 - upgrade to 35 diff --git a/enable-dbus-broker-to-reexecute.patch b/enable-dbus-broker-to-reexecute.patch index fffe7f0..e3f9a52 100644 --- a/enable-dbus-broker-to-reexecute.patch +++ b/enable-dbus-broker-to-reexecute.patch @@ -1917,7 +1917,7 @@ index 0000000..c027999 + r = log_commitf(&broker->log, "NameOwner string %s is invalid, skipping.\n", + nameowner_ship_str); + if (r < 0) -+ return error_fold(r); ++ return error_fold(r); + close(peeri->connection.socket.fd); + continue; + } @@ -1932,7 +1932,6 @@ index 0000000..c027999 + if (arg0 && !strncmp(arg0 + strlen("arg0"), "=':1", strlen("=':1"))) { + continue; + } -+ rule_str_list_cur = stpcpy(rule_str_list_cur, rule_str); + left_length -= strlen(rule_str); + /* Besides the next rule_str, we should also keep MATCH_RULE_LENGTH_MAX + * bytes for sasl_str. sasl_str usually doesn't need that much space, @@ -1941,6 +1940,7 @@ index 0000000..c027999 + skip_this_peer = true; + break; + } ++ rule_str_list_cur = stpcpy(rule_str_list_cur, rule_str); + } + + if (skip_this_peer) {