Stop NOTIFY_SOCKET from leaking into the GNOME environment

This commit is contained in:
Debarshi Ray 2019-09-24 19:18:08 +02:00
parent c5384ff8e4
commit 225a1f3590
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Mon, 23 Sep 2019 11:04:18 +0200
Subject: [PATCH] main: Remove NOTIFY_SOCKET from environment
It is only used exactly once to notify systemd about the service
startup. So unset it as soon as possible as it can leak into
subprocesses we spawn otherwise.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/741
---
src/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
index 8be1395f7099..489026b76573 100644
--- a/src/main.c
+++ b/src/main.c
@@ -532,7 +532,9 @@ main (int argc, char **argv)
shell_init_debug (g_getenv ("SHELL_DEBUG"));
shell_dbus_init (meta_get_replace_current_wm ());
- sd_notify (0, "READY=1");
+ /* We only use NOTIFY_SOCKET exactly once; unset it so it doesn't remain in
+ * our environment. */
+ sd_notify (1, "READY=1");
shell_a11y_init ();
shell_perf_log_init ();
shell_introspection_init ();
--
2.20.1

View File

@ -1,6 +1,6 @@
Name: gnome-shell
Version: 3.34.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+
@ -20,6 +20,9 @@ Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1753337
Patch4: fix-disappearing-icons.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1753328
Patch5: gnome-shell-main-Remove-NOTIFY_SOCKET-from-environment.patch
%define libcroco_version 0.6.8
%define eds_version 3.33.1
%define gnome_desktop_version 3.33.4
@ -214,6 +217,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1*
%changelog
* Tue Sep 24 2019 Debarshi Ray <rishi@fedorapeople.org> - 3.34.0-3
- Stop NOTIFY_SOCKET from leaking into the GNOME environment
* Fri Sep 20 2019 Florian Müllner <fmuellner@redhat.com> - 3.34.0-2
- Fix disappearing icons in frequent view