diff options
| author | root <root@rshg054.dnsready.net> | 2011-12-20 23:14:59 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-12-20 23:14:59 +0000 |
| commit | ea1f4bece8870857691a7123bdc899562760b3fe (patch) | |
| tree | b332a0692c3e63d46cb60cb1214fc57871e619c8 /extra/xorg-xinit | |
| parent | 6d2dec5c3443d142a0131c43666929490961c16a (diff) | |
Tue Dec 20 23:14:59 UTC 2011
Diffstat (limited to 'extra/xorg-xinit')
| -rw-r--r-- | extra/xorg-xinit/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/xorg-xinit/fs25361.patch | 16 |
2 files changed, 22 insertions, 3 deletions
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index a65ace85e..edb93716e 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140273 2011-10-11 21:27:57Z jgc $ +# $Id: PKGBUILD 145242 2011-12-19 22:24:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libx11' 'xorg-xauth') +depends=('libx11' 'xorg-xauth' 'inetutils') makedepends=('xorg-util-macros') optdepends=('xorg-twm' 'xterm') backup=('etc/skel/.xinitrc' @@ -18,12 +18,14 @@ backup=('etc/skel/.xinitrc' '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 @@ md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4' 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 diff --git a/extra/xorg-xinit/fs25361.patch b/extra/xorg-xinit/fs25361.patch new file mode 100644 index 000000000..4596122de --- /dev/null +++ b/extra/xorg-xinit/fs25361.patch @@ -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 |