Accepting request 1235079 from X11:XOrg

- 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

- Properly comment %patch 5 out: '#' still expands the macro, which
  makes build fail with rpm 4.20. Use %dnl instead.

OBS-URL: https://build.opensuse.org/request/show/1235079
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xinit?expand=0&rev=32

xinit-1.4.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86409f21a6a31148d2c1c17bf5f2d904eb5ef455f9dc67c49fbd0c10ab18fd5a
+size 158348

xinit-client-session.patch

@@ -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 @@ Index: xinit-1.3.4/xinit.c
  
  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 @@ Index: xinit-1.3.4/xinit.c
          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

@@ -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,52 +97,53 @@ Index: xinit-1.4.0/startx.cpp
 +. /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

@@ -1,12 +1,12 @@
-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)

xinit.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Sun Jan  5 21:33:42 UTC 2025 - Stefan Dirsch <sndirsch@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 <dimstar@opensuse.org>
+
+- Properly comment %patch 5 out: '#' still expands the macro, which
+  makes build fail with rpm 4.20. Use %dnl instead.
+
 -------------------------------------------------------------------
 Thu Jul  4 12:02:51 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 

xinit.spec

@@ -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 @@ sed -i 's+%{_sysconfdir}/X11+%{_libexecdir}+' %{PATCH0}
 %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