mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 02:42:56 +02:00
xinit: update to 1.4.4.
Refresh both patches as upstream renamed the target files. Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com>
This commit is contained in:
parent
dcbef048d5
commit
35454e4d38
3 changed files with 24 additions and 23 deletions
|
@ -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
|
||||
The trap patch didn't seem to work on reboot.
|
||||
---
|
||||
startx.cpp | 2 +-
|
||||
startx.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: xinit/startx.cpp
|
||||
Index: xinit/startx.in
|
||||
===================================================================
|
||||
diff --git a/startx.cpp b/startx.cpp
|
||||
index dfbebe1..63f9ac6 100644
|
||||
--- a/startx.cpp
|
||||
+++ b/startx.cpp
|
||||
@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then
|
||||
diff --git a/startx.in b/startx.in
|
||||
index 9b224af..cf559bb 100644
|
||||
--- a/startx.in
|
||||
+++ b/startx.in
|
||||
@@ -283,7 +283,7 @@ if [ "$enable_xauth" = 1 ] ; then
|
||||
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`
|
||||
# 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 BUS TERM
|
||||
xauth -q -f "$xserverauthfile" << EOF
|
||||
add :$dummy . $mcookie
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
diff -u xinit.orig/startx.cpp xinit/startx.cpp
|
||||
--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
|
||||
+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
|
||||
@@ -290,9 +290,9 @@
|
||||
XCOMM now add the same credentials to the client authority file
|
||||
XCOMM if '$displayname' already exists do not overwrite it as another
|
||||
XCOMM server may need it. Add them to the '$xserverauthfile' instead.
|
||||
diff --git a/startx.in b/startx.in
|
||||
index 9b224af..dc0fb33 100644
|
||||
--- a/startx.in
|
||||
+++ b/startx.in
|
||||
@@ -302,9 +302,9 @@ EOF
|
||||
# now add the same credentials to the client authority file
|
||||
# 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/unix$authdisplay; do
|
||||
authcookie=`XAUTH list "$displayname" @@
|
||||
- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
||||
+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
||||
authcookie=$(xauth list "$displayname" \
|
||||
- | sed -n 's/.*'"$displayname"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null);
|
||||
+ | sed -n 's/.*'"$hostname\/unix$authdisplay"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null);
|
||||
if [ "z${authcookie}" = "z" ] ; then
|
||||
XAUTH -q << EOF
|
||||
"$xauth" -q << EOF
|
||||
add $displayname . $mcookie
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'xinit'
|
||||
pkgname=xinit
|
||||
version=1.4.2
|
||||
version=1.4.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-xinitdir=/etc/X11/xinit"
|
||||
|
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="MIT"
|
||||
homepage="https://gitlab.freedesktop.org/xorg/app/xinit"
|
||||
distfiles="${XORG_SITE}/app/xinit-${version}.tar.xz"
|
||||
checksum=b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23
|
||||
checksum=40a47c7a164c7f981ce3787b4b37f7e411fb43231dcde543d70094075dacfef9
|
||||
|
||||
conf_files="
|
||||
/etc/X11/xinit/xinitrc
|
||||
|
|
Loading…
Add table
Reference in a new issue