Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2025-01-06 16:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Mon Jan 6 16:04:41 2025 rev:32 rq:1235079 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2024-07-05 19:49:36.722915251 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new.1881/xinit.changes 2025-01-06 16:04:53.804967997 +0100 @@ -1,0 +2,25 @@ +Sun Jan 5 21:33:42 UTC 2025 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 1.4.3 + * Reindent startx after !6 + * Remove Xdmx from suggested Xserver list + * Mark global variables as static since there's only one source file + * Clear -Wunused-parameter warnings from clang + * Use ptrdiff_t to store results of pointer subtraction + * Use asprintf() if available + * Don't exit with failure on SIGTERM regardless. + * darwin: Remove bashism from 10-tmpdirs script + * Modernized shell scripts + * startx: Assign XSERVERRC to correct userserverrc + * add closing quote to /dev/random mcookie hex +- adjusted xinit-suse.patch +- refreshed xinit-client-session.patch +- refreshed xinit-tolerant-hostname-changes.patch + +------------------------------------------------------------------- +Mon Dec 23 16:55:44 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org> + +- Properly comment %patch 5 out: '#' still expands the macro, which + makes build fail with rpm 4.20. Use %dnl instead. + +------------------------------------------------------------------- Old: ---- xinit-1.4.2.tar.xz New: ---- xinit-1.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.512997222 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.512997222 +0100 @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define UsrEtcMove 1 %endif Name: xinit -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: X Window System initializer License: MIT @@ -72,7 +72,7 @@ %patch -P 2 -p1 %patch -P 3 -p1 ### patch is applied later in %install section -#%patch -P 5 -p0 +%dnl %patch -P 5 -p0 # needed for patch0 autoreconf -fi ++++++ xinit-1.4.2.tar.xz -> xinit-1.4.3.tar.xz ++++++ ++++ 8087 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.4.2/ChangeLog new/xinit-1.4.3/ChangeLog --- old/xinit-1.4.2/ChangeLog 2022-12-03 23:18:52.000000000 +0100 +++ new/xinit-1.4.3/ChangeLog 2025-01-05 19:26:09.000000000 +0100 @@ -1,3 +1,161 @@ +commit 79d1a902f93fe75e31c0bfb95e949293e6213992 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jan 5 10:20:39 2025 -0800 + + xinit 1.4.3 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 6ad6378928dd1eec2a3e159f92b53b68ce3884ba +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Dec 7 10:27:28 2024 -0800 + + Use asprintf() if available + + If we can use it, then we avoid a couple of clang warnings: + xinit.c:534:20: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + len = numn + 1; + ~ ~~~~~^~~ + xinit.c:540:40: warning: implicit conversion changes signedness: + 'int' to 'unsigned long' [-Wsign-conversion] + len = strlen(windowpath) + 1 + numn + 1; + ~ ^~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 0420d0b58b34217e496caa7dfa904bd833c00133 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Dec 7 10:03:33 2024 -0800 + + Use ptrdiff_t to store results of pointer subtraction + + Clears warnings from clang of: + xinit.c:174:34: warning: implicit conversion loses integer precision: + 'long' to 'int' [-Wshorten-64-to-32] + start_of_client_args = (cptr - client); + ~ ~~~~~^~~~~~~~ + xinit.c:203:34: warning: implicit conversion loses integer precision: + 'long' to 'int' [-Wshorten-64-to-32] + start_of_server_args = (sptr - server); + ~ ~~~~~^~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 35de4b9d29a78e0f95539c0540b8b173cae71766 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Dec 7 09:55:49 2024 -0800 + + Clear -Wunused-parameter warnings from clang + + Add _X_UNUSED to parameters required by callback definitions which we + don't acutally use. + + Clears clang warnings of: + + xinit.c:129:15: warning: unused parameter 'sig' [-Wunused-parameter] + sigIgnore(int sig) + ^ + xinit.c:581:20: warning: unused parameter 'dpy' [-Wunused-parameter] + ignorexio(Display *dpy) + ^ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 8a9c76dd35d5f824669ea2c7268cd7b4684c8687 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Dec 7 09:50:10 2024 -0800 + + Mark global variables as static since there's only one source file + + Clears 8 warnings from clang of the form: + + xinit.c:61:13: warning: no previous extern declaration for non-static + variable 'bindir' [-Wmissing-variable-declarations] + const char *bindir = BINDIR; + ^ + xinit.c:61:7: note: declare 'static' if the variable is not intended + to be used outside of this translation unit + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 2f62c78b5714c95d03c0b1271b9b83b550af50b3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Aug 27 16:45:36 2024 -0700 + + Remove Xdmx from suggested Xserver list + + It's not included in the xorg-server-21.x releases. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/19> + +commit 8252e334c5cc381d5a32bc4d3d47bae1bfc94fe0 +Author: jopamo <p...@1g4.org> +Date: Tue Jun 25 20:06:53 2024 -0400 + + add closing quote to /dev/random mcookie hex + + Fixes: b8517b6 ("Modernized shell scripts") + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/18> + +commit 671da781805728fdea68efa5609906f6e0d0a3fe +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 16 11:52:00 2024 -0700 + + Reindent startx after !6 + + Converting cpp-level ifdefs to shell-level ifs left confusing indentation + levels, this fixes that. + + Fixes: b8517b6 ("Modernized shell scripts") + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/17> + +commit b8517b646839969548e5c1f1ac0045f0254da774 +Author: Marc Pervaz Boocha <mboo...@sudomsg.xyz> +Date: Wed Nov 17 22:43:35 2021 +0530 + + Modernized shell scripts + + Fixes #14 + Makes Progress to #15 + + Signed-off-by: Marc Pervaz Boocha <mboo...@sudomsg.xyz> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/6> + +commit 354d1386d18631630447f47e6f2fd7f93e55feab +Author: Geert Hendrickx <ge...@hendrickx.be> +Date: Sun Jun 16 18:17:21 2024 +0000 + + Don't exit with failure on SIGTERM regardless. + +commit 0fb9f76d3f0205298b0d98c5b0a9a09c4e418388 +Author: ayekat <tak...@bluewin.ch> +Date: Thu Jan 12 22:06:50 2023 +0100 + + startx: Assign XSERVERRC to correct userserverrc + + Also fix same mistake in the startx manpage. + + Signed-off-by: ayekat <tak...@bluewin.ch> + +commit 3172dc7e15b7a249555ca12e24f4a787164a7f8a +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Wed Jan 11 21:33:11 2023 -0800 + + darwin: Remove bashism from 10-tmpdirs script + + possible bashism in 10-tmpdirs line 57 (should be >word 2>&1): + if ${MKTEMP} -d ${dir} >& /dev/null ; then + + Fixes: https://github.com/XQuartz/XQuartz/issues/316 + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + commit f9786fb5a7e526035699f3d4d6661468ab20e689 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sat Dec 3 14:05:44 2022 -0800 @@ -1471,7 +1629,7 @@ when the structure of the component changes. Do not edit defaults. commit d243b9943879ec2790d65785805aefdfbb64a378 -Author: Rémi Cardona <r...@gentoo.org> +Author: Rémi Cardona <r...@gentoo.org> Date: Sat Nov 14 14:51:59 2009 +0100 xinit 1.2.0 @@ -1517,7 +1675,7 @@ Tested-by: Jon TURNEY <jon.tur...@dronecode.org.uk> commit c2a5751175b11d3206805468aae1ddecd02c4a98 -Author: Rémi Cardona <r...@gentoo.org> +Author: Rémi Cardona <r...@gentoo.org> Date: Sat Oct 3 11:50:12 2009 +0200 make XINITDIR configurable at build-time, default is unchanged @@ -2501,7 +2659,7 @@ correctly commit d731a249d0c1c7f9eb77828c0d6e79cfdaf75589 -Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk> Date: Tue Jul 5 21:12:01 2005 +0000 Build system for xinit 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.4.2/compile new/xinit-1.4.3/compile --- old/xinit-1.4.2/compile 2022-12-03 23:18:47.000000000 +0100 +++ new/xinit-1.4.3/compile 2025-01-05 19:26:02.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # 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.4.2/config.h.in new/xinit-1.4.3/config.h.in --- old/xinit-1.4.2/config.h.in 2022-12-03 23:18:46.000000000 +0100 +++ new/xinit-1.4.3/config.h.in 2025-01-05 19:26:01.000000000 +0100 @@ -3,9 +3,15 @@ /* Prefix to use for launchd identifiers */ #undef BUNDLE_ID_PREFIX +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -30,6 +36,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -65,5 +74,93 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION 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.4.2/configure.ac new/xinit-1.4.3/configure.ac --- old/xinit-1.4.2/configure.ac 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/configure.ac 2025-01-05 19:25:56.000000000 +0100 @@ -22,10 +22,11 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.4.2], +AC_INIT([xinit], [1.4.3], [https://gitlab.freedesktop.org/xorg/app/xinit/-/issues], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) @@ -125,8 +126,11 @@ AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"]) AM_CONDITIONAL(LAUNCHAGENT_XSERVER, [test "x$launchagentxserver" != "xno"]) +# Checks for library functions. +AC_CHECK_FUNCS([asprintf]) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.17) +PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.22) case $host_os in *bsd*) 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.4.2/launchd/privileged_startx/10-tmpdirs.cpp new/xinit-1.4.3/launchd/privileged_startx/10-tmpdirs.cpp --- old/xinit-1.4.2/launchd/privileged_startx/10-tmpdirs.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/launchd/privileged_startx/10-tmpdirs.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -54,7 +54,7 @@ # Use mktemp rather than mkdir to avoid possible security issue # if $dir exists and is a symlink (ie protect against a race # against the above check) - if ${MKTEMP} -d ${dir} >& /dev/null ; then + if ${MKTEMP} -d ${dir} > /dev/null 2>&1 ; then chmod 1777 $dir chown root:wheel $dir success=1 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.4.2/man/startx.man new/xinit-1.4.3/man/startx.man --- old/xinit-1.4.2/man/startx.man 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/man/startx.man 2025-01-05 19:25:56.000000000 +0100 @@ -177,7 +177,7 @@ .TP 25 XSERVERRC This variable should contain the location of an xserver file. If unset, -.I $(HOME)/.xinitrc +.I $(HOME)/.xserverrc or .I __xinitdir__/xserverrc will be used. 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.4.2/missing new/xinit-1.4.3/missing --- old/xinit-1.4.2/missing 2022-12-03 23:18:47.000000000 +0100 +++ new/xinit-1.4.3/missing 2025-01-05 19:26:02.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 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.4.2/startx.cpp new/xinit-1.4.3/startx.cpp --- old/xinit-1.4.2/startx.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/startx.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -12,50 +12,58 @@ XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM +xinitdir=XINITDIR +xterm=XTERM +xserver=XSERVER +xinit=XINIT +bundle_id_prefix=BUNDLE_ID_PREFIX +xauth=XAUTH +bindir=__bindir__ +libexecdir=__libexecdir__ +mk_cookie=MK_COOKIE +has_cookie_maker=HAS_COOKIE_MAKER + unset SESSION_MANAGER -#ifdef __APPLE__ +if [ "$(uname -s)" = "Darwin" ] ; then -XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them. -XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin -XCOMM and people may use X without changing their PATH. -XCOMM Note that we put our own bin directory at the front of the path, and -XCOMM the standard system path at the back, since if you are using the Xorg -XCOMM server there's a pretty good chance you want to bias the Xorg clients -XCOMM over the old system's clients. + XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them. + XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin + XCOMM and people may use X without changing their PATH. + XCOMM Note that we put our own bin directory at the front of the path, and + XCOMM the standard system path at the back, since if you are using the Xorg + XCOMM server there's a pretty good chance you want to bias the Xorg clients + XCOMM over the old system's clients. -XCOMM First our compiled path -bindir=__bindir__ + case $PATH in + *:$bindir | *:$bindir:* | $bindir:*) ;; + *) PATH=$bindir:$PATH ;; + esac -case $PATH in - *:$bindir | *:$bindir:* | $bindir:*) ;; - *) PATH=$bindir:$PATH ;; -esac + XCOMM Now the "old" compiled path + oldbindir=/usr/X11R6/bin -XCOMM Now the "old" compiled path -oldbindir=/usr/X11R6/bin + if [ -d "$oldbindir" ] ; then + case $PATH in + *:$oldbindir | *:$oldbindir:* | $oldbindir:*) ;; + *) PATH=$PATH:$oldbindir ;; + esac + fi -if [ -d "$oldbindir" ] ; then - case $PATH in - *:$oldbindir | *:$oldbindir:* | $oldbindir:*) ;; - *) PATH=$PATH:$oldbindir ;; - esac + XCOMM Bourne shell does not automatically export modified environment variables + XCOMM so export the new PATH just in case the user changes the shell + export PATH fi -XCOMM Bourne shell does not automatically export modified environment variables -XCOMM so export the new PATH just in case the user changes the shell -export PATH -#endif - userclientrc=$HOME/.xinitrc [ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc userserverrc=$HOME/.xserverrc -[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" -sysserverrc=XINITDIR/xserverrc -defaultclient=XTERM -defaultserver=XSERVER +[ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}" +sysserverrc=$xinitdir/xserverrc +defaultclient=$xterm +defaultserver=$xserver defaultclientargs="" defaultserverargs="" defaultdisplay="" @@ -63,73 +71,74 @@ serverargs="" vtarg="" -#ifdef __APPLE__ -if [ "x$X11_PREFS_DOMAIN" = x ] ; then - export X11_PREFS_DOMAIN=BUNDLE_ID_PREFIX".X11" -fi +if [ "$(uname -s)" = "Darwin" ] ; then -XCOMM Initialize defaults (this will cut down on "safe" error messages) -if ! defaults read $X11_PREFS_DOMAIN cache_fonts > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN cache_fonts -bool true -fi + if [ "$X11_PREFS_DOMAIN" = "" ] ; then + export X11_PREFS_DOMAIN=$bundle_id_prefix".X11" + fi -if ! defaults read $X11_PREFS_DOMAIN no_auth > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN no_auth -bool false -fi + XCOMM Initialize defaults (this will cut down on "safe" error messages) + if ! defaults read $X11_PREFS_DOMAIN cache_fonts > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN cache_fonts -bool true + fi -if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true -fi + if ! defaults read $X11_PREFS_DOMAIN no_auth > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN no_auth -bool false + fi -if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN enable_iglx -bool false -fi + if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true + fi -XCOMM First, start caching fonts -if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then - if [ -x $bindir/font_cache ] ; then - $bindir/font_cache - elif [ -x $bindir/font_cache.sh ] ; then - $bindir/font_cache.sh - elif [ -x $bindir/fc-cache ] ; then - $bindir/fc-cache + 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 [ "$(defaults read $X11_PREFS_DOMAIN cache_fonts)" = 1 ] ; then + if [ -x $bindir/font_cache ] ; then + $bindir/font_cache + elif [ -x $bindir/font_cache.sh ] ; then + $bindir/font_cache.sh + elif [ -x $bindir/fc-cache ] ; then + $bindir/fc-cache + fi fi -fi -if [ -x __libexecdir__/privileged_startx ] ; then + if [ -x $libexecdir/privileged_startx ] ; then XCOMM Don't push this into the background because it can cause XCOMM a race to create /tmp/.X11-unix - __libexecdir__/privileged_startx -fi + $libexecdir/privileged_startx + fi -if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then - enable_xauth=1 -else - enable_xauth=0 -fi + if [ "$(defaults read $X11_PREFS_DOMAIN no_auth)" = 0 ] ; then + enable_xauth=1 + else + enable_xauth=0 + fi -if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then - defaultserverargs="$defaultserverargs -nolisten tcp" -else - defaultserverargs="$defaultserverargs -listen tcp" -fi + if [ "$(defaults read $X11_PREFS_DOMAIN nolisten_tcp)" = 1 ] ; 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 +extension GLX" -else - defaultserverargs="$defaultserverargs -iglx" -fi + if [ "$(defaults read $X11_PREFS_DOMAIN enable_iglx)" = 1 ] ; then + defaultserverargs="$defaultserverargs +iglx +extension GLX" + else + defaultserverargs="$defaultserverargs -iglx" + fi -XCOMM The second check is the real one. The first is to hopefully avoid -XCOMM needless syslog spamming. -if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then - defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`" -fi + XCOMM The second check is the real one. The first is to hopefully avoid + XCOMM needless syslog spamming. + if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then + defaultserverargs="$defaultserverargs -dpi $(defaults read $X11_PREFS_DOMAIN dpi)" + fi -#else -enable_xauth=1 -#endif +else + enable_xauth=1 +fi XCOMM Automatically determine an unused $DISPLAY d=0 @@ -141,18 +150,18 @@ unset d whoseargs="client" -while [ x"$1" != x ]; do +while [ "$1" != "" ]; do case "$1" in XCOMM '' required to prevent cpp from treating "/*" as a C comment. /''*|\./''*) if [ "$whoseargs" = "client" ]; then - if [ x"$client" = x ] && [ x"$clientargs" = x ]; then + if [ "$client" = "" ] && [ "$clientargs" = "" ]; then client="$1" else clientargs="$clientargs $1" fi else - if [ x"$server" = x ] && [ x"$serverargs" = x ]; then + if [ "$server" = "" ] && [ "$serverargs" = "" ]; then server="$1" else serverargs="$serverargs $1" @@ -167,7 +176,7 @@ clientargs="$clientargs $1" else XCOMM display must be the FIRST server argument - if [ x"$serverargs" = x ] && @@ + if [ "$serverargs" = "" ] && @@ expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then display="$1" else @@ -180,11 +189,11 @@ done XCOMM process client arguments -if [ x"$client" = x ]; then +if [ "$client" = "" ]; then client=$defaultclient XCOMM For compatibility reasons, only use startxrc if there were no client command line arguments - if [ x"$clientargs" = x ]; then + if [ "$clientargs" = "" ]; then if [ -f "$userclientrc" ]; then client=$userclientrc elif [ -f "$sysclientrc" ]; then @@ -194,15 +203,15 @@ fi XCOMM if no client arguments, use defaults -if [ x"$clientargs" = x ]; then +if [ "$clientargs" = "" ]; then clientargs=$defaultclientargs fi XCOMM process server arguments -if [ x"$server" = x ]; then +if [ "$server" = "" ]; then server=$defaultserver -#ifdef __linux__ +if [ "$(uname -s)" = "Linux" ] ; then 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"; @@ -211,10 +220,10 @@ tty_num=${tty#/dev/tty} vtarg="vt$tty_num -keeptty" fi -#endif +fi 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 [ "$serverargs" = "" ] && [ "$display" = "" ]; then if [ -f "$userserverrc" ]; then server=$userserverrc elif [ -f "$sysserverrc" ]; then @@ -224,7 +233,7 @@ fi XCOMM if no server arguments, use defaults -if [ x"$serverargs" = x ]; then +if [ "$serverargs" = "" ]; then serverargs=$defaultserverargs fi @@ -240,12 +249,12 @@ fi XCOMM if no display, use default -if [ x"$display" = x ]; then +if [ "$display" = "" ]; then display=$defaultdisplay fi -if [ x"$enable_xauth" = x1 ] ; then - if [ x"$XAUTHORITY" = x ]; then +if [ "$enable_xauth" = 1 ] ; then + if [ "$XAUTHORITY" = "" ]; then XAUTHORITY=$HOME/.Xauthority export XAUTHORITY fi @@ -253,19 +262,19 @@ removelist= XCOMM set up default Xauth info for this machine - hostname=`uname -n` + hostname="$(uname -n)" authdisplay=${display:-:0} -#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - mcookie=`MK_COOKIE` -#else - if [ -r /dev/urandom ]; then - mcookie=`dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` + if [ -n "$has_cookie_maker" ] && [ -n "$mk_cookie" ] ; then + mcookie=$($mk_cookie) else - mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` + if [ -r /dev/urandom ]; then + mcookie=$(dd if=dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\") + else + mcookie=$(dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\") + fi fi -#endif - if test x"$mcookie" = x; then + if [ "$mcookie" = "" ]; then echo "Couldn't create cookie" exit 1 fi @@ -277,61 +286,65 @@ xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie EOF -#if defined(__APPLE__) || defined(__CYGWIN__) - xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g") - serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'" -#else - serverargs=${serverargs}" -auth "${xserverauthfile} -#endif + + case "$(uname -s)" in + CYGWIN*|Darwin) + xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g") + serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'" + ;; + *) + serverargs=${serverargs}" -auth "${xserverauthfile} + ;; + esac 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. for displayname in $authdisplay $hostname$authdisplay; do - authcookie=`XAUTH list "$displayname" @@ - | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + authcookie=$(xauth list "$displayname" @@ + | sed -n 's/.*'"$displayname"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null); if [ "z${authcookie}" = "z" ] ; then - XAUTH -q << EOF + $xauth -q << EOF add $displayname . $mcookie EOF removelist="$displayname $removelist" else dummy=$(($dummy+1)); - XAUTH -q -f "$xserverauthfile" << EOF + $xauth -q -f "$xserverauthfile" << EOF add :$dummy . $authcookie EOF fi done fi -#if defined(__APPLE__) || defined(__CYGWIN__) -eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -#else -XINIT "$client" $clientargs -- "$server" $display $serverargs -#endif +case "$(uname -s)" in +CYGWIN_NT*|Darwin) + eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs + ;; +*) + $xinit "$client" $clientargs -- "$server" $display $serverargs + ;; +esac retval=$? -if [ x"$enable_xauth" = x1 ] ; then - if [ x"$removelist" != x ]; then - XAUTH remove $removelist +if [ "$enable_xauth" = 1 ] ; then + if [ "$removelist" != "" ]; then + $xauth remove $removelist fi - if [ x"$xserverauthfile" != x ]; then + if [ "$xserverauthfile" != "" ]; then rm -f "$xserverauthfile" fi fi -/* - * various machines need special cleaning up - */ -#ifdef __linux__ -if command -v deallocvt > /dev/null 2>&1; then - deallocvt -fi -#endif - -#if defined(sun) -kbd_mode -a -#endif +XCOMM various machines need special cleaning up +if [ "$(uname -s)" = "Linux" ]; then + if command -v deallocvt > /dev/null 2>&1; then + deallocvt + fi +fi + +if [ "$(uname -s)" = "SunOS" ]; then + kbd_mode -a +fi exit $retval - 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.4.2/xinit.c new/xinit-1.4.3/xinit.c --- old/xinit-1.4.2/xinit.c 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/xinit.c 2025-01-05 19:25:56.000000000 +0100 @@ -31,8 +31,10 @@ #include <X11/Xlib.h> #include <X11/Xos.h> #include <X11/Xatom.h> +#include <X11/Xfuncproto.h> #include <stdio.h> #include <ctype.h> +#include <stddef.h> #include <stdint.h> #include <signal.h> @@ -58,8 +60,8 @@ #define SHELL "sh" #endif -const char *bindir = BINDIR; -const char * const server_names[] = { +static const char *bindir = BINDIR; +static const char * const server_names[] = { #ifdef __APPLE__ "Xquartz Mac OSX Quartz displays.", #else @@ -74,18 +76,17 @@ "Xnest X server nested in a window on another X server", "Xephyr kdrive-based nested X server", "Xvnc X server accessed over VNC's RFB protocol", - "Xdmx Distributed Multi-head X server", NULL}; #ifndef XINITRC #define XINITRC ".xinitrc" #endif -char xinitrcbuf[256]; +static char xinitrcbuf[256]; #ifndef XSERVERRC #define XSERVERRC ".xserverrc" #endif -char xserverrcbuf[256]; +static char xserverrcbuf[256]; #define TRUE 1 #define FALSE 0 @@ -100,10 +101,10 @@ static char *displayNum = NULL; static char *program = NULL; static Display *xd = NULL; /* server connection */ -int status; -pid_t serverpid = -1; -pid_t clientpid = -1; -volatile int gotSignal = 0; +static int status; +static pid_t serverpid = -1; +static pid_t clientpid = -1; +static volatile int gotSignal = 0; static void Execute(char **vec); static Bool waitforserver(void); @@ -127,7 +128,7 @@ } static void -sigIgnore(int sig) +sigIgnore(_X_UNUSED int sig) { } @@ -151,7 +152,7 @@ register char **ptr; pid_t pid; int client_given = 0, server_given = 0; - int start_of_client_args, start_of_server_args; + ptrdiff_t start_of_client_args, start_of_server_args; struct sigaction sa, si; #ifdef __APPLE__ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 @@ -314,11 +315,6 @@ shutdown(); - if (gotSignal != 0) { - Errorx("unexpected signal %d", gotSignal); - exit(EXIT_FAILURE); - } - if (serverpid < 0) Fatalx("server error"); if (clientpid < 0) @@ -488,9 +484,12 @@ const char *windowpath; char *newwindowpath; unsigned long num; +#ifndef HAVE_ASPRINTF char nums[10]; int numn; size_t len; +#endif + prop = XInternAtom(xd, "XFree86_VT", False); if (prop == None) { Errorx("Unable to intern XFree86_VT atom"); @@ -534,6 +533,15 @@ } XFree(buf); windowpath = getenv("WINDOWPATH"); +#ifdef HAVE_ASPRINTF + if (!windowpath) { + if (asprintf(&newwindowpath, "%lu", num) < 0) + return; + } else { + if (asprintf(&newwindowpath, "%s:%lu", windowpath, num) < 0) + return; + } +#else numn = snprintf(nums, sizeof(nums), "%lu", num); if (!windowpath) { len = numn + 1; @@ -549,6 +557,7 @@ snprintf(newwindowpath, len, "%s:%s", windowpath, nums); } +#endif /* HAVE_ASPRINTF */ if (setenv("WINDOWPATH", newwindowpath, TRUE) == -1) Error("unable to set WINDOWPATH"); @@ -584,7 +593,7 @@ static jmp_buf close_env; static int -ignorexio(Display *dpy) +ignorexio(_X_UNUSED Display *dpy) { Errorx("connection to X server lost"); longjmp(close_env, 1); 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.4.2/xinitrc.cpp new/xinit-1.4.3/xinitrc.cpp --- old/xinit-1.4.2/xinitrc.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/xinitrc.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -1,55 +1,54 @@ XCOMM!SHELL_CMD +xrdb=XRDB +xinitdir=XINITDIR +xclock=XCLOCK +xterm=XTERM +twm=TWM +xmodmap=XMODMAP + userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap +sysresources=$xinitdir/.Xresources +sysmodmap=$xinitdir/.Xmodmap XCOMM merge in defaults and keymaps if [ -f $sysresources ]; then -#ifdef __APPLE__ if [ -x /usr/bin/cpp ] ; then - XRDB -merge $sysresources + $xrdb -merge $sysresources else - XRDB -nocpp -merge $sysresources + $xrdb -nocpp -merge $sysresources fi -#else - XRDB -merge $sysresources -#endif fi if [ -f $sysmodmap ]; then - XMODMAP $sysmodmap + $xmodmap $sysmodmap fi if [ -f "$userresources" ]; then -#ifdef __APPLE__ if [ -x /usr/bin/cpp ] ; then - XRDB -merge "$userresources" + $xrdb -merge "$userresources" else - XRDB -nocpp -merge "$userresources" + $xrdb -nocpp -merge "$userresources" fi -#else - XRDB -merge "$userresources" -#endif fi if [ -f "$usermodmap" ]; then - XMODMAP "$usermodmap" + $xmodmap "$usermodmap" fi XCOMM start some nice programs -if [ -d XINITDIR/xinitrc.d ] ; then - for f in XINITDIR/xinitrc.d/?*.sh ; do +if [ -d $xinitdir/xinitrc.d ] ; then + for f in "$xinitdir/xinitrc.d"/?*.sh ; do [ -x "$f" ] && . "$f" done unset f fi -TWM & -XCLOCK -geometry 50x50-1+1 & -XTERM -geometry 80x50+494+51 & -XTERM -geometry 80x20+494-0 & -exec XTERM -geometry 80x66+0+0 -name login +$twm & +$xclock -geometry 50x50-1+1 & +$xterm -geometry 80x50+494+51 & +$xterm -geometry 80x20+494-0 & +exec $xterm -geometry 80x66+0+0 -name login ++++++ xinit-client-session.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.653003002 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.657003167 +0100 @@ -1,8 +1,8 @@ -Index: xinit-1.3.4/xinit.c +Index: xinit-1.4.3/xinit.c =================================================================== ---- xinit-1.3.4.orig/xinit.c -+++ xinit-1.3.4/xinit.c -@@ -89,6 +89,7 @@ char xserverrcbuf[256]; +--- xinit-1.4.3.orig/xinit.c ++++ xinit-1.4.3/xinit.c +@@ -90,6 +90,7 @@ static char xserverrcbuf[256]; #define TRUE 1 #define FALSE 0 @@ -10,7 +10,7 @@ static char *default_server = "X"; static char *default_display = ":0"; /* choose most efficient */ -@@ -560,6 +561,8 @@ startClient(char *client_argv[]) +@@ -570,6 +571,8 @@ startClient(char *client_argv[]) { clientpid = fork(); if (clientpid == 0) { @@ -19,7 +19,7 @@ set_environment(); setWindowPath(); -@@ -567,7 +570,17 @@ startClient(char *client_argv[]) +@@ -577,7 +580,17 @@ startClient(char *client_argv[]) Error("cannot change uid"); _exit(EXIT_FAILURE); } ++++++ xinit-suse.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.669003662 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.673003827 +0100 @@ -1,8 +1,8 @@ -Index: xinit-1.4.0/startx.cpp +Index: xinit-1.4.3/startx.cpp =================================================================== ---- xinit-1.4.0.orig/startx.cpp 2018-03-10 02:46:03.000000000 +0100 -+++ xinit-1.4.0/startx.cpp 2018-07-11 13:16:21.864694488 +0200 -@@ -50,11 +50,103 @@ +--- xinit-1.4.3.orig/startx.cpp ++++ xinit-1.4.3/startx.cpp +@@ -59,11 +59,103 @@ userclientrc=$HOME/.xinitrc [ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc @@ -97,53 +97,54 @@ +. /etc/sysconfig/displaymanager + userserverrc=$HOME/.xserverrc - [ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" - sysserverrc=XINITDIR/xserverrc - defaultclient=XTERM + [ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}" + sysserverrc=$xinitdir/xserverrc + defaultclient=$xterm +XCOMM set X Server accordingly (Xorg/Xgl) - defaultserver=XSERVER + defaultserver=$xserver +test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER defaultclientargs="" defaultserverargs="" defaultdisplay="" -@@ -312,6 +404,9 @@ - fi +@@ -317,6 +409,10 @@ EOF done fi + +XCOMM handle TCP port 6000 +test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ + serverargs="$serverargs -nolisten tcp" - - #if defined(__APPLE__) || defined(__CYGWIN__) - eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -320,6 +415,12 @@ - #endif ++ + case "$(uname -s)" in + CYGWIN_NT*|Darwin) + eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs +@@ -327,6 +423,12 @@ CYGWIN_NT*|Darwin) + esac retval=$? +if [ "$retval" != 0 -a ! -u "/usr/bin/Xorg" ]; then -+ echo "-------------------------------------------------------------------------------------------" -+ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?" -+ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards" ++ echo "-------------------------------------------------------------------------------------------" ++ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?" ++ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards" +fi + - if [ x"$enable_xauth" = x1 ] ; then - if [ x"$removelist" != x ]; then - XAUTH remove $removelist -Index: xinit-1.4.0/xinitrc.cpp + if [ "$enable_xauth" = 1 ] ; then + if [ "$removelist" != "" ]; then + $xauth remove $removelist +Index: xinit-1.4.3/xinitrc.cpp =================================================================== ---- xinit-1.4.0.orig/xinitrc.cpp 2018-03-10 02:46:03.000000000 +0100 -+++ xinit-1.4.0/xinitrc.cpp 2018-07-11 13:13:23.808686361 +0200 -@@ -48,8 +48,10 @@ +--- xinit-1.4.3.orig/xinitrc.cpp ++++ xinit-1.4.3/xinitrc.cpp +@@ -47,8 +47,10 @@ if [ -d $xinitdir/xinitrc.d ] ; then unset f fi --TWM & +-$twm & +if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then + exec fvwm +fi - XCLOCK -geometry 50x50-1+1 & - XTERM -geometry 80x50+494+51 & - XTERM -geometry 80x20+494-0 & --exec XTERM -geometry 80x66+0+0 -name login -+exec TWM + $xclock -geometry 50x50-1+1 & + $xterm -geometry 80x50+494+51 & + $xterm -geometry 80x20+494-0 & +-exec $xterm -geometry 80x66+0+0 -name login ++exec $twm ++++++ xinit-tolerant-hostname-changes.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.689004487 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.689004487 +0100 @@ -1,13 +1,13 @@ -Index: xinit-1.3.4/startx.cpp +Index: xinit-1.4.3/startx.cpp =================================================================== ---- xinit-1.3.4.orig/startx.cpp -+++ xinit-1.3.4/startx.cpp -@@ -407,6 +407,7 @@ fi +--- xinit-1.4.3.orig/startx.cpp ++++ xinit-1.4.3/startx.cpp +@@ -412,6 +412,7 @@ fi XCOMM handle TCP port 6000 test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ serverargs="$serverargs -nolisten tcp" +export XAUTHLOCALHOSTNAME=`hostname` - #if defined(__APPLE__) || defined(__CYGWIN__) - eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs + case "$(uname -s)" in + CYGWIN_NT*|Darwin)
