diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-09-23 00:38:29 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-09-23 00:38:29 +0000 |
| commit | efa3492c6eaa112592e4d835310cf6d18a849eae (patch) | |
| tree | 576432fcac54aaa5a49102e1229d979ddf2c0ee9 /packages/dbus | |
| parent | 1c259e381f897d199abc66f6237aeb8542779468 (diff) | |
| parent | e08f51149bd655e670114418f1f873d93d938fd2 (diff) | |
merge of '68c1dba00e182241b1e887487fb3c8271f9c0d01'
and '954ad99909199c0ef7c0d21819dce8c20cf40c64'
Diffstat (limited to 'packages/dbus')
| -rw-r--r-- | packages/dbus/dbus.inc | 1 | ||||
| -rw-r--r-- | packages/dbus/dbus/fix-segfault.patch | 11 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.2.bb | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index 8baf8d9feb..b329e82fa3 100644 --- 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 index de5bcff774..0000000000 --- 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 3c45ee8bd6..f5e4aa16ea 100644 --- 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 0c97e30406..799509ab66 100644 --- 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" |