Description: Don't use abstract sockets for tests (unsupported in kFreeBSD)
Author: Christoph Egger
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759023
Forwarded: not yet
Last-Update: 2014-08-24
Index: cjs/test/run-with-dbus
===================================================================
--- cjs.orig/test/run-with-dbus	2014-08-24 10:29:55.097063688 -0700
+++ cjs/test/run-with-dbus	2014-08-24 10:30:12.481524059 -0700
@@ -78,7 +78,7 @@
 ## this has to be set BEFORE we start session bus,
 ## or stuff the session bus starts won't get it
 if ! test -z "$START_SYSTEM_BUS" ; then
-    DBUS_SYSTEM_BUS_ADDRESS="unix:abstract=/tmp/dbus-$USER-$$-$RANDOM-system"
+    DBUS_SYSTEM_BUS_ADDRESS="unix:path=/tmp/dbus-$USER-$$-$RANDOM-system"
     export DBUS_SYSTEM_BUS_ADDRESS
 fi
 
@@ -99,12 +99,12 @@
         SED_RULE="s@<type>session</type>@<type>session</type><standard_session_servicedirs/><servicedir>$PWD/test-services/</servicedir>@"
 
         if test x"$GJS_USE_FIXED_DBUS_ADDRESS" != x ; then
-            # use fixed path (unix:abstract=/tmp/dbus-$USER-$DISPLAY) for session bus for
+            # use fixed path (unix:path=/tmp/dbus-$USER-$DISPLAY) for session bus for
             # easy access across shells
             # (DISPLAY without ':' as dbus doesn't like it unescaped)
-            SED_RULE="$SED_RULE;s@<listen>.*</listen>@<listen>unix:abstract=/tmp/dbus-$USER-${DISPLAY#:}</listen>@"
+            SED_RULE="$SED_RULE;s@<listen>.*</listen>@<listen>unix:path=/tmp/dbus-$USER-${DISPLAY#:}</listen>@"
         else
-            SED_RULE="$SED_RULE;s@<listen>.*</listen>@<listen>unix:abstract=/tmp/dbus-$USER-$$-$RANDOM</listen>@"
+            SED_RULE="$SED_RULE;s@<listen>.*</listen>@<listen>unix:path=/tmp/dbus-$USER-$$-$RANDOM</listen>@"
         fi
         sed -e "$SED_RULE" "$CONFIG_FILE" > "$NEW_CONFIG_FILE"
         CONFIG_FILE="$NEW_CONFIG_FILE"
@@ -129,7 +129,7 @@
         NEW_SYSTEM_CONFIG_FILE="$BUILDDIR"/uninstalled-system-test-bus.conf
 
         SED_RULE="s@<type>session</type>@<type>system</type><servicedir>$BUILDDIR/test-system-services/</servicedir>@"
-        # use fixed path (unix:abstract=/tmp/dbus-$USER-$DISPLAY) for session bus for
+        # use fixed path (unix:path=/tmp/dbus-$USER-$DISPLAY) for session bus for
         # easy access across shells
         # (DISPLAY without ':' as dbus doesn't like it unescaped)
         SED_RULE="$SED_RULE;s@<listen>.*</listen>@<listen>$DBUS_SYSTEM_BUS_ADDRESS</listen>@"
