Date: Saturday, November 21, 2009 @ 13:04:14 Author: jgc Revision: 59254
Merged revisions 59230 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-xinit/trunk ........ r59230 | jgc | 2009-11-21 17:03:19 +0100 (Sat, 21 Nov 2009) | 5 lines upgpkg: xorg-xinit 1.2.0-1 Update to 1.2.0 No longer install rc files with executable bit (FS#16358) Add xterm and xorg-twm to optdepends (FS#7781) Add debian patch to move xauthority file to /tmp to make sure they are removed on reboot (FS#16003) ........ Added: xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 59230, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) Modified: xorg-xinit/repos/extra-x86_64/ (properties) xorg-xinit/repos/extra-x86_64/PKGBUILD --------------------------------------+ 06_move_serverauthfile_into_tmp.diff | 20 ++++++++++++++++++++ PKGBUILD | 26 +++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) Property changes on: xorg-xinit/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /xorg-xinit/trunk:1-26599 + /xorg-xinit/trunk:1-59253 Copied: xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 59230, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) =================================================================== --- extra-x86_64/06_move_serverauthfile_into_tmp.diff (rev 0) +++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2009-11-21 18:04:14 UTC (rev 59254) @@ -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 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-21 18:03:21 UTC (rev 59253) +++ extra-x86_64/PKGBUILD 2009-11-21 18:04:14 UTC (rev 59254) @@ -2,7 +2,7 @@ # Maintainer: Alexander Baldeck <alexan...@archlinux.org> # Contributor: Jan de Groot <j...@archlinux.org> pkgname=xorg-xinit -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="X.Org initialisation program " arch=(i686 x86_64) @@ -10,30 +10,34 @@ url="http://xorg.freedesktop.org/" depends=('libx11' 'xorg-xauth') makedepends=('pkgconfig') +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=('93c73705ed9eb1e1a6b6938405672f2b' +md5sums=('fe1696cab2fbed6fa059d0cd1c53ac13' + 'abd072ec435ce084cf4e89c58f83d45c' 'cee2d70748a089fbc7db64a4a6e8fdb1' '7873d97db30d6c279ed37e3559e7c59d' 'bb550d3b9a2d2b6cbe6e2667a3a7cd03') build() { cd "${srcdir}/xinit-${pkgver}" + patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" || return 1 ./configure --prefix=/usr || return 1 make XINITDIR=/etc/X11/xinit || return 1 make XINITDIR=/etc/X11/xinit DESTDIR="${pkgdir}" install || return 1 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" || return 1 + install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" || return 1 + install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" || return 1 + install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" || return 1 }