diff options
| -rw-r--r-- | meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb (renamed from meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb) | 7 |
3 files changed, 5 insertions, 36 deletions
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 = "\ | |||
| 58 | uriparser \ | 58 | uriparser \ |
| 59 | utf8proc \ | 59 | utf8proc \ |
| 60 | uthash \ | 60 | uthash \ |
| 61 | xdg-dbus-proxy \ | ||
| 61 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'xrdp', '', d)} \ | 62 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'xrdp', '', d)} \ |
| 62 | zeromq \ | 63 | zeromq \ |
| 63 | " | 64 | " |
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 @@ | |||
| 1 | From 99f9b9f68664166badfdfaa7e69efcedf750f1e3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brahmajit Das <listout@listout.xyz> | ||
| 3 | Date: Wed, 4 Mar 2026 06:27:54 +0530 | ||
| 4 | Subject: [PATCH] dbus-proxy: fix build with glibc >= 2.43 | ||
| 5 | |||
| 6 | memchr() returns const void * when passed const input, but the result | ||
| 7 | was assigned to guchar *. This triggers | ||
| 8 | -Wincompatible-pointer-types-discards-qualifiers when building with | ||
| 9 | clang and -Werror. | ||
| 10 | |||
| 11 | Make the pointer const to preserve const correctness. | ||
| 12 | |||
| 13 | Closes: https://github.com/flatpak/xdg-dbus-proxy/issues/70 | ||
| 14 | Signed-off-by: Brahmajit Das <listout@listout.xyz> | ||
| 15 | |||
| 16 | Upstream-Status: Backport [https://github.com/flatpak/xdg-dbus-proxy/commit/99f9b9f68664166badfdfaa7e69efcedf750f1e3] | ||
| 17 | --- | ||
| 18 | dbus-proxy.c | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/dbus-proxy.c b/dbus-proxy.c | ||
| 22 | index 53d5c01..b32df34 100644 | ||
| 23 | --- a/dbus-proxy.c | ||
| 24 | +++ b/dbus-proxy.c | ||
| 25 | @@ -133,7 +133,7 @@ add_args (GBytes *bytes, | ||
| 26 | { | ||
| 27 | gsize data_len, remainder_len; | ||
| 28 | const guchar *data = g_bytes_get_data (bytes, &data_len); | ||
| 29 | - guchar *s; | ||
| 30 | + const guchar *s; | ||
| 31 | const guchar *remainder; | ||
| 32 | |||
| 33 | 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 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 = " \ | |||
| 12 | inherit meson pkgconfig ptest-gnome | 12 | inherit meson pkgconfig ptest-gnome |
| 13 | 13 | ||
| 14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
| 15 | git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main \ | 15 | git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main;tag=${PV} \ |
| 16 | file://99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch \ | ||
| 17 | file://run-ptest \ | 16 | file://run-ptest \ |
| 18 | " | 17 | " |
| 19 | 18 | ||
| 20 | SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496" | 19 | SRCREV = "6a170fa77e3cbecb48f9dd2478fe5c0a119eb467" |
| 20 | |||
| 21 | CVE_STATUS[CVE-2026-34080] = "fixed-version: fixed in 0.1.7" | ||
| 21 | 22 | ||
| 22 | PACKAGECONFIG = "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 23 | PACKAGECONFIG = "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
| 23 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" | 24 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" |
