From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 23 Dec 2010 16:10:50 +0000 (+0000)
Subject: dbus: upgrade 1.4.0 to 1.4.1 and make it new default CVE-2010-4352
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d486ced03eed0d145768ad918602d1aa28e401c3;p=openembedded.git

dbus: upgrade 1.4.0 to 1.4.1 and make it new default CVE-2010-4352

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 1c336b3db4..6a96798ee3 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1,7 +1,5 @@
 # Upgraded
 # use newer version then preferred by default
-PREFERRED_VERSION_dbus = "1.4.0"
-PREFERRED_VERSION_dbus-native = "1.4.0"
 PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
 PREFERRED_VERSION_strace = "4.5.15"
 PREFERRED_VERSION_emacs-x11 = "23.1"
diff --git a/recipes/dbus/dbus_1.4.0.bb b/recipes/dbus/dbus_1.4.1.bb
similarity index 53%
rename from recipes/dbus/dbus_1.4.0.bb
rename to recipes/dbus/dbus_1.4.1.bb
index 2c4943b4f0..5dec10e46c 100644
--- a/recipes/dbus/dbus_1.4.0.bb
+++ b/recipes/dbus/dbus_1.4.1.bb
@@ -11,8 +11,5 @@ SRC_URI = "\
   file://dbus-1.init \
 "            
 
-# This needs more testing before pushing as default dbus
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI[md5sum] = "f59618b18d2fb2bd1fce9e1c5a2a3282"
-SRC_URI[sha256sum] = "c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652"
+SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
+SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"