This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 813b21e x2goserver.spec: install new files x2go{checkport,get{free,random}port,queryconfig} into the lib dir. new 966addd x2goserver/lib: add new perl wrapper script for X2Go::Utils::is_true called x2goistrue. new 88f142f x2goserver.spec: add x2goistrue to %files section. new a44d4eb x2goserver/bin/x2gostartagent: replace inline perl with calls to x2goistrue and x2goqueryconfig. new f4b29ea x2goserver/bin/x2gostartagent: support disabling or enabling RANDR Xinerama in x2goagent via any parameter in the form randr_xinerama=value (with value interpreted by x2goistrue). The 4 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: debian/changelog | 10 ++++++++++ x2goserver.spec | 1 + x2goserver/bin/x2gostartagent | 24 +++++++++++++++++++++--- x2goserver/lib/{x2gologlevel => x2goistrue} | 13 +++++++------ 4 files changed, 39 insertions(+), 9 deletions(-) copy x2goserver/lib/{x2gologlevel => x2goistrue} (72%) -- 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 88f142f54a3f143b9d8fe5e3734a1715f7a85ca5 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 03:45:28 2018 +0100 x2goserver.spec: add x2goistrue to %files section. --- debian/changelog | 1 + x2goserver.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index ef5af5b..7db3ecf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low - Let x2goserver-x2goagent conflict with the former x2goagent package. - Let x2goserver depend upon its own x2goserver-virtual package for now. The release after that can drop the virtual package again. + - Add x2goistrue to %files section. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Depend upon newer x2goagent package that now provides the diff --git a/x2goserver.spec b/x2goserver.spec index 2edd6f8..c0c4f3b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -807,6 +807,7 @@ fi %{_libdir}/x2go/x2goinsertport %{_libdir}/x2go/x2goinsertsession %{_libdir}/x2go/x2goinsertshadowsession +%{_libdir}/x2go/x2goistrue %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel %{_libdir}/x2go/x2goqueryconfig -- 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 f4b29ea834cfe984ad50497900e3ba2be898d179 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 05:37:12 2018 +0100 x2goserver/bin/x2gostartagent: support disabling or enabling RANDR Xinerama in x2goagent via any parameter in the form randr_xinerama=value (with value interpreted by x2goistrue). Note that it is not possible to change the RRXinerama preference after a session has been started currently. --- debian/changelog | 5 +++++ x2goserver/bin/x2gostartagent | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eae1765..36d871d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -205,6 +205,11 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low called x2goistrue. - x2goserver/bin/x2gostartagent: replace inline perl with calls to x2goistrue and x2goqueryconfig. + - x2goserver/bin/x2gostartagent: support disabling or enabling RANDR + Xinerama in x2goagent via any parameter in the form randr_xinerama=value + (with value interpreted by x2goistrue). Note that it is not possible to + change the RRXinerama preference after a session has been started + currently. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 1ddf82f..c285f06 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -113,6 +113,21 @@ fi "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "client announced itself as "'"'"${X2GO_CLIENT}"'"' +typeset -i x2go_randr_xinerama='1' + +# Extending optional parameters isn't trivially possible, but +# we want this script to work with newer X2Go Client versions +# that supply a Xinerama configuration value and with older +# ones that do not. +# Since we already have trailing optional arguments (for +# the desktop sharing functionality), go ahead and scan +# all arguments for the required value. +typeset item='' +for item in "${@}"; do + typeset tmp_regex='^randr_xinerama=(.*)$' + [[ "${item}" =~ ${tmp_regex} ]] && x2go_randr_xinerama="$("${X2GO_LIB_PATH}/x2goistrue" "${BASH_REMATCH[1]}")" +done + X2GO_GEOMETRY="${1}"; shift X2GO_LINK="${1}"; shift X2GO_PACK="${1}"; shift @@ -432,6 +447,9 @@ if [[ -n "${X2GO_GEOMETRY}" ]] && [[ "${X2GO_GEOMETRY}" != 'fullscreen' ]]; then agent_geometry="-geometry ${X2GO_GEOMETRY}" fi +typeset randr_xinerama_option='' +[[ "${x2go_randr_xinerama}" = '0' ]] && randr_xinerama_option='-rrxinerama' + # systemd is prone to kill remaining sessions on user logouts. # That sort of makes sense to clean up stray processes, # but gets in the way of our persistent session scheme. @@ -443,11 +461,11 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then 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}" & + NX_TEMP='/tmp' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${randr_xinerama_option} -${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 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_}') 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' x2goagent ${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' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} ${randr_xinerama_option} -${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 966addd7d05aa16187fa59e9e1e7f66d0dcc943d Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 03:44:44 2018 +0100 x2goserver/lib: add new perl wrapper script for X2Go::Utils::is_true called x2goistrue. --- debian/changelog | 2 ++ x2goserver/lib/x2goistrue | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/debian/changelog b/debian/changelog index db98424..ef5af5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -201,6 +201,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low quotes, curly braces et. al. - x2goserver/bin/x2goresume-session: fix most other shellcheck warnings, more quotes, curly braces et. al. + - x2goserver/lib: add new perl wrapper script for X2Go::Utils::is_true + called x2goistrue. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/lib/x2goistrue b/x2goserver/lib/x2goistrue new file mode 100755 index 0000000..0c938af --- /dev/null +++ b/x2goserver/lib/x2goistrue @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +# Copyright (C) 2017-2018 X2Go Project - https://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +use strict; + +use X2Go::Utils qw (is_true); + +my $value = shift or die "Missing value argument"; + +print is_true($value)."\n"; + +exit 0; -- 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 a44d4ebea7530b3e6d76311fe216cdf1abef4383 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 03:50:28 2018 +0100 x2goserver/bin/x2gostartagent: replace inline perl with calls to x2goistrue and x2goqueryconfig. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7db3ecf..eae1765 100644 --- a/debian/changelog +++ b/debian/changelog @@ -203,6 +203,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low more quotes, curly braces et. al. - x2goserver/lib: add new perl wrapper script for X2Go::Utils::is_true called x2goistrue. + - x2goserver/bin/x2gostartagent: replace inline perl with calls to + x2goistrue and x2goqueryconfig. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 9e659a1..1ddf82f 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -80,7 +80,7 @@ if ! current_host_name="$(hostname)"; then exit '6' fi -X2GO_TELEKINESIS_ENABLED="$(perl -e 'use X2Go::Config qw( get_config ); use X2Go::Utils qw( is_true ); my $Config = get_config(); print is_true($Config->param("telekinesis.enable"));')" +X2GO_TELEKINESIS_ENABLED="$("${X2GO_LIB_PATH}/x2goistrue" "$("${X2GO_LIB_PATH}/x2goqueryconfig" "telekinesis" "enable")")" X2GO_ROOT="${HOME}/.x2go" export NX_ROOT="${X2GO_ROOT}" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org