dbus: Drop fix-segfault patch. Thei issue it fixed can no longer be reproduced (teste...

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 8baf8d9..b329e82 100644 (file)
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -7,7 +7,6 @@ DEPENDS = "expat virtual/libintl"
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
           file://tmpdir.patch;patch=1 \
           file://dbus-1.init \
-          file://fix-segfault.patch;patch=1 \
            file://cross.patch;patch=1 \
           file://fix-install-daemon.patch;patch=1"
 

diff --git a/packages/dbus/dbus/fix-segfault.patch b/packages/dbus/dbus/fix-segfault.patch
deleted file mode 100644 (file)
index de5bcff..0000000
--- a/packages/dbus/dbus/fix-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /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_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index 3c45ee8..f5e4aa1 100644 (file)
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -2,4 +2,4 @@ require dbus.inc
 
 SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
 
-PR = "r3"
+PR = "r4"

diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
index 0c97e30..799509a 100644 (file)
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -2,4 +2,4 @@ require dbus.inc
 
 SRC_URI += " file://fix-waitpid.patch;patch=1"
 
-PR = "r3"
+PR = "r4"