wok-next diff xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff @ rev 8678

Automated merge with https://bitbucket.org/gokhlayeh/wok
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Feb 17 00:50:03 2011 +0100 (2011-02-17)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff	Thu Feb 17 00:50:03 2011 +0100
     1.3 @@ -0,0 +1,20 @@
     1.4 +Move startx auth files in /tmp so they are removed on reboot.
     1.5 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
     1.6 +The trap patch didn't seem to work on reboot.
     1.7 +---
     1.8 + startx.cpp |    2 +-
     1.9 + 1 file changed, 1 insertion(+), 1 deletion(-)
    1.10 +
    1.11 +Index: xinit/startx.cpp
    1.12 +===================================================================
    1.13 +--- xinit.orig/startx.cpp
    1.14 ++++ xinit/startx.cpp
    1.15 +@@ -273,7 +273,7 @@
    1.16 +     dummy=0
    1.17 + 
    1.18 +     XCOMM create a file with auth information for the server. ':0' is a dummy.
    1.19 +-    xserverauthfile=$HOME/.serverauth.$$
    1.20 ++    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
    1.21 +     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
    1.22 +     xauth -q -f "$xserverauthfile" << EOF
    1.23 + add :$dummy . $mcookie