[arch-commits] Commit in xorg-xinit/repos (18 files)
Jan Steffens
heftig at archlinux.org
Mon Sep 21 15:12:07 UTC 2015
Date: Monday, September 21, 2015 @ 17:12:06
Author: heftig
Revision: 247034
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
(from rev 247033, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/extra-i686/PKGBUILD
(from rev 247033, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/extra-i686/fs25361.patch
(from rev 247033, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/extra-i686/fs46369.patch
(from rev 247033, xorg-xinit/trunk/fs46369.patch)
xorg-xinit/repos/extra-i686/xserverrc
(from rev 247033, xorg-xinit/trunk/xserverrc)
xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff
(from rev 247033, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/extra-x86_64/PKGBUILD
(from rev 247033, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/extra-x86_64/fs25361.patch
(from rev 247033, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/extra-x86_64/fs46369.patch
(from rev 247033, xorg-xinit/trunk/fs46369.patch)
xorg-xinit/repos/extra-x86_64/xserverrc
(from rev 247033, xorg-xinit/trunk/xserverrc)
Deleted:
xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
xorg-xinit/repos/extra-i686/PKGBUILD
xorg-xinit/repos/extra-i686/fs25361.patch
xorg-xinit/repos/extra-i686/xserverrc
xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff
xorg-xinit/repos/extra-x86_64/PKGBUILD
xorg-xinit/repos/extra-x86_64/fs25361.patch
xorg-xinit/repos/extra-x86_64/xserverrc
---------------------------------------------------+
/06_move_serverauthfile_into_tmp.diff | 40 ++++++++
/PKGBUILD | 100 ++++++++++++++++++++
/fs25361.patch | 32 ++++++
/xserverrc | 4
extra-i686/06_move_serverauthfile_into_tmp.diff | 20 ----
extra-i686/PKGBUILD | 47 ---------
extra-i686/fs25361.patch | 16 ---
extra-i686/fs46369.patch | 11 ++
extra-i686/xserverrc | 2
extra-x86_64/06_move_serverauthfile_into_tmp.diff | 20 ----
extra-x86_64/PKGBUILD | 47 ---------
extra-x86_64/fs25361.patch | 16 ---
extra-x86_64/fs46369.patch | 11 ++
extra-x86_64/xserverrc | 2
14 files changed, 198 insertions(+), 170 deletions(-)
Deleted: extra-i686/06_move_serverauthfile_into_tmp.diff
===================================================================
--- extra-i686/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-i686/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,20 +0,0 @@
-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
Copied: xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff (from rev 247033, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- extra-i686/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ extra-i686/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,20 @@
+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
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-i686/PKGBUILD 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.4
-pkgrel=2
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/X11/xinit/xserverrc'
- 'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
- 06_move_serverauthfile_into_tmp.diff
- fs25361.patch
- xserverrc)
-options=(!emptydirs)
-sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
- 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
- '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
- '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
-
-prepare() {
- cd xinit-${pkgver}
- patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
- patch -Np1 -i ../fs25361.patch
- sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-}
-
-build() {
- cd xinit-${pkgver}
- autoreconf -fi
- ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
- make
-}
-
-package() {
- cd xinit-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xorg-xinit/repos/extra-i686/PKGBUILD (from rev 247033, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.4
+pkgrel=3
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/X11/xinit/xserverrc'
+ 'etc/X11/xinit/xinitrc')
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+ 06_move_serverauthfile_into_tmp.diff
+ fs25361.patch
+ fs46369.patch
+ xserverrc)
+options=(!emptydirs)
+sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
+ 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+ '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+ '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
+ '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
+
+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
+}
+
+build() {
+ cd xinit-${pkgver}
+ autoreconf -fi
+ ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+ make
+}
+
+package() {
+ cd xinit-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/fs25361.patch
===================================================================
--- extra-i686/fs25361.patch 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-i686/fs25361.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,16 +0,0 @@
-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
Copied: xorg-xinit/repos/extra-i686/fs25361.patch (from rev 247033, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- extra-i686/fs25361.patch (rev 0)
+++ extra-i686/fs25361.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -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
Copied: xorg-xinit/repos/extra-i686/fs46369.patch (from rev 247033, xorg-xinit/trunk/fs46369.patch)
===================================================================
--- extra-i686/fs46369.patch (rev 0)
+++ extra-i686/fs46369.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,11 @@
+diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
+--- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200
++++ xinit-1.3.4-dbus/startx.cpp 2015-09-21 17:07:59.255424644 +0200
+@@ -11,7 +11,6 @@
+ XCOMM Site administrators are STRONGLY urged to write nicer versions.
+ XCOMM
+
+-unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+
+ #ifdef __APPLE__
Deleted: extra-i686/xserverrc
===================================================================
--- extra-i686/xserverrc 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-i686/xserverrc 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
Copied: xorg-xinit/repos/extra-i686/xserverrc (from rev 247033, xorg-xinit/trunk/xserverrc)
===================================================================
--- extra-i686/xserverrc (rev 0)
+++ extra-i686/xserverrc 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
Deleted: extra-x86_64/06_move_serverauthfile_into_tmp.diff
===================================================================
--- extra-x86_64/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,20 +0,0 @@
-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
Copied: xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 247033, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- extra-x86_64/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,20 @@
+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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-x86_64/PKGBUILD 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.4
-pkgrel=2
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/X11/xinit/xserverrc'
- 'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
- 06_move_serverauthfile_into_tmp.diff
- fs25361.patch
- xserverrc)
-options=(!emptydirs)
-sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
- 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
- '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
- '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
-
-prepare() {
- cd xinit-${pkgver}
- patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
- patch -Np1 -i ../fs25361.patch
- sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-}
-
-build() {
- cd xinit-${pkgver}
- autoreconf -fi
- ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
- make
-}
-
-package() {
- cd xinit-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xorg-xinit/repos/extra-x86_64/PKGBUILD (from rev 247033, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.4
+pkgrel=3
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/X11/xinit/xserverrc'
+ 'etc/X11/xinit/xinitrc')
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+ 06_move_serverauthfile_into_tmp.diff
+ fs25361.patch
+ fs46369.patch
+ xserverrc)
+options=(!emptydirs)
+sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
+ 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+ '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+ '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
+ '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
+
+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
+}
+
+build() {
+ cd xinit-${pkgver}
+ autoreconf -fi
+ ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+ make
+}
+
+package() {
+ cd xinit-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-x86_64/fs25361.patch
===================================================================
--- extra-x86_64/fs25361.patch 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-x86_64/fs25361.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,16 +0,0 @@
-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
Copied: xorg-xinit/repos/extra-x86_64/fs25361.patch (from rev 247033, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- extra-x86_64/fs25361.patch (rev 0)
+++ extra-x86_64/fs25361.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -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
Copied: xorg-xinit/repos/extra-x86_64/fs46369.patch (from rev 247033, xorg-xinit/trunk/fs46369.patch)
===================================================================
--- extra-x86_64/fs46369.patch (rev 0)
+++ extra-x86_64/fs46369.patch 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,11 @@
+diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
+--- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200
++++ xinit-1.3.4-dbus/startx.cpp 2015-09-21 17:07:59.255424644 +0200
+@@ -11,7 +11,6 @@
+ XCOMM Site administrators are STRONGLY urged to write nicer versions.
+ XCOMM
+
+-unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+
+ #ifdef __APPLE__
Deleted: extra-x86_64/xserverrc
===================================================================
--- extra-x86_64/xserverrc 2015-09-21 15:11:09 UTC (rev 247033)
+++ extra-x86_64/xserverrc 2015-09-21 15:12:06 UTC (rev 247034)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
Copied: xorg-xinit/repos/extra-x86_64/xserverrc (from rev 247033, xorg-xinit/trunk/xserverrc)
===================================================================
--- extra-x86_64/xserverrc (rev 0)
+++ extra-x86_64/xserverrc 2015-09-21 15:12:06 UTC (rev 247034)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
More information about the arch-commits
mailing list