X Strike Force SVN commit: rev 360 - in trunk/debian: . local local/Xsession.d
Author: branden
Date: 2003-08-05 00:03:18 -0500 (Tue, 05 Aug 2003)
New Revision: 360
Modified:
trunk/debian/changelog
trunk/debian/local/Xsession
trunk/debian/local/Xsession.d/20xfree86-common_process-args
trunk/debian/local/Xsession.d/30xfree86-common_xresources
trunk/debian/local/Xsession.d/50xfree86-common_determine-startup
trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent
trunk/debian/local/Xsession.d/99xfree86-common_start
Log:
debian/local/{Xsession,Xsession.d/*}: fix X session handling bug when a
specific program is handed to the /etc/X11/Xsession script where that
program would get ignored in favor of a user's $HOME/.[Xx]session file;
while I was at it, fixed a lot of confusing variable names that led to
this logic error in the first place (based on a patch by Frank Murphy --
thanks!) (Closes: #195845)
also, added $Id$ keyword strings and set corresponding property on these
files
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/changelog 2003-08-05 05:03:18 UTC (rev 360)
@@ -87,8 +87,15 @@
* debian/local/dexconf: write out non-standard modelines built-in to the
XFree86 4.x server to XF86Config files for XFree86 3.x servers
- -- Branden Robinson <branden@debian.org> Fri, 1 Aug 2003 17:48:11 -0500
+ * debian/local/{Xsession,Xsession.d/*}: fix X session handling bug when a
+ specific program is handed to the /etc/X11/Xsession script where that
+ program would get ignored in favor of a user's $HOME/.[Xx]session file;
+ while I was at it, fixed a lot of confusing variable names that led to
+ this logic error in the first place (based on a patch by Frank Murphy --
+ thanks!) (Closes: #195845)
+ -- Branden Robinson <branden@debian.org> Mon, 4 Aug 2003 23:57:03 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/local/Xsession
==============================================================================
--- trunk/debian/local/Xsession 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession 2003-08-05 05:03:18 UTC (rev 360)
@@ -4,6 +4,8 @@
#
# global Xsession file -- used by display managers and xinit (startx)
+# $Id$
+
set -e
PROGNAME=Xsession
@@ -71,8 +73,8 @@
USRRESOURCES=$HOME/.Xresources
SYSSESSIONDIR=/etc/X11/Xsession.d
-STARTUP=$HOME/.xsession
-ALTSTARTUP=$HOME/.Xsession
+USERXSESSION=$HOME/.xsession
+ALTUSERXSESSION=$HOME/.Xsession
ERRFILE=$HOME/.xsession-errors
# attempt to create an error file; abort if we cannot
Modified: trunk/debian/local/Xsession.d/20xfree86-common_process-args
==============================================================================
--- trunk/debian/local/Xsession.d/20xfree86-common_process-args 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession.d/20xfree86-common_process-args 2003-08-05 05:03:18 UTC (rev 360)
@@ -1,3 +1,5 @@
+# $Id$
+
case $# in
0)
;;
@@ -23,10 +25,10 @@
default)
;;
*)
- PROGRAM=$(which $1)
- if [ -n "$PROGRAM" -a -e "$PROGRAM" ]; then
- if [ -x "$PROGRAM" ]; then
- STARTUP=$PROGRAM
+ STARTUP_FULL_PATH=$(which $1)
+ if [ -n "$STARTUP_FULL_PATH" -a -e "$STARTUP_FULL_PATH" ]; then
+ if [ -x "$STARTUP_FULL_PATH" ]; then
+ STARTUP="$1"
else
message "unable to launch \"$1\" X session ---" \
"\"$1\" not executable; falling back to default session."
Modified: trunk/debian/local/Xsession.d/30xfree86-common_xresources
==============================================================================
--- trunk/debian/local/Xsession.d/30xfree86-common_xresources 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession.d/30xfree86-common_xresources 2003-08-05 05:03:18 UTC (rev 360)
@@ -1,3 +1,5 @@
+# $Id$
+
if [ -d "$SYSRESOURCES" ]; then
RESOURCEFILES=$(run_parts $SYSRESOURCES)
if [ -n "$RESOURCEFILES" ]; then
Modified: trunk/debian/local/Xsession.d/50xfree86-common_determine-startup
==============================================================================
--- trunk/debian/local/Xsession.d/50xfree86-common_determine-startup 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession.d/50xfree86-common_determine-startup 2003-08-05 05:03:18 UTC (rev 360)
@@ -1,33 +1,33 @@
-REALSTARTUP=
+# $Id$
if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
- for STARTUPFILE in "$STARTUP" "$ALTSTARTUP"; do
+ for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
if [ -e "$STARTUPFILE" ]; then
if [ -x "$STARTUPFILE" ]; then
- REALSTARTUP=$STARTUPFILE
+ STARTUP="$STARTUPFILE"
else
- REALSTARTUP="sh $STARTUPFILE"
+ STARTUP="sh $STARTUPFILE"
fi
break
fi
done
fi
-if [ -z "$REALSTARTUP" ]; then
+if [ -z "$STARTUP" ]; then
if [ -x /usr/bin/x-session-manager ]; then
- REALSTARTUP=x-session-manager
+ STARTUP=x-session-manager
elif [ -x /usr/bin/x-window-manager ]; then
- REALSTARTUP=x-window-manager
+ STARTUP=x-window-manager
elif [ -x /usr/bin/x-terminal-emulator ]; then
- REALSTARTUP=x-terminal-emulator
+ STARTUP=x-terminal-emulator
fi
fi
-if [ -z "$REALSTARTUP" ]; then
+if [ -z "$STARTUP" ]; then
# fatal error
ERRMSG="unable to start X session ---"
if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
- ERRMSG="$ERRMSG no \"$STARTUP\" file, no \"$ALTSTARTUP\" file,"
+ ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
"emulators found; aborting."
Modified: trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent
==============================================================================
--- trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession.d/90xfree86-common_ssh-agent 2003-08-05 05:03:18 UTC (rev 360)
@@ -1,3 +1,5 @@
+# $Id$
+
STARTSSH=
SSHAGENT=/usr/bin/ssh-agent
SSHAGENTARGS=
@@ -13,5 +15,5 @@
fi
if [ -n "$STARTSSH" ]; then
- REALSTARTUP="$SSHAGENT $SSHAGENTARGS $REALSTARTUP"
+ STARTUP="$SSHAGENT $SSHAGENTARGS $STARTUP"
fi
Modified: trunk/debian/local/Xsession.d/99xfree86-common_start
==============================================================================
--- trunk/debian/local/Xsession.d/99xfree86-common_start 2003-08-02 19:42:44 UTC (rev 359)
+++ trunk/debian/local/Xsession.d/99xfree86-common_start 2003-08-05 05:03:18 UTC (rev 360)
@@ -1 +1,3 @@
-exec $REALSTARTUP
+# $Id$
+
+exec $STARTUP
Reply to: