rpms/xorg-x11-xinit/devel Xsession, 1.3, 1.4 xorg-x11-xinit.spec, 1.43, 1.44
Soren Sandmann Pedersen (ssp)
fedora-extras-commits at redhat.com
Sun Jul 29 23:10:22 UTC 2007
Author: ssp
Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1717
Modified Files:
Xsession xorg-x11-xinit.spec
Log Message:
Fix bug 164869
Index: Xsession
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Xsession 23 Oct 2006 18:04:35 -0000 1.3
+++ Xsession 29 Jul 2007 23:09:50 -0000 1.4
@@ -50,27 +50,28 @@
fi;
case "$1" in
- failsafe)
- exec -l $SHELL -c "xterm -geometry 80x24-0-0"
- ;;
- gnome)
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
- ;;
- kde|kde1|kde2)
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH startkde"
- ;;
- twm)
+ failsafe)
+ exec -l $SHELL -c "xterm -geometry 80x24-0-0"
+ ;;
+ gnome)
+ exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\""
+ ;;
+ kde|kde1|kde2)
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
+ ;;
+ twm)
# fall back to twm
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH twm"
- ;;
- *)
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"DBUS_LAUNCH 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 -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $1"
- fi
- ;;
+ if [ "$1" != "default" -a "$1" != "custom" ]; then
+ exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $1\""
+ fi
+ ;;
esac
esac
fi
Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-xinit.spec 27 Jul 2007 16:24:19 -0000 1.43
+++ xorg-x11-xinit.spec 29 Jul 2007 23:09:50 -0000 1.44
@@ -110,6 +110,11 @@
%{_mandir}/man1/xinit.1*
%changelog
+* Sun Jul 29 2007 Soren Sandmann <sandmann at redhat.com> 1.0.2-23
+- Fix Xsession to run the login shell inside the setgid ssh-agent, rather
+ than the other way around. This preserves LD_LIBRARY_PRELOAD.
+ Patch from Stefan Becker, bug 164869.
+
* Fri Jul 27 2007 Soren Sandmann <sandmann at redhat.com> 1.0.2-22
- Remove xinput.sh. Bug 244963.
More information about the fedora-extras-commits
mailing list