4 files changed, 19 insertions, 2 deletions
diff --git a/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch b/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch
new file mode 100644
index 0000000000..75ee6bdd6a
--- /dev/null
+++ b/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch
@@ -0,0 +1,16 @@
+# DBus is from the desktop world, systems are _FAST_ there
+# On Embedded, some things might take a bit longer
+# Default session bus timeout is 300 seconds(!), whereas default
+# system bus timeout is only 25 seconds. This increases it to 60.
+# Signed off: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+Index: dbus-1.2.1/bus/system.conf
+===================================================================
+--- dbus-1.2.1.orig/bus/system.conf.in
++++ dbus-1.2.1/bus/system.conf.in
+@@ -65,4 +65,6 @@
+ 
+   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+ 
++  <limit name="reply_timeout">60000</limit>
++
+ </busconfig>
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index b0f0299a0d..d99fa26455 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -9,6 +9,7 @@ SRC_URI = "\
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
   file://fix-install-daemon.patch;patch=1 \
+  file://sanitize-reply-timeout.patch;patch=1 \
   file://dbus-1.init \
 "
 
diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb
index 61379ee8b7..b3eca63491 100644
--- a/packages/dbus/dbus_1.0.3.bb
+++ b/packages/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-PR = "r12"
+PR = "r13"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index d067dfcedb..4e4caaa78c 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r5"
+PR = "r6"