# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1290107546 0
# Node ID 0c592641eae249a7ac0ad8d48f24dc0feaaf9a37
# Parent  fd94327b5714ee1aa51af235dd3669d7e2bbe8f3
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.

diff -r fd94327b5714 -r 0c592641eae2 xorg-xinit/receipt
--- a/xorg-xinit/receipt	Thu Nov 18 12:06:33 2010 +0000
+++ b/xorg-xinit/receipt	Thu Nov 18 19:12:26 2010 +0000
@@ -17,6 +17,7 @@
 compile_rules()
 {
 	cd $src
+	patch -Np1 -i ../stuff/06_move_serverauthfile_into_tmp.diff
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -28,8 +29,9 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr	
+	mkdir -p $fs/usr $fs/etc/X11/xinit
+	cp -a $_pkg/usr/bin $fs/usr
+	cp -a stuff/xserverrc $fs/etc/X11/xinit/xserverrc
 }
 
 pre_install()
diff -r fd94327b5714 -r 0c592641eae2 xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-xinit/stuff/06_move_serverauthfile_into_tmp.diff	Thu Nov 18 19:12:26 2010 +0000
@@ -0,0 +1,20 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp
++++ xinit/startx.cpp
+@@ -273,7 +273,7 @@
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
++    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
diff -r fd94327b5714 -r 0c592641eae2 xorg-xinit/stuff/xserverrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-xinit/stuff/xserverrc	Thu Nov 18 19:12:26 2010 +0000
@@ -0,0 +1,1 @@
+exec /usr/bin/X -nolisten tcp