[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xinit: Changes to 'debian-experimental'



 debian/changelog                                    |    7 +++++++
 debian/patches/06_move_serverauthfile_into_tmp.diff |   20 ++++++++++++++++++++
 debian/patches/series                               |    1 +
 3 files changed, 28 insertions(+)

New commits:
commit 12076440aee13ec0d0e61de6d8cbfcb4deb048d6
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Aug 15 14:37:54 2007 +0200

    Add 06_move_serverauthfile_into_tmp.diff so that startx auth files are removed on reboot

diff --git a/debian/changelog b/debian/changelog
index 4f74ea5..b62a159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xinit (1.0.4-3) UNRELEASED; urgency=low
+
+  * Add 06_move_serverauthfile_into_tmp.diff so that startx auth files
+    are removed on reboot, thanks Luca Capello, closes: #357736.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 15 Aug 2007 14:08:53 +0200
+
 xinit (1.0.4-2) experimental; urgency=low
 
   * Add upstream URL in debian/copyright; thanks, Jörg Jaspert.
diff --git a/debian/patches/06_move_serverauthfile_into_tmp.diff b/debian/patches/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 0000000..dd2b2ff
--- /dev/null
+++ b/debian/patches/06_move_serverauthfile_into_tmp.diff
@@ -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	2007-08-15 14:21:36.000000000 +0200
++++ xinit/startx.cpp	2007-08-15 14:22:41.000000000 +0200
+@@ -189,7 +189,7 @@
+ dummy=0
+ 
+ XCOMM create a file with auth information for the server. ':0' is a dummy.
+-xserverauthfile=$HOME/.serverauth.$$
++xserverauthfile=/tmp/.serverauth.$$
+ xauth -q -f $xserverauthfile << EOF
+ add :$dummy . $mcookie
+ EOF
diff --git a/debian/patches/series b/debian/patches/series
index b5ed162..e1db3c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_debian_startx_manpage.diff -p1
 04_startx_paths.diff -p2
 05_use_bash.diff
+06_move_serverauthfile_into_tmp.diff



Reply to: