From 6f6747d500439782476cf5c029a7fc45fc954c86 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 11 Sep 2014 16:29:06 +0200 Subject: xinit 1.3.4 Signed-off-by: Hans de Goede --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3e9bd79..18794b3 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.3.3], +AC_INIT([xinit], [1.3.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.3 From bd6cacdd36615e9b8136aeb86c3924a404785977 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 20 Jan 2015 16:18:34 +0100 Subject: startx: Pass -keeptty when telling the server to start on the current tty Detaching from the tty causes systemd-logind to refuse service to the xserver, the xserver already tries to detect that it is being asked to run on the current tty and then automatically enables -keeptty, but this code fails if all of stdin, stdout and stderr are redirected to a file. So explicitly tell the xserver to not detach when we're telling it to run on the current tty. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513 Signed-off-by: Hans de Goede Acked-by: Peter Hutterer --- startx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index 1c6fce0..45d7bd9 100644 --- a/startx.cpp +++ b/startx.cpp @@ -195,7 +195,7 @@ if [ x"$server" = x ]; then tty=$(tty) if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then tty_num=$(echo "$tty" | grep -oE '[0-9]+$') - vtarg="vt$tty_num" + vtarg="vt$tty_num -keeptty" fi #endif -- cgit v1.2.3 From e3bab0cc706880c22f2b205e7abad9d8c0227071 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 29 Jan 2015 11:23:01 +0100 Subject: startx: Don't use GNU expr extensions Use the ':' operator instead of "match" and avoid the use of "\+". Both constructions aren't specified by POSIX and not supported in BSD expr. Also drop the '^' from the regular expressions as it is implicit and POSIX leaves its behaviour undefined. Signed-off-by: Mark Kettenis Acked-by: Hans de Goede Reviewed-by: Matthieu Herrb --- startx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/startx.cpp b/startx.cpp index 45d7bd9..ce4713f 100644 --- a/startx.cpp +++ b/startx.cpp @@ -193,7 +193,7 @@ if [ x"$server" = x ]; then XCOMM the startx session being seen as inactive: XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" tty=$(tty) - if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then + 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 @@ -217,7 +217,7 @@ fi XCOMM if no vt is specified add vtarg (which may be empty) have_vtarg="no" for i in $serverargs; do - if expr match "$i" '^vt[0-9]\+$' > /dev/null; then + if expr "$i" : 'vt[0-9][0-9]*$' > /dev/null; then have_vtarg="yes" fi done -- cgit v1.2.3 From 5268936259c598ea1e51370df33011a48ec9f3d4 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 13 Feb 2015 19:37:16 -0500 Subject: Remove SCO support for SHELL_CMD and startx man page. SCO support was removed from startx.cpp and xinitrc.cpp earlier. Remove unixware / sco support http://cgit.freedesktop.org/xorg/app/xinit/commit/ ?id=fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a Signed-off-by: Gaetan Nadon Reviewed-by: Alan Coopersmith --- configure.ac | 5 ----- man/Makefile.am | 1 - man/startx.man | 26 -------------------------- 3 files changed, 32 deletions(-) diff --git a/configure.ac b/configure.ac index 18794b3..461648b 100644 --- a/configure.ac +++ b/configure.ac @@ -190,13 +190,8 @@ case $host_os in *solaris*) SHELL_CMD="/bin/ksh" ;; - *sco*) - SHELL_CMD="/bin/ksh" - SCOMAN=1 - ;; esac AC_SUBST(SHELL_CMD) -AC_SUBST(SCOMAN) AC_SUBST(XSERVERNAME) AC_SUBST(XCONFIGFILE) AC_SUBST(XCONFIGFILEMAN) diff --git a/man/Makefile.am b/man/Makefile.am index b24faca..9c6569f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -13,7 +13,6 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ -e 's|__xinitdir__|$(XINITDIR)|g' \ -e 's|__bindir__|$(bindir)|g' \ -e 's|__libdir__|$(libdir)|g' \ - -e 's|__SCOMAN__|$(SCOMAN)|g' \ -e 's|__configdir__|$(XINITDIR)|g' diff --git a/man/startx.man b/man/startx.man index 0405be0..4728a25 100644 --- a/man/startx.man +++ b/man/startx.man @@ -74,7 +74,6 @@ startx -- -dpi 100 .PP startx -- -layout Multihead .RE -.if '__SCOMAN__'' .ig .PP To determine the client to run, .B startx @@ -90,20 +89,6 @@ looks for the following files, in order: .I __xinitdir__/xinitrc .RE .PP -.. -.if !'x.__SCOMAN__'x.' .ig -.PP -To determine the client to run, -.B startx -first looks for a file called -.I .xinitrc -in the user's home directory. If that is not found, it uses -the file -.I xinitrc -in the -.I xinit -library directory. -.. If command line client options are given, they override this behavior and revert to the .BR xinit (__appmansuffix__) @@ -187,17 +172,6 @@ and .IR Xsecurity (__miscmansuffix__) manual pages for more information on X client/server authentication. .SH FILES -.if '__SCOMAN__'' .ig -.TP 25 -.I $(HOME)/.startxrc -Client to run. Typically a shell script which runs many programs in -the background. -.TP 25 -.I __libdir__/sys.startxrc -Client to use if the user has no -.I .startxrc -file. -.. .TP 25 .I $(HOME)/.xinitrc Client to run. Typically a shell script which runs many programs in -- cgit v1.2.3 From 1be5f1ae5df1d9b3f29fafe3eb29ea890a628b54 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 13 Feb 2015 20:21:51 -0500 Subject: Remove support for ancient A/UX 3.0 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was Apple Computer’s implementation of the Unix operating system for some of their Macintosh computers. From 1988 to 1995. Signed-off-by: Gaetan Nadon Reviewed-by: Alan Coopersmith --- startx.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/startx.cpp b/startx.cpp index ce4713f..8520399 100644 --- a/startx.cpp +++ b/startx.cpp @@ -326,11 +326,6 @@ if command -v deallocvt > /dev/null 2>&1; then fi #endif -#ifdef macII -Xrepair -screenrestore -#endif - #if defined(sun) kbd_mode -a #endif -- cgit v1.2.3 From 27488975a61858bbaf72047838074389566e2136 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 13 Feb 2015 21:43:37 -0500 Subject: Remove left over $(launchagents_DATA) in CLEANFILES This was left over when reorganizing layout of launchd sources in commit 567f59d3f8189b92bc46e2af1260f9340f462bdb Signed-off-by: Gaetan Nadon Reviewed-by: Alan Coopersmith --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3867bea..c1eb5a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,7 @@ CPP_FILES_FLAGS = \ xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = xinitrc startx $(launchagents_DATA) +CLEANFILES = xinitrc startx EXTRA_DIST = xinitrc.cpp startx.cpp \ autogen.sh -- cgit v1.2.3 From a3a34a393b9aeacc0b41dc9b4608ad2be25564cf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Mar 2015 11:08:45 +1000 Subject: startx: fix comment typo Signed-off-by: Peter Hutterer --- startx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index 8520399..cc8be90 100644 --- a/startx.cpp +++ b/startx.cpp @@ -283,7 +283,7 @@ EOF XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another - XCOMM server man need it. Add them to the '$xserverauthfile' instead. + XCOMM server may need it. Add them to the '$xserverauthfile' instead. for displayname in $authdisplay $hostname$authdisplay; do authcookie=`XAUTH list "$displayname" @@ | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; -- cgit v1.2.3 From e07fa99039c0f63ed8f0b142e546ef102321fca0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Mar 2015 14:25:44 +0100 Subject: startx: Fix startx picking an already used display number when -nolock is used Currently startx relies on /tmp/.X?-lock being present for automatically picking a free display number. This does not work if -nolock is used when starting the server, or if the server is started with -displayfd as -displayfd implies -nolock. This is becoming a problem now that -displayfd is getting used by display-managers (e.g. gdm), this fixes this by also checking for /tmp/.X11-unix/X? Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer --- startx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index cc8be90..a9d477b 100644 --- a/startx.cpp +++ b/startx.cpp @@ -120,7 +120,7 @@ enable_xauth=1 XCOMM Automatically determine an unused $DISPLAY d=0 while true ; do - [ -e /tmp/.X$d-lock ] || break + [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break d=$(($d + 1)) done defaultdisplay=":$d" -- cgit v1.2.3 From c5e40f503420bd61c7a33e082db755c03c070c81 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Mar 2015 11:04:13 +1000 Subject: startx: don't init defaultdisplay to :0 This is misleading - it is always overwritten after looping through the lock files. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- startx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startx.cpp b/startx.cpp index a9d477b..2a10283 100644 --- a/startx.cpp +++ b/startx.cpp @@ -56,7 +56,7 @@ defaultclient=XTERM defaultserver=XSERVER defaultclientargs="" defaultserverargs="" -defaultdisplay=":0" +defaultdisplay="" clientargs="" serverargs="" vtarg="" -- cgit v1.2.3