Hello community, here is the log from the commit of package xorg-x11 checked in at Wed Jun 21 17:55:28 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-06-14 06:25:12.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-06-21 10:46:00.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 21 10:33:56 CEST 2006 - sndirsch@suse.de + +- fixed defines for LinuxDistribution/OSVendor/DefaultOSName: + * SuSE --> SUSE (Bug #180064) +- xdm init scripts: + * better watching (including timeout) for displaymanager before + starting xvkbd (Bug #149957) + * switched from numlock to numlockx (Bug #167388) + * better user specific ssh/gpg-agent handling (Bug #174771) + * improved dbus stuff (Bug #150623) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.EW0fu5/_old 2006-06-21 17:54:55.000000000 +0200 +++ /var/tmp/diff_new_pack.EW0fu5/_new 2006-06-21 17:54:55.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 60 +Release: 61 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -1577,11 +1577,11 @@ RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-D_FORTIFY_SOURCE=2//g') echo "RPM_OPT_FLAGS: $RPM_OPT_FLAGS" cat << EOF > config/cf/host.def -#define LinuxDistribution LinuxSuSE +#define LinuxDistribution LinuxSUSE #undef OSVendor -#define OSVendor SuSE +#define OSVendor SUSE #undef DefaultOSName -#define DefaultOSName SuSE Linux +#define DefaultOSName SUSE Linux #ifndef DefaultOSMajorVersion #define DefaultOSMajorVersion ${UTS_MAJOR} #endif @@ -2722,6 +2722,15 @@ %clean %changelog -n xorg-x11 +* Wed Jun 21 2006 - sndirsch@suse.de +- fixed defines for LinuxDistribution/OSVendor/DefaultOSName: + * SuSE --> SUSE (Bug #180064) +- xdm init scripts: + * better watching (including timeout) for displaymanager before + starting xvkbd (Bug #149957) + * switched from numlock to numlockx (Bug #167388) + * better user specific ssh/gpg-agent handling (Bug #174771) + * improved dbus stuff (Bug #150623) * Wed Jun 14 2006 - sndirsch@suse.de - p_XK_ISO_Level5.diff obsolete by now (X.Org Bug #4411) * Sat Jun 10 2006 - sndirsch@suse.de ++++++ xdm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xsetup new/Xsetup --- old/Xsetup 2006-05-19 12:44:00.000000000 +0200 +++ new/Xsetup 2006-06-21 10:27:03.000000000 +0200 @@ -68,8 +68,17 @@ # xvkbd in xdm do be able to input username and password # $halporp --key system.formfactor.subtype --string tabletpc -if test $? -eq 0 -a -x $xvkbd ; then - ( sleep 1; HOME=/root exec $xvkbd -compact -geometry -0-0 ) & echo $! > /var/run/xvkbd.pid +if test $? -eq 0 -a -x $xvkbd ; then + # Bug 149957 + ( declare -i t=100 + while test $((t--)) -gt 0 ; do + case "$(xwininfo -root -children)" in + *greet*|xlogin) break ;; + esac + sleep 0.1 + done + HOME=/root exec $xvkbd -compact -geometry -0-0 + ) & echo $! > /var/run/xvkbd.pid fi # @@ -110,6 +119,13 @@ fi # +# Enable Numlock if set +# +if test -r /var/run/numlock-on && type -p numlockx > /dev/null ; then + numlockx on +fi + +# # Xresources # if test "$kdm" != "yes" -a "$gdm" != "yes" ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sys.xsession new/sys.xsession --- old/sys.xsession 2006-04-24 15:17:02.000000000 +0200 +++ new/sys.xsession 2006-06-21 10:30:41.000000000 +0200 @@ -35,12 +35,42 @@ fi # +# Check if there is already a running ssh-agent +# +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 + +# +# Check if there is already a running gpg-agent +# +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" + fi + fi +else + usegpg=no +fi + +# # Run ssh-agent only if ssh is configured and avaliable. # -sshagent="no" SSH_ASKPASS="" if test "$usessh" = "yes" -a -d $HOME/.ssh ; then - type -p ssh-agent > /dev/null 2>&1 && sshagent="yes" if test -x /usr/lib/ssh/x11-ssh-askpass ; then SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass" export SSH_ASKPASS @@ -60,15 +90,14 @@ # gpg-agent would increase on every new X session. # if test "$usegpg" = "yes" -a -d $HOME/.gnupg ; then - GPG_AGENT="$(type -p gpg-agent 2>/dev/null)" - if test -n "$GPG_AGENT" -a -x "$GPG_AGENT"; 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" "$GPG_AGENT" ; then + if /sbin/checkproc -p "$GPG_AGPID_FILE" "$gpgagent" ; then read -t1 GPG_AGENT_INFO < "$GPG_AGENT_FILE" export GPG_AGENT_INFO else - eval $($GPG_AGENT --sh --daemon 2>/dev/null) + 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" @@ -81,8 +110,8 @@ test -r $HOME/.xinitrc && XINITRCFILE=$HOME/.xinitrc if test -f $XINITRCFILE ; then - if test "$sshagent" = "yes" ; then - exec ssh-agent /bin/bash $XINITRCFILE + if test "$usessh" = "yes" -a -n "$sshagent" ; then + exec $sshagent /bin/bash $XINITRCFILE else exec /bin/bash $XINITRCFILE fi @@ -94,8 +123,8 @@ . /etc/X11/xinit/xinitrc.common unset WINDOW_MANAGER STARTUP - if test "$sshagent" = "yes" ; then - exec ssh-agent $WINDOWMANAGER + if test "$usessh" = "yes" -a -n "$sshagent" ; then + exec $sshagent $WINDOWMANAGER else exec $WINDOWMANAGER fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinitrc.common new/xinitrc.common --- old/xinitrc.common 2006-01-11 13:11:33.000000000 +0100 +++ new/xinitrc.common 2006-06-21 10:44:22.000000000 +0200 @@ -70,12 +70,21 @@ fi # -# Run dbus-launch if found and no dbus session already activ +# Launch dbus if no session is activ or if the session is not reachable # -if test -z "$DBUS_SESSION_BUS_ADDRESS" && dbuslaunch="$(type -p dbus-launch)" ; then - WINDOWMANAGER="$dbuslaunch --sh-syntax --exit-with-session $WINDOWMANAGER" +if dbuslaunch="$(type -p dbus-launch)" && dbussend="$(type -p dbus-send)" ; then + dbustest () { + $dbussend --session --type=method_call \ + --dest='org.freedesktop.DBus' \ + /org/freedesktop/DBus \ + org.freedesktop.DBus.NameHasOwner \ + string:'org.freedesktop.DBus' > /dev/null 2>&1 + } + if test -z "$DBUS_SESSION_BUS_ADDRESS" || ! dbustest ; then + WINDOWMANAGER="$dbuslaunch --sh-syntax --exit-with-session $WINDOWMANAGER" + fi fi -unset dbuslaunch +unset dbuslaunch dbussend dbustest # # Foreign X session scripts may use an other variable name @@ -94,8 +103,8 @@ # # Enable Numlock if set # -if test -r /var/run/numlock-on && type -p numlock > /dev/null ; then - numlock +if test -r /var/run/numlock-on && type -p numlockx > /dev/null ; then + numlockx fi # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org