From: John Audia <redacted>
Date: Fri, 1 Aug 2025 14:12:05 +0000 (-0400)
Subject: dbus: use pid file owned by dbus
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=78bdf21e799c917d1e3336e09ca8d06f748733e7;p=openwrt-packages.git

dbus: use pid file owned by dbus

Switching to the dbus user in edc5a534 also needed to redefine the
location of dbus.pid into the directory under its ownership. This
commit fixes that omission.

Build system: x86/64
Build-tested: x86/64-glibc
Run-tested: x86/64-glibc

Signed-off-by: John Audia <redacted>
---

diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile
index 20a96cf44..193d54d2c 100644
--- a/utils/dbus/Makefile
+++ b/utils/dbus/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus
 PKG_VERSION:=1.16.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus
@@ -86,7 +86,7 @@ MESON_ARGS += \
 	-Ddbus_user=root \
 	-Dsession_socket_dir=/tmp \
 	-Dsystem_socket=/var/run/dbus/system_bus_socket \
-	-Dsystem_pid_file=/var/run/dbus.pid \
+	-Dsystem_pid_file=/var/run/dbus/dbus.pid \
 	-Dasserts=false \
 	-Dchecks=false \
 	-Ddoxygen_docs=disabled \