aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-05-14 17:29:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-15 23:24:04 +0100
commit596470547451084944082cbed50351ad0d912255 (patch)
tree2cb2d74142281a3ddadc520f3bbb25ac00b0d371 /meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
parent0c16964c8f1c96066ab7254048bc5025dd7b4e59 (diff)
downloadopenembedded-core-contrib-596470547451084944082cbed50351ad0d912255.tar.gz
dbus: Update to 1.8.2 version
Upgrade dbus to 1.8.2. Modify ptest suite to make it enabled on new version. If systemd in DISTRO_FEATURES, we expect to install dbus systemd unit files. Remove unneeded patches since it's included in new version. Remove unrecognized option: "--with-xml" [YOCTO #6092] Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch')
-rw-r--r--meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch b/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
deleted file mode 100644
index 96290f41be..0000000000
--- a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
-From: Radoslaw Pajak <r.pajak@samsung.com>
-Date: Fri, 8 Nov 2013 13:51:32 +0100
-Subject: [PATCH] fixed memory freeing if error during listing services
-
-Upstream-Status: Backport
-
-Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
-Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- bus/activation.c | 2 +-
- bus/services.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bus/activation.c b/bus/activation.c
-index fcb7133..ea48a26 100644
---- a/bus/activation.c
-+++ b/bus/activation.c
-@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
-
- error:
- for (j = 0; j < i; j++)
-- dbus_free (retval[i]);
-+ dbus_free (retval[j]);
- dbus_free (retval);
-
- return FALSE;
-diff --git a/bus/services.c b/bus/services.c
-index 6f380fa..01a720e 100644
---- a/bus/services.c
-+++ b/bus/services.c
-@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
-
- error:
- for (j = 0; j < i; j++)
-- dbus_free (retval[i]);
-+ dbus_free (retval[j]);
- dbus_free (retval);
-
- return FALSE;
---
-1.9.0
-