[arch-commits] Commit in xorg-xinit/trunk (2 files)
Date: Saturday, October 10, 2020 @ 14:33:17
Author: andyrtr
Revision: 397930
upgpkg: xorg-xinit 1.4.1-3: drop dependency on inetutils - FS#67679
Added:
xorg-xinit/trunk/use_uname_-n_instead_of_hostname.diff
Modified:
xorg-xinit/trunk/PKGBUILD
---+
PKGBUILD |8 ++--
use_uname_-n_instead_of_hostname.diff | 24
2 files changed, 30 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-10-10 13:52:37 UTC (rev 397929)
+++ PKGBUILD2020-10-10 14:33:17 UTC (rev 397930)
@@ -3,12 +3,12 @@
pkgname=xorg-xinit
pkgver=1.4.1
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org initialisation program "
arch=('x86_64')
license=('custom')
url="https://xorg.freedesktop.org/;
-depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils')
+depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap')
makedepends=('xorg-util-macros')
optdepends=('xorg-twm' 'xterm')
backup=('etc/X11/xinit/xserverrc'
@@ -17,6 +17,7 @@
06_move_serverauthfile_into_tmp.diff
fs25361.patch
fs46369.patch
+use_uname_-n_instead_of_hostname.diff
xserverrc)
options=(!emptydirs)
sha512sums=('6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340'
@@ -24,6 +25,7 @@
'99216b2d50052a0bafede9a2db1744a8b0313ccbc02c609502ddacb8684fc56c6f2656e6521c848880033b25005bb14a1bce0d6fefade85141ed56aad07dadf3'
'12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8'
'8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0'
+
'860aa77462e56d399ca0cc829e8a60f4df6d62eca5ac41bc52dd9e3783b7cf6e6e33ce27e76a86ae393058f53a0cb44624058cdd1733fcbfc96ab800882649f7'
'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b')
validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') # "Hans de Goede
"
validpgpkeys+=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith
"
@@ -33,6 +35,8 @@
patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
patch -Np1 -i ../fs25361.patch
patch -Np1 -i ../fs46369.patch
+ # FS#67679
+ patch -Np1 -i ../use_uname_-n_instead_of_hostname.diff
sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
}
Added: use_uname_-n_instead_of_hostname.diff
===
--- use_uname_-n_instead_of_hostname.diff (rev 0)
+++ use_uname_-n_instead_of_hostname.diff 2020-10-10 14:33:17 UTC (rev
397930)
@@ -0,0 +1,24 @@
+diff --git a/startx.cpp b/startx.cpp
+index
a390f0341a126c87de91634139de1f0329d0c06d..33b9eb7bfc35117df97ef6c54f2620bbcd90b9a6
100644
+--- a/startx.cpp
b/startx.cpp
+@@ -251,18 +251,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+ removelist=
+
+ XCOMM set up default Xauth info for this machine
+-case `uname` in
+-Linux*)
+-if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+-hostname=`hostname -f`
+-else
+-hostname=`hostname`
+-fi
+-;;
+-*)
+-hostname=`hostname`
+-;;
+-esac
++hostname=`uname -n`
+
+ authdisplay=${display:-:0}
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
[arch-commits] Commit in xorg-xinit/trunk (2 files)
Date: Saturday, March 17, 2018 @ 07:42:55
Author: andyrtr
Revision: 319544
upgpkg: xorg-xinit 1.4.0-3
move the serverauth file back to tmp dir
Added:
xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff
Modified:
xorg-xinit/trunk/PKGBUILD
--+
06_move_serverauthfile_into_tmp.diff | 21 +
PKGBUILD |5 -
2 files changed, 25 insertions(+), 1 deletion(-)
Added: 06_move_serverauthfile_into_tmp.diff
===
--- 06_move_serverauthfile_into_tmp.diff(rev 0)
+++ 06_move_serverauthfile_into_tmp.diff2018-03-17 07:42:55 UTC (rev
319544)
@@ -0,0 +1,21 @@
+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.XX`
+ trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+ xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+
Modified: PKGBUILD
===
--- PKGBUILD2018-03-17 07:37:30 UTC (rev 319543)
+++ PKGBUILD2018-03-17 07:42:55 UTC (rev 319544)
@@ -4,7 +4,7 @@
pkgname=xorg-xinit
pkgver=1.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org initialisation program "
arch=('x86_64')
license=('custom')
@@ -15,6 +15,7 @@
backup=('etc/X11/xinit/xserverrc'
'etc/X11/xinit/xinitrc')
source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig}
+06_move_serverauthfile_into_tmp.diff
fs25361.patch
fs46369.patch
xserverrc)
@@ -21,6 +22,7 @@
options=(!emptydirs)
sha512sums=('53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e'
'SKIP'
+
'99216b2d50052a0bafede9a2db1744a8b0313ccbc02c609502ddacb8684fc56c6f2656e6521c848880033b25005bb14a1bce0d6fefade85141ed56aad07dadf3'
'12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8'
'8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0'
'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b')
@@ -29,6 +31,7 @@
prepare() {
cd xinit-${pkgver}
+ patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
patch -Np1 -i ../fs25361.patch
patch -Np1 -i ../fs46369.patch
sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
[arch-commits] Commit in xorg-xinit/trunk (2 files)
Date: Saturday, November 21, 2009 @ 11:03:19
Author: jgc
Revision: 59230
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/trunk/06_move_serverauthfile_into_tmp.diff
Modified:
xorg-xinit/trunk/PKGBUILD
--+
06_move_serverauthfile_into_tmp.diff | 20
PKGBUILD | 26 +++---
2 files changed, 35 insertions(+), 11 deletions(-)
Added: 06_move_serverauthfile_into_tmp.diff
===
--- 06_move_serverauthfile_into_tmp.diff(rev 0)
+++ 06_move_serverauthfile_into_tmp.diff2009-11-21 16:03:19 UTC (rev
59230)
@@ -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.XX`
+ trap rm -f '$xserverauthfile' HUP INT QUIT ILL TRAP KILL BUS TERM
+ xauth -q -f $xserverauthfile EOF
+ add :$dummy . $mcookie
Modified: PKGBUILD
===
--- PKGBUILD2009-11-21 15:47:43 UTC (rev 59229)
+++ PKGBUILD2009-11-21 16:03:19 UTC (rev 59230)
@@ -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
}
