diff --git a/tigervnc.changes b/tigervnc.changes index 7b7cced..b50a11a 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 25 16:28:09 UTC 2020 - Stefan Dirsch + +- u_tigervnc_update_default_vncxstartup.patch + * check first for /usr/libexec/xinit/xinitrc, then + /etc/X11/xinit/xinitrc (reported by aschnell @SUSE) + ------------------------------------------------------------------- Thu Nov 19 13:43:27 UTC 2020 - Stefan Dirsch diff --git a/u_tigervnc_update_default_vncxstartup.patch b/u_tigervnc_update_default_vncxstartup.patch index 9d3985e..3af324f 100644 --- a/u_tigervnc_update_default_vncxstartup.patch +++ b/u_tigervnc_update_default_vncxstartup.patch @@ -2,11 +2,11 @@ Author: Michal Srb References: bnc#956537 Subject: Update default vnc xstartup script. -Index: b/unix/vncserver +Index: tigervnc-1.10.1/unix/vncserver =================================================================== ---- a/unix/vncserver -+++ b/unix/vncserver -@@ -58,27 +58,31 @@ $defaultXStartup +--- tigervnc-1.10.1.orig/unix/vncserver ++++ tigervnc-1.10.1/unix/vncserver +@@ -58,27 +58,33 @@ $defaultXStartup = ("#!/bin/sh\n\n". "unset SESSION_MANAGER\n". "unset DBUS_SESSION_BUS_ADDRESS\n". @@ -22,12 +22,14 @@ Index: b/unix/vncserver - " esac\n". + "\n". + "userclientrc=\$HOME/.xinitrc\n". -+ "sysclientrc=/etc/X11/xinit/xinitrc\n". ++ "sysclientrc=/usr/libexec/xinit/xinitrc\n". + "\n". + "if [ -f \"\$userclientrc\" ]; then\n". + " client=\"\$userclientrc\"\n". + "elif [ -f \"\$sysclientrc\" ]; then\n". + " client=\"\$sysclientrc\"\n". ++ "elif [ -f \"/etc/X11/xinit/xinitrc\" ]; then\n". ++ " client=\"/etc/X11/xinit/xinitrc\"\n". "fi\n". - "if [ -x /etc/X11/xinit/xinitrc ]; then\n". - " exec /etc/X11/xinit/xinitrc\n".