Hello community, here is the log from the commit of package xorg-x11 checked in at Fri Mar 31 15:53:15 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-03-28 17:53:17.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-03-31 15:10:28.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Mar 31 15:14:31 CEST 2006 - sndirsch@suse.de + +- xdm.tar.gz: converted to .gz format (has been .bz2) + +------------------------------------------------------------------- +Fri Mar 31 11:56:36 CEST 2006 - werner@suse.de + +- Do not use killall within the xdm scripts to avoid to kill xvkbd + of other running sessions maybe local or remote (bug #149957) +- Avoid error message of not existent device tty0 (bug #162365) + +------------------------------------------------------------------- +Thu Mar 30 15:56:52 CEST 2006 - sndirsch@suse.de + +- p_x86_renderinit.diff: + * should fix the Xrender related segfault (Bug #152730, comment #39) + +------------------------------------------------------------------- New: ---- p_x86_renderinit.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.ArNv1V/_old 2006-03-31 15:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ArNv1V/_new 2006-03-31 15:52:44.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 30 +Release: 31 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -115,6 +115,7 @@ Patch357: p_pci-ce-x.diff Patch358: p_setxkbmap.diff Patch359: p_mappciBIOS_complete.diff +Patch360: p_x86_renderinit.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1538,6 +1539,7 @@ %patch357 -p2 %patch358 %patch359 +%patch360 # UTS_RELEASE=`uname -r` UTS_MAJOR=${UTS_RELEASE%%%%.*} @@ -2679,6 +2681,15 @@ %clean %changelog -n xorg-x11 +* Fri Mar 31 2006 - sndirsch@suse.de +- xdm.tar.gz: converted to .gz format (has been .bz2) +* Fri Mar 31 2006 - werner@suse.de +- Do not use killall within the xdm scripts to avoid to kill xvkbd + of other running sessions maybe local or remote (bug #149957) +- Avoid error message of not existent device tty0 (bug #162365) +* Thu Mar 30 2006 - sndirsch@suse.de +- p_x86_renderinit.diff: + * should fix the Xrender related segfault (Bug #152730, comment #39) * Tue Mar 28 2006 - sndirsch@suse.de - p_mappciBIOS_complete.diff: * fixes system hang (IERR on PCI bus) on Dell (Bug #151644) ++++++ FILES ++++++ --- xorg-x11/FILES 2006-03-28 15:34:29.000000000 +0200 +++ xorg-x11/FILES 2006-03-30 15:40:38.000000000 +0200 @@ -156,3 +156,5 @@ - fixed invalid free() in setxkbmap (Bug #71244) p_mappciBIOS_complete.diff [KEEP?] - fixes system hang (IERR on PCI bus) on Dell machines (Bug #151644) +p_x86_renderinit.diff [KEEP?] +- should fix the Xrender related segfault (Bug #152730, comment #39) ++++++ p_x86_renderinit.diff ++++++ Index: programs/Xserver/render/picture.c =================================================================== RCS file: /cvs/xorg/xserver/xorg/render/picture.c,v retrieving revision 1.20 diff -u -p -r1.20 programs/Xserver/picture.c --- programs/Xserver/render/picture.c 9 Dec 2005 18:35:21 -0000 1.20 +++ programs/Xserver/render/picture.c 30 Mar 2006 10:51:28 -0000 @@ -975,6 +975,7 @@ static PicturePtr createSourcePicture(vo pPicture = (PicturePtr) xalloc(sizeof(PictureRec)); pPicture->pDrawable = 0; pPicture->pFormat = 0; + pPicture->format = PICT_a8r8g8b8; /* FIXME: is this right? */ pPicture->pNext = 0; SetPictureToDefaults(pPicture); ++++++ xdm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/GiveDevices new/GiveDevices --- old/GiveDevices 2004-08-19 17:39:39.000000000 +0200 +++ new/GiveDevices 2006-03-31 11:38:04.000000000 +0200 @@ -12,7 +12,7 @@ # if test -c /dev/tty0 && type -p showconsole > /dev/null 2>&1 ; then - device="`showconsole < /dev/tty0 2>/dev/null`" + device="`(showconsole < /dev/tty0) 2>/dev/null`" if test -n "$device" -a -c "$device" ; then chown ${USER}:tty "$device" chmod 620 "$device" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/TakeDevices new/TakeDevices --- old/TakeDevices 2004-08-19 17:41:14.000000000 +0200 +++ new/TakeDevices 2006-03-31 11:37:33.000000000 +0200 @@ -11,7 +11,7 @@ # if test -c /dev/tty0 && type -p showconsole > /dev/null 2>&1 ; then - device="`showconsole < /dev/tty0 2>/dev/null`" + device="`(exec showconsole < /dev/tty0) 2>/dev/null`" if test -n "$device" -a -c "$device" ; then chown root:tty "$device" chmod 620 "$device" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xsetup new/Xsetup --- old/Xsetup 2006-02-13 11:32:26.000000000 +0100 +++ new/Xsetup 2006-03-31 11:54:41.000000000 +0200 @@ -17,18 +17,6 @@ set +e &> /dev/null # -# Check if the machine is a TabletPC and start -# xvkbd in xdm do be able to input username and password -# -( export HOME=/root; - /usr/bin/hal-find-by-property --key system.formfactor.subtype --string tabletpc - if [ $? = 0 ]; then - sleep 1; - /usr/X11/bin/xvkbd -compact -geometry -0-0 - fi -)& - -# # Background picture for plain xdm: # Store your preferred picture in XPM format (see xv(1) or ppm(5)) # You can run gzip on the file BackGround.xpm to save disk space. @@ -69,6 +57,18 @@ xmessage=${BINDIR}/xmessage xrdb=${BINDIR}/xrdb backprg=${BINDIR}/BackGround + halporp=/usr/bin/hal-find-by-property + xvkbd=${BINDIR}/xvkbd + +# +# Check if the machine is a TabletPC and start +# 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 +fi # # Check if kdm is running diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xstartup new/Xstartup --- old/Xstartup 2006-03-13 17:08:14.000000000 +0100 +++ new/Xstartup 2006-03-31 11:54:52.000000000 +0200 @@ -14,21 +14,21 @@ BINDIR=/usr/X11R6/bin xmessage=${BINDIR}/xmessage NOLOGIN=/etc/nologin + halporp=/usr/bin/hal-find-by-property + xvkbd=${BINDIR}/xvkbd no_exit_on_failed_exec=1 type shopt &> /dev/null && shopt -s execfail set +e &> /dev/null - -# Check if the machine is a TabletPC and kill xdm +# +# Check if the machine is a TabletPC and kill xvkbd # to avoid multiple start on user desktop -( export HOME=/root; - /usr/bin/hal-find-by-property --key system.formfactor.subtype --string tabletpc - if [ $? = 0 ]; then - killall -KILL xvkbd - fi -)& - +# +$halporp --key system.formfactor.subtype --string tabletpc +if test $? -eq 0 -a -x $xvkbd ; then + /sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd +fi # # The real user id diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinitrc new/xinitrc --- old/xinitrc 2006-03-13 02:58:27.000000000 +0100 +++ new/xinitrc 2006-03-31 11:34:02.000000000 +0200 @@ -26,20 +26,21 @@ # # Run user xinit scripts. # -for SCRIPT in /etc/X11/xinit/xinitrc.d/*; do - test -d $SCRIPT && continue - case "$SCRIPT" in - .svn) continue ;; - *.rpm*) continue ;; - *.swap) continue ;; - *.bak) continue ;; - *.orig) continue ;; - \#*) continue ;; - *~) continue ;; +for script in /etc/X11/xinit/xinitrc.d/*; do + test -d $script && continue + test -x $script || continue + case "$script" in + .*) continue ;; + *.rpm*) continue ;; + *.swap) continue ;; + *.bak) continue ;; + *.orig) continue ;; + \#*) continue ;; + *~) continue ;; esac - - $SCRIPT + $script done +unset script # # Source common code shared between the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...