This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 4d31a29 Add support for X2Go KDrive. new 568f27a X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. new fc89339 x2goserver/bin/x2gostartagent: fix quoting. new 69f8f85 x2goserver/bin/x2gostartagent: adapt debug message to ${AGENTBIN} usage. new 9bb0c43 x2goserver/bin/x2gostartagent: also use ${AGENTBIN} in shadow session code. new 56bc3bf x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.20. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: X2Go_in_progress_do_not_use/Server/DB/MySQL.pm | 2 +- debian/changelog | 10 ++++++++++ x2goserver-x2goagent/etc/keystrokes.cfg | 27 +++++++++++++++++--------- x2goserver/bin/x2gostartagent | 10 +++++----- 4 files changed, 34 insertions(+), 15 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 568f27a33b802a664e9189cf277265cbacabd84e Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 21:30:43 2019 +0200 X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. --- X2Go_in_progress_do_not_use/Server/DB/MySQL.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm b/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm index a06b437..3870172 100644 --- a/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm +++ b/X2Go_in_progress_do_not_use/Server/DB/MySQL.pm @@ -129,7 +129,7 @@ sub validate_session_id $uname_ =~ s/\\//; # perform the user check - $user =~ s/($uname_-[0-9]{2,}-[0-9]{10,}_st(D|R).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$uname_.*)/$uname_/; + $user =~ s/($uname_-[0-9]{2,}-[0-9]{10,}_st(D|R|K).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$uname_.*)/$uname_/; die "$uname_ is not authorized to perform this operation" unless ($uname_ eq $user); } diff --git a/debian/changelog b/debian/changelog index 4e325cf..d12c16e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - 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. + - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit fc8933912e245d7f328456e2f1d0557234ea2a9a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 21:33:15 2019 +0200 x2goserver/bin/x2gostartagent: fix quoting. --- debian/changelog | 1 + x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d12c16e..e126196 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/Makefile: install man1 files and dirs, too. - x2goserver/bin/x2goruncommand: fix typo in IceWM branch. - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. + - x2goserver/bin/x2gostartagent: fix quoting. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 0c7cd2e..565b4bd 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -211,7 +211,7 @@ COLORDEPTH="$(awk '{split($0,a,"-depth_"); print a[2]}' <<< "${X2GO_TYPE}")" SESSION_TYPE='D' NOEXITPARAM='' -AGENTBIN=x2goagent +AGENTBIN='x2goagent' if [[ "${X2GO_STYPE}" = 'R' ]]; then SESSION_TYPE='R' @@ -469,7 +469,7 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then else # set NX_TEMP to /tmp, make sure agent starts when pam_tmpdir.so is in use "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" ('\"${ [...] - NX_TEMP='/tmp' ${AGENTBIN} ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & + NX_TEMP='/tmp' "${AGENTBIN}" ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi ln -s -- "${SESSION_DIR}" "${X2GO_ROOT}/C-${SESSION_NAME}" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 69f8f85e387275f309081d8125523926fe83e817 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 21:34:28 2019 +0200 x2goserver/bin/x2gostartagent: adapt debug message to ${AGENTBIN} usage. --- debian/changelog | 1 + x2goserver/bin/x2gostartagent | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e126196..0b1085f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2goruncommand: fix typo in IceWM branch. - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. - x2goserver/bin/x2gostartagent: fix quoting. + - x2goserver/bin/x2gostartagent: adapt debug message to ${AGENTBIN} usage. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 565b4bd..4429fdd 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -468,7 +468,7 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then NX_TEMP='/tmp' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} -${SESSION_TYPE} -auth "${XAUTHORITY}" -shadow ${SHADOW_DESKTOP} -shadowmode ${SHADOW_MODE} ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else # set NX_TEMP to /tmp, make sure agent starts when pam_tmpdir.so is in use - "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" ('\"${ [...] + "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp \"${AGENTBIN}\" X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" [...] NX_TEMP='/tmp' "${AGENTBIN}" ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 9bb0c438c782cdb0e127bf3c191af949bf614538 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 21:35:29 2019 +0200 x2goserver/bin/x2gostartagent: also use ${AGENTBIN} in shadow session code. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b1085f..243998d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change. - x2goserver/bin/x2gostartagent: fix quoting. - x2goserver/bin/x2gostartagent: adapt debug message to ${AGENTBIN} usage. + - x2goserver/bin/x2gostartagent: also use ${AGENTBIN} in shadow session + code. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 4429fdd..887cb32 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -464,8 +464,8 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then # unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing unset LD_LIBRARY_PATH # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use - "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') -SESSION_TYPE ('-${SESSION_TYPE}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') -shadow SHADOW_DESKTOP ('${SHADOW_DESKTOP}') -shadowmode SHADOW_MODE ('${SHADOW_MODE}') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGEN [...] - NX_TEMP='/tmp' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} -${SESSION_TYPE} -auth "${XAUTHORITY}" -shadow ${SHADOW_DESKTOP} -shadowmode ${SHADOW_MODE} ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & + "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp \"${AGENTBIN}\" X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') -SESSION_TYPE ('-${SESSION_TYPE}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') -shadow SHADOW_DESKTOP ('${SHADOW_DESKTOP}') -shadowmode SHADOW_MODE ('${SHADOW_MODE}') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${N [...] + NX_TEMP='/tmp' "${AGENTBIN}" ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} -${SESSION_TYPE} -auth "${XAUTHORITY}" -shadow ${SHADOW_DESKTOP} -shadowmode ${SHADOW_MODE} ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else # set NX_TEMP to /tmp, make sure agent starts when pam_tmpdir.so is in use "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp \"${AGENTBIN}\" X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" [...] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 56bc3bf6626d193891a68085fbdf9c82f59e0986 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Jun 16 21:44:24 2019 +0200 x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.20. Previous version was broken and incomplete. Fixes: #1388. --- 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 243998d..6ee1067 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 <mike.gabriel@das-netzwerkteam.de> 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 007a182..c57d2ef 100644 --- a/x2goserver-x2goagent/etc/keystrokes.cfg +++ b/x2goserver-x2goagent/etc/keystrokes.cfg @@ -2,18 +2,27 @@ <keystrokes> <keystroke action="close_session" Control="1" AltMeta="1" key="t" /> <keystroke action="switch_all_screens" Control="1" AltMeta="1" key="f" /> +<keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" /> <keystroke action="minimize" Control="1" AltMeta="1" key="m" /> -<keystroke action="resize" Control="1" AltMeta="1" key="r" /> <keystroke action="defer" Control="1" AltMeta="1" key="e" /> <keystroke action="ignore" Control="1" AltMeta="1" key="BackSpace" /> <keystroke action="force_synchronization" Control="1" AltMeta="1" key="j" /> -<keystroke action="debug_tree" Control="1" AltMeta="1" key="q" /> -<keystroke action="regions_on_screen" Control="1" AltMeta="1" key="a" /> -<keystroke action="test_input" Control="1" AltMeta="1" key="x" /> -<keystroke action="deactivate_input_devices_grab" Control="1" AltMeta="1" key="y" /> -<keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" /> +<keystroke action="resize" Control="1" AltMeta="1" key="r" /> <keystroke action="viewport_move_left" Control="1" Shift="1" AltMeta="1" key="Left" /> -<keystroke action="viewport_move_up" Control="1" AltMeta="1" key="Up" /> -<keystroke action="viewport_move_right" Control="1" AltMeta="1" key="Right" /> -<keystroke action="viewport_move_down" Control="1" AltMeta="1" key="Down" /> +<keystroke action="viewport_move_left" Control="1" Shift="1" AltMeta="1" key="KP_Left" /> +<keystroke action="viewport_move_up" Control="1" Shift="1" AltMeta="1" key="Up" /> +<keystroke action="viewport_move_up" Control="1" Shift="1" AltMeta="1" key="KP_Up" /> +<keystroke action="viewport_move_right" Control="1" Shift="1" AltMeta="1" key="Right" /> +<keystroke action="viewport_move_right" Control="1" Shift="1" AltMeta="1" key="KP_Right" /> +<keystroke action="viewport_move_down" Control="1" Shift="1" AltMeta="1" key="Down" /> +<keystroke action="viewport_move_down" Control="1" Shift="1" AltMeta="1" key="KP_Down" /> +<keystroke action="viewport_scroll_left" Control="1" AltMeta="1" key="Left" /> +<keystroke action="viewport_scroll_left" Control="1" AltMeta="1" key="KP_Left" /> +<keystroke action="viewport_scroll_up" Control="1" AltMeta="1" key="Up" /> +<keystroke action="viewport_scroll_up" Control="1" AltMeta="1" key="KP_Up" /> +<keystroke action="viewport_scroll_right" Control="1" AltMeta="1" key="Right" /> +<keystroke action="viewport_scroll_right" Control="1" AltMeta="1" key="KP_Right" /> +<keystroke action="viewport_scroll_down" Control="1" AltMeta="1" key="Down" /> +<keystroke action="viewport_scroll_down" Control="1" AltMeta="1" key="KP_Down" /> +<keystroke action="reread_keystrokes" Control="1" AltMeta="1" key="k" /> </keystrokes> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org