Xorg update part1

4 files changed, 39 insertions, 11 deletions

diff --git a/abs/core/xorg-xinit/PKGBUILD b/abs/core/xorg-xinit/PKGBUILD
index 9bbf6f6..f4d5673 100644
--- a/abs/core/xorg-xinit/PKGBUILD
+++ b/abs/core/xorg-xinit/PKGBUILD
@@ -1,39 +1,44 @@
-# $Id: PKGBUILD 99539 2010-11-15 11:06:22Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 149821 2012-02-11 08:52:05Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
 pkgname=xorg-xinit
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
 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'
         'etc/skel/.xsession'
         'etc/X11/xinit/xserverrc'
         'etc/X11/xinit/xinitrc')
-groups=('xorg')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
+        fs25361.patch
         xinitrc
         xsession
         xserverrc)
 options=(!emptydirs)
-md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
+md5sums=('9c0943cbd83e489ad1b05221b97efd44'
          'abd072ec435ce084cf4e89c58f83d45c'
-         'cee2d70748a089fbc7db64a4a6e8fdb1'
+         '73a597d3fb7f5b9487318ac8cfd4bedf'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
          '7873d97db30d6c279ed37e3559e7c59d'
-         'bb550d3b9a2d2b6cbe6e2667a3a7cd03')
+         'c5baef10fdb7239594daee72a94ddab3')
 
 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
 }
+
 package() {
   cd "${srcdir}/xinit-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/abs/core/xorg-xinit/fs25361.patch b/abs/core/xorg-xinit/fs25361.patch
new file mode 100644
index 0000000..4596122
--- /dev/null
+++ b/abs/core/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
diff --git a/abs/core/xorg-xinit/xinitrc b/abs/core/xorg-xinit/xinitrc
index a5a3527..dbd080d 100644
--- a/abs/core/xorg-xinit/xinitrc
+++ b/abs/core/xorg-xinit/xinitrc
@@ -4,6 +4,13 @@
 #
 # Executed by startx (run your window manager from here)
 
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
 # exec gnome-session
 # exec startkde
 # exec startxfce4
diff --git a/abs/core/xorg-xinit/xserverrc b/abs/core/xorg-xinit/xserverrc
index 6a636c1..6f746cd 100644
--- a/abs/core/xorg-xinit/xserverrc
+++ b/abs/core/xorg-xinit/xserverrc
@@ -1 +1 @@
-exec /usr/bin/X -nolisten tcp
+exec /usr/bin/X -nolisten tcp "$@"