[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs25361.patch)

[Jan de Groot]

    Date: Monday, December 19, 2011 @ 14:32:08
  Author: jgc
Revision: 145237

Fix FS#25361. Patch from user, created as suggested by Adam Jackson. Upstream reference: https://bugs.freedesktop.org/show_bug.cgi?id=13462

Added:
  xorg-xinit/trunk/fs25361.patch
Modified:
  xorg-xinit/trunk/PKGBUILD

---------------+
 PKGBUILD      |    3 +++
 fs25361.patch |   16 ++++++++++++++++
 2 files changed, 19 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-19 19:17:54 UTC (rev 145236)
+++ PKGBUILD	2011-12-19 19:32:08 UTC (rev 145237)
@@ -18,12 +18,14 @@
         'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
+        fs25361.patch
         xinitrc
         xsession
         xserverrc)
 options=(!emptydirs)
 md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
          'abd072ec435ce084cf4e89c58f83d45c'
+         '73a597d3fb7f5b9487318ac8cfd4bedf'
          'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
          '7873d97db30d6c279ed37e3559e7c59d'
          'c5baef10fdb7239594daee72a94ddab3')
@@ -31,6 +33,7 @@
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make

Added: fs25361.patch
===================================================================
--- fs25361.patch	                        (rev 0)
+++ fs25361.patch	2011-12-19 19:32:08 UTC (rev 145237)
@@ -0,0 +1,16 @@
+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 man 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" @@
+-        | sed -n "s/.*$displayname[[: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