diff -r b3a835aa617c -r 11e79e472059 dbus/dbus.patch
--- a/dbus/dbus.patch	Mon Jan 12 19:09:19 2009 +0100
+++ b/dbus/dbus.patch	Tue Jan 13 18:26:52 2009 +0100
@@ -1,7 +1,7 @@
 Index: dbus/dbus-internals.c
 --- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
 +++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
-@@ -512,6 +512,14 @@
+@@ -516,6 +516,14 @@
    uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
    
    _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
@@ -27,7 +27,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <signal.h>
-@@ -526,6 +527,8 @@
+@@ -728,6 +729,8 @@
  #   else
  #       if defined(NAME_MAX)
  	 name_max = NAME_MAX;
@@ -36,3 +36,39 @@
  #       else
  #           error "buffer size for readdir_r cannot be determined"
  #       endif
+@@ -1233,4 +1236,4 @@
+   _dbus_string_free (&cmdline);
+   _dbus_string_free (&path);
+   return FALSE;
+-}
+\ No newline at end of file
++}
+Index: bus/config-parser-trivial.c
+--- bus/config-parser-trivial.c.orig	2009-01-13 16:12:32.838078473 +0100
++++ bus/config-parser-trivial.c	2009-01-13 16:11:58.375810360 +0100
+@@ -131,6 +131,25 @@
+ }
+ 
+ dbus_bool_t
++bus_config_parser_check_doctype (BusConfigParser   *parser,
++                                 const char        *doctype,
++                                 DBusError         *error)
++{
++  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
++
++  if (strcmp (doctype, "busconfig") != 0)
++    {
++      dbus_set_error (error,
++                      DBUS_ERROR_FAILED,
++                      "Configuration file has the wrong document type %s",
++                      doctype);
++      return FALSE;
++    }
++  else
++    return TRUE;
++}
++
++dbus_bool_t
+ bus_config_parser_start_element (BusConfigParser   *parser,
+                                  const char        *element_name,
+                                  const char       **attribute_names,