Import of pkgsrc-2015Q3

sysutils/dbus/files/smf/dbus.sh

@@ -13,11 +13,16 @@ fi
 if [ ! -f @VARBASE@/db/dbus/machine-id ]; then
 	@PREFIX@/bin/dbus-uuidgen --ensure
 fi
-
+pidfile="@VARBASE@/run/dbus/pid"
 case "$1" in
 'start')
-	if [ -f @VARBASE@/run/dbus/pid ]; then
-		rm -f @VARBASE@/run/dbus/pid
+    dir="@VARBASE@/run/dbus"
+    if ! [ -d $dir ]; then
+		@MKDIR@ $dir
+		@CHMOD@ 0755 $dir
+		@CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir
+	elif [ -f $pidfile ]; then
+		rm -f $pidfile
 	fi
 	@PREFIX@/bin/dbus-daemon --system
 	err=$?

sysutils/dbus/files/smf/manifest.xml

@@ -19,7 +19,7 @@
 		exec='@PREFIX@/@SMF_METHOD_FILE.dbus@ start'
 		timeout_seconds='30'>
 		<method_context>
-			<method_credential user='@DBUS_USER@' group='@DBUS_GROUP@' />
+			<method_credential user='root' group='@DBUS_GROUP@' />
 		</method_context>
 	</exec_method>
 	<exec_method