summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky-bleeding.conf4
-rw-r--r--meta/packages/dbus/dbus-1.1.2/fix-validate.patch49
-rw-r--r--meta/packages/dbus/dbus-1.1.3/cross.patch (renamed from meta/packages/dbus/dbus-1.1.2/cross.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.1.3/dbus-1.init (renamed from meta/packages/dbus/dbus-1.1.2/dbus-1.init)0
-rw-r--r--meta/packages/dbus/dbus-1.1.3/fix-install-daemon.patch (renamed from meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.1.3/tmpdir.patch (renamed from meta/packages/dbus/dbus-1.1.2/tmpdir.patch)0
-rw-r--r--meta/packages/dbus/dbus-native_1.1.3.bb (renamed from meta/packages/dbus/dbus-native_1.1.2.bb)1
-rw-r--r--meta/packages/dbus/dbus_1.1.3.bb (renamed from meta/packages/dbus/dbus_1.1.2.bb)1
8 files changed, 2 insertions, 53 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index c54c0ada7c..9f92cbd641 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,4 @@
1PREFERRED_VERSION_dbus ?= "1.1.2" 1PREFERRED_VERSION_dbus ?= "1.1.3"
2PREFERRED_VERSION_dbus-native ?= "1.1.2" 2PREFERRED_VERSION_dbus-native ?= "1.1.3"
3 3
4require conf/distro/poky.conf 4require conf/distro/poky.conf
diff --git a/meta/packages/dbus/dbus-1.1.2/fix-validate.patch b/meta/packages/dbus/dbus-1.1.2/fix-validate.patch
deleted file mode 100644
index 3bfddca603..0000000000
--- a/meta/packages/dbus/dbus-1.1.2/fix-validate.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1commit ae4a1586969aaca534508837830d7d3de4ade070
2Author: Havoc Pennington <hp@redhat.com>
3Date: Mon Jul 30 16:16:47 2007 +0000
4
5 2007-07-30 Havoc Pennington <hp@redhat.com>
6
7 * bus/activation-helper.c (check_bus_name): don't use
8 _dbus_check_valid_bus_name() which is only around with
9 --enable-checks, instead use _dbus_validate_bus_name().
10 Bug #11766 from Diego <diego@pemas.net>
11
12diff --git a/bus/activation-helper.c b/bus/activation-helper.c
13index 1636660..36006a4 100644
14--- a/bus/activation-helper.c
15+++ b/bus/activation-helper.c
16@@ -381,14 +381,20 @@ exec_for_correct_user (char *exec, char *user, DBusError *error)
17 }
18
19 static dbus_bool_t
20-check_bus_name (const char *bus_name, DBusError *error)
21+check_bus_name (const char *bus_name,
22+ DBusError *error)
23 {
24- if (!_dbus_check_is_valid_bus_name (bus_name))
25+ DBusString str;
26+
27+ _dbus_string_init_const (&str, bus_name);
28+ if (!_dbus_validate_bus_name (&str, 0, _dbus_string_get_length (&str)))
29 {
30 dbus_set_error (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND,
31- "bus name '%s' not found\n", bus_name);
32+ "bus name '%s' is not a valid bus name\n",
33+ bus_name);
34 return FALSE;
35 }
36+
37 return TRUE;
38 }
39
40@@ -517,7 +523,8 @@ check_dbus_user (BusConfigParser *parser, DBusError *error)
41 }
42
43 dbus_bool_t
44-run_launch_helper (const char *bus_name, DBusError *error)
45+run_launch_helper (const char *bus_name,
46+ DBusError *error)
47 {
48 BusConfigParser *parser;
49 dbus_bool_t retval;
diff --git a/meta/packages/dbus/dbus-1.1.2/cross.patch b/meta/packages/dbus/dbus-1.1.3/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/meta/packages/dbus/dbus-1.1.2/cross.patch
+++ b/meta/packages/dbus/dbus-1.1.3/cross.patch
diff --git a/meta/packages/dbus/dbus-1.1.2/dbus-1.init b/meta/packages/dbus/dbus-1.1.3/dbus-1.init
index 0725083c69..0725083c69 100644
--- a/meta/packages/dbus/dbus-1.1.2/dbus-1.init
+++ b/meta/packages/dbus/dbus-1.1.3/dbus-1.init
diff --git a/meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.1.3/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch
+++ b/meta/packages/dbus/dbus-1.1.3/fix-install-daemon.patch
diff --git a/meta/packages/dbus/dbus-1.1.2/tmpdir.patch b/meta/packages/dbus/dbus-1.1.3/tmpdir.patch
index 838b903f0a..838b903f0a 100644
--- a/meta/packages/dbus/dbus-1.1.2/tmpdir.patch
+++ b/meta/packages/dbus/dbus-1.1.3/tmpdir.patch
diff --git a/meta/packages/dbus/dbus-native_1.1.2.bb b/meta/packages/dbus/dbus-native_1.1.3.bb
index e2fb483824..55889a1a8b 100644
--- a/meta/packages/dbus/dbus-native_1.1.2.bb
+++ b/meta/packages/dbus/dbus-native_1.1.3.bb
@@ -12,7 +12,6 @@ DEFAULT_PREFERENCE = "-1"
12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" 12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
14 file://cross.patch;patch=1 \ 14 file://cross.patch;patch=1 \
15 file://fix-validate.patch;patch=1 \
16 " 15 "
17 16
18inherit autotools pkgconfig gettext native 17inherit autotools pkgconfig gettext native
diff --git a/meta/packages/dbus/dbus_1.1.2.bb b/meta/packages/dbus/dbus_1.1.3.bb
index 93846bd822..6e47790159 100644
--- a/meta/packages/dbus/dbus_1.1.2.bb
+++ b/meta/packages/dbus/dbus_1.1.3.bb
@@ -13,7 +13,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
13 file://dbus-1.init \ 13 file://dbus-1.init \
14 file://cross.patch;patch=1 \ 14 file://cross.patch;patch=1 \
15 file://fix-install-daemon.patch;patch=1 \ 15 file://fix-install-daemon.patch;patch=1 \
16 file://fix-validate.patch;patch=1 \
17 " 16 "
18 17
19inherit autotools pkgconfig update-rc.d gettext 18inherit autotools pkgconfig update-rc.d gettext