From ae5f99ea0a966cb0caf1b2e9556bee2ffe646a18 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 15 Jan 2008 13:48:16 +0000 Subject: [PATCH] dbus: bump -bleeding from 1.1.1 to 1.1.2 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3491 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 4 +- .../dbus/{dbus-1.1.1 => dbus-1.1.2}/cross.patch | 0 .../dbus/{dbus-1.1.1 => dbus-1.1.2}/dbus-1.init | 0 .../fix-install-daemon.patch | 0 meta/packages/dbus/dbus-1.1.2/fix-validate.patch | 49 ++++++++++++++++++++++ .../dbus/{dbus-1.1.1 => dbus-1.1.2}/tmpdir.patch | 0 .../{dbus-native_1.1.1.bb => dbus-native_1.1.2.bb} | 3 +- .../packages/dbus/{dbus_1.1.1.bb => dbus_1.1.2.bb} | 8 ++-- 8 files changed, 58 insertions(+), 6 deletions(-) rename meta/packages/dbus/{dbus-1.1.1 => dbus-1.1.2}/cross.patch (100%) rename meta/packages/dbus/{dbus-1.1.1 => dbus-1.1.2}/dbus-1.init (100%) rename meta/packages/dbus/{dbus-1.1.1 => dbus-1.1.2}/fix-install-daemon.patch (100%) create mode 100644 meta/packages/dbus/dbus-1.1.2/fix-validate.patch rename meta/packages/dbus/{dbus-1.1.1 => dbus-1.1.2}/tmpdir.patch (100%) rename meta/packages/dbus/{dbus-native_1.1.1.bb => dbus-native_1.1.2.bb} (94%) rename meta/packages/dbus/{dbus_1.1.1.bb => dbus_1.1.2.bb} (91%) diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 66bca23..c54c0ad 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf @@ -1,4 +1,4 @@ -PREFERRED_VERSION_dbus ?= "1.1.1" -PREFERRED_VERSION_dbus-native ?= "1.1.1" +PREFERRED_VERSION_dbus ?= "1.1.2" +PREFERRED_VERSION_dbus-native ?= "1.1.2" require conf/distro/poky.conf diff --git a/meta/packages/dbus/dbus-1.1.1/cross.patch b/meta/packages/dbus/dbus-1.1.2/cross.patch similarity index 100% rename from meta/packages/dbus/dbus-1.1.1/cross.patch rename to meta/packages/dbus/dbus-1.1.2/cross.patch diff --git a/meta/packages/dbus/dbus-1.1.1/dbus-1.init b/meta/packages/dbus/dbus-1.1.2/dbus-1.init similarity index 100% rename from meta/packages/dbus/dbus-1.1.1/dbus-1.init rename to meta/packages/dbus/dbus-1.1.2/dbus-1.init diff --git a/meta/packages/dbus/dbus-1.1.1/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch similarity index 100% rename from meta/packages/dbus/dbus-1.1.1/fix-install-daemon.patch rename to meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch diff --git a/meta/packages/dbus/dbus-1.1.2/fix-validate.patch b/meta/packages/dbus/dbus-1.1.2/fix-validate.patch new file mode 100644 index 0000000..3bfddca --- /dev/null +++ b/meta/packages/dbus/dbus-1.1.2/fix-validate.patch @@ -0,0 +1,49 @@ +commit ae4a1586969aaca534508837830d7d3de4ade070 +Author: Havoc Pennington +Date: Mon Jul 30 16:16:47 2007 +0000 + + 2007-07-30 Havoc Pennington + + * bus/activation-helper.c (check_bus_name): don't use + _dbus_check_valid_bus_name() which is only around with + --enable-checks, instead use _dbus_validate_bus_name(). + Bug #11766 from Diego + +diff --git a/bus/activation-helper.c b/bus/activation-helper.c +index 1636660..36006a4 100644 +--- a/bus/activation-helper.c ++++ b/bus/activation-helper.c +@@ -381,14 +381,20 @@ exec_for_correct_user (char *exec, char *user, DBusError *error) + } + + static dbus_bool_t +-check_bus_name (const char *bus_name, DBusError *error) ++check_bus_name (const char *bus_name, ++ DBusError *error) + { +- if (!_dbus_check_is_valid_bus_name (bus_name)) ++ DBusString str; ++ ++ _dbus_string_init_const (&str, bus_name); ++ if (!_dbus_validate_bus_name (&str, 0, _dbus_string_get_length (&str))) + { + dbus_set_error (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND, +- "bus name '%s' not found\n", bus_name); ++ "bus name '%s' is not a valid bus name\n", ++ bus_name); + return FALSE; + } ++ + return TRUE; + } + +@@ -517,7 +523,8 @@ check_dbus_user (BusConfigParser *parser, DBusError *error) + } + + dbus_bool_t +-run_launch_helper (const char *bus_name, DBusError *error) ++run_launch_helper (const char *bus_name, ++ DBusError *error) + { + BusConfigParser *parser; + dbus_bool_t retval; diff --git a/meta/packages/dbus/dbus-1.1.1/tmpdir.patch b/meta/packages/dbus/dbus-1.1.2/tmpdir.patch similarity index 100% rename from meta/packages/dbus/dbus-1.1.1/tmpdir.patch rename to meta/packages/dbus/dbus-1.1.2/tmpdir.patch diff --git a/meta/packages/dbus/dbus-native_1.1.1.bb b/meta/packages/dbus/dbus-native_1.1.2.bb similarity index 94% rename from meta/packages/dbus/dbus-native_1.1.1.bb rename to meta/packages/dbus/dbus-native_1.1.2.bb index 72e2190..e2fb483 100644 --- a/meta/packages/dbus/dbus-native_1.1.1.bb +++ b/meta/packages/dbus/dbus-native_1.1.2.bb @@ -9,9 +9,10 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native" DEFAULT_PREFERENCE = "-1" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ + file://fix-validate.patch;patch=1 \ " inherit autotools pkgconfig gettext native diff --git a/meta/packages/dbus/dbus_1.1.1.bb b/meta/packages/dbus/dbus_1.1.2.bb similarity index 91% rename from meta/packages/dbus/dbus_1.1.1.bb rename to meta/packages/dbus/dbus_1.1.2.bb index f2318d4..93846bd 100644 --- a/meta/packages/dbus/dbus_1.1.1.bb +++ b/meta/packages/dbus/dbus_1.1.2.bb @@ -6,13 +6,15 @@ DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" -PR = "r4" +PR = "r0" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ file://cross.patch;patch=1 \ - file://fix-install-daemon.patch;patch=1" + file://fix-install-daemon.patch;patch=1 \ + file://fix-validate.patch;patch=1 \ + " inherit autotools pkgconfig update-rc.d gettext @@ -40,7 +42,7 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" } -EXTRA_OECONF = " --disable-tests --disable-asserts --disable-xml-docs \ +EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \ --disable-doxygen-docs --with-xml=expat --without-x" do_stage () { -- 2.7.4