From 44e72c29d1a1a245dac19ccf3bec57b36475d597 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Tue, 30 Nov 2010 01:45:54 +0000
Subject: xorg-xinit: upgrade

---
 .../06_move_serverauthfile_into_tmp.diff           | 20 ++++++++
 abs/core/xorg-xinit/PKGBUILD                       | 56 ++++++++++++----------
 abs/core/xorg-xinit/xinitrc                        | 10 +---
 abs/core/xorg-xinit/xserverrc                      |  2 +-
 4 files changed, 54 insertions(+), 34 deletions(-)
 create mode 100644 abs/core/xorg-xinit/06_move_serverauthfile_into_tmp.diff

diff --git a/abs/core/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/abs/core/xorg-xinit/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 0000000..99e8a67
--- /dev/null
+++ b/abs/core/xorg-xinit/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/abs/core/xorg-xinit/PKGBUILD b/abs/core/xorg-xinit/PKGBUILD
index d66a5cb..6705c49 100644
--- a/abs/core/xorg-xinit/PKGBUILD
+++ b/abs/core/xorg-xinit/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 3232 2008-06-21 15:51:37Z jgc $
+# $Id: PKGBUILD 99539 2010-11-15 11:06:22Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xinit
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="X.Org initialisation program "
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
+license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11' 'xorg-xauth')
-makedepends=('pkgconfig')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'
-	'etc/skel/.xsession'
-	'etc/X11/xinit/xserverrc'
-	'etc/X11/xinit/xinitrc')
+        'etc/skel/.xsession'
+        'etc/X11/xinit/xserverrc'
+        'etc/X11/xinit/xinitrc')
 groups=('xorg')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
-	xinitrc
-	xsession
-	xserverrc)
+        06_move_serverauthfile_into_tmp.diff
+        xinitrc
+        xsession
+        xserverrc)
 options=(!emptydirs)
-md5sums=('9144097186c3d2454beffe8ac3b53c6e'
-         'f165d9a52284ef8cd4c8a129463a2b49'
+md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
+         'abd072ec435ce084cf4e89c58f83d45c'
+         'cee2d70748a089fbc7db64a4a6e8fdb1'
          '7873d97db30d6c279ed37e3559e7c59d'
-         '7a9d2659689a3d64b68758772cff4688')
+         'bb550d3b9a2d2b6cbe6e2667a3a7cd03')
 
 build() {
-  cd ${startdir}/src/xinit-${pkgver}
-  ./configure --prefix=/usr
-  make XINITDIR=/etc/X11/xinit || return 1
-  make XINITDIR=/etc/X11/xinit DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}/xinit-${pkgver}"
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make || return 1
+}
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
-  install -m755 -d ${pkgdir}/etc/skel
-  install -m755 -d ${pkgdir}/etc/X11/xinit
-  install -m755 ${srcdir}/xinitrc ${pkgdir}/etc/skel/.xinitrc || return 1
-  install -m755 ${srcdir}/xsession ${pkgdir}/etc/skel/.xsession || return 1
-  install -m755 ${srcdir}/xserverrc ${pkgdir}/etc/X11/xinit/xserverrc
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  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/abs/core/xorg-xinit/xinitrc b/abs/core/xorg-xinit/xinitrc
index 7af398d..a5a3527 100644
--- a/abs/core/xorg-xinit/xinitrc
+++ b/abs/core/xorg-xinit/xinitrc
@@ -1,18 +1,10 @@
 #!/bin/sh
-
 #
 # ~/.xinitrc
 #
 # Executed by startx (run your window manager from here)
-#
 
 # exec gnome-session
 # exec startkde
 # exec startxfce4
-# exec icewm
-# exec openbox
-# exec blackbox
-# exec fluxbox
-# exec ratpoison
-# exec dwm
-# ... or any other WM of your choosing ...
+# ...or the Window Manager of your choice
diff --git a/abs/core/xorg-xinit/xserverrc b/abs/core/xorg-xinit/xserverrc
index c880000..6a636c1 100644
--- a/abs/core/xorg-xinit/xserverrc
+++ b/abs/core/xorg-xinit/xserverrc
@@ -1 +1 @@
-exec /usr/bin/X -nolisten tcp -logverbose 6
+exec /usr/bin/X -nolisten tcp
-- 
cgit v0.12

