[oe] [PATCH] dbus: upgrade 1.4.0 to 1.4.1 and make it new default CVE-2010-4352

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 conf/distro/include/preferred-shr-versions.inc |    2 --
 recipes/dbus/dbus_1.4.0.bb                     |   18 ------------------
 recipes/dbus/dbus_1.4.1.bb                     |   15 +++++++++++++++
 3 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 recipes/dbus/dbus_1.4.0.bb
 create mode 100644 recipes/dbus/dbus_1.4.1.bb

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 1c336b3..6a96798 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.0.bb
deleted file mode 100644
index 2c4943b..0000000
--- a/recipes/dbus/dbus_1.4.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-include dbus.inc
-PR = "${INC_PR}.0"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI = "\
-  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-  \
-  file://tmpdir.patch \
-  file://add-configurable-reply-timeouts.patch \
-  file://dbus-1.init \
-"            
-
-# This needs more testing before pushing as default dbus
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI[md5sum] = "f59618b18d2fb2bd1fce9e1c5a2a3282"
-SRC_URI[sha256sum] = "c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652"
diff --git a/recipes/dbus/dbus_1.4.1.bb b/recipes/dbus/dbus_1.4.1.bb
new file mode 100644
index 0000000..5dec10e
--- /dev/null
+++ b/recipes/dbus/dbus_1.4.1.bb
@@ -0,0 +1,15 @@
+include dbus.inc
+PR = "${INC_PR}.0"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI = "\
+  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+  \
+  file://tmpdir.patch \
+  file://add-configurable-reply-timeouts.patch \
+  file://dbus-1.init \
+"            
+
+SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
+SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
-- 
1.7.3.4