From c7812d7f9f598e3958c8ade1d18523d97efc7976 Mon Sep 17 00:00:00 2001
From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Fri, 28 Nov 2025 21:26:37 +0100
Subject: dbus-broker: upgrade 36->37

Changelog:
- Add `/etc` and `/run` to the search-paths for system services. This
  change is aligned with recent changes to the reference
  implementation.
- Support systemd's `notify-reload` to trigger a reload operation.
  This replaces the old `busctl call ...ReloadConfig` operation.
- Extend `org.freedesktop.DBus.Debug.Stats.GetStats` with all the
  fields defined by the specification.
- Fix a bug in match-rule processing which caused argument processing
  to fail for any but the first message argument.
- Fix a memory leak in configuration processing when parsing invalid
  user or group IDs.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-core/dbus/dbus-broker_36.bb | 38 -----------------------------
 meta-oe/recipes-core/dbus/dbus-broker_37.bb | 38 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker_36.bb
 create mode 100644 meta-oe/recipes-core/dbus/dbus-broker_37.bb

diff --git a/meta-oe/recipes-core/dbus/dbus-broker_36.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb
deleted file mode 100644
index 8959927a92..0000000000
--- a/meta-oe/recipes-core/dbus/dbus-broker_36.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "dbus broker"
-DESCRIPTION = "Drop-in replacement for dbus-daemon."
-SECTION = "base"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
-DEPENDS = "\
-    expat \
-    systemd \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \
-"
-
-SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b"
-
-UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
-UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)"
-
-SYSTEMD_SERVICE:${PN} = "${BPN}.service"
-
-inherit meson pkgconfig systemd features_check
-
-EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
-EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/systemd/user
-    ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service
-}
-
-RCONFLICTS:${PN} = "dbus"
-RDEPENDS:${PN} += "dbus-common dbus-tools"
-
-FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
-FILES:${PN} += "${systemd_system_unitdir}"
-FILES:${PN} += "${systemd_user_unitdir}"
diff --git a/meta-oe/recipes-core/dbus/dbus-broker_37.bb b/meta-oe/recipes-core/dbus/dbus-broker_37.bb
new file mode 100644
index 0000000000..f0312181b6
--- /dev/null
+++ b/meta-oe/recipes-core/dbus/dbus-broker_37.bb
@@ -0,0 +1,38 @@
+SUMMARY = "dbus broker"
+DESCRIPTION = "Drop-in replacement for dbus-daemon."
+SECTION = "base"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
+DEPENDS = "\
+    expat \
+    systemd \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \
+"
+
+SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "f819a8db8795fa08c767612e3823fd594694a0990f2543ecf35d6a1a6bf2ab5b"
+
+UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)"
+
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
+
+inherit meson pkgconfig systemd features_check
+
+EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
+EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/systemd/user
+    ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service
+}
+
+RCONFLICTS:${PN} = "dbus"
+RDEPENDS:${PN} += "dbus-common dbus-tools"
+
+FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
+FILES:${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_user_unitdir}"
-- 
cgit v1.2.3-54-g00ecf