From 699df0a583524171b4a42e65bb18cc959c569b4f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Wed, 7 Apr 2021 16:29:41 -0300
Subject: [PATCH] recipes: daemons/dbus*: Reconfigure using /var/run/dbus as
 address path
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This location is hard-coded in other programs (e.g tdelibs).

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 archive/dbus/rc.main            | 5 +++++
 recipes/daemons/dbus-x11/recipe | 9 +++++----
 recipes/daemons/dbus/recipe     | 8 ++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/archive/dbus/rc.main b/archive/dbus/rc.main
index 9a4788af..f7638643 100644
--- a/archive/dbus/rc.main
+++ b/archive/dbus/rc.main
@@ -15,6 +15,11 @@ start()
 {
     echo "*** ${SVNAME}: Starting dbus ..."
 
+    if test ! -e /var/run/dbus
+    then
+        mkdir -p /var/run/dbus || exit $?
+    fi
+
     # Validate or generate unique ID file
     /usr/bin/dbus-uuidgen --ensure
 
diff --git a/recipes/daemons/dbus-x11/recipe b/recipes/daemons/dbus-x11/recipe
index ae9c2e33..bae16872 100644
--- a/recipes/daemons/dbus-x11/recipe
+++ b/recipes/daemons/dbus-x11/recipe
@@ -20,7 +20,7 @@ set -e
 
 program=dbus
 version=1.12.20
-release=6
+release=7
 
 pkgname=dbus-x11
 
@@ -77,8 +77,9 @@ build()
      --disable-selinux \
      --disable-doxygen-docs \
      --with-xml=expat \
-     --with-system-socket=/run/system_bus_socket \
-     --with-system-pid-file=/run/dbus.pid \
+     --with-x \
+     --with-system-socket=/var/run/dbus/system_bus_socket \
+     --with-system-pid-file=/var/run/dbus/dbus.pid \
      --with-console-auth-dir=/dev/console \
      --with-systemduserunitdir=no \
      --with-systemdsystemunitdir=no \
@@ -110,7 +111,7 @@ build()
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
 
-    # Install perp service for dbus
+    # Install perp service for DBUS
 
     mkdir -p "${destdir}/etc/perp/dbus"
     cp -p "${worktree}/archive/dbus/rc.log" \
diff --git a/recipes/daemons/dbus/recipe b/recipes/daemons/dbus/recipe
index 6ce95ab6..bbb32301 100644
--- a/recipes/daemons/dbus/recipe
+++ b/recipes/daemons/dbus/recipe
@@ -20,7 +20,7 @@ set -e
 
 program=dbus
 version=1.12.20
-release=6
+release=7
 
 # Define a category for the output of the package name
 pkgcategory=daemons
@@ -73,8 +73,8 @@ build()
      --disable-selinux \
      --disable-doxygen-docs \
      --with-xml=expat \
-     --with-system-socket=/run/system_bus_socket \
-     --with-system-pid-file=/run/dbus.pid \
+     --with-system-socket=/var/run/dbus/system_bus_socket \
+     --with-system-pid-file=/var/run/dbus/dbus.pid \
      --with-console-auth-dir=/dev/console \
      --with-systemduserunitdir=no \
      --with-systemdsystemunitdir=no \
@@ -107,7 +107,7 @@ build()
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
 
-    # Install perp service for dbus
+    # Install perp service for DBUS
 
     mkdir -p "${destdir}/etc/perp/dbus"
     cp -p "${worktree}/archive/dbus/rc.log" \
-- 
2.11.4.GIT