From 36d69c92211442a2affb953fce8846b0102d318e Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 28 Jul 2018 15:09:34 +0300 Subject: [PATCH] xinit:ver.bump --- .../xinit/files/06_move_serverauthfile_into_tmp.diff | 1 + x11/misc/xinit/files/fs25361.patch | 3 ++- x11/misc/xinit/pspec.xml | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/x11/misc/xinit/files/06_move_serverauthfile_into_tmp.diff b/x11/misc/xinit/files/06_move_serverauthfile_into_tmp.diff index 99e8a6754d..dde11e3835 100644 --- a/x11/misc/xinit/files/06_move_serverauthfile_into_tmp.diff +++ b/x11/misc/xinit/files/06_move_serverauthfile_into_tmp.diff @@ -18,3 +18,4 @@ Index: xinit/startx.cpp trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie + diff --git a/x11/misc/xinit/files/fs25361.patch b/x11/misc/xinit/files/fs25361.patch index 4596122de8..046968576e 100644 --- a/x11/misc/xinit/files/fs25361.patch +++ b/x11/misc/xinit/files/fs25361.patch @@ -5,7 +5,7 @@ diff -u xinit.orig/startx.cpp xinit/startx.cpp @@ -290,9 +290,9 @@ XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another - XCOMM server man need it. Add them to the '$xserverauthfile' instead. + XCOMM server may need it. Add them to the '$xserverauthfile' instead. - for displayname in $authdisplay $hostname$authdisplay; do + for displayname in $authdisplay $hostname/unix$authdisplay; do authcookie=`XAUTH list "$displayname" @@ @@ -14,3 +14,4 @@ diff -u xinit.orig/startx.cpp xinit/startx.cpp if [ "z${authcookie}" = "z" ] ; then XAUTH -q << EOF add $displayname . $mcookie + diff --git a/x11/misc/xinit/pspec.xml b/x11/misc/xinit/pspec.xml index d1ac98d0f9..a5fccd39c9 100644 --- a/x11/misc/xinit/pspec.xml +++ b/x11/misc/xinit/pspec.xml @@ -13,7 +13,7 @@ app:console X Window System session initializer xinit initializes X Window System server and runs the first client application. - mirrors://xorg/individual/app/xinit-1.3.4.tar.bz2 + mirrors://xorg/individual/app/xinit-1.4.0.tar.bz2 util-macros xorg-proto @@ -22,7 +22,7 @@ 06_move_serverauthfile_into_tmp.diff - fs25361.patch + fs25361.patch @@ -62,6 +62,13 @@ + + 2018-07-28 + 1.4.0 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2017-02-16 1.3.4