Date: Saturday, March 17, 2018 @ 07:42:55 Author: andyrtr Revision: 319544
upgpkg: xorg-xinit 1.4.0-3 move the serverauth file back to tmp dir Added: xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff Modified: xorg-xinit/trunk/PKGBUILD --------------------------------------+ 06_move_serverauthfile_into_tmp.diff | 21 +++++++++++++++++++++ PKGBUILD | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) Added: 06_move_serverauthfile_into_tmp.diff =================================================================== --- 06_move_serverauthfile_into_tmp.diff (rev 0) +++ 06_move_serverauthfile_into_tmp.diff 2018-03-17 07:42:55 UTC (rev 319544) @@ -0,0 +1,21 @@ +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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-17 07:37:30 UTC (rev 319543) +++ PKGBUILD 2018-03-17 07:42:55 UTC (rev 319544) @@ -4,7 +4,7 @@ pkgname=xorg-xinit pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org initialisation program " arch=('x86_64') license=('custom') @@ -15,6 +15,7 @@ backup=('etc/X11/xinit/xserverrc' 'etc/X11/xinit/xinitrc') source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig} + 06_move_serverauthfile_into_tmp.diff fs25361.patch fs46369.patch xserverrc) @@ -21,6 +22,7 @@ options=(!emptydirs) sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e' 'SKIP' + '99216b2d50052a0bafede9a2db1744a8b0313ccbc02c609502ddacb8684fc56c6f2656e6521c848880033b25005bb14a1bce0d6fefade85141ed56aad07dadf3' '12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8' '8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0' 'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b') @@ -29,6 +31,7 @@ prepare() { cd xinit-${pkgver} + patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff patch -Np1 -i ../fs25361.patch patch -Np1 -i ../fs46369.patch sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
