diff --git a/SOURCES/0001-Revert-media-keys-Add-support-for-new-XF86RFKill-key.patch b/SOURCES/0001-Revert-media-keys-Add-support-for-new-XF86RFKill-key.patch new file mode 100644 index 0000000..23a36e7 --- /dev/null +++ b/SOURCES/0001-Revert-media-keys-Add-support-for-new-XF86RFKill-key.patch @@ -0,0 +1,25 @@ +From ad622a6806c37adbfcf84e2286487376e0c9d18a Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Fri, 16 Jul 2021 23:47:25 +0200 +Subject: [PATCH] Revert "media-keys: Add support for new XF86RFKill keysym" + +This reverts commit 7fffc28b050db4c2561890e64803f890bfc1e9b3. +--- + plugins/media-keys/shortcuts-list.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h +index 00a15b64..9bd81b8f 100644 +--- a/plugins/media-keys/shortcuts-list.h ++++ b/plugins/media-keys/shortcuts-list.h +@@ -107,7 +107,6 @@ static struct { + { BATTERY_KEY, NULL, N_("Battery Status"), "XF86Battery", GSD_ACTION_MODE_LAUNCHER }, + { RFKILL_KEY, NULL, N_("Toggle Airplane Mode"), "XF86WLAN", GSD_ACTION_MODE_LAUNCHER }, + { RFKILL_KEY, NULL, N_("Toggle Airplane Mode"), "XF86UWB", GSD_ACTION_MODE_LAUNCHER }, +- { RFKILL_KEY, NULL, N_("Toggle Airplane Mode"), "XF86RFKill", GSD_ACTION_MODE_LAUNCHER }, + { BLUETOOTH_RFKILL_KEY, NULL, N_("Toggle Bluetooth"), "XF86Bluetooth", GSD_ACTION_MODE_LAUNCHER } + }; + +-- +2.31.1 + diff --git a/SOURCES/0001-housekeeping-Ignore-permission-issues-during-file-de.patch b/SOURCES/0001-housekeeping-Ignore-permission-issues-during-file-de.patch new file mode 100644 index 0000000..a720573 --- /dev/null +++ b/SOURCES/0001-housekeeping-Ignore-permission-issues-during-file-de.patch @@ -0,0 +1,31 @@ +From 6aac44a17c6b5bcc258458d554963c51e019e489 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Mon, 8 Oct 2018 21:10:04 +0200 +Subject: [PATCH] housekeeping: Ignore permission issues during file deletion + +The directories that are monitored by gsd-housekeeping are likely to +contain files from other users that cannot be deleted. This will result +in permission denied errors that can be safely ignored. + +Fixes #26 +--- + plugins/housekeeping/gsd-disk-space.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c +index 40f0a8b7..bd3437e5 100644 +--- a/plugins/housekeeping/gsd-disk-space.c ++++ b/plugins/housekeeping/gsd-disk-space.c +@@ -366,7 +366,8 @@ delete_subdir (GObject *source, + enumerator = g_file_enumerate_children_finish (file, res, &error); + if (error) { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY) && +- !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) && ++ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) + g_warning ("Failed to enumerate children of %s: %s\n", data->name, error->message); + } + if (enumerator) { +-- +2.31.1 + diff --git a/SOURCES/0001-media-keys-Do-not-access-GVariant-before-error-check.patch b/SOURCES/0001-media-keys-Do-not-access-GVariant-before-error-check.patch new file mode 100644 index 0000000..93683a7 --- /dev/null +++ b/SOURCES/0001-media-keys-Do-not-access-GVariant-before-error-check.patch @@ -0,0 +1,37 @@ +From ce60828b9e04a614dde7e0af1a9ab94f6f3fcdd1 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Tue, 1 Jun 2021 20:52:44 +0200 +Subject: [PATCH] media-keys: Do not access GVariant before error checks + +This may trigger asserts and crashes down the line. +--- + plugins/media-keys/gsd-media-keys-manager.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index 1b3ff38..c4aef34 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -442,8 +442,6 @@ grab_accelerators_complete (GObject *object, + GsdMediaKeysManager *manager = user_data; + + ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), result, &error); +- g_variant_get (ret, "(@au)", &actions); +- g_variant_unref (ret); + + if (error) { + retry = g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD); +@@ -454,6 +452,10 @@ grab_accelerators_complete (GObject *object, + g_error_free (error); + } else { + int i; ++ ++ g_variant_get (ret, "(@au)", &actions); ++ g_variant_unref (ret); ++ + for (i = 0; i < manager->priv->keys->len; i++) { + MediaKey *key; + +-- +2.31.1 + diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec index 34481ed..5c5192f 100644 --- a/SPECS/gnome-settings-daemon.spec +++ b/SPECS/gnome-settings-daemon.spec @@ -8,7 +8,7 @@ Name: gnome-settings-daemon Version: 3.28.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -44,6 +44,11 @@ Patch60: 0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch Patch61: 0001-power-Avoid-automatic-logout-in-GDM-greeter.patch Patch62: 0002-power-Never-register-sleep-timeout-for-logout-in-GDM.patch +Patch63: 0001-media-keys-Do-not-access-GVariant-before-error-check.patch + +Patch64: 0001-housekeeping-Ignore-permission-issues-during-file-de.patch +Patch65: 0001-Revert-media-keys-Add-support-for-new-XF86RFKill-key.patch + BuildRequires: cups-devel BuildRequires: gettext BuildRequires: meson @@ -244,6 +249,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/gsd-test-input-helper %changelog +* Fri Jul 16 2021 Carlos Garnacho - 3.28.1-11 +- Fix possible crash on gsd-media-keys startup + Resolves: #1878167 +- Ignore permission issues during gsd-housekeeping file deletion + Resolves: #1909954 +- Revert mapping of "XF86RFKill" key + Resolves: #1888412 + * Fri Oct 30 2020 Benjamin Berg - 3.28.1-10 - Prevent automatic logout warning in greeter sessions Related: #1729296