Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2012-12-07 14:52:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2012-07-02 21:40:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2012-12-07 14:52:54.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 5 09:40:27 UTC 2012 - [email protected] + +- Move xinitrc.d sourcing part to xinit.common to make it work + even with xdm session scripts +- Detect other running X server in xserverrc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 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 2012-07-02 11:30:33.000000000 +0200 +++ new/etc/X11/xinit/xinitrc 2012-12-05 10:27:34.000000000 +0100 @@ -24,33 +24,6 @@ fi # -# Run user xinit scripts. -# -for script in /etc/X11/xinit/xinitrc.d/*; do - test -e $script || continue - test -d $script && continue - case "$script" in - .*) continue ;; - *.rpm*) continue ;; - *.swap) continue ;; - *.bak) continue ;; - *.orig) continue ;; - \#*) continue ;; - *~) continue ;; - esac - if test -x $script ; then - if grep -qE "^# to be sourced" $script >/dev/null 2>&1; then - . $script - else - $script & - fi - else - . $script - fi -done -unset script - -# # Source common code shared between the # X session and X init scripts # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common --- old/etc/X11/xinit/xinitrc.common 2009-04-22 15:39:04.000000000 +0200 +++ new/etc/X11/xinit/xinitrc.common 2012-12-05 10:27:13.000000000 +0100 @@ -35,6 +35,33 @@ esac # +# Run user xinit scripts. +# +for script in /etc/X11/xinit/xinitrc.d/*; do + test -e $script || continue + test -d $script && continue + case "$script" in + .*) continue ;; + *.rpm*) continue ;; + *.swap) continue ;; + *.bak) continue ;; + *.orig) continue ;; + \#*) continue ;; + *~) continue ;; + esac + if test -x $script ; then + if grep -qE "^# to be sourced" $script >/dev/null 2>&1; then + . $script + else + $script & + fi + else + . $script + fi +done +unset script + +# # Choose a window manager # test -n "$WINDOWMANAGER" && WINDOWMANAGER="$(type -p $WINDOWMANAGER 2>/dev/null)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xserverrc new/etc/X11/xinit/xserverrc --- old/etc/X11/xinit/xserverrc 2009-02-05 12:51:57.000000000 +0100 +++ new/etc/X11/xinit/xserverrc 2012-12-05 10:39:28.000000000 +0100 @@ -5,7 +5,13 @@ # everybody to get access to your X-Server # -dspnum=":0" +typeset -i num=0 +for lock in /tmp/.X*-lock ; do + test -e $lock || break + let num++ +done + +dspnum=":$num" args="" done=no if test -z "$XAUTHORITY" ; then @@ -16,7 +22,7 @@ while test -n "$1" ; do case "$1" in - \:[0-9]) + \:[0-9]*) dspnum="$1" ; shift ;; -auth) done=yes @@ -28,21 +34,23 @@ # handle TCP port 6000 . /etc/sysconfig/displaymanager -test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ - args="$args -nolisten tcp" +if test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" ; then + args="$args -nolisten tcp" +fi -if test -x "`type -p keygen`" -a "$done" != "yes" ; then +if test -x "$(type -p keygen)" -a "$done" != "yes" ; then host=localhost trap "echo" 1 2 15 - cookie="MIT-MAGIC-COOKIE-1 `keygen`" + cookie="MIT-MAGIC-COOKIE-1 $(keygen)" tcpip="$host$dspnum" - unix="${host%%.*}/unix$dspnum" + unixs="${host%%.*}/unix$dspnum" + unixf="${host}/unix$dspnum" xauth -f $auth source - <<-EOF add $tcpip $cookie - add $unix $cookie - add ${host}/unix$dspnum $cookie + add $unixs $cookie + add $unixf $cookie EOF cookie= -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
