From 283741972cde9183446ce74feacc40af714d5756 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Tue, 2 Mar 2021 21:34:11 -0300
Subject: [PATCH] recipes: daemons/dbus*: Reconfigured
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

diff --git a/archive/dbus/rc.main b/archive/dbus/rc.main
index a0cda82f..1e345ee6 100644
--- a/archive/dbus/rc.main
+++ b/archive/dbus/rc.main
@@ -15,8 +15,6 @@ start()
 {
     echo "*** ${SVNAME}: Starting dbus ..."
 
-    test -d /var/run/dbus || mkdir -p /var/run/dbus
-
     # Validate or generate unique ID file
     /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
 
diff --git a/recipes/daemons/dbus-x11/recipe b/recipes/daemons/dbus-x11/recipe
index eb1fce4c..9d029a16 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=3
+release=4
 
 pkgname=dbus-x11
 
@@ -77,13 +77,13 @@ build()
      --disable-selinux \
      --disable-doxygen-docs \
      --with-xml=expat \
-     --with-system-socket=/var/run/dbus/system_bus_socket \
-     --with-system-pid-file=/var/run/dbus/dbus.pid \
+     --with-system-socket=/run/system_bus_socket \
+     --with-system-pid-file=/run/dbus.pid \
      --with-console-auth-dir=/dev/console \
      --build="$(gcc -dumpmachine)"
 
     make -j${jobs} V=1
-    make -j${jobs} DESTDIR="$destdir" install-strip
+    make -j${jobs} DESTDIR="$destdir" install
 
     chown root:messagebus "${destdir}/usr/libexec/dbus-daemon-launch-helper"
     chmod 4750 "${destdir}/usr/libexec/dbus-daemon-launch-helper"
diff --git a/recipes/daemons/dbus/recipe b/recipes/daemons/dbus/recipe
index 0602772a..a7c2fcb2 100644
--- a/recipes/daemons/dbus/recipe
+++ b/recipes/daemons/dbus/recipe
@@ -20,7 +20,7 @@ set -e
 
 program=dbus
 version=1.12.20
-release=3
+release=4
 
 # Define a category for the output of the package name
 pkgcategory=daemons
@@ -73,14 +73,14 @@ build()
      --disable-selinux \
      --disable-doxygen-docs \
      --with-xml=expat \
-     --with-system-socket=/var/run/dbus/system_bus_socket \
-     --with-system-pid-file=/var/run/dbus/dbus.pid \
+     --with-system-socket=/run/system_bus_socket \
+     --with-system-pid-file=/run/dbus.pid \
      --with-console-auth-dir=/dev/console \
      --without-x \
      --build="$(gcc -dumpmachine)"
     
     make -j${jobs} V=1
-    make -j${jobs} DESTDIR="$destdir" install-strip
+    make -j${jobs} DESTDIR="$destdir" install
 
     chown root:messagebus "${destdir}/usr/libexec/dbus-daemon-launch-helper"
     chmod 4750 "${destdir}/usr/libexec/dbus-daemon-launch-helper"
-- 
2.11.4.GIT