[arch-commits] Commit in xorg-xinit/repos (10 files)
Andreas Radke
andyrtr at archlinux.org
Mon Mar 16 18:19:43 UTC 2015
Date: Monday, March 16, 2015 @ 19:19:42
Author: andyrtr
Revision: 233951
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xorg-xinit/repos/testing-i686/
xorg-xinit/repos/testing-i686/06_move_serverauthfile_into_tmp.diff
(from rev 233950, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/testing-i686/PKGBUILD
(from rev 233950, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/testing-i686/fs25361.patch
(from rev 233950, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/testing-i686/xserverrc
(from rev 233950, xorg-xinit/trunk/xserverrc)
xorg-xinit/repos/testing-x86_64/
xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff
(from rev 233950, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/testing-x86_64/PKGBUILD
(from rev 233950, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/testing-x86_64/fs25361.patch
(from rev 233950, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/testing-x86_64/xserverrc
(from rev 233950, xorg-xinit/trunk/xserverrc)
-----------------------------------------------------+
testing-i686/06_move_serverauthfile_into_tmp.diff | 20 +++++++
testing-i686/PKGBUILD | 47 ++++++++++++++++++
testing-i686/fs25361.patch | 16 ++++++
testing-i686/xserverrc | 2
testing-x86_64/06_move_serverauthfile_into_tmp.diff | 20 +++++++
testing-x86_64/PKGBUILD | 47 ++++++++++++++++++
testing-x86_64/fs25361.patch | 16 ++++++
testing-x86_64/xserverrc | 2
8 files changed, 170 insertions(+)
Copied: xorg-xinit/repos/testing-i686/06_move_serverauthfile_into_tmp.diff (from rev 233950, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- testing-i686/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ testing-i686/06_move_serverauthfile_into_tmp.diff 2015-03-16 18:19:42 UTC (rev 233951)
@@ -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
Copied: xorg-xinit/repos/testing-i686/PKGBUILD (from rev 233950, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-03-16 18:19:42 UTC (rev 233951)
@@ -0,0 +1,47 @@
+# $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/testing-i686/fs25361.patch (from rev 233950, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- testing-i686/fs25361.patch (rev 0)
+++ testing-i686/fs25361.patch 2015-03-16 18:19:42 UTC (rev 233951)
@@ -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/testing-i686/xserverrc (from rev 233950, xorg-xinit/trunk/xserverrc)
===================================================================
--- testing-i686/xserverrc (rev 0)
+++ testing-i686/xserverrc 2015-03-16 18:19:42 UTC (rev 233951)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
Copied: xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 233950, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- testing-x86_64/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ testing-x86_64/06_move_serverauthfile_into_tmp.diff 2015-03-16 18:19:42 UTC (rev 233951)
@@ -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
Copied: xorg-xinit/repos/testing-x86_64/PKGBUILD (from rev 233950, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-03-16 18:19:42 UTC (rev 233951)
@@ -0,0 +1,47 @@
+# $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/testing-x86_64/fs25361.patch (from rev 233950, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- testing-x86_64/fs25361.patch (rev 0)
+++ testing-x86_64/fs25361.patch 2015-03-16 18:19:42 UTC (rev 233951)
@@ -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/testing-x86_64/xserverrc (from rev 233950, xorg-xinit/trunk/xserverrc)
===================================================================
--- testing-x86_64/xserverrc (rev 0)
+++ testing-x86_64/xserverrc 2015-03-16 18:19:42 UTC (rev 233951)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
More information about the arch-commits
mailing list