[dbus] version bump 1.2.16 -> 1.2.24

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 91 insertions, 0 deletions

diff --git a/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch b/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
new file mode 100644
index 000000000..cccaa3fb9
--- /dev/null
+++ b/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
@@ -0,0 +1,42 @@
+From 8032e967a4684e93ab25067b1b4344dbd8d0526d Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Sun, 31 May 2009 09:37:49 +0200
+Subject: [PATCH 1/3] dbus-daemon-launch-helper: fix build with libxml
+
+dbus-daemon-launch-helper links with the trival config parser, which
+doesn't provide bus_config_parser_check_doctype(), like the big parser does.
+The libxml loader unfortunately wants to call it, so this breaks the build.
+
+Fix it by including a dummy bus_config_parser_check_doctype() in the trivial
+config parser.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+# 20091211 rsc: mailed to dbus mailing list
+
+ bus/config-parser-trivial.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
+index 98d554e..a936371 100644
+--- a/bus/config-parser-trivial.c
++++ b/bus/config-parser-trivial.c
+@@ -310,6 +310,14 @@ bus_config_parser_get_service_dirs (BusConfigParser *parser)
+   return &parser->service_dirs;
+ }
+ 
++dbus_bool_t
++bus_config_parser_check_doctype (BusConfigParser   *parser,
++                                 const char        *doctype,
++                                 DBusError         *error)
++{
++    return TRUE;
++}
++
+ #ifdef DBUS_BUILD_TESTS
+ #include <stdio.h>
+ #include "test.h"
+-- 
+1.6.3.1
+
diff --git a/patches/dbus-1.2.24/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.2.24/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
new file mode 100644
index 000000000..f9d432079
--- /dev/null
+++ b/patches/dbus-1.2.24/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
@@ -0,0 +1,46 @@
+From 0abe80a736147a55fbae630aaf3b7bd70493b74a Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 31 May 2009 09:38:33 +0200
+Subject: [PATCH 2/3] dbus: change DBUS_MACHINE_UUID_FILE path
+
+Change the path for DBUS_MACHINE_UUID_FILE from /var/lib/dbus/machine-id
+to /var/run/dbus/machine-id. This is necessary because /var/lib may be a
+readonly filesystem.
+This is a special situation in our BSPs. This patch is not intended for
+upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ dbus/Makefile.am  |    2 +-
+ tools/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index e966a43..c015ffe 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -2,7 +2,7 @@
+ configdir=$(sysconfdir)/dbus-1
+ 
+ INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION	\
+-	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"		\
++	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\"		\
+ 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"			\
+ 	-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
+ 
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 9fad7a7..e347afc 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,6 +1,6 @@
+ configdir=$(sysconfdir)/dbus-1
+ 
+-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
++INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\"
+ 
+ bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen
+ 
+-- 
+1.6.3.1
+
diff --git a/patches/dbus-1.2.24/autogen.sh b/patches/dbus-1.2.24/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/dbus-1.2.24/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/dbus-1.2.24/series b/patches/dbus-1.2.24/series
new file mode 100644
index 000000000..430010de0
--- /dev/null
+++ b/patches/dbus-1.2.24/series
@@ -0,0 +1,2 @@
+0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
+0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch