Hello community,
here is the log from the commit of package xorg-x11
checked in at Sun Apr 20 15:32:42 CEST 2008.
--------
--- xorg-x11/xorg-x11.changes 2008-04-08 23:38:46.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2008-04-18 17:11:41.844472000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 18 17:31:39 CEST 2008 - sndirsch@suse.de
+
+- moved stupid workaround to fix keyboard layouts to Xstartup
+ (bnc #368673)
+
+-------------------------------------------------------------------
+Wed Apr 16 12:52:11 CEST 2008 - werner@suse.de
+
+- Make gpg-agent shutdown after a session is closed (bnc #351888)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.h24761/_old 2008-04-20 15:30:34.000000000 +0200
+++ /var/tmp/diff_new_pack.h24761/_new 2008-04-20 15:30:34.000000000 +0200
@@ -19,7 +19,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 72
+Release: 74
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -459,6 +459,11 @@
/var/lib/xdm/authdir/
%changelog
+* Fri Apr 18 2008 sndirsch@suse.de
+- moved stupid workaround to fix keyboard layouts to Xstartup
+ (bnc #368673)
+* Wed Apr 16 2008 werner@suse.de
+- Make gpg-agent shutdown after a session is closed (bnc #351888)
* Wed Apr 09 2008 sndirsch@suse.de
- /etc/X11/xdm/Xsetup
* added stupid workaround to fix keyboard layouts (bnc #368673)
++++++ xdm.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/SuSEconfig.xdm new/etc/X11/xdm/SuSEconfig.xdm
--- old/etc/X11/xdm/SuSEconfig.xdm 2006-11-09 15:09:15.000000000 +0100
+++ new/etc/X11/xdm/SuSEconfig.xdm 2008-04-15 18:24:43.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
#
# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany.
+# Copyright (c) 2008 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
type -p sed &> /dev/null || {
@@ -22,56 +23,39 @@
}
. $r/lib/YaST/SuSEconfig.functions
-if test -r $r/etc/X11/xdm/Xservers; then
- if test $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/Xservers; then
+if test -r $r/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/Xservers; then
file=$r/etc/X11/xdm/Xservers
+ cp -p $file ${file}.SuSEconfig
if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then
- sed "s/^\(:[0-9][ \t]\+local[ \t]\+\)/#\1/g" < $file > ${file}.tmp
+ sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' ${file}.SuSEconfig
elif test "$DISPLAYMANAGER_STARTS_XSERVER" = "yes" ; then
- sed "s/^#[ \t]*\(:[0-9][ \t]\+local[ \t]\+\)/\1/g" < $file > ${file}.tmp
- else
- cp $file $file.tmp
+ sed -ri 's/^#[[:blank:]]*(:[0-9][[:blank:]]+local[[:blank:]]+)/\1/g' ${file}.SuSEconfig
fi
if test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "no" ; then
- sed "s/\(.*\/usr\/bin\/X\)[ \t]*\(-nolisten[ \t]*tcp[ \t]*\|\)/\1 -nolisten tcp /g" < $file.tmp > ${file}.SuSEconfig
+ sed -ri 's%(.*/usr/bin/X)[[:blank:]]*(-nolisten[[:blank:]]*tcp[[:blank:]]*|)%\1 -nolisten tcp %g' ${file}.SuSEconfig
elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then
- sed "s/\(.*\/usr\/bin\/X\)[ \t]*-nolisten tcp[ \t]*/\1 /g" < $file.tmp > ${file}.SuSEconfig
- else
- cp $file.tmp ${file}.SuSEconfig
+ sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g' ${file}.SuSEconfig
fi
- rm $file.tmp
- check_md5_and_move $file
- fi
+ check_md5_and_move $file
fi
if test $r/etc/sysconfig/displaymanager -nt /var/X11R6/bin/X; then
- if test -n "$DISPLAYMANAGER_XSERVER" ; then
- if test -f "/usr/bin/$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" ; then
- test -d /var/X11R6/bin && \
- ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/X11R6/bin/X
+ if test -n "$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" ; then
+ test -d /var/X11R6/bin && ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/X11R6/bin/X
else
- test -d /var/X11R6/bin && \
- ln -snf /usr/bin/Xorg /var/X11R6/bin/X
+ test -d /var/X11R6/bin && ln -snf /usr/bin/Xorg /var/X11R6/bin/X
fi
- else
- test -d /var/X11R6/bin && \
- ln -snf /usr/bin/Xorg /var/X11R6/bin/X
- fi
fi
-if test -r $r/etc/X11/xdm/xdm-config ; then
- if test $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/xdm-config; then
+if test -r $r/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/xdm-config; then
file=$r/etc/X11/xdm/xdm-config
+ cp -p $file ${file}.SuSEconfig
if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then
- sed "s/^\(DisplayManager\.requestPort:[ \t]\+0\)/!\1/g" < $file > ${file}.SuSEconfig
- check_md5_and_move $file
+ sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig
elif test "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ; then
- sed "s/^![ \t]*\(DisplayManager\.requestPort:[ \t]\+0\)/\1/g" < $file > ${file}.SuSEconfig
- check_md5_and_move $file
- else
- echo "${0##*/}: change of $file skipped"
+ sed -ri 's/^![[:blank:]]*(DisplayManager\.requestPort:[[:blank:]]+0)/\1/g' ${file}.SuSEconfig
fi
- fi
+ check_md5_and_move $file
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 2006-06-21 10:30:41.000000000 +0200
+++ new/etc/X11/xdm/sys.xsession 2008-04-16 12:33:58.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# sys.xsession: Login for an X session, will be executed
+# sys.xsession: Login for an X session, will be executed
# by the Xsession script of the xdm with
# the help of the login shell of the user.
#
@@ -8,12 +8,12 @@
#
# If ssh is configured and ssh-agent is wanted set "yes"
#
-usessh="yes"
+usessh=yes
#
# If gpg is configured and gpg-agent is wanted set "yes"
#
-usegpg="yes"
+usegpg=yes
#
# What we do if we fail at least ... emergency fall back.
@@ -35,99 +35,95 @@
fi
#
-# Check if there is already a running ssh-agent
+# Simple helper
#
-if sshagent="$(type -p ssh-agent)" ; then
- if test -n "$SSH_AGENT_PID" -a -S "$SSH_AUTH_SOCK" ; then
- if /sbin/checkproc -p "$SSH_AGENT_PID" $sshagent ; then
- usessh=no
- fi
- fi
-else
- usessh=no
-fi
+checkproc () { /sbin/checkproc -k ${1+"$@"}; }
+
+#
+# Reset the command line, used for execution at the end.
+#
+set --
#
-# Check if there is already a running gpg-agent
+# Run ssh-agent only if ssh service is configured and avaliable.
+# Check if there is already a running ssh-agent and if use this.
#
-if gpgagent="$(type -p gpg-agent)" ; then
- if test -n "$GPG_AGENT_INFO" ; then
- GPG_AGENT_PID="${GPG_AGENT_INFO#*:}"
- GPG_AGENT_PID="${GPG_AGENT_PID%%:*}"
- if /sbin/checkproc -p "$GPG_AGENT_PID" "$gpgagent" ; then
- usegpg=no
- GPG_AGENT_FILE=$HOME/.gnupg/agent.info
- GPG_AGPID_FILE=$HOME/.gnupg/agent.pid
- echo "$GPG_AGENT_INFO" > "$GPG_AGENT_FILE"
- echo "$GPG_AGENT_PID" > "$GPG_AGPID_FILE"
+if test "$usessh" = yes -a -d "$HOME/.ssh" && sshagent=$(type -p ssh-agent) ; then
+ if test -S "$SSH_AUTH_SOCK" ; then
+ if test -n "$SSH_AGENT_PID" && checkproc -p $SSH_AGENT_PID $sshagent ; then
+ export SSH_AGENT_PID SSH_AUTH_SOCK
+ else
+ rm -f "$SSH_AUTH_SOCK"
+ case "${SSH_AUTH_SOCK%/*}" in
+ /tmp/*) rm -rf "${SSH_AUTH_SOCK%/*}"
+ esac
+ unset SSH_AUTH_SOCK
fi
+ else
+ unset SSH_AUTH_SOCK
+ fi
+
+ if test -z "$SSH_AUTH_SOCK" ; then
+ set -- $sshagent ${1+"$@"}
fi
-else
- usegpg=no
-fi
-#
-# Run ssh-agent only if ssh is configured and avaliable.
-#
-SSH_ASKPASS=""
-if test "$usessh" = "yes" -a -d $HOME/.ssh ; then
if test -x /usr/lib/ssh/x11-ssh-askpass ; then
- SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
+ SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass
export SSH_ASKPASS
elif test -x /usr/lib64/ssh/x11-ssh-askpass ; then
- SSH_ASKPASS="/usr/lib64/ssh/x11-ssh-askpass"
+ SSH_ASKPASS=/usr/lib64/ssh/x11-ssh-askpass
export SSH_ASKPASS
fi
fi
#
-# Run gpg-agent only if gpg-agent is configured and avaliable.
-# Note that the method in the following few lines is necessary
-# because the gpg2 developers force every user to use the
-# daemon mode regardless of the staying gpg-agent after leaving
-# the X session. If the method of the ssh-agent of getting
-# a secure X session would be used, the number of running
-# gpg-agent would increase on every new X session.
-#
-if test "$usegpg" = "yes" -a -d $HOME/.gnupg ; then
- if test -n "$gpgagent" ; then
- GPG_AGENT_FILE=$HOME/.gnupg/agent.info
- GPG_AGPID_FILE=$HOME/.gnupg/agent.pid
- if /sbin/checkproc -p "$GPG_AGPID_FILE" "$gpgagent" ; then
- read -t1 GPG_AGENT_INFO < "$GPG_AGENT_FILE"
+# Run gpg-agent only if gpg service is configured and avaliable.
+# Check if there is already a running gpg-agent and if use this.
+#
+if test "$usegpg" = yes -a -d "$HOME/.gnupg" && gpgagent=$(type -p gpg-agent) ; then
+ GPG_AGENT_FILE="$HOME/.gnupg/agent.info"
+ test -s "$GPG_AGENT_FILE" && . "$GPG_AGENT_FILE"
+
+ if test -n "$GPG_AGENT_INFO" ; then
+ GPG_AGENT_PID=${GPG_AGENT_INFO#*:}
+ GPG_AGENT_PID=${GPG_AGENT_PID%%:*}
+ if test -n "$GPG_AGENT_PID" && checkproc -p $GPG_AGENT_PID $gpgagent ; then
export GPG_AGENT_INFO
else
- eval $($gpgagent --sh --daemon 2>/dev/null)
- GPG_AGENT_PID="${GPG_AGENT_INFO#*:}"
- GPG_AGENT_PID="${GPG_AGENT_PID%%:*}"
- echo "$GPG_AGENT_INFO" > "$GPG_AGENT_FILE"
- echo "$GPG_AGENT_PID" > "$GPG_AGPID_FILE"
+ unset GPG_AGENT_INFO
fi
fi
+
+ if test -z "$GPG_AGENT_INFO" ; then
+ set -- $gpgagent --sh --daemon --write-env-file "$GPG_AGENT_FILE" ${1+"$@"}
+ fi
fi
+#
+# Use system default xinitrc if the users does not have one.
+#
XINITRCFILE=/etc/X11/xinit/xinitrc
-test -r $HOME/.xinitrc && XINITRCFILE=$HOME/.xinitrc
+test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc"
-if test -f $XINITRCFILE ; then
- if test "$usessh" = "yes" -a -n "$sshagent" ; then
- exec $sshagent /bin/bash $XINITRCFILE
- else
- exec /bin/bash $XINITRCFILE
- fi
+if test -f "$XINITRCFILE" ; then
+ #
+ # Some foreign xinitrc uses other variables
+ #
+ STARTUP=$WINDOWMANAGER
+ WINDOW_MANAGER=$WINDOWMANAGER
+ export STARTUP WINDOW_MANAGER
+
+ exec ${1+"$@"} /bin/bash "$XINITRCFILE"
else
#
# Source common code shared between the
# X session and X init scripts
#
. /etc/X11/xinit/xinitrc.common
+ unset STARTUP
+ unset WINDOW_MANAGER
- unset WINDOW_MANAGER STARTUP
- if test "$usessh" = "yes" -a -n "$sshagent" ; then
- exec $sshagent $WINDOWMANAGER
- else
- exec $WINDOWMANAGER
- fi
+ exec ${1+"$@"} $WINDOWMANAGER
fi
# call failsafe
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup 2008-04-08 23:37:05.000000000 +0200
+++ new/etc/X11/xdm/Xsetup 2008-04-18 17:10:31.000000000 +0200
@@ -66,11 +66,6 @@
gwd=/usr/bin/gtk-window-decorator
#
-# Fix keyboard layout (Bug #368673)
-#
-setxkbmap -print | xkbcomp - $DISPLAY
-
-#
# Check if the machine is a laptop and configure
# external output if XRANDR 1.2 is available
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup 2008-04-04 20:17:04.000000000 +0200
+++ new/etc/X11/xdm/Xstartup 2008-04-18 17:10:38.000000000 +0200
@@ -22,6 +22,11 @@
set +e &> /dev/null
#
+# Fix keyboard layout (Bug #368673)
+#
+setxkbmap -print | xkbcomp - $DISPLAY
+
+#
# Check if the machine is a TabletPC and kill xvkbd
# to avoid multiple start on user desktop
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org