dbus-1/dbus-move-everything-to-run-directory.patch

Index: dbus-1.6.8/configure
===================================================================
--- dbus-1.6.8.orig/configure
+++ dbus-1.6.8/configure
@@ -22254,7 +22254,7 @@ fi
 if ! test -z "$with_system_socket"; then
    DBUS_SYSTEM_SOCKET=$with_system_socket
 else
-   DBUS_SYSTEM_SOCKET=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket
+   DBUS_SYSTEM_SOCKET=/run/dbus/system_bus_socket
 fi
 
 
@@ -22278,9 +22278,9 @@ _ACEOF
 if ! test -z "$with_system_pid_file"; then
    DBUS_SYSTEM_PID_FILE=$with_system_pid_file
 elif test x$with_init_scripts = xredhat ; then
-   DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
+   DBUS_SYSTEM_PID_FILE=/run/messagebus.pid
 else
-   DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
+   DBUS_SYSTEM_PID_FILE=/run/dbus/pid
 fi
 
 
@@ -22289,7 +22289,7 @@ fi
 if ! test -z "$with_console_auth_dir"; then
    DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
 else
-   DBUS_CONSOLE_AUTH_DIR=/var/run/console/
+   DBUS_CONSOLE_AUTH_DIR=/run/console/
 fi
 
 
Index: dbus-1.6.8/configure.ac
===================================================================
--- dbus-1.6.8.orig/configure.ac
+++ dbus-1.6.8/configure.ac
@@ -1517,7 +1517,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$
 if ! test -z "$with_system_socket"; then
    DBUS_SYSTEM_SOCKET=$with_system_socket
 else
-   DBUS_SYSTEM_SOCKET=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket
+   DBUS_SYSTEM_SOCKET=/run/dbus/system_bus_socket
 fi
 
 AC_SUBST(DBUS_SYSTEM_SOCKET)
@@ -1533,9 +1533,9 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAU
 if ! test -z "$with_system_pid_file"; then
    DBUS_SYSTEM_PID_FILE=$with_system_pid_file
 elif test x$with_init_scripts = xredhat ; then
-   DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
+   DBUS_SYSTEM_PID_FILE=/run/messagebus.pid
 else
-   DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
+   DBUS_SYSTEM_PID_FILE=/run/dbus/pid
 fi
 
 AC_SUBST(DBUS_SYSTEM_PID_FILE)
@@ -1544,7 +1544,7 @@ AC_SUBST(DBUS_SYSTEM_PID_FILE)
 if ! test -z "$with_console_auth_dir"; then
    DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
 else
-   DBUS_CONSOLE_AUTH_DIR=/var/run/console/
+   DBUS_CONSOLE_AUTH_DIR=/run/console/
 fi
 
 AC_SUBST(DBUS_CONSOLE_AUTH_DIR)
Index: dbus-1.6.8/doc/dbus-specification.html
===================================================================
--- dbus-1.6.8.orig/doc/dbus-specification.html
+++ dbus-1.6.8/doc/dbus-specification.html
@@ -2599,7 +2599,7 @@
           in the <code class="literal">DBUS_SYSTEM_BUS_ADDRESS</code> environment 
           variable. If that variable is not set, applications should try 
           to connect to the well-known address
-          <code class="literal">unix:path=/var/run/dbus/system_bus_socket</code>.
+          <code class="literal">unix:path=/run/dbus/system_bus_socket</code>.
           <sup>[<a name="idp5733888" href="#ftn.idp5733888" class="footnote">2</a>]</sup>
         </p><p>
           On Unix systems, the system bus should default to searching
Index: dbus-1.6.8/doc/dbus-specification.xml
===================================================================
--- dbus-1.6.8.orig/doc/dbus-specification.xml
+++ dbus-1.6.8/doc/dbus-specification.xml
@@ -4717,7 +4717,7 @@
           in the <literal>DBUS_SYSTEM_BUS_ADDRESS</literal> environment 
           variable. If that variable is not set, applications should try 
           to connect to the well-known address
-          <literal>unix:path=/var/run/dbus/system_bus_socket</literal>.
+          <literal>unix:path=/run/dbus/system_bus_socket</literal>.
           <footnote>
             <para>
               The D-Bus reference implementation actually honors the 
Index: dbus-1.6.8/cmake/CMakeLists.txt
===================================================================
--- dbus-1.6.8.orig/cmake/CMakeLists.txt
+++ dbus-1.6.8/cmake/CMakeLists.txt
@@ -414,7 +414,7 @@ if (WIN32)
   # bus-test expects a non empty string
 	set (DBUS_SYSTEM_PID_FILE "/dbus-pid")
 else (WIN32)
-	set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
+	set (DBUS_SYSTEM_PID_FILE "/run/dbus/pid")
 endif (WIN32)
 
 #AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon]))
@@ -424,7 +424,7 @@ endif (WIN32)
 if (WIN32)
 	set (DBUS_CONSOLE_AUTH_DIR "")
 else (WIN32)
-	set (DBUS_CONSOLE_AUTH_DIR "/var/run/console/")
+	set (DBUS_CONSOLE_AUTH_DIR "/run/console/")
 endif (WIN32)
 
 #AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
Index: dbus-1.6.8/dbus/dbus-sysdeps-win.h
===================================================================
--- dbus-1.6.8.orig/dbus/dbus-sysdeps-win.h
+++ dbus-1.6.8/dbus/dbus-sysdeps-win.h
@@ -36,7 +36,7 @@ extern void *_dbus_win_get_dll_hmodule (
 #include <windows.h>
 #undef interface
 
-#define DBUS_CONSOLE_DIR "/var/run/console/"
+#define DBUS_CONSOLE_DIR "/run/console/"
 
 
 void _dbus_win_set_errno (int err);