File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,21 +2,21 @@ Move startx auth files in /tmp so they are removed on reboot.
22http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
33The trap patch didn't seem to work on reboot.
44---
5- startx.cpp | 2 +-
5+ startx.in | 2 +-
66 1 file changed, 1 insertion(+), 1 deletion(-)
77
8- Index: xinit/startx.cpp
8+ Index: xinit/startx.in
99===================================================================
10- diff --git a/startx.cpp b/startx.cpp
11- index dfbebe1..63f9ac6 100644
12- --- a/startx.cpp
13- +++ b/startx.cpp
14- @@ -272 ,7 +272 ,7 @@ if [ x "$enable_xauth" = x1 ] ; then
10+ diff --git a/startx.in b/startx.in
11+ index 9b224af..cf559bb 100644
12+ --- a/startx.in
13+ +++ b/startx.in
14+ @@ -283 ,7 +283 ,7 @@ if [ "$enable_xauth" = 1 ] ; then
1515 dummy=0
1616
17- XCOMM create a file with auth information for the server. ':0' is a dummy.
18- - xserverauthfile=$HOME/.serverauth.$$
19- + xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
17+ # create a file with auth information for the server. ':0' is a dummy.
18+ - xserverauthfile=" $HOME/.serverauth.$$"
19+ + xserverauthfile=" `mktemp -p /tmp serverauth.XXXXXXXXXX`"
2020 trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
2121 xauth -q -f "$xserverauthfile" << EOF
2222 add :$dummy . $mcookie
Original file line number Diff line number Diff line change 1- diff -u xinit.orig/startx.cpp xinit/startx.cpp
2- --- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
3- +++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
4- @@ -290,9 +290,9 @@
5- XCOMM now add the same credentials to the client authority file
6- XCOMM if '$displayname' already exists do not overwrite it as another
7- XCOMM server may need it. Add them to the '$xserverauthfile' instead.
1+ diff --git a/startx.in b/startx.in
2+ index 9b224af..dc0fb33 100644
3+ --- a/startx.in
4+ +++ b/startx.in
5+ @@ -302,9 +302,9 @@ EOF
6+ # now add the same credentials to the client authority file
7+ # if '$displayname' already exists do not overwrite it as another
8+ # server may need it. Add them to the '$xserverauthfile' instead.
89- for displayname in $authdisplay $hostname$authdisplay; do
910+ for displayname in $authdisplay $hostname/unix$authdisplay; do
10- authcookie=`XAUTH list "$displayname" @@
11- - | sed -n " s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
12- + | sed -n " s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
11+ authcookie=$(xauth list "$displayname" \
12+ - | sed -n ' s/.*'" $displayname"' [[:space:]*].*[[:space:]*]//p' 2>/dev/null) ;
13+ + | sed -n ' s/.*'" $hostname\/unix$authdisplay"' [[:space:]*].*[[:space:]*]//p' 2>/dev/null) ;
1314 if [ "z${authcookie}" = "z" ] ; then
14- XAUTH -q << EOF
15+ "$xauth" -q << EOF
1516 add $displayname . $mcookie
Original file line number Diff line number Diff line change 11# Template file for 'xinit'
22pkgname=xinit
3- version=1.4.2
3+ version=1.4.4
44revision=1
55build_style=gnu-configure
66configure_args="--with-xinitdir=/etc/X11/xinit"
1111license="MIT"
1212homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
1313distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
14- checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23
14+ checksum=40a47c7a164c7f981ce3787b4b37f7e411fb43231dcde543d70094075dacfef9
1515
1616conf_files="
1717 /etc/X11/xinit/xinitrc
You can’t perform that action at this time.
0 commit comments