From cdc66cc7110e78bf1197f9effc70422114f9341b Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 Feb 2012 23:14:50 +0000 Subject: Sat Feb 4 23:14:50 UTC 2012 --- .../06_move_serverauthfile_into_tmp.diff | 20 +++++++++ testing/xorg-xinit/PKGBUILD | 52 ++++++++++++++++++++++ testing/xorg-xinit/fs25361.patch | 16 +++++++ testing/xorg-xinit/xinitrc | 17 +++++++ testing/xorg-xinit/xserverrc | 1 + testing/xorg-xinit/xsession | 10 +++++ 6 files changed, 116 insertions(+) create mode 100644 testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff create mode 100644 testing/xorg-xinit/PKGBUILD create mode 100644 testing/xorg-xinit/fs25361.patch create mode 100644 testing/xorg-xinit/xinitrc create mode 100644 testing/xorg-xinit/xserverrc create mode 100644 testing/xorg-xinit/xsession (limited to 'testing/xorg-xinit') diff --git a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff new file mode 100644 index 000000000..99e8a6754 --- /dev/null +++ b/testing/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/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD new file mode 100644 index 000000000..957fd0570 --- /dev/null +++ b/testing/xorg-xinit/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 148559 2012-02-03 17:12:06Z andyrtr $ +# Maintainer: Jan de Groot +# Contributor: Alexander Baldeck + +pkgname=xorg-xinit +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' 'inetutils') +makedepends=('xorg-util-macros') +optdepends=('xorg-twm' 'xterm') +backup=('etc/skel/.xinitrc' + 'etc/skel/.xsession' + '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 + xinitrc + xsession + xserverrc) +options=(!emptydirs) +md5sums=('9c0943cbd83e489ad1b05221b97efd44' + 'abd072ec435ce084cf4e89c58f83d45c' + '73a597d3fb7f5b9487318ac8cfd4bedf' + 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' + '7873d97db30d6c279ed37e3559e7c59d' + '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 + + 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/testing/xorg-xinit/fs25361.patch b/testing/xorg-xinit/fs25361.patch new file mode 100644 index 000000000..4596122de --- /dev/null +++ b/testing/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/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc new file mode 100644 index 000000000..dbd080d00 --- /dev/null +++ b/testing/xorg-xinit/xinitrc @@ -0,0 +1,17 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# 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 +# ...or the Window Manager of your choice diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc new file mode 100644 index 000000000..6f746cdce --- /dev/null +++ b/testing/xorg-xinit/xserverrc @@ -0,0 +1 @@ +exec /usr/bin/X -nolisten tcp "$@" diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession new file mode 100644 index 000000000..a16dc0b84 --- /dev/null +++ b/testing/xorg-xinit/xsession @@ -0,0 +1,10 @@ +#!/bin/sh + +# +# ~/.xsession +# +# Executed by xdm/gdm/kdm at login +# + +/bin/bash --login -i ~/.xinitrc + -- cgit v1.2.3-54-g00ecf