From a1628c643eed8cef1849eeb7b70c5451ef6ebb4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 13 Jan 2015 19:09:24 +0100
Subject: [PATCH] dbus: run dbus-uuidgen --ensure via post-install not via
 runit.

Also remove the REMOVE script, which is completely wrong.
---
 srcpkgs/dbus/INSTALL        | 10 +++-------
 srcpkgs/dbus/REMOVE         | 13 -------------
 srcpkgs/dbus/files/dbus/run |  1 -
 srcpkgs/dbus/template       |  2 +-
 4 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/dbus/REMOVE

diff --git a/srcpkgs/dbus/INSTALL b/srcpkgs/dbus/INSTALL
index 2fa82f4ad9b..6d2e0a6c199 100644
--- a/srcpkgs/dbus/INSTALL
+++ b/srcpkgs/dbus/INSTALL
@@ -1,13 +1,9 @@
-#
-# This script fixes permissions for dbus-daemon-launch-helper.
-#
-dbus_launch=usr/libexec/dbus-daemon-launch-helper
-
 case "${ACTION}" in
 post)
 	[ ! -d var/lib/dbus ] && install -d var/lib/dbus
 	[ ! -d etc/dbus-1/session.d ] && install -d etc/dbus-1/session.d
-	chown root:22 ${dbus_launch}
-	chmod 4750 ${dbus_launch}
+	chown root:22 usr/libexec/dbus-daemon-launch-helper
+	chmod 4750 usr/libexec/dbus-daemon-launch-helper
+	usr/bin/dbus-uuidgen --ensure || :
 	;;
 esac
diff --git a/srcpkgs/dbus/REMOVE b/srcpkgs/dbus/REMOVE
deleted file mode 100644
index d483da401df..00000000000
--- a/srcpkgs/dbus/REMOVE
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This script removes pre-created dirs required for dbus-daemon.
-#
-case "${ACTION}" in
-purge)
-	if [ -d var/run/dbus ]; then
-		rm -rf var/run/dbus
-	fi
-	if [ -d etc/dbus-1/session.d ]; then
-		rm -rf etc/dbus-1/session.d
-	fi
-	;;
-esac
diff --git a/srcpkgs/dbus/files/dbus/run b/srcpkgs/dbus/files/dbus/run
index 2ed764dd625..ed60b734343 100755
--- a/srcpkgs/dbus/files/dbus/run
+++ b/srcpkgs/dbus/files/dbus/run
@@ -1,4 +1,3 @@
 #!/bin/sh
 [ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
-dbus-uuidgen --ensure
 exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index bbbd2cea72a..3ba7e9b0f4a 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -2,7 +2,7 @@
 #
 pkgname=dbus
 version=1.8.14
-revision=1
+revision=2
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"