Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Nov 5 13:48:46 CET 2010. -------- --- xorg-x11/xorg-x11.changes 2010-11-02 01:06:51.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2010-11-03 12:51:42.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 3 12:49:05 CET 2010 - werner@suse.de + +- Forward all options of the display manager to the window manager + (bnc#641045) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.12adoG/_old 2010-11-05 13:47:29.000000000 +0100 +++ /var/tmp/diff_new_pack.12adoG/_new 2010-11-05 13:47:29.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 28 +Release: 29 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession --- old/etc/X11/xdm/Xsession 2010-03-17 12:04:15.000000000 +0100 +++ new/etc/X11/xdm/Xsession 2010-11-03 13:06:20.000000000 +0100 @@ -45,20 +45,23 @@ # Save our arguments, maybe some of users call # `set' in their profile files. # -argv="$@" +argv=("$@") # # Handle the NoChange option of wdm # /sbin/pidof -s wdm > /dev/null 2>&1 if test $? -eq 0 ; then - if test -z "$argv" ; then + OIFS="$IFS" + IFS=$'\n' + if test ${#argv[@]} -eq 0 ; then if test -s $HOME/.wmrc ; then - argv=$(<$HOME/.wmrc) #use wm from previous session + argv=($(<$HOME/.wmrc)) #use wm from previous session fi else - echo "$argv" > $HOME/.wmrc #save wm + echo "${argv[*]}" > $HOME/.wmrc #save wm fi + IFS="$OIFS" fi readonly argv @@ -89,20 +92,25 @@ exec_login () { local shell=$SHELL - case "$SHELL" in - */csh|*/tcsh) ;; - */sh|*/bash) ;; - */bash[123]) ;; - */pdksh|*/ksh*) ;; - */zsh|*/ash|*/dash) ;; - */rbash) shell=/bin/bash ;; - */rsh) shell=/bin/sh ;; - */rksh) shell=/bin/ksh ;; - */rzsh) shell=/bin/zsh ;; - */true) shell=/bin/sh ;; - *) shell=/bin/bash ;; + local cmd=${shell##*/} + + case "${cmd}" in + r*sh) shell=/bin/${cmd#r}; cmd=${shell##*/} ;; + true) shell=/bin/sh ; cmd=${shell##*/} ;; + esac + + test -f "$1" -a ! -x "$1" && set -- /bin/bash "$@" + + case "${cmd}" in + csh|tcsh) + exec -l -a ${cmd} ${shell} -c 'exec $argv:q' "${@}" ;; + bash*|zsh) + exec -l -a ${cmd} ${shell} --login -c 'exec "${@}"' - "${@}" ;; + dash|pdksh|*pcksh|ksh*) + exec -l -a ${cmd} ${shell} -l -c 'exec "${@}"' - "${@}" ;; + *) + exec -l -a ${cmd} ${shell} -c 'exec "${@}"' - "${@}" ;; esac - exec -l -a ${shell##*/} ${shell} -c ${1+"exec $@"} } # @@ -154,7 +162,7 @@ # Handle arguments given by xdm/kdm/gdm. # forced=no -set -- $argv +set -- "${argv[@]}" if test $# -ge 1 ; then case "$1" in failsafe) exec $failsafe ;; @@ -163,20 +171,24 @@ *) forced=yes WINDOWMANAGER=$1 ;; esac - if test $# -ge 2 -a -n "$2" ; then - LANG=$2 - export LANG - else - # get the system default locale settings: - if [ -z "$LANG" -a -f /etc/profile.d/lang.sh ] ; then - . /etc/profile.d/lang.sh - fi + for l ; do + case "$l" in + [a-z][a-z]_[A-Z][A-Z]*) + LANG=$l + export LANG + break + esac + done + unset l + # get the system default locale settings: + if test -z "$LANG" -a -f /etc/profile.d/lang.sh ; then + . /etc/profile.d/lang.sh fi fi # If LANG is still not set, get the system default locale settings: # -if [ -z "$LANG" -a -f /etc/profile.d/lang.sh ] ; then +if test -z "$LANG" -a -f /etc/profile.d/lang.sh ; then . /etc/profile.d/lang.sh fi @@ -201,34 +213,25 @@ sysinit=$XINITDIR/xinitrc syssess=$XDMDIR/sys.xsession -# -# Forced X session type if the user asked for -# an other session environment. -# -if test "$forced" = "yes" ; then - test -x $syssess && exec_login "$syssess" - exec_login "/bin/bash $syssess" -fi - # User login X session # If the user doesn't have their own xsession, then run -# system xsession or xinitrc script if they exist +# system xsession or xinitrc script if they exist, but +# use a forced X session type if the user asked for +# an other session environment. -if test -f $session ; then - test -x $session && exec_login "$session" - exec_login "/bin/bash $session" +if test "$forced" = "yes" ; then + exec_login "$syssess" "$@" +elif test -f $session ; then + exec_login "$session" "$@" elif test -f $xinitrc ; then - test -x $xinitrc && exec_login "$xinitrc" - exec_login "/bin/bash $xinitrc" + exec_login "$xinitrc" "$@" elif test -f $syssess; then - test -x $syssess && exec_login "$syssess" - exec_login "/bin/bash $syssess" + exec_login "$syssess" "$@" elif test -f $sysinit ; then - test -x $sysinit && exec_login "$sysinit" - exec_login "/bin/bash $sysinit" + exec_login "$sysinit" "$@" elif test -n "$WINDOWMANAGER" ; then unset STARTUP WINDOW_MANAGER - exec_login "$WINDOWMANAGER" + exec_login "$WINDOWMANAGER" "$@" fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession --- old/etc/X11/xdm/sys.xsession 2009-12-27 12:11:51.000000000 +0100 +++ new/etc/X11/xdm/sys.xsession 2010-11-02 19:53:24.000000000 +0100 @@ -43,8 +43,9 @@ } # -# Reset the command line, used for execution at the end. +# Remember and reset the command line, used for execution at the end. # +argv=("$@") set -- # @@ -147,7 +148,7 @@ test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc" if test -f "$XINITRCFILE" ; then - exec ${1+"$@"} /bin/bash "$XINITRCFILE" + exec ${1+"$@"} /bin/bash "$XINITRCFILE" "${argv[@]}" else # # Source common code shared between the @@ -156,7 +157,7 @@ . /etc/X11/xinit/xinitrc.common unset STARTUP WINDOW_MANAGER - exec ${1+"$@"} $WINDOWMANAGER + exec ${1+"$@"} $WINDOWMANAGER "${argv[@]}" fi # call failsafe ++++++ xinit.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc new/etc/X11/xinit/xinitrc --- old/etc/X11/xinit/xinitrc 2008-05-23 15:37:42.000000000 +0200 +++ new/etc/X11/xinit/xinitrc 2010-11-03 12:46:56.000000000 +0100 @@ -74,7 +74,7 @@ # finally start the window manager # unset WINDOW_MANAGER STARTUP -exec $WINDOWMANAGER +exec $WINDOWMANAGER ${1+"$@"} # call failsafe exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org