From 23398704b5a17f835882fc2a0cd8a134a544c7bc Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Sun, 9 Jun 2024 00:22:49 +0200 Subject: [PATCH] gnome-shell: correct regression with glib-2.0 fix for CVE-2024-34397 Backport fix to work with new glib-2.0. Signed-off-by: Peter Marko Signed-off-by: Armin Kuster --- ...orrect-expected-bus-name-for-streams.patch | 38 +++++++++++++++++++ .../gnome-shell/gnome-shell_42.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch new file mode 100644 index 0000000000..a4178b87e0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch @@ -0,0 +1,38 @@ +From 50a011a19dcc6997ea6173c07bb80b2d9888d363 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 6 May 2024 21:58:09 +0100 +Subject: [PATCH] screencast: Correct expected bus name for streams +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Previously, this only worked because GDBusConnection was not filtering +signals by their sender correctly (GNOME/glib#3268). + +Thanks: Alicia Boya García +Signed-off-by: Simon McVittie +Part-of: + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/50a011a19dcc6997ea6173c07bb80b2d9888d363] + +Signed-off-by: Peter Marko +--- + js/dbusServices/screencast/screencastService.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/dbusServices/screencast/screencastService.js b/js/dbusServices/screencast/screencastService.js +index d664a51b083..0645811fa0a 100644 +--- a/js/dbusServices/screencast/screencastService.js ++++ b/js/dbusServices/screencast/screencastService.js +@@ -166,7 +166,7 @@ var Recorder = class { + }); + + this._streamProxy = new ScreenCastStreamProxy(Gio.DBus.session, +- 'org.gnome.ScreenCast.Stream', ++ 'org.gnome.Mutter.ScreenCast', + streamPath); + + this._streamProxy.connectSignal('PipeWireStreamAdded', +-- +2.30.2 + diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb index f54d966c73..b58058ed86 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb @@ -33,6 +33,7 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" +SRC_URI += "file://0002-screencast-Correct-expected-bus-name-for-streams.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"