From 9c93d53017828f492d7213c65499e524524eebc1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 19 Sep 2019 18:53:21 +0200 Subject: [PATCH] Stop NOTIFY_SOCKET from leaking into the GNOME environment --- 0001-util-Blacklist-NOTIFY_SOCKET.patch | 32 +++++++++++++++++++++++++ gnome-session.spec | 6 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-util-Blacklist-NOTIFY_SOCKET.patch diff --git a/0001-util-Blacklist-NOTIFY_SOCKET.patch b/0001-util-Blacklist-NOTIFY_SOCKET.patch new file mode 100644 index 0000000..3cb2d95 --- /dev/null +++ b/0001-util-Blacklist-NOTIFY_SOCKET.patch @@ -0,0 +1,32 @@ +From 9d8b070982403ff8e608d4c7cce313bc2a7dce4a Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 19 Sep 2019 13:54:53 +0200 +Subject: [PATCH] util: Blacklist NOTIFY_SOCKET + +The NOTIFY_SOCKET environment variable was leaking into systemd +managed GNOME sessions and breaking things like OCI container runtimes +(eg., runc and crun) [1]. This variable is absent in non-systemd +managed sessions. + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=1753328 + +https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/22 +--- + gnome-session/gsm-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index f6ddefc374dc..1528723cc7d8 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -36,6 +36,7 @@ static gchar *_saved_session_dir = NULL; + static gchar **child_environment; + + static const char * const variable_blacklist[] = { ++ "NOTIFY_SOCKET", + "XDG_SEAT", + "XDG_SESSION_ID", + "XDG_VTNR", +-- +2.20.1 + diff --git a/gnome-session.spec b/gnome-session.spec index 3a6fc03..9c2f5c1 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -9,7 +9,7 @@ Name: gnome-session Version: 3.34.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME session manager License: GPLv2+ @@ -25,6 +25,7 @@ Patch4: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch # This should go upstream once systemd has a generic interface for this Patch5: 0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch Patch6: 0002-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch +Patch7: 0001-util-Blacklist-NOTIFY_SOCKET.patch BuildRequires: meson BuildRequires: gcc @@ -129,6 +130,9 @@ Desktop file to add GNOME on wayland to display manager session menu. %{_userunitdir}/gnome-session* %changelog +* Thu Sep 19 2019 Debarshi Ray - 3.34.0-2 +- Stop NOTIFY_SOCKET from leaking into the GNOME environment + * Wed Sep 11 2019 Kalev Lember - 3.34.0-1 - Update to 3.34.0