Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2018-04-20 17:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Fri Apr 20 17:24:23 2018 rev:21 rq:593569 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2016-06-05 14:19:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2018-04-20 17:24:27.509442936 +0200 @@ -1,0 +2,21 @@ +Wed Apr 4 14:27:04 UTC 2018 - [email protected] + +- Update to version 1.4.0 + * autogen.sh: use quoted string variables + * Remove SCO support for SHELL_CMD and startx man page. + * Remove support for ancient A/UX 3.0 support + * Remove left over $(launchagents_DATA) in CLEANFILES + * startx: Pass -keeptty when telling the server to start on the current tty + * startx: Fix startx picking an already used display number when -nolock is used + * remove bogus \/ escapes + * launchd: Install binaries into libexecdir + * startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz + * startx: Add support for enabling IGLX for XQuartz + * startx: Don't use GNU expr extensions + * autogen: add default patch prefix + * startx: fix comment typo + * startx: don't init defaultdisplay to :0 + * autogen.sh: use exec instead of waiting for configure to finish + * xinit: check for correct fork error code + +------------------------------------------------------------------- Old: ---- xinit-1.3.4.tar.bz2 New: ---- xinit-1.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.cytDcp/_old 2018-04-20 17:24:28.137420165 +0200 +++ /var/tmp/diff_new_pack.cytDcp/_new 2018-04-20 17:24:28.141420021 +0200 @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xinit -Version: 1.3.4 +Version: 1.4.0 Release: 0 Summary: X Window System initializer License: MIT ++++++ xinit-1.3.4.tar.bz2 -> xinit-1.4.0.tar.bz2 ++++++ ++++ 5200 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/ChangeLog new/xinit-1.4.0/ChangeLog --- old/xinit-1.3.4/ChangeLog 2014-09-11 19:32:14.000000000 +0200 +++ new/xinit-1.4.0/ChangeLog 2018-03-10 02:46:13.000000000 +0100 @@ -1,3 +1,205 @@ +commit 2df7937c6d57a4f44288d13fc50218fe088c4185 +Author: Alan Coopersmith <[email protected]> +Date: Fri Mar 9 17:44:47 2018 -0800 + + xinit 1.4.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2effad417dabccd0b41ac32dc8108c99c73801d2 +Author: Tobias Stoeckmann <[email protected]> +Date: Mon Jan 30 21:35:37 2017 +0100 + + xinit: check for correct fork error code + + Even though this code is only active on __sun machines, the fork return + value should be checked for -1, not 1, to detect an error situation. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 710ea2cec2b36831a3b6b5bdae223d18edbea933 +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 14:00:21 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit 4345a602d48fbdf68e57db54e08f6a78d1679993 +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 762c1a8db1257246e23e0f9dfd876f97cb73e528 +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit 4525e14fcfeaaf526227e3addec67d0ce4632270 +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Sat May 28 14:00:58 2016 -0700 + + startx: Add support for enabling IGLX for XQuartz + + https://bugs.freedesktop.org/show_bug.cgi?id=96260 + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> + +commit 208a47e0d8f62e7c77fa42137511de890feea7fe +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Sat May 28 13:47:01 2016 -0700 + + startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz + + https://bugs.freedesktop.org/show_bug.cgi?id=95379 + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> + +commit 72160c42bea2073bf95c01aca59a12f0ca7ab707 +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Tue Dec 29 17:03:43 2015 -0800 + + launchd: Install binaries into libexecdir + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> + +commit 281b314f38564537279c94e605bee74ff41b0245 +Author: Ingo Schwarze <[email protected]> +Date: Sun Aug 30 15:13:07 2015 +0200 + + remove bogus \/ escapes + + some X manuals use then escape sequence \/ when they want to render + a slash. That's bad because \/ is not a slash but an italic + correction, never producing any output, having no effect at all in + terminal output, and only changing spacing in a minor way in typeset + output. + + Signed-off-by: Matthieu Herrb <[email protected]> + Reviewed-by: Mark Kettenis <[email protected]> + +commit c5e40f503420bd61c7a33e082db755c03c070c81 +Author: Peter Hutterer <[email protected]> +Date: Wed Mar 25 11:04:13 2015 +1000 + + 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 <[email protected]> + Reviewed-by: Hans de Goede <[email protected]> + +commit e07fa99039c0f63ed8f0b142e546ef102321fca0 +Author: Hans de Goede <[email protected]> +Date: Fri Mar 20 14:25:44 2015 +0100 + + 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 <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + +commit a3a34a393b9aeacc0b41dc9b4608ad2be25564cf +Author: Peter Hutterer <[email protected]> +Date: Wed Mar 25 11:08:45 2015 +1000 + + startx: fix comment typo + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 27488975a61858bbaf72047838074389566e2136 +Author: Gaetan Nadon <[email protected]> +Date: Fri Feb 13 21:43:37 2015 -0500 + + 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 <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 1be5f1ae5df1d9b3f29fafe3eb29ea890a628b54 +Author: Gaetan Nadon <[email protected]> +Date: Fri Feb 13 20:21:51 2015 -0500 + + Remove support for ancient A/UX 3.0 support + + 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 <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 5268936259c598ea1e51370df33011a48ec9f3d4 +Author: Gaetan Nadon <[email protected]> +Date: Fri Feb 13 19:37:16 2015 -0500 + + 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 <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit e3bab0cc706880c22f2b205e7abad9d8c0227071 +Author: Mark Kettenis <[email protected]> +Date: Thu Jan 29 11:23:01 2015 +0100 + + 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 <[email protected]> + Acked-by: Hans de Goede <[email protected]> + Reviewed-by: Matthieu Herrb <[email protected]> + +commit bd6cacdd36615e9b8136aeb86c3924a404785977 +Author: Hans de Goede <[email protected]> +Date: Tue Jan 20 16:18:34 2015 +0100 + + 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 <[email protected]> + Acked-by: Peter Hutterer <[email protected]> + commit 6f6747d500439782476cf5c029a7fc45fc954c86 Author: Hans de Goede <[email protected]> Date: Thu Sep 11 16:29:06 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/Makefile.am new/xinit-1.4.0/Makefile.am --- old/xinit-1.3.4/Makefile.am 2014-03-25 15:07:57.000000000 +0100 +++ new/xinit-1.4.0/Makefile.am 2018-03-10 02:46:03.000000000 +0100 @@ -58,7 +58,7 @@ xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = xinitrc startx $(launchagents_DATA) +CLEANFILES = xinitrc startx EXTRA_DIST = xinitrc.cpp startx.cpp \ autogen.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/autogen.sh new/xinit-1.4.0/autogen.sh --- old/xinit-1.3.4/autogen.sh 2014-08-26 11:51:35.000000000 +0200 +++ new/xinit-1.4.0/autogen.sh 2018-03-10 02:46:03.000000000 +0100 @@ -1,14 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH app/xinit" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/compile new/xinit-1.4.0/compile --- old/xinit-1.3.4/compile 2014-09-11 19:32:07.000000000 +0200 +++ new/xinit-1.4.0/compile 2018-03-10 02:46:07.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/configure.ac new/xinit-1.4.0/configure.ac --- old/xinit-1.3.4/configure.ac 2014-09-11 16:23:25.000000000 +0200 +++ new/xinit-1.4.0/configure.ac 2018-03-10 02:46:03.000000000 +0100 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.3.4], +AC_INIT([xinit], [1.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -190,13 +190,8 @@ *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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/launchd/privileged_startx/Makefile.am new/xinit-1.4.0/launchd/privileged_startx/Makefile.am --- old/xinit-1.3.4/launchd/privileged_startx/Makefile.am 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/launchd/privileged_startx/Makefile.am 2018-03-10 02:46:03.000000000 +0100 @@ -27,14 +27,14 @@ include $(top_srcdir)/cpprules.in -xinitrcdir = $(libdir)/X11/xinit +xinitrcdir = $(XINITDIR) privstartxdir = $(xinitrcdir)/privileged_startx.d -xinitrc_PROGRAMS = privileged_startx +libexec_PROGRAMS = privileged_startx privstartx_SCRIPTS = 10-tmpdirs 20-font_cache AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\" -CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)" +CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)" if TIGER_LAUNCHD CPP_FILES_FLAGS += -DTIGER_LAUNCHD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/launchd/privileged_startx/privileged_startx.plist.cpp new/xinit-1.4.0/launchd/privileged_startx/privileged_startx.plist.cpp --- old/xinit-1.3.4/launchd/privileged_startx/privileged_startx.plist.cpp 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/launchd/privileged_startx/privileged_startx.plist.cpp 2018-03-10 02:46:03.000000000 +0100 @@ -6,7 +6,7 @@ <string>BUNDLE_ID_PREFIX.privileged_startx</string> <key>ProgramArguments</key> <array> - <string>XINITDIR/privileged_startx</string> + <string>__libexecdir__/privileged_startx</string> <string>-d</string> <string>SCRIPTDIR</string> </array> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/launchd/user_startx/Makefile.am new/xinit-1.4.0/launchd/user_startx/Makefile.am --- old/xinit-1.3.4/launchd/user_startx/Makefile.am 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/launchd/user_startx/Makefile.am 2018-03-10 02:46:03.000000000 +0100 @@ -21,9 +21,7 @@ include $(top_srcdir)/cpprules.in -xinitrcdir = $(XINITDIR) - -xinitrc_PROGRAMS = launchd_startx +libexec_PROGRAMS = launchd_startx AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\" @@ -32,6 +30,7 @@ launchd_startx.c CPP_FILES_FLAGS = \ + -D__libexecdir__="$(libexecdir)" \ -D__xinitrcdir__="$(xinitrcdir)" \ -D__bindir__="$(bindir)" \ -DBUNDLE_ID_PREFIX="$(bundleidprefix)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/launchd/user_startx/startx.plist.cpp new/xinit-1.4.0/launchd/user_startx/startx.plist.cpp --- old/xinit-1.3.4/launchd/user_startx/startx.plist.cpp 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/launchd/user_startx/startx.plist.cpp 2018-03-10 02:46:03.000000000 +0100 @@ -6,7 +6,7 @@ <string>BUNDLE_ID_PREFIX.startx</string> <key>ProgramArguments</key> <array> - <string>__xinitrcdir__/launchd_startx</string> + <string>__libexecdir__/launchd_startx</string> <string>__bindir__/startx</string> #ifdef LAUNCHAGENT_XSERVER_PATH <string>--</string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/man/Makefile.am new/xinit-1.4.0/man/Makefile.am --- old/xinit-1.3.4/man/Makefile.am 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/man/Makefile.am 2018-03-10 02:46:03.000000000 +0100 @@ -13,7 +13,6 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/man/startx.man new/xinit-1.4.0/man/startx.man --- old/xinit-1.3.4/man/startx.man 2014-09-11 19:31:42.000000000 +0200 +++ new/xinit-1.4.0/man/startx.man 2018-03-10 02:46:03.000000000 +0100 @@ -74,7 +74,6 @@ .PP startx -- -layout Multihead .RE -.if '__SCOMAN__'' .ig .PP To determine the client to run, .B startx @@ -90,20 +89,6 @@ .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 @@ .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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/man/xinit.man new/xinit-1.4.0/man/xinit.man --- old/xinit-1.3.4/man/xinit.man 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/man/xinit.man 2018-03-10 02:46:03.000000000 +0100 @@ -117,7 +117,7 @@ arguments to the default \fIxterm\fP command. It will ignore \fI\.xinitrc\fP. .TP 8 .B "xinit \-e widgets \-\^\- ./Xorg \-l \-c" -This will use the command \fI\.\/Xorg \-l \-c\fP to start the server and will +This will use the command \fI\./Xorg \-l \-c\fP to start the server and will append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command. .TP 8 .B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\- :1 \-a 2 \-t 5" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/missing new/xinit-1.4.0/missing --- old/xinit-1.3.4/missing 2014-09-11 19:32:07.000000000 +0200 +++ new/xinit-1.4.0/missing 2018-03-10 02:46:07.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/startx.cpp new/xinit-1.4.0/startx.cpp --- old/xinit-1.3.4/startx.cpp 2014-09-11 19:31:42.000000000 +0200 +++ new/xinit-1.4.0/startx.cpp 2018-03-10 02:46:03.000000000 +0100 @@ -56,7 +56,7 @@ defaultserver=XSERVER defaultclientargs="" defaultserverargs="" -defaultdisplay=":0" +defaultdisplay="" clientargs="" serverargs="" vtarg="" @@ -80,6 +80,10 @@ defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true fi +if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN enable_iglx -bool false +fi + XCOMM First, start caching fonts if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then if [ -x $bindir/font_cache ] ; then @@ -91,10 +95,10 @@ fi fi -if [ -x XINITDIR/privileged_startx ] ; then +if [ -x __libexecdir__/privileged_startx ] ; then # Don't push this into the background becasue it can cause # a race to create /tmp/.X11-unix - XINITDIR/privileged_startx + __libexecdir__/privileged_startx fi if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then @@ -105,6 +109,14 @@ if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then defaultserverargs="$defaultserverargs -nolisten tcp" +else + defaultserverargs="$defaultserverargs -listen tcp" +fi + +if [ x`defaults read $X11_PREFS_DOMAIN enable_iglx` = x1 ] ; then + defaultserverargs="$defaultserverargs +iglx" +else + defaultserverargs="$defaultserverargs -iglx" fi XCOMM The second check is the real one. The first is to hopefully avoid @@ -120,7 +132,7 @@ 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" @@ -193,9 +205,9 @@ 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" + vtarg="vt$tty_num -keeptty" fi #endif @@ -217,7 +229,7 @@ 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 @@ -283,7 +295,7 @@ 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; @@ -326,11 +338,6 @@ fi #endif -#ifdef macII -Xrepair -screenrestore -#endif - #if defined(sun) kbd_mode -a #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.4/xinit.c new/xinit-1.4.0/xinit.c --- old/xinit-1.3.4/xinit.c 2014-03-25 10:20:26.000000000 +0100 +++ new/xinit-1.4.0/xinit.c 2018-03-10 02:46:03.000000000 +0100 @@ -638,7 +638,7 @@ Fatal("Unable to run program \"%s\"", "kbd_mode"); break; - case 1: + case -1: Error("fork failed"); break; ++++++ xinit-suse.patch ++++++ --- /var/tmp/diff_new_pack.cytDcp/_old 2018-04-20 17:24:28.369411753 +0200 +++ /var/tmp/diff_new_pack.cytDcp/_new 2018-04-20 17:24:28.369411753 +0200 @@ -1,7 +1,7 @@ -Index: xinit-1.3.4/startx.cpp +Index: xinit-1.4.0/startx.cpp =================================================================== ---- xinit-1.3.4.orig/startx.cpp -+++ xinit-1.3.4/startx.cpp +--- xinit-1.4.0.orig/startx.cpp ++++ xinit-1.4.0/startx.cpp @@ -50,10 +50,114 @@ export PATH userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc @@ -42,7 +42,7 @@ +XCOMM + +for WM in $WMLIST $WINDOWMANAGERLIST -+do ++do + test "$WM" = "$WANTEDWM" && { +XCOMM +XCOMM is it reachable via $PATH? @@ -50,7 +50,7 @@ + type $WM >/dev/null 2>&1 || { + + echo "`basename $0`: error: the requested window manager '$1' could not be found!" -+ echo "Window manager must be one of (currently installed window amangers):" ++ echo "Window manager must be one of (currently installed window amangers):" + for i in $WMLIST; do echo $i; done + exit 1 + } @@ -116,8 +116,8 @@ +test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER defaultclientargs="" defaultserverargs="" - defaultdisplay=":0" -@@ -300,6 +404,9 @@ EOF + defaultdisplay="" +@@ -312,6 +416,9 @@ EOF fi done fi @@ -127,7 +127,7 @@ #if defined(__APPLE__) || defined(__CYGWIN__) eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -308,6 +415,12 @@ XINIT "$client" $clientargs -- "$server" +@@ -320,6 +427,12 @@ XINIT "$client" $clientargs -- "$server" #endif retval=$? @@ -140,10 +140,10 @@ if [ x"$enable_xauth" = x1 ] ; then if [ x"$removelist" != x ]; then XAUTH remove $removelist -Index: xinit-1.3.4/xinitrc.cpp +Index: xinit-1.4.0/xinitrc.cpp =================================================================== ---- xinit-1.3.4.orig/xinitrc.cpp -+++ xinit-1.3.4/xinitrc.cpp +--- xinit-1.4.0.orig/xinitrc.cpp ++++ xinit-1.4.0/xinitrc.cpp @@ -48,8 +48,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then unset f fi
