diff mbox series

[meta-oe,2/2] xdg-dbus-proxy: upgrade 0.1.6 -> 0.1.7

Message ID 20260414055749.1163036-2-skandigraun@gmail.com
State Accepted
Headers show
Series [meta-oe,1/2] wolfssl: upgrade 5.9.0 -> 5.9.1 | expand

Commit Message

Gyorgy Sarvari April 14, 2026, 5:57 a.m. UTC 
Contains fix for CVE-2026-34080. Since it is tracked without version info
by NVD, mark it explicitily as patched.

Drop the patch that is included in this release.

While here, also add the recipe to the ptest list - it's a fast one,
runs under a second.

Changelog:
- Drop the autotools build system
- Unbreak the CI
- Prevent a crash on disconnect
- Fix building with glibc >= 2.43
- Fix the eavesdrop filtering to prevent message interception

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../include/ptest-packagelists-meta-oe.inc    |  1 +
 ...b9f68664166badfdfaa7e69efcedf750f1e3.patch | 33 -------------------
 ...proxy_0.1.6.bb => xdg-dbus-proxy_0.1.7.bb} |  7 ++--
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
 rename meta-oe/recipes-support/xdg-dbus-proxy/{xdg-dbus-proxy_0.1.6.bb => xdg-dbus-proxy_0.1.7.bb} (83%)
diff mbox series

Patch

diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index ca800f12fa..0e63c6af10 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -58,6 +58,7 @@  PTESTS_FAST_META_OE = "\
     uriparser \
     utf8proc \
     uthash \
+    xdg-dbus-proxy \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'xrdp', '', d)} \
     zeromq \
 "
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
deleted file mode 100644
index 5ae21b5989..0000000000
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From 99f9b9f68664166badfdfaa7e69efcedf750f1e3 Mon Sep 17 00:00:00 2001
-From: Brahmajit Das <listout@listout.xyz>
-Date: Wed, 4 Mar 2026 06:27:54 +0530
-Subject: [PATCH] dbus-proxy: fix build with glibc >= 2.43
-
-memchr() returns const void * when passed const input, but the result
-was assigned to guchar *. This triggers
--Wincompatible-pointer-types-discards-qualifiers when building with
-clang and -Werror.
-
-Make the pointer const to preserve const correctness.
-
-Closes: https://github.com/flatpak/xdg-dbus-proxy/issues/70
-Signed-off-by: Brahmajit Das <listout@listout.xyz>
-
-Upstream-Status: Backport [https://github.com/flatpak/xdg-dbus-proxy/commit/99f9b9f68664166badfdfaa7e69efcedf750f1e3]
----
- dbus-proxy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbus-proxy.c b/dbus-proxy.c
-index 53d5c01..b32df34 100644
---- a/dbus-proxy.c
-+++ b/dbus-proxy.c
-@@ -133,7 +133,7 @@ add_args (GBytes    *bytes,
- {
-   gsize data_len, remainder_len;
-   const guchar *data = g_bytes_get_data (bytes, &data_len);
--  guchar *s;
-+  const guchar *s;
-   const guchar *remainder;
- 
-   remainder = data;
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb
similarity index 83%
rename from meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
rename to meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb
index 617d29bd84..a8e0a651ad 100644
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb
@@ -12,12 +12,13 @@  DEPENDS = " \
 inherit meson pkgconfig ptest-gnome
 
 SRC_URI = " \
-    git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main \
-    file://99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch \
+    git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main;tag=${PV} \
     file://run-ptest \
     "
 
-SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496"
+SRCREV = "6a170fa77e3cbecb48f9dd2478fe5c0a119eb467"
+
+CVE_STATUS[CVE-2026-34080] = "fixed-version: fixed in 0.1.7"
 
 PACKAGECONFIG = "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false"