Attachment 311066 Details for Bug 452156 – run ck-xinit-session for all sessions where the xdg cookie isn't already set

[patch] run ck-xinit-session for all sessions where the xdg cookie isn't already set

xorg-x11-xinit-ck-init-session.diff (text/plain), 3.79 KB, created by Patrice Dumas on 2008-07-05 13:16:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-07-05 13:16:55 UTC

Size: 3.79 KB

patch

obsolete

>? .build-1.0.7-8.fc10.log
>? i386
>? xinit-1.0.7
>? xorg-x11-xinit-1.0.7-8.fc10.src.rpm
>Index: Xsession
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
>retrieving revision 1.10
>diff -u -3 -p -r1.10 Xsession
>--- Xsession	8 Apr 2008 21:20:03 -0000	1.10
>+++ Xsession	5 Jul 2008 13:12:43 -0000
>@@ -40,7 +40,7 @@ SWITCHDESKPATH=/usr/share/switchdesk
> # this script. 
> XCLIENTS_D=/etc/X11/xinit/Xclients.d
> if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
>+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
> else
> # now, we see if xdm/gdm/kdm has asked for a specific environment
> case $# in
>@@ -60,18 +60,18 @@ case $# in
> 	    exec /bin/sh -c "exec -l $SHELL -c \"gnome-session\"" 
> 	    ;;
> 	kde|kde1|kde2)
>-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
>+	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
> 	    ;;
> 	twm)
>         # fall back to twm
>-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"twm\""
>+	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"twm\""
> 	    ;;
> 	*)
>        # GDM provies either a command line as the first argument or
>        # provides 'failsafe', 'default' or 'custom'.  KDM will do the
>        # same at some point
> 	    if [ "$1" != "default" -a "$1" != "custom" ]; then
>-		exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
>+		exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
> 	    fi
> 	    ;;
>     esac
>@@ -80,11 +80,11 @@ fi
> 
> # otherwise, take default action
> if [ -x "$HOME/.xsession" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $HOME/.xsession"
>+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $HOME/.xsession"
> elif [ -x "$HOME/.Xclients" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $HOME/.Xclients"
>+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients"
> elif [ -x /etc/X11/xinit/Xclients ]; then
>-    exec -l $SHELL -c "$SSH_AGENT /etc/X11/xinit/Xclients"
>+    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients"
> else
>     # should never get here; failsafe fallback
>     exec -l $SHELL -c "xsm"
>Index: xinitrc-common
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v
>retrieving revision 1.4
>diff -u -3 -p -r1.4 xinitrc-common
>--- xinitrc-common	4 Feb 2008 18:49:27 -0000	1.4
>+++ xinitrc-common	5 Jul 2008 13:12:43 -0000
>@@ -65,4 +65,6 @@ if [ -x /usr/bin/ssh-agent -a -z "$SSH_A
> fi
> 
> CK_XINIT_SESSION=
>-[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
>+if [ -x /usr/bin/ck-xinit-session -a -z "$XDG_SESSION_COOKIE" ]; then
>+    CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
>+fi
>Index: xorg-x11-xinit.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
>retrieving revision 1.57
>diff -u -3 -p -r1.57 xorg-x11-xinit.spec
>--- xorg-x11-xinit.spec	8 Apr 2008 21:20:03 -0000	1.57
>+++ xorg-x11-xinit.spec	5 Jul 2008 13:12:43 -0000
>@@ -3,7 +3,7 @@
> Summary:   X.Org X11 X Window System xinit startup scripts
> Name:      xorg-x11-%{pkgname}
> Version:   1.0.7
>-Release:   7%{?dist}
>+Release:   8%{?dist}
> License:   MIT/X11
> Group:     User Interface/X
> URL:       http://www.x.org
>@@ -131,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/xsessions/xinit-compat.desktop
> 
> %changelog
>+* Sat Jul 05 2008 Patrice Dumas <pertusus@free.fr> 1.0.7-8
>+- run ck-xinit-session for all sessions where the xdg cookie isn't already
>+  set (#452156)
>+
> * Tue Apr 08 2008 Adam Jackson <ajax@redhat.com> 1.0.7-7
> - Xsession: Don't start ssh-agent for gnome sessions anymore, gnome-keyring
>   acts as an agent now. (#441123)

Actions: View | Diff

Attachments on bug 452156: 309866 | 311066 | 311422 | 316982