Date: Sunday, December 4, 2022 @ 20:39:53 Author: andyrtr Revision: 463043
upgpkg: xorg-xinit 1.4.2-1: upstream update 1.4.2 Modified: xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff xorg-xinit/trunk/PKGBUILD Deleted: xorg-xinit/trunk/fs46369.patch xorg-xinit/trunk/use_uname_-n_instead_of_hostname.diff ---------------------------------------+ 06_move_serverauthfile_into_tmp.diff | 18 ++++-------------- PKGBUILD | 21 +++++++-------------- fs46369.patch | 11 ----------- use_uname_-n_instead_of_hostname.diff | 24 ------------------------ 4 files changed, 11 insertions(+), 63 deletions(-) Modified: 06_move_serverauthfile_into_tmp.diff =================================================================== --- 06_move_serverauthfile_into_tmp.diff 2022-12-04 20:27:57 UTC (rev 463042) +++ 06_move_serverauthfile_into_tmp.diff 2022-12-04 20:39:53 UTC (rev 463043) @@ -1,21 +1,11 @@ -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 @@ +--- xinit-1.4.2/startx.cpp 2022-12-04 21:29:02.886416839 +0100 ++++ xinit-1.4.2/startx.cpp.new 2022-12-04 21:34:36.943389951 +0100 +@@ -272,7 +272,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 + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie - Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-04 20:27:57 UTC (rev 463042) +++ PKGBUILD 2022-12-04 20:39:53 UTC (rev 463043) @@ -1,9 +1,9 @@ -# Maintainer: Jan de Groot <[email protected]> -# Contributor: Alexander Baldeck <[email protected]> +# Maintainer: AndyRTR <[email protected]> +# Contributor: Jan de Groot <[email protected]> pkgname=xorg-xinit -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=1 pkgdesc="X.Org initialisation program " arch=('x86_64') license=('custom') @@ -13,19 +13,15 @@ optdepends=('xorg-twm' 'xterm') backup=('etc/X11/xinit/xserverrc' 'etc/X11/xinit/xinitrc') -source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig} +source=(${url}/releases/individual/app/xinit-${pkgver}.tar.xz{,.sig} 06_move_serverauthfile_into_tmp.diff fs25361.patch - fs46369.patch - use_uname_-n_instead_of_hostname.diff xserverrc) options=(!emptydirs) -sha512sums=('6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340' +sha512sums=('4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0' 'SKIP' - '99216b2d50052a0bafede9a2db1744a8b0313ccbc02c609502ddacb8684fc56c6f2656e6521c848880033b25005bb14a1bce0d6fefade85141ed56aad07dadf3' + '70fa34d8bd6b4f8557de9cebf04cf2ab8feb9902cc365c52edd44a4656391841bfa75df709d2fcee0da63dffa45f47a53b8751c9a82e91fd13d0680ade199a11' '12a89cbb26902e135bb21f945c8de86526ff879c9f20a2601157f6a39899f021ed2970cee9e4fbcd4c13af6fe78e7902dd1f7ce1928fc914d681453bf848c0f8' - '8a36bff3c472763a9a46b9a36b8b4a15f03e6fb0387b12efba27f15dc500faa2a3f92c0f7e217a0b00da7c78682c7af6357cc6b88b550ece9bc89c477412b7e0' - '860aa77462e56d399ca0cc829e8a60f4df6d62eca5ac41bc52dd9e3783b7cf6e6e33ce27e76a86ae393058f53a0cb44624058cdd1733fcbfc96ab800882649f7' 'f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b') validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') # "Hans de Goede <[email protected]>" validpgpkeys+=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <[email protected]>" @@ -34,9 +30,6 @@ cd xinit-${pkgver} 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 } Deleted: fs46369.patch =================================================================== --- fs46369.patch 2022-12-04 20:27:57 UTC (rev 463042) +++ fs46369.patch 2022-12-04 20:39:53 UTC (rev 463043) @@ -1,11 +0,0 @@ -diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp ---- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200 -+++ xinit-1.3.4-dbus/startx.cpp 2015-09-21 17:07:59.255424644 +0200 -@@ -11,7 +11,6 @@ - XCOMM Site administrators are STRONGLY urged to write nicer versions. - XCOMM - --unset DBUS_SESSION_BUS_ADDRESS - unset SESSION_MANAGER - - #ifdef __APPLE__ Deleted: use_uname_-n_instead_of_hostname.diff =================================================================== --- use_uname_-n_instead_of_hostname.diff 2022-12-04 20:27:57 UTC (rev 463042) +++ use_uname_-n_instead_of_hostname.diff 2022-12-04 20:39:53 UTC (rev 463043) @@ -1,24 +0,0 @@ -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)
