diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /main/xinit/06_move_serverauthfile_into_tmp.patch | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'main/xinit/06_move_serverauthfile_into_tmp.patch')
| -rw-r--r-- | main/xinit/06_move_serverauthfile_into_tmp.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/main/xinit/06_move_serverauthfile_into_tmp.patch b/main/xinit/06_move_serverauthfile_into_tmp.patch new file mode 100644 index 0000000000..99e8a6754d --- /dev/null +++ b/main/xinit/06_move_serverauthfile_into_tmp.patch @@ -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 |