Version in base suite: 4.1.0.3-7 Base version: x2goserver_4.1.0.3-7 Target version: x2goserver_4.1.0.3-7+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/x/x2goserver/x2goserver_4.1.0.3-7.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/x/x2goserver/x2goserver_4.1.0.3-7+deb12u1.dsc changelog | 12 + patches/0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch | 40 +++++ patches/0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch | 34 ++++ patches/0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch | 40 +++++ patches/0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch | 74 +++++++++ patches/0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch | 56 +++++++ patches/0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch | 77 ++++++++++ patches/0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch | 61 +++++++ patches/1003_support-startkde-from-old-x2goclients.patch | 16 ++ patches/series | 8 + po/fi.po | 14 - 11 files changed, 425 insertions(+), 7 deletions(-) diff -Nru x2goserver-4.1.0.3/debian/changelog x2goserver-4.1.0.3/debian/changelog --- x2goserver-4.1.0.3/debian/changelog 2023-05-08 14:25:39.000000000 +0000 +++ x2goserver-4.1.0.3/debian/changelog 2023-08-22 06:40:44.000000000 +0000 @@ -1,3 +1,15 @@ +x2goserver (4.1.0.3-7+deb12u1) bookworm; urgency=medium + + * debian/patches: + + Cherry-pick upstream fixes between 4.1.0.3 and 4.1.0.6, i.e. add patches + 0004 - 0010. (Closes: #1050213). + + Add 1003_support-startkde-from-old-x2goclients.patch. Translate startkde + command coming from old X2Go Clients to startplasma-x11. + * debian/po/fi.po: + + Convert from iso8859 encoding to utf8. Thanks, lintian. + + -- Mike Gabriel Tue, 22 Aug 2023 08:40:44 +0200 + x2goserver (4.1.0.3-7) unstable; urgency=medium * debian/x2goserver-*.postrm: diff -Nru x2goserver-4.1.0.3/debian/patches/0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch x2goserver-4.1.0.3/debian/patches/0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch --- x2goserver-4.1.0.3/debian/patches/0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,40 @@ +From 222d706a52d2010a95d903d50e76babb2a9c4877 Mon Sep 17 00:00:00 2001 +From: Mihai Moldovan +Date: Fri, 19 May 2023 22:16:38 +0200 +Subject: [PATCH] x2goserver/bin/x2goruncommand: add support for KDE Plasma 5 + (startplasma-x11). + +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 2 ++ + x2goserver/bin/x2goruncommand | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +#diff --git a/debian/changelog b/debian/changelog +#index fcadd407..aad24e8e 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -436,6 +436,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium +# - x2goserver.spec: add BR: and R: on distribution-release +# (pseudo-package/provides) for /usr/lib/os-release and /etc/os-release. +# - X2Go/Server/Agent/NX/Options.pm: fix typo in test comment. +#+ - x2goserver/bin/x2goruncommand: add support for KDE Plasma 5 +#+ (startplasma-x11). +# * debian/control: +# + Build-depend upon lsb-release for distro version detection. +# + Pull in base64 as a run-time dependency. We'll need it in scripts. +--- a/x2goserver/bin/x2goruncommand ++++ b/x2goserver/bin/x2goruncommand +@@ -235,7 +235,11 @@ + elif [ "$cmd" == "MATE" ]; then + cmd="/usr/bin/mate-session" + elif [ "$cmd" == "KDE" ]; then +- cmd="/usr/bin/startkde" ++ if [ -e '/usr/bin/startplasma-x11' ]; then ++ cmd='/usr/bin/startplasma-x11' ++ else ++ cmd="/usr/bin/startkde" ++ fi + elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then + cmd="/usr/bin/xfce4-session" + elif [ "$cmd" == "LXDE" ]; then diff -Nru x2goserver-4.1.0.3/debian/patches/0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch x2goserver-4.1.0.3/debian/patches/0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch --- x2goserver-4.1.0.3/debian/patches/0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,34 @@ +From d00f3f081a59b58290b756a2b3ddec3036d77bc7 Mon Sep 17 00:00:00 2001 +From: Mihai Moldovan +Date: Fri, 29 Mar 2019 03:38:38 +0100 +Subject: [PATCH] x2goserver/bin/x2goruncommand: fix typo in IceWM branch. + +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 1 + + x2goserver/bin/x2goruncommand | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +#diff --git a/debian/changelog b/debian/changelog +#index 4011f270..be5013ab 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -80,6 +80,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium +# handling. +# - x2goserver/Makefile: don't quote POD_SCRIPTS, because of... make. +# - x2goserver/Makefile: install man1 files and dirs, too. +#+ - x2goserver/bin/x2goruncommand: fix typo in IceWM branch. +# * debian/control: +# + Build-depend upon lsb-release for distro version detection. +# * debian/x2goserver.manpages: +--- a/x2goserver/bin/x2goruncommand ++++ b/x2goserver/bin/x2goruncommand +@@ -246,7 +246,7 @@ + cmd="/usr/bin/startlxde" + elif [ "$cmd" == "LXQt" ]; then + cmd="/usr/bin/startlxqt" +-elif [ "$dmd" == "IceWM" ]; then ++elif [ "$cmd" == "IceWM" ]; then + cmd="/usr/bin/icewm" + elif [ "$cmd" == "TRINITY" ]; then + # If we are on Q4OS, we needs to set env and run some tasks before diff -Nru x2goserver-4.1.0.3/debian/patches/0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch x2goserver-4.1.0.3/debian/patches/0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch --- x2goserver-4.1.0.3/debian/patches/0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,40 @@ +From 16fad4232117be46a15b5b92c7cea80f6c7358bf Mon Sep 17 00:00:00 2001 +From: Ulrich Sibiller +Date: Fri, 12 Mar 2021 11:17:32 +0100 +Subject: [PATCH] x2goserver/bin/x2gostartagent: prevent logfile corruption. + +Both stderr redirection and errors= in the options file wrote to the +same file which lead to corruption with lots of debug output. + +Fixes: #1537. +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 3 +++ + x2goserver/bin/x2gostartagent | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +#diff --git a/debian/changelog b/debian/changelog +#index 7b79abcb..f8c6dde8 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -448,6 +448,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium +# * New upstream version (4.1.0.4): +# - x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.20. +# Previous version was broken and incomplete. Fixes: #1388. +#+ - x2goserver/bin/x2gostartagent: prevent logfile corruption. Both stderr +#+ redirection and errors= in the options file wrote to the same file which +#+ lead to corruption with lots of debug output. Fixes: #1537. +# +# -- Mike Gabriel Fri, 19 Jul 2019 20:55:11 +0200 +# +--- a/x2goserver/bin/x2gostartagent ++++ b/x2goserver/bin/x2gostartagent +@@ -412,7 +412,7 @@ + X2GO_NXOPTIONS="${X2GO_NXOPTIONS%,}," + fi + +-echo "nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG},kbtype=${kbtype_option},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,${X2GO_NXOPTIONS}state=${STATE_FILE}:${X2GO_PORT}" >"${SESSION_DIR}/options" ++echo "nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG}_errors,kbtype=${kbtype_option},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,${X2GO_NXOPTIONS}state=${STATE_FILE}:${X2GO_PORT}" >"${SESSION_DIR}/options" + + NX_AGENT=":${X2GO_PORT}" + SAVED_DISPLAY="${DISPLAY}" diff -Nru x2goserver-4.1.0.3/debian/patches/0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch x2goserver-4.1.0.3/debian/patches/0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch --- x2goserver-4.1.0.3/debian/patches/0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,74 @@ +From 56bc3bf6626d193891a68085fbdf9c82f59e0986 Mon Sep 17 00:00:00 2001 +From: Ulrich Sibiller +Date: Sun, 16 Jun 2019 21:44:24 +0200 +Subject: [PATCH] x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs + 3.5.99.20. + +Previous version was broken and incomplete. Fixes: #1388. + +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 5 +++++ + x2goserver-x2goagent/etc/keystrokes.cfg | 27 ++++++++++++++++--------- + 2 files changed, 23 insertions(+), 9 deletions(-) + +#diff --git a/debian/changelog b/debian/changelog +#index 243998df..6ee10671 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -105,6 +105,11 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium +# [ Tom Ruzicka ] +# * debian/po: Add Czech debconf translation. +# +#+ [ Ulrich Sibiller ] +#+ * New upstream version (4.1.0.4): +#+ - x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.20. +#+ Previous version was broken and incomplete. Fixes: #1388. +#+ +# -- Mike Gabriel Mon, 14 Jan 2019 16:33:04 +0100 +# +# x2goserver (4.1.0.3-0x2go1) unstable; urgency=medium +diff --git a/x2goserver-x2goagent/etc/keystrokes.cfg b/x2goserver-x2goagent/etc/keystrokes.cfg +index 007a1828..c57d2efb 100644 +--- a/x2goserver-x2goagent/etc/keystrokes.cfg ++++ b/x2goserver-x2goagent/etc/keystrokes.cfg +@@ -2,18 +2,27 @@ + + + ++ + +- + + + +- +- +- +- +- ++ + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +-- +2.39.2 + diff -Nru x2goserver-4.1.0.3/debian/patches/0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch x2goserver-4.1.0.3/debian/patches/0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch --- x2goserver-4.1.0.3/debian/patches/0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,56 @@ +From 4768edb3cd698a8d673f8aaa880d4f4a9a3e9832 Mon Sep 17 00:00:00 2001 +From: Ulrich Sibiller +Date: Fri, 12 Mar 2021 11:24:02 +0100 +Subject: [PATCH] x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs + 3.5.99.26. + +Previous version was incomplete. + +Note that this will only work correctly once we actually update to +3.5.99.26 within X2Go, but it doesn't hurt to have the new definitions +until then. + +Fixes: #1538. +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 4 ++++ + x2goserver-x2goagent/etc/keystrokes.cfg | 3 ++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +#diff --git a/debian/changelog b/debian/changelog +#index f8c6dde8..e0556d9c 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -451,6 +451,10 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium +# - x2goserver/bin/x2gostartagent: prevent logfile corruption. Both stderr +# redirection and errors= in the options file wrote to the same file which +# lead to corruption with lots of debug output. Fixes: #1537. +#+ - x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.26. +#+ Previous version was incomplete. Note that this will only work correctly +#+ once we actually update to 3.5.99.26 within X2Go, but it doesn't hurt to +#+ have the new definitions until then. Fixes: #1538. +# +# -- Mike Gabriel Fri, 19 Jul 2019 20:55:11 +0200 +# +diff --git a/x2goserver-x2goagent/etc/keystrokes.cfg b/x2goserver-x2goagent/etc/keystrokes.cfg +index c57d2efb..ea9feeea 100644 +--- a/x2goserver-x2goagent/etc/keystrokes.cfg ++++ b/x2goserver-x2goagent/etc/keystrokes.cfg +@@ -5,7 +5,6 @@ + + + +- + + + +@@ -25,4 +24,6 @@ + + + ++ ++ + +-- +2.39.2 + diff -Nru x2goserver-4.1.0.3/debian/patches/0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch x2goserver-4.1.0.3/debian/patches/0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch --- x2goserver-4.1.0.3/debian/patches/0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,77 @@ +From 20721402b13178336564e1e1355f1cf93420d547 Mon Sep 17 00:00:00 2001 +From: Oleksandr Shneyder +Date: Fri, 13 Aug 2021 09:47:04 -0500 +Subject: [PATCH] x2goterminate-session: terminate x2goruncommand and all + processes from the group. + +Signed-off-by: Mike Gabriel +--- +# debian/changelog | 2 ++ + x2goserver/bin/x2goruncommand | 4 ++++ + x2goserver/bin/x2goterminate-session | 6 ++++++ + 3 files changed, 12 insertions(+) + +#diff --git a/debian/changelog b/debian/changelog +#index 8cd85461..852ecb84 100644 +#--- a/debian/changelog +#+++ b/debian/changelog +#@@ -456,6 +456,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium +# * New upstream version (4.1.0.4): +# - Add support for X2Go KDrive. +# - x2goruncommand: start Xsession on X2Go KDrive desktops. +#+ - x2goterminate-session: terminate x2goruncommand and all processes +#+ from the group. +# +# [ Tom Ruzicka ] +# * debian/po: Add Czech debconf translation. +diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand +index 5a553043..13a93fab 100755 +--- a/x2goserver/bin/x2goruncommand ++++ b/x2goserver/bin/x2goruncommand +@@ -46,8 +46,12 @@ args='' + + X2GO_ROOT="${HOME}/.x2go" + MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" ++PID_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmd.pid" + echo "exec $cmd" >> "$MESSAGE_FILE" + ++#save x2goruncommand pid ++echo -n "$$" > "$PID_FILE" ++ + # make Kerberos's ticket cache known inside the X2Go session + test -n $KRB5CCNAME && export KRB5CCNAME + +diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session +index 64125436..3afd49db 100755 +--- a/x2goserver/bin/x2goterminate-session ++++ b/x2goserver/bin/x2goterminate-session +@@ -35,6 +35,8 @@ if [ -z $SESSION_NAME ]; then + fi + + X2GO_ROOT="${HOME}/.x2go" ++PID_FILE="$X2GO_ROOT/C-$SESSION_NAME/cmd.pid" ++ + + X2GO_LIB_PATH="$(x2gopath libexec)"; + +@@ -42,6 +44,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + + X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` + X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` ++X2GO_CMD_PID=`cat $PID_FILE` + + # stop x2godesktopsharing process gracefully... + x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true +@@ -49,6 +52,9 @@ x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SE + # run x2goserver-extensions for pre-terminate + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-terminate || true + ++#terminate x2goruncommand process and all processes from group ++kill -- -$X2GO_CMD_PID ++ + if kill -TERM $X2GO_AGENT_PID &>/dev/null; then + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID "$SESSION_NAME" has been terminated successfully" + +-- +2.39.2 + diff -Nru x2goserver-4.1.0.3/debian/patches/0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch x2goserver-4.1.0.3/debian/patches/0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch --- x2goserver-4.1.0.3/debian/patches/0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,61 @@ +From ef4bdbeb1b53e4d5119ee6789f372df44b250ed7 Mon Sep 17 00:00:00 2001 +From: Oleksandr Shneyder +Date: Tue, 26 Jul 2022 12:26:14 -0500 +Subject: [PATCH] - x2gostartagent: save the XDMCP server in the session id. + - x2gotermin atesession: don't terminate x2goruncommand on XDMCP sessions. + +Signed-off-by: Mike Gabriel +--- + X2Go/Utils.pm | 2 +- +# debian/changelog | 2 ++ + x2goserver/bin/x2gostartagent | 4 ++++ + x2goserver/bin/x2goterminate-session | 7 +++++-- + 4 files changed, 12 insertions(+), 3 deletions(-) + +--- a/X2Go/Utils.pm ++++ b/X2Go/Utils.pm +@@ -129,7 +129,7 @@ + $string =~ s/[^a-zA-Z0-9\.\_\-\@]//g; + if ($string =~ /^([a-zA-Z0-9\.\_\-\@]*)$/) { + $string = $1; +- if ($string =~ /^([a-zA-Z0-9\.\_][a-zA-Z0-9\.\_\-\@]*)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\.\_\-]*\_dp[\d]{1,2}$/) { ++ if ($string =~ /^([a-zA-Z0-9\.\_][a-zA-Z0-9\.\_\-\@]*)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\.\_\-]*\_dp[\d]{1,2}[a-zA-Z0-9\.\_\-]*$/) { + return $string; + } else {return 0;} + } else {return 0;} +--- a/x2goserver/bin/x2gostartagent ++++ b/x2goserver/bin/x2gostartagent +@@ -244,6 +244,10 @@ + SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" + SESSION_NAME="${SESSION_NAME//:/PP}" + fi ++ if [[ -n "${X2GOXDMCP}" ]] ;then ++ SESSION_NAME="${SESSION_NAME}_${X2GOXDMCP}" ++ fi ++ + + # sanitize session name + SESSION_NAME="$(perl -pe 's/[^a-zA-Z0-9\.\_\-\@]//g' <<< "${SESSION_NAME}")" +--- a/x2goserver/bin/x2goterminate-session ++++ b/x2goserver/bin/x2goterminate-session +@@ -44,7 +44,6 @@ + + X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` + X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` +-X2GO_CMD_PID=`cat $PID_FILE` + + # stop x2godesktopsharing process gracefully... + x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true +@@ -53,7 +52,11 @@ + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-terminate || true + + #terminate x2goruncommand process and all processes from group +-kill -- -$X2GO_CMD_PID ++#in case of XDMCP session cmd.pid won't exist ++if [ -f $PID_FILE ];then ++ X2GO_CMD_PID=`cat $PID_FILE` ++ kill -- -$X2GO_CMD_PID ++fi + + if kill -TERM $X2GO_AGENT_PID &>/dev/null; then + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID "$SESSION_NAME" has been terminated successfully" diff -Nru x2goserver-4.1.0.3/debian/patches/1003_support-startkde-from-old-x2goclients.patch x2goserver-4.1.0.3/debian/patches/1003_support-startkde-from-old-x2goclients.patch --- x2goserver-4.1.0.3/debian/patches/1003_support-startkde-from-old-x2goclients.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/1003_support-startkde-from-old-x2goclients.patch 2023-08-22 06:40:44.000000000 +0000 @@ -0,0 +1,16 @@ +Description: x2goruncommand: rewrite 'startkde' from old X2Go Client versions (that send 'startkde' as command instead of 'KDE') +Author: Mike Gabriel +Forwarded: https://code.x2go.org/gitweb?p=x2goserver.git;a=commit;h=28e7669e64ad2ffc629222a017757dd7022f4066 + +--- a/x2goserver/bin/x2goruncommand ++++ b/x2goserver/bin/x2goruncommand +@@ -244,6 +244,9 @@ + else + cmd="/usr/bin/startkde" + fi ++# provide this command rewrite for old X2Go Client versions (that send 'startkde' as command) ++elif [ "$cmd" == "startkde" ] && [ -e "/usr/bin/startplasma-x11" ]; then ++ cmd="/usr/bin/startplasma-x11" + elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then + cmd="/usr/bin/xfce4-session" + elif [ "$cmd" == "LXDE" ]; then diff -Nru x2goserver-4.1.0.3/debian/patches/series x2goserver-4.1.0.3/debian/patches/series --- x2goserver-4.1.0.3/debian/patches/series 2023-03-26 21:31:59.000000000 +0000 +++ x2goserver-4.1.0.3/debian/patches/series 2023-08-22 06:40:44.000000000 +0000 @@ -2,3 +2,11 @@ 0001-x2goversion-Fix-situations-where-compfile-contains-a.patch 1002_cross.patch 0002-x2goserver-xsession-Port-OPTIONS-variable-and-has_op.patch +0004-x2goserver-bin-x2goruncommand-add-support-for-KDE-Pl.patch +0005-x2goserver-bin-x2goruncommand-fix-typo-in-IceWM-bran.patch +0006-x2goserver-bin-x2gostartagent-prevent-logfile-corrup.patch +0007-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch +0008-x2goserver-x2goagent-etc-keystrokes.cfg-sync-with-nx.patch +0009-x2goterminate-session-terminate-x2goruncommand-and-a.patch +0010-x2gostartagent-save-the-XDMCP-server-in-the-session-.patch +1003_support-startkde-from-old-x2goclients.patch diff -Nru x2goserver-4.1.0.3/debian/po/fi.po x2goserver-4.1.0.3/debian/po/fi.po --- x2goserver-4.1.0.3/debian/po/fi.po 2018-12-10 20:39:35.000000000 +0000 +++ x2goserver-4.1.0.3/debian/po/fi.po 2023-08-22 06:40:44.000000000 +0000 @@ -17,7 +17,7 @@ "Report-Msgid-Bugs-To: x2goserver@packages.debian.org\n" "POT-Creation-Date: 2018-11-29 09:26+0100\n" "PO-Revision-Date: 2017-10-04 12:44+0300\n" -"Last-Translator: Martti Pitkänen \n" +"Last-Translator: Martti Pitkänen \n" "Language-Team: LANGUAGE \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -38,8 +38,8 @@ "You have configured X2Go Server with PostgreSQL as session DB backend and " "you are upgrading x2goserver from a version minor to 3.1.0.0." msgstr "" -"Olet määritellyt X2Go Serverille tietokantapalvelimeksi PostgreSQLn ja olet " -"päivittämässä X2Go serveriä alemmasta versiosta kuin 3.1.0.0." +"Olet määritellyt X2Go Serverille tietokantapalvelimeksi PostgreSQLn ja olet " +"päivittämässä X2Go serveriä alemmasta versiosta kuin 3.1.0.0." #. Type: text #. Description @@ -49,14 +49,14 @@ "using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-" "database.gz" msgstr "" -"Lue nämä ohjeet ennenkuin jatkat X2Go Serverin käyttöä: /usr/share/doc/" +"Lue nämä ohjeet ennenkuin jatkat X2Go Serverin käyttöä: /usr/share/doc/" "x2goserver/README.upgrade-pgsql-database.gz" #. Type: text #. Description #: ../x2goserver.templates:2001 msgid "X2Go Server Upgrade" -msgstr "X2Go Serverin päivtys" +msgstr "X2Go Serverin päivtys" #. Type: text #. Description @@ -65,8 +65,8 @@ "You are upgrading from an X2Go Server version (< 4.1.0.0). Between 4.1.0.0 " "and 4.0.0.x the package structure has undergone a major change." msgstr "" -"Olet päivittämässä X2Go Serverin versiosta (< 4.1.0.0). Version välillä " -"4.1.0.0 ja 4.0.0.x ovat muuttuneet erittäin paljon." +"Olet päivittämässä X2Go Serverin versiosta (< 4.1.0.0). Version välillä " +"4.1.0.0 ja 4.0.0.x ovat muuttuneet erittäin paljon." #. Type: text #. Description