From 8027bb6b6ace2f9e8327bf0c822021393a2ce41b9528a140f5a19b7029c0da9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 11 Jan 2018 15:36:25 +0000 Subject: [PATCH] Accepting request 563166 from home:xiaoguang_wang:branches:GNOME:Factory - Add gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch: When run PreSession script, don't set DISPLAY and XAUTHORITY environment variable, avoiding environment variable equal (null) (bsc#1068016 bgo#792150). - Remove gdm-ignore-SLE-CLASSIC-MODE.patch: SLE-Classic doesn't use environment variable SLE_CLASSIC_MODE anymore. OBS-URL: https://build.opensuse.org/request/show/563166 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=368 --- gdm-ignore-SLE-CLASSIC-MODE.patch | 24 ----------- ...ot-run-with-bogus-DISPLAY-XAUTHORITY.patch | 42 +++++++++++++++++++ gdm.changes | 11 +++++ gdm.spec | 8 ++-- 4 files changed, 57 insertions(+), 28 deletions(-) delete mode 100644 gdm-ignore-SLE-CLASSIC-MODE.patch create mode 100644 gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch diff --git a/gdm-ignore-SLE-CLASSIC-MODE.patch b/gdm-ignore-SLE-CLASSIC-MODE.patch deleted file mode 100644 index 2d514bd..0000000 --- a/gdm-ignore-SLE-CLASSIC-MODE.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c -index b648e9de..eee31724 100644 ---- a/daemon/gdm-wayland-session.c -+++ b/daemon/gdm-wayland-session.c -@@ -285,6 +285,7 @@ spawn_session (State *state, - "WAYLAND_DISPLAY", - "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", -+ "SLE_CLASSIC_MODE", - NULL }; - - g_debug ("Running wayland session"); -diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c -index 88fe96f4..c60ae04f 100644 ---- a/daemon/gdm-x-session.c -+++ b/daemon/gdm-x-session.c -@@ -610,6 +610,7 @@ spawn_session (State *state, - "WAYLAND_DISPLAY", - "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", -+ "SLE_CLASSIC_MODE", - NULL }; - - g_debug ("Running X session"); diff --git a/gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch b/gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch new file mode 100644 index 0000000..536c384 --- /dev/null +++ b/gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch @@ -0,0 +1,42 @@ +From 5dd631c9d5dbb1dc8e548c3dc6a21ef656f44944 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 4 Jan 2018 11:09:55 -0500 +Subject: [PATCH 1/5] common: don't run scripts with bogus DISPLAY and + XAUTHORITY + +DISPLAY and XAUTHORITY might not be set if we're starting the +X server as part of the session. + +In that case we should ensure the variables aren't set in the +environment of the gdm session scripts. + +This commit fixes that. + +https://bugzilla.gnome.org/show_bug.cgi?id=792150 +--- + common/gdm-common.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/common/gdm-common.c b/common/gdm-common.c +index 31fc810a..c4fc7073 100644 +--- a/common/gdm-common.c ++++ b/common/gdm-common.c +@@ -594,8 +594,13 @@ gdm_get_script_environment (const char *username, + } + + /* Runs as root */ +- g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (display_x11_authority_file)); +- g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (display_name)); ++ if (display_x11_authority_file) { ++ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (display_x11_authority_file)); ++ } ++ ++ if (display_name) { ++ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (display_name)); ++ } + g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH)); + g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); + +-- +2.12.3 + diff --git a/gdm.changes b/gdm.changes index f60b80b..a56ea17 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 9 07:38:30 UTC 2018 - xwang@suse.com + +- Add gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch: When run + PreSession script, don't set DISPLAY and XAUTHORITY environment + variable, avoiding environment variable equal (null) + (bsc#1068016 bgo#792150). + +- Remove gdm-ignore-SLE-CLASSIC-MODE.patch: SLE-Classic doesn't use + environment variable SLE_CLASSIC_MODE anymore. + ------------------------------------------------------------------- Thu Nov 28 02:50:25 UTC 2017 - qzhao@suse.com diff --git a/gdm.spec b/gdm.spec index ea296af..b830e55 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,10 +62,10 @@ Patch36: gdm-ignore-duplicate-session.patch Patch41: gdm-plymouth-vt1.patch # PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 tyang@suse.com -- Gdm should stop after a few times fails Patch42: gdm-fails-to-restart-gnome-shell.patch +# PATCH-FIX-UPSTREAM gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch bsc#1068016 bgo#792150 xwang@suse.com -- When run PreSession script, don't set DISPLAY and XAUTHORITY environment variable +Patch43: gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch # PATCH-FIX-SLE gdm-default-wm-sle12.patch bnc#881659 cxiong@suse.com -- set default/fallback session type to SLE Classic Patch49: gdm-default-wm-sle12.patch -# PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 xwang@suse.com -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session -Patch51: gdm-ignore-SLE-CLASSIC-MODE.patch # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. Patch52: gdm-disable-gnome-initial-setup.patch BuildRequires: check-devel @@ -214,9 +214,9 @@ translation-update-upstream %patch36 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 %if !0%{?is_opensuse} %patch49 -p1 -%patch51 -p1 %patch52 -p1 %endif