From: Koen Kooi <koen@openembedded.org>
Date: Sat, 29 Jul 2006 21:14:47 +0000 (+0000)
Subject: dbus 0.62: 'fix' segfault using patch from dbus 0.90
X-Git-Tag: Release-2010-05/1~9453^2~1050
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb05d950954fb06dbb8455360eaf652b08266f04;p=openembedded.git

dbus 0.62: 'fix' segfault using patch from dbus 0.90
---

diff --git a/packages/dbus/dbus-0.6x/fix-segfault.patch b/packages/dbus/dbus-0.6x/fix-segfault.patch
new file mode 100644
index 0000000000..de5bcff774
--- /dev/null
+++ b/packages/dbus/dbus-0.6x/fix-segfault.patch
@@ -0,0 +1,11 @@
+--- /tmp/dbus-marshal-recursive.c	2006-07-28 14:58:08.000000000 +0200
++++ dbus-0.90/dbus/dbus-marshal-recursive.c	2006-07-28 14:58:18.724411000 +0200
+@@ -1294,7 +1294,7 @@
+                                                _dbus_string_get_length (&block->replacement) - block->padding,
+                                                &fixups))
+     goto oom;
+-
++printf("%s(%d)""got here", __FILE__, __LINE__);
+ #if RECURSIVE_MARSHAL_WRITE_TRACE
+   _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding,
+                  _dbus_string_get_length (&block->replacement) - block->padding);
diff --git a/packages/dbus/dbus_0.62.inc b/packages/dbus/dbus_0.62.inc
index c1dcc0e4a3..c1c84713a3 100644
--- a/packages/dbus/dbus_0.62.inc
+++ b/packages/dbus/dbus_0.62.inc
@@ -1,5 +1,5 @@
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
@@ -10,6 +10,7 @@ SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
 	   file://dbus-1.init \
 	   file://no-examples.patch;patch=1 \
+	   file://fix-segfault.patch;patch=1 \
 	   ${SRC_URI_EXTRA}"
 
 inherit autotools pkgconfig update-rc.d gettext