r54074 - in /desktop/stretch/gdm3/debian: changelog patches/launch-environment-fix-crasher-when-session-mode-isn.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Sep 23 09:56:32 2017
New Revision: 54074

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54074
Log:
Add yet an other patch to fix XDMCP

Added:
    desktop/stretch/gdm3/debian/patches/launch-environment-fix-crasher-when-session-mode-isn.patch
Modified:
    desktop/stretch/gdm3/debian/changelog
    desktop/stretch/gdm3/debian/patches/series

Modified: desktop/stretch/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/stretch/gdm3/debian/changelog?rev=54074&op=diff
==============================================================================
--- desktop/stretch/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/stretch/gdm3/debian/changelog	[utf-8] Sat Sep 23 09:56:32 2017
@@ -1,8 +1,9 @@
 gdm3 (3.22.3-3+deb9u1) UNRELEASED; urgency=medium
 
-  * Backports a bunch of patches to fix XDMCP support (Closes: #873199, #814989)
-
- -- Laurent Bigonville <bigon at debian.org>  Fri, 22 Sep 2017 17:30:56 +0200
+  * Backports a bunch of patches to fix XDMCP support including a potential
+    cracher (Closes: #873199, #814989)
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 23 Sep 2017 11:55:48 +0200
 
 gdm3 (3.22.3-3) unstable; urgency=medium
 

Added: desktop/stretch/gdm3/debian/patches/launch-environment-fix-crasher-when-session-mode-isn.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/stretch/gdm3/debian/patches/launch-environment-fix-crasher-when-session-mode-isn.patch?rev=54074&op=file
==============================================================================
--- desktop/stretch/gdm3/debian/patches/launch-environment-fix-crasher-when-session-mode-isn.patch	(added)
+++ desktop/stretch/gdm3/debian/patches/launch-environment-fix-crasher-when-session-mode-isn.patch	[utf-8] Sat Sep 23 09:56:32 2017
@@ -0,0 +1,41 @@
+From 50b0751c3cf9bb56cbe4223e5884a01ce58be5e3 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 27 Mar 2017 16:56:29 -0400
+Subject: [PATCH] launch-environment: fix crasher when session-mode isn't set
+
+This commit fixes a crasher when starting the indirect chooser.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780618
+---
+ daemon/gdm-launch-environment.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
+index a30276b4..4372ac29 100644
+--- a/daemon/gdm-launch-environment.c
++++ b/daemon/gdm-launch-environment.c
+@@ -155,14 +155,15 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment,
+         if (launch_environment->priv->x11_authority_file != NULL)
+                 g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (launch_environment->priv->x11_authority_file));
+ 
+-        if (launch_environment->priv->session_mode != NULL)
++        if (launch_environment->priv->session_mode != NULL) {
+                 g_hash_table_insert (hash, g_strdup ("GNOME_SHELL_SESSION_MODE"), g_strdup (launch_environment->priv->session_mode));
+ 
+-        /* Inital setup needs gvfs for fetching remote avatars. */
+-        if (strcmp (launch_environment->priv->session_mode, INITIAL_SETUP_SESSION_MODE) != 0) {
+-                g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
+-                g_hash_table_insert (hash, g_strdup ("GIO_USE_VFS"), g_strdup ("local"));
+-                g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup ("1"));
++		/* Inital setup needs gvfs for fetching remote avatars. */
++		if (strcmp (launch_environment->priv->session_mode, INITIAL_SETUP_SESSION_MODE) != 0) {
++			g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
++			g_hash_table_insert (hash, g_strdup ("GIO_USE_VFS"), g_strdup ("local"));
++			g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup ("1"));
++		}
+         }
+ 
+         g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name));
+-- 
+2.14.1
+

Modified: desktop/stretch/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/stretch/gdm3/debian/patches/series?rev=54074&op=diff
==============================================================================
--- desktop/stretch/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/stretch/gdm3/debian/patches/series	[utf-8] Sat Sep 23 09:56:32 2017
@@ -14,3 +14,4 @@
 session-worker-only-jump-to-VT-on-seat0.patch
 gdm-sessions-force-a-session-bus-for-non-seat0-sessi.patch
 xdmcp-display-factory-more-signal-prototype-fixing.patch
+launch-environment-fix-crasher-when-session-mode-isn.patch