xinit: update to 1.4.1.
This commit is contained in:
parent
850fd3f85e
commit
cdb743989d
4 changed files with 4 additions and 85 deletions
|
@ -1,18 +0,0 @@
|
|||
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(-)
|
||||
|
||||
--- startx.cpp
|
||||
+++ 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
|
|
@ -1,24 +0,0 @@
|
|||
Revert this change that was committed to fix an issue with systemd.
|
||||
|
||||
We want to keep the original behaviour, i.e use the first unused vt.
|
||||
|
||||
--- startx.cpp.orig 2018-03-10 02:46:03.000000000 +0100
|
||||
+++ startx.cpp 2018-03-12 20:18:16.065493050 +0100
|
||||
@@ -200,17 +200,6 @@
|
||||
if [ x"$server" = x ]; then
|
||||
server=$defaultserver
|
||||
|
||||
-#ifdef __linux__
|
||||
- XCOMM When starting the defaultserver start X on the current tty to avoid
|
||||
- XCOMM the startx session being seen as inactive:
|
||||
- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
|
||||
- tty=$(tty)
|
||||
- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
|
||||
- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
|
||||
- vtarg="vt$tty_num -keeptty"
|
||||
- fi
|
||||
-#endif
|
||||
-
|
||||
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
|
||||
if [ x"$serverargs" = x -a x"$display" = x ]; then
|
||||
if [ -f "$userserverrc" ]; then
|
|
@ -1,39 +0,0 @@
|
|||
Signed-off-by: Tobias Stoeckmann <tobias at stoeckmann.org>
|
||||
---
|
||||
xinit.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/xinit.c b/xinit.c
|
||||
index f826b7a..8efd0be 100644
|
||||
--- xinit.c
|
||||
+++ xinit.c
|
||||
@@ -151,7 +151,6 @@ main(int argc, char *argv[])
|
||||
register char **ptr;
|
||||
pid_t pid;
|
||||
int client_given = 0, server_given = 0;
|
||||
- int client_args_given = 0, server_args_given = 0;
|
||||
int start_of_client_args, start_of_server_args;
|
||||
struct sigaction sa, si;
|
||||
#ifdef __APPLE__
|
||||
@@ -174,7 +173,8 @@ main(int argc, char *argv[])
|
||||
}
|
||||
start_of_client_args = (cptr - client);
|
||||
while (argc && strcmp(*argv, "--")) {
|
||||
- client_args_given++;
|
||||
+ if (cptr > clientargv + 98)
|
||||
+ Fatalx("too many client arguments");
|
||||
*cptr++ = *argv++;
|
||||
argc--;
|
||||
}
|
||||
@@ -202,7 +202,8 @@ main(int argc, char *argv[])
|
||||
|
||||
start_of_server_args = (sptr - server);
|
||||
while (--argc >= 0) {
|
||||
- server_args_given++;
|
||||
+ if (sptr > serverargv + 98)
|
||||
+ Fatalx("too many server arguments");
|
||||
*sptr++ = *argv++;
|
||||
}
|
||||
*sptr = NULL;
|
||||
--
|
||||
2.20.1
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'xinit'
|
||||
pkgname=xinit
|
||||
version=1.4.0
|
||||
revision=4
|
||||
version=1.4.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-xinitdir=/etc/X11/xinit"
|
||||
hostmakedepends="pkg-config"
|
||||
|
@ -9,9 +9,9 @@ makedepends="libX11-devel"
|
|||
short_desc="X init program"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||
license="MIT"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
homepage="https://xorgwiki.freedesktop.org/xorg"
|
||||
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
|
||||
checksum=230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef
|
||||
checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
|
||||
|
||||
conf_files="
|
||||
/etc/X11/xinit/xinitrc
|
||||
|
|
Loading…
Reference in a new issue