Patchwork dbus: dbus update to 1.8.6

login
register
mail settings
Submitter Daniel BORNAZ
Date July 17, 2014, 12:08 p.m.
Message ID <1405598932-28766-1-git-send-email-daniel.bornaz@enea.com>
Download mbox | patch
Permalink /patch/75911/
State New
Headers show

Comments

Daniel BORNAZ - July 17, 2014, 12:08 p.m.
dbus: dbus update to 1.8.6

Dbus and dbus-test updated to version 1.8.6, dbus-glib updated to
version 0.102. Removed recipes and files from previous version(s).

Current version fixes two DoS vulnerabilities in dbus-daemon (CVE-2014-3532).

Signed-off-by: Daniel BORNAZ <daniel.bornaz@enea.com>

	renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch -> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
	renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch -> meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
	renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch -> meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
	deleted:    meta/recipes-core/dbus/dbus-glib_0.100.2.bb
	new file:   meta/recipes-core/dbus/dbus-glib_0.102.bb
	renamed:    meta/recipes-core/dbus/dbus-test_1.8.2.bb -> meta/recipes-core/dbus/dbus-test_1.8.6.bb
	deleted:    meta/recipes-core/dbus/dbus_1.8.2.bb
	new file:   meta/recipes-core/dbus/dbus_1.8.6.bb
---
 .../dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/no-examples.patch | 0
 .../obsolete_automake_macros.patch                                | 0
 .../test-install-makefile.patch                                   | 0
 meta/recipes-core/dbus/dbus-glib_0.100.2.bb                       | 5 -----
 meta/recipes-core/dbus/dbus-glib_0.102.bb                         | 8 ++++++++
 meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} | 3 +--
 meta/recipes-core/dbus/dbus_1.8.2.bb                              | 4 ----
 meta/recipes-core/dbus/dbus_1.8.6.bb                              | 4 ++++
 8 files changed, 13 insertions(+), 11 deletions(-)
 rename meta/recipes-core/dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/no-examples.patch (100%)
 rename meta/recipes-core/dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/obsolete_automake_macros.patch (100%)
 rename meta/recipes-core/dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/test-install-makefile.patch (100%)
 delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.100.2.bb
 create mode 100644 meta/recipes-core/dbus/dbus-glib_0.102.bb
 rename meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} (93%)
 delete mode 100644 meta/recipes-core/dbus/dbus_1.8.2.bb
 create mode 100644 meta/recipes-core/dbus/dbus_1.8.6.bb
Ross Burton - July 17, 2014, 2:33 p.m.
On 17 July 2014 13:08, Daniel BORNAZ <daniel.bornaz@enea.com> wrote:
>         renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch -> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch

If there's just a single version of the recipe, please don't version
the directory.

>         renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch -> meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
>         renamed:    meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch -> meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch

Your upgraded dbus-glib has a SRC_URI assignment in the .bb which
overrides the assignment in the .inc, so these two patches are not
being used.  The obsolete automake macros patch appears to have been
merged upstream but it appears that by not
applying-test-install-makefile you've disabled the dbus-glib-tests
package.

> deleted file mode 100644
> index c1bb06a..0000000
> --- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -require dbus-glib.inc
> -
> -
> -SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
> -SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
> diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb b/meta/recipes-core/dbus/dbus-glib_0.102.bb
> new file mode 100644
> index 0000000..28e8a72
> --- /dev/null
> +++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
> @@ -0,0 +1,8 @@
> +require dbus-glib.inc
> +
> +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
> +           file://no-examples.patch \
> +"
> +
> +SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
> +SRC_URI[sha256sum] = "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"

Please use -M so renames are expressed as a change, instead of a
delete and a creation.

Ross

Patch

diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
deleted file mode 100644
index c1bb06a..0000000
--- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@ 
-require dbus-glib.inc
-
-
-SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
-SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb b/meta/recipes-core/dbus/dbus-glib_0.102.bb
new file mode 100644
index 0000000..28e8a72
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
@@ -0,0 +1,8 @@ 
+require dbus-glib.inc
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+           file://no-examples.patch \
+"
+
+SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
+SRC_URI[sha256sum] = "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.2.bb b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.2.bb
rename to meta/recipes-core/dbus/dbus-test_1.8.6.bb
index e19d2e9..53c5d9a 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
@@ -18,8 +18,7 @@  SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068"
-SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08"
+SRC_URI[md5sum] = "6a08ba555d340e9dfe2d623b83c0eea8"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
diff --git a/meta/recipes-core/dbus/dbus_1.8.2.bb b/meta/recipes-core/dbus/dbus_1.8.2.bb
deleted file mode 100644
index 37ebed2..0000000
--- a/meta/recipes-core/dbus/dbus_1.8.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@ 
-include dbus.inc
-
-SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068"
-SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08"
diff --git a/meta/recipes-core/dbus/dbus_1.8.6.bb b/meta/recipes-core/dbus/dbus_1.8.6.bb
new file mode 100644
index 0000000..2fd630f
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.8.6.bb
@@ -0,0 +1,4 @@ 
+include dbus.inc
+
+SRC_URI[md5sum] = "6a08ba555d340e9dfe2d623b83c0eea8"
+SRC_URI[sha256sum] = "eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f"