diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-21 14:24:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-21 14:26:00 +0000 |
| commit | 857f48e8e319db95763fa77ee515c47fff56f0ee (patch) | |
| tree | c01b224f5f9d7ace99e34ecc1ed2495c7ed3a4e5 /main/xinit | |
| parent | 8f137f35e59c34a04f9ed5afeb10e9b9bc724a1d (diff) | |
| download | aports-857f48e8e319db95763fa77ee515c47fff56f0ee.tar.bz2 aports-857f48e8e319db95763fa77ee515c47fff56f0ee.tar.xz | |
main/xinit: upgrade to 1.2.1
Diffstat (limited to 'main/xinit')
| -rw-r--r-- | main/xinit/06_move_serverauthfile_into_tmp.patch | 20 | ||||
| -rw-r--r-- | main/xinit/APKBUILD | 25 |
2 files changed, 39 insertions, 6 deletions
diff --git a/main/xinit/06_move_serverauthfile_into_tmp.patch b/main/xinit/06_move_serverauthfile_into_tmp.patch new file mode 100644 index 000000000..99e8a6754 --- /dev/null +++ b/main/xinit/06_move_serverauthfile_into_tmp.patch @@ -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/main/xinit/APKBUILD b/main/xinit/APKBUILD index 86eb500e5..87bd23899 100644 --- a/main/xinit/APKBUILD +++ b/main/xinit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xinit -pkgver=1.1.1 -pkgrel=4 +pkgver=1.2.1 +pkgrel=0 pkgdesc="X.Org initialisation program " url="http://xorg.freedesktop.org/" license="GPL" @@ -9,26 +9,39 @@ subpackages="$pkgname-doc" depends="xauth" makedepends="pkgconfig libx11-dev" source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2 + 06_move_serverauthfile_into_tmp.patch xinitrc xsession xserverrc" +prepare() { + cd "$srcdir"/xinit-$pkgver + for i in $source; do + case $i in + *.patch) patch -p1 -i "$srcdir"/$i + esac + done +} + build() { cd "$srcdir"/xinit-$pkgver - ./configure --prefix=/usr || return 1 - make XINITDIR=/etc/X11/xinit || return 1 + ./configure --prefix=/usr \ + --with-xinitdir=/etc/X11/xinit \ + || return 1 + make || return 1 } package() { cd "$srcdir"/xinit-$pkgver - make XINITDIR=/etc/X11/xinit DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install || return 1 chmod +x "$pkgdir"/usr/bin/startx install -m755 -d "$pkgdir"/etc/skel install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc install -m755 "$srcdir"/xsession "$pkgdir"/etc/skel/.xsession || return 1 install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc || return 1 } -md5sums="93c73705ed9eb1e1a6b6938405672f2b xinit-1.1.1.tar.bz2 +md5sums="56f2d202b3dc10fcd21931a67bb270f7 xinit-1.2.1.tar.bz2 +abd072ec435ce084cf4e89c58f83d45c 06_move_serverauthfile_into_tmp.patch af322d72972d5722b7fc0a9e8f025b15 xinitrc 4f04d2891ea87f50fde518267b7a1154 xsession bb550d3b9a2d2b6cbe6e2667a3a7cd03 xserverrc" |