dbus: sneak in the security fix release

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3875 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e94e835d41ee7f9e3d6e2ff8199db0bc18c778af..15d065ef964ca1b95d98ee30e71bea8e5ad2f82c 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_cairo ?= "1.4.14"
 PREFERRED_VERSION_pango ?= "1.18.3"
 PREFERRED_VERSION_gtk+ ?= "2.12.7"
 
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-native ?= "1.0.2"
+PREFERRED_VERSION_dbus ?= "1.0.3"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
 PREFERRED_VERSION_dbus-glib ?= "0.74"
 PREFERRED_VERSION_dbus-glib-native ?= "0.74"
 PREFERRED_VERSION_gnome-vfs ?= "2.20.0"

diff --git a/meta/packages/dbus/dbus-1.0.2/cross.patch b/meta/packages/dbus/dbus-1.0.3/cross.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.2/cross.patch
rename to meta/packages/dbus/dbus-1.0.3/cross.patch

diff --git a/meta/packages/dbus/dbus-1.0.2/dbus-1.init b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.2/dbus-1.init
rename to meta/packages/dbus/dbus-1.0.3/dbus-1.init

diff --git a/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
rename to meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch

diff --git a/meta/packages/dbus/dbus-1.0.2/tmpdir.patch b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.2/tmpdir.patch
rename to meta/packages/dbus/dbus-1.0.3/tmpdir.patch

diff --git a/meta/packages/dbus/dbus-native_1.0.2.bb b/meta/packages/dbus/dbus-native_1.0.3.bb
similarity index 99%
rename from meta/packages/dbus/dbus-native_1.0.2.bb
rename to meta/packages/dbus/dbus-native_1.0.3.bb
index 72e2190f78eeb9b0ffc07e9f45dbed9e78bd1dd5..55889a1a8b9c92ef7f72e306543ee76f8d03fdc8 100644 (file)
--- a/meta/packages/dbus/dbus-native_1.0.2.bb
+++ b/meta/packages/dbus/dbus-native_1.0.3.bb
@@ -9,7 +9,7 @@ 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 \
           "

diff --git a/meta/packages/dbus/dbus_1.0.2.bb b/meta/packages/dbus/dbus_1.0.3.bb
similarity index 100%
rename from meta/packages/dbus/dbus_1.0.2.bb
rename to meta/packages/dbus/dbus_1.0.3.bb