1.1 --- a/dbus/dbus.patch Mon Jan 12 19:09:19 2009 +0100
1.2 +++ b/dbus/dbus.patch Tue Jan 13 18:26:52 2009 +0100
1.3 @@ -1,7 +1,7 @@
1.4 Index: dbus/dbus-internals.c
1.5 --- dbus/dbus-internals.c.orig 2006-11-17 20:12:18 +0100
1.6 +++ dbus/dbus-internals.c 2006-11-18 12:35:56 +0100
1.7 -@@ -512,6 +512,14 @@
1.8 +@@ -516,6 +516,14 @@
1.9 uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
1.10
1.11 _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
1.12 @@ -27,7 +27,7 @@
1.13 #include <stdlib.h>
1.14 #include <string.h>
1.15 #include <signal.h>
1.16 -@@ -526,6 +527,8 @@
1.17 +@@ -728,6 +729,8 @@
1.18 # else
1.19 # if defined(NAME_MAX)
1.20 name_max = NAME_MAX;
1.21 @@ -36,3 +36,39 @@
1.22 # else
1.23 # error "buffer size for readdir_r cannot be determined"
1.24 # endif
1.25 +@@ -1233,4 +1236,4 @@
1.26 + _dbus_string_free (&cmdline);
1.27 + _dbus_string_free (&path);
1.28 + return FALSE;
1.29 +-}
1.30 +\ No newline at end of file
1.31 ++}
1.32 +Index: bus/config-parser-trivial.c
1.33 +--- bus/config-parser-trivial.c.orig 2009-01-13 16:12:32.838078473 +0100
1.34 ++++ bus/config-parser-trivial.c 2009-01-13 16:11:58.375810360 +0100
1.35 +@@ -131,6 +131,25 @@
1.36 + }
1.37 +
1.38 + dbus_bool_t
1.39 ++bus_config_parser_check_doctype (BusConfigParser *parser,
1.40 ++ const char *doctype,
1.41 ++ DBusError *error)
1.42 ++{
1.43 ++ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
1.44 ++
1.45 ++ if (strcmp (doctype, "busconfig") != 0)
1.46 ++ {
1.47 ++ dbus_set_error (error,
1.48 ++ DBUS_ERROR_FAILED,
1.49 ++ "Configuration file has the wrong document type %s",
1.50 ++ doctype);
1.51 ++ return FALSE;
1.52 ++ }
1.53 ++ else
1.54 ++ return TRUE;
1.55 ++}
1.56 ++
1.57 ++dbus_bool_t
1.58 + bus_config_parser_start_element (BusConfigParser *parser,
1.59 + const char *element_name,
1.60 + const char **attribute_names,
