Date: Tuesday, March 13, 2018 @ 16:36:47 Author: andyrtr Revision: 318839
upgpkg: xorg-xinit 1.4.0-2 revert to old fs25361.patch status - FS#12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8' Modified: xorg-xinit/trunk/PKGBUILD xorg-xinit/trunk/fs25361.patch ---------------+ PKGBUILD | 4 ++-- fs25361.patch | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-13 16:13:02 UTC (rev 318838) +++ PKGBUILD 2018-03-13 16:36:47 UTC (rev 318839) @@ -4,7 +4,7 @@ pkgname=xorg-xinit pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org initialisation program " arch=('x86_64') license=('custom') @@ -21,7 +21,7 @@ options=(!emptydirs) sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e' 'SKIP' - 'cd52aa831154a8ed4f88c695b17fc692dc6ded30818b0e2bc28cb0174f4148bb1fb945c54e0ef2613e1dd459e36da69f03863b33b6ec16dc1d8466ff5e480a6a' + '12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8' '8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0' 'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b') validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') # "Hans de Goede <jwrdego...@fedoraproject.org>" Modified: fs25361.patch =================================================================== --- fs25361.patch 2018-03-13 16:13:02 UTC (rev 318838) +++ fs25361.patch 2018-03-13 16:36:47 UTC (rev 318839) @@ -1,6 +1,8 @@ ---- xinit-1.4.0/startx.cpp 2018-03-11 17:49:26.995313610 +0100 -+++ xinit-1.4.0/startx.cpp.new 2018-03-11 17:49:11.334908458 +0100 -@@ -296,9 +296,9 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -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 may need it. Add them to the '$xserverauthfile' instead. @@ -8,7 +10,8 @@ + for displayname in $authdisplay $hostname/unix$authdisplay; do authcookie=`XAUTH list "$displayname" @@ - | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; -+ | sed -n "s/.*$displayname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; if [ "z${authcookie}" = "z" ] ; then XAUTH -q << EOF add $displayname . $mcookie +