From df54a54a30b4401a767991e75a59a37b3788647e4adc0403b8df5258f1c792cb Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 29 Mar 2010 11:20:06 +0000
Subject: [PATCH] Accepting request 35924 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 35924 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/35924
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=119
---
 gdm-suse-xsession.patch | 36 ++++++++++++++++++++++++------------
 gdm.changes             |  7 +++++++
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/gdm-suse-xsession.patch b/gdm-suse-xsession.patch
index b8b73c4..776d7b1 100644
--- a/gdm-suse-xsession.patch
+++ b/gdm-suse-xsession.patch
@@ -1,7 +1,7 @@
-Index: gdm-2.29.5/data/Init.in
+Index: gdm-2.29.92/data/Init.in
 ===================================================================
---- gdm-2.29.5.orig/data/Init.in
-+++ gdm-2.29.5/data/Init.in
+--- gdm-2.29.92.orig/data/Init.in
++++ gdm-2.29.92/data/Init.in
 @@ -1,4 +1,9 @@
  #!/bin/sh
 +
@@ -12,10 +12,10 @@ Index: gdm-2.29.5/data/Init.in
  # Stolen from the debian kdm setup, aren't I sneaky
  # Plus a lot of fun stuff added
  #  -George
-Index: gdm-2.29.5/data/PostSession.in
+Index: gdm-2.29.92/data/PostSession.in
 ===================================================================
---- gdm-2.29.5.orig/data/PostSession.in
-+++ gdm-2.29.5/data/PostSession.in
+--- gdm-2.29.92.orig/data/PostSession.in
++++ gdm-2.29.92/data/PostSession.in
 @@ -1,3 +1,7 @@
  #!/bin/sh
  
@@ -24,18 +24,30 @@ Index: gdm-2.29.5/data/PostSession.in
 +fi
 +
  exit 0
-Index: gdm-2.29.5/data/Xsession.in
+Index: gdm-2.29.92/data/Xsession.in
 ===================================================================
---- gdm-2.29.5.orig/data/Xsession.in
-+++ gdm-2.29.5/data/Xsession.in
-@@ -1,4 +1,10 @@
+--- gdm-2.29.92.orig/data/Xsession.in
++++ gdm-2.29.92/data/Xsession.in
+@@ -1,4 +1,9 @@
  #!@XSESSION_SHELL@
 +
-+if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
-+       /bin/bash /etc/X11/xdm/Xstartup
++if test -x /etc/X11/xdm/Xsession; then
 +       exec /etc/X11/xdm/Xsession $1 $GDM_LANG
 +fi
 +
  #
  # This is SORT OF LIKE an X session, but not quite.  You get a command as the
  # first argument (it could be multiple words, so run it with "eval").  As a
+Index: gdm-2.29.92/data/PreSession.in
+===================================================================
+--- gdm-2.29.92.orig/data/PreSession.in
++++ gdm-2.29.92/data/PreSession.in
+@@ -6,4 +6,8 @@
+ #
+ # Note that output goes into the .xsession-errors file for easy debugging
+ #
++if test -x /etc/X11/xdm/Xstartup; then
++       exec /etc/X11/xdm/Xstartup
++fi
++
+ PATH="@X_PATH@:$PATH"
diff --git a/gdm.changes b/gdm.changes
index 98eca5f..bc72dfd 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Mar 28 16:43:57 CEST 2010 - vuntz@opensuse.org
+
+- Call /etc/X11/xdm/Xstartup from /etc/gdm/PreSession/Default
+  instead of from /etc/gdm/Xsession. This should fix some
+  permission issue. Fix bnc#573669.
+
 -------------------------------------------------------------------
 Tue Mar  9 01:54:09 CET 2010 - dimstar@opensuse.org