diff options
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | 06_move_serverauthfile_into_tmp.diff | 20 | ||||
| -rw-r--r-- | PKGBUILD | 59 | ||||
| -rw-r--r-- | fs25361.patch | 15 | ||||
| -rw-r--r-- | xserverrc | 6 |
5 files changed, 131 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..74d7e673154d --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,31 @@ +pkgbase = xorg-xinit-git + pkgdesc = X.Org initialisation program + pkgver = 1.3.4.r8.gc5e40f5 + pkgrel = 1 + epoch = 1 + url = http://xorg.freedesktop.org/ + arch = i686 + arch = x86_64 + license = custom + makedepends = xorg-util-macros + depends = libx11 + depends = xorg-xauth + depends = inetutils + optdepends = xorg-twm + optdepends = xterm + provides = xorg-xinit + conflicts = xorg-xinit + options = !emptydirs + backup = etc/X11/xinit/xserverrc + backup = etc/X11/xinit/xinitrc + source = xorg-xinit-git::git://anongit.freedesktop.org/git/xorg/app/xinit + source = 06_move_serverauthfile_into_tmp.diff + source = fs25361.patch + source = xserverrc + sha256sums = SKIP + sha256sums = a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb + sha256sums = 7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562 + sha256sums = 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f + +pkgname = xorg-xinit-git + diff --git a/06_move_serverauthfile_into_tmp.diff b/06_move_serverauthfile_into_tmp.diff new file mode 100644 index 000000000000..99e8a6754dfa --- /dev/null +++ b/06_move_serverauthfile_into_tmp.diff @@ -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 diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..c8a4b28c5200 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 201357 2013-12-09 12:20:22Z jgc $ +# Maintainer: Brian Bidulock <bidulock@openss7.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +_pkgname=xorg-xinit +pkgname=xorg-xinit-git +pkgver=1.3.4.r8.gc5e40f5 +pkgrel=1 +epoch=1 +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') +conflicts=('xorg-xinit') +provides=('xorg-xinit') +source=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xinit" + 06_move_serverauthfile_into_tmp.diff + fs25361.patch + xserverrc) +options=(!emptydirs) +sha256sums=('SKIP' + 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' + '7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562' + '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') + +pkgver() { + cd $pkgname + git describe --long --tags | sed -r 's/xinit-//;s/([^-]*-g)/r\1/;s/-/./g' +} + +prepare() { + cd $pkgname + 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 $pkgname + autoreconf -fi + ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit + make +} + +package() { + cd $pkgname + 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}/" +} diff --git a/fs25361.patch b/fs25361.patch new file mode 100644 index 000000000000..28ed3ecbb835 --- /dev/null +++ b/fs25361.patch @@ -0,0 +1,15 @@ +diff -up xorg-xinit-git/startx.cpp.orig xorg-xinit-git/startx.cpp +--- xorg-xinit-git/startx.cpp.orig 2014-07-03 06:04:55.000000000 -0600 ++++ xorg-xinit-git/startx.cpp 2014-07-03 06:04:55.000000000 -0600 +@@ -284,9 +284,9 @@ EOF + 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 diff --git a/xserverrc b/xserverrc new file mode 100644 index 000000000000..6b57eeba6da3 --- /dev/null +++ b/xserverrc @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi |