wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 10:52:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xinit: update to 1.4.4.

Browse source 
Refresh both patches as upstream renamed the target files.

Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com>
This commit is contained in:
Vincent Legoll 2025-06-15 10:00:22 +02:00 • committed by Duncan Overbruck
parent dcbef048d5
commit 35454e4d38
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff
View file

@ -2,21 +2,21 @@ Move startx auth files in /tmp so they are removed on reboot.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
The trap patch didn't seem to work on reboot. The trap patch didn't seem to work on reboot.
--- ---
startx.cpp | 2 +- startx.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: xinit/startx.cpp Index: xinit/startx.in
=================================================================== ===================================================================
diff --git a/startx.cpp b/startx.cpp diff --git a/startx.in b/startx.in
index dfbebe1..63f9ac6 100644 index 9b224af..cf559bb 100644
--- a/startx.cpp --- a/startx.in
+++ b/startx.cpp +++ b/startx.in
@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then @@ -283,7 +283,7 @@ if [ "$enable_xauth" = 1 ] ; then
dummy=0 dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy. # create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$ - xserverauthfile="$HOME/.serverauth.$$"
+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` + xserverauthfile="`mktemp -p /tmp serverauth.XXXXXXXXXX`"
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
xauth -q -f "$xserverauthfile" << EOF xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie add :$dummy . $mcookie

23
srcpkgs/xinit/patches/fs25361.patch
View file

@ -1,15 +1,16 @@
diff -u xinit.orig/startx.cpp xinit/startx.cpp diff --git a/startx.in b/startx.in
--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 index 9b224af..dc0fb33 100644
+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 --- a/startx.in
@@ -290,9 +290,9 @@ +++ b/startx.in
XCOMM now add the same credentials to the client authority file @@ -302,9 +302,9 @@ EOF
XCOMM if '$displayname' already exists do not overwrite it as another # now add the same credentials to the client authority file
XCOMM server may need it. Add them to the '$xserverauthfile' instead. # if '$displayname' already exists do not overwrite it as another
# server may need it. Add them to the '$xserverauthfile' instead.
- for displayname in $authdisplay $hostname$authdisplay; do - for displayname in $authdisplay $hostname$authdisplay; do
+ for displayname in $authdisplay $hostname/unix$authdisplay; do + for displayname in $authdisplay $hostname/unix$authdisplay; do
authcookie=`XAUTH list "$displayname" @@ authcookie=$(xauth list "$displayname" \
- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; - | sed -n 's/.*'"$displayname"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null);
+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + | sed -n 's/.*'"$hostname\/unix$authdisplay"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null);
if [ "z${authcookie}" = "z" ] ; then if [ "z${authcookie}" = "z" ] ; then
XAUTH -q << EOF "$xauth" -q << EOF
add $displayname . $mcookie add $displayname . $mcookie

4
srcpkgs/xinit/template
View file

@ -1,6 +1,6 @@
# Template file for 'xinit' # Template file for 'xinit'
pkgname=xinit pkgname=xinit
version=1.4.2 version=1.4.4
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-xinitdir=/etc/X11/xinit" configure_args="--with-xinitdir=/etc/X11/xinit"
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT" license="MIT"
homepage="https://gitlab.freedesktop.org/xorg/app/xinit" homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz" distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23 checksum=40a47c7a164c7f981ce3787b4b37f7e411fb43231dcde543d70094075dacfef9
conf_files=" conf_files="
/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc