wok rev 7326

Added xserverrc to stop X from listen to port 6000 in xorg-xinit. Added patch to move .serverauth.XX to /tmp to its removed on reboot.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Nov 18 19:12:26 2010 +0000 (2010-11-18)
parents fd94327b5714
children 2efc369ef060
files xorg-xinit/receipt xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff xorg-xinit/stuff/xserverrc
line diff
     1.1 --- a/xorg-xinit/receipt	Thu Nov 18 12:06:33 2010 +0000
     1.2 +++ b/xorg-xinit/receipt	Thu Nov 18 19:12:26 2010 +0000
     1.3 @@ -17,6 +17,7 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +	patch -Np1 -i ../stuff/06_move_serverauthfile_into_tmp.diff
     1.8  	./configure \
     1.9  		--prefix=/usr \
    1.10  		--mandir=/usr/share/man \
    1.11 @@ -28,8 +29,9 @@
    1.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.13  genpkg_rules()
    1.14  {
    1.15 -	mkdir -p $fs/usr
    1.16 -	cp -a $_pkg/usr/bin $fs/usr	
    1.17 +	mkdir -p $fs/usr $fs/etc/X11/xinit
    1.18 +	cp -a $_pkg/usr/bin $fs/usr
    1.19 +	cp -a stuff/xserverrc $fs/etc/X11/xinit/xserverrc
    1.20  }
    1.21  
    1.22  pre_install()
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff	Thu Nov 18 19:12:26 2010 +0000
     2.3 @@ -0,0 +1,20 @@
     2.4 +Move startx auth files in /tmp so they are removed on reboot.
     2.5 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
     2.6 +The trap patch didn't seem to work on reboot.
     2.7 +---
     2.8 + startx.cpp |    2 +-
     2.9 + 1 file changed, 1 insertion(+), 1 deletion(-)
    2.10 +
    2.11 +Index: xinit/startx.cpp
    2.12 +===================================================================
    2.13 +--- xinit.orig/startx.cpp
    2.14 ++++ xinit/startx.cpp
    2.15 +@@ -273,7 +273,7 @@
    2.16 +     dummy=0
    2.17 + 
    2.18 +     XCOMM create a file with auth information for the server. ':0' is a dummy.
    2.19 +-    xserverauthfile=$HOME/.serverauth.$$
    2.20 ++    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
    2.21 +     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
    2.22 +     xauth -q -f "$xserverauthfile" << EOF
    2.23 + add :$dummy . $mcookie
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xorg-xinit/stuff/xserverrc	Thu Nov 18 19:12:26 2010 +0000
     3.3 @@ -0,0 +1,1 @@
     3.4 +exec /usr/bin/X -nolisten tcp