x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

page changed: wiki:development:build-howto-macos:x2goclient
by wiki-admin＠x2go.org 26 Sep '13

26 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/26 08:51 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient Edit Summary: [Dependencies] User : sunweaver @@ -227,17 +227,16 @@ **Run the following commands as a regular, non-root user. You'll need the root password to install them.** - **1. FIXME -> nxproxy has to be installed from nx-libs.git - Install nxproxy from git** + **1. + Install nxproxy from the nx-libs-lite tarball** <code> - $ git clone git://code.x2go.org/nxproxy - $ cd nxproxy - $ autoconf - $ ./configure --prefix=/usr - $ make + $ wget http://code.x2go.org/releases/source/nx-libs/nx-libs-<version>-lite.tar.gz + $ tar xzf nx-libs-<version>-lite.tar.gz + $ cd nx-libs-<version> + $ PREFIX=/usr make $ su -c "make install" </code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-macos:x2goclient
by wiki-admin＠x2go.org 26 Sep '13

26 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/26 08:46 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient Edit Summary: User : sunweaver @@ -3,13 +3,18 @@ ===== Build X2Go Client using Mac Ports ===== As X2Go Client is already in Mac Ports (thanks to Clemens Lang) it is possible to install all dependencies via Mac Ports. - **Steps:** + **Steps summarized:** - Install Mac Ports on your Mac OS system - Take a look at the dependency list (in a terminal shell) - And install those dependencies + - Get X2Go Client from X2Go Git + - Build X2Go Client + + So, first install the X2Go Client dependencies: + <code> $ port echo depof:x2goclient $ sudo port install depof:x2goclient </code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-macos:x2goclient
by wiki-admin＠x2go.org 26 Sep '13

26 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/26 08:45 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient Edit Summary: User : sunweaver @@ -1,8 +1,46 @@ ====== Build X2GoClient on MacOS ====== + ===== Build X2Go Client using Mac Ports ===== - ===== Variables ===== + As X2Go Client is already in Mac Ports (thanks to Clemens Lang) it is possible to install all dependencies via Mac Ports. + + **Steps:** + + - Install Mac Ports on your Mac OS system + - Take a look at the dependency list (in a terminal shell) + - And install those dependencies + <code> + $ port echo depof:x2goclient + $ sudo port install depof:x2goclient + </code> + + Once the dependencies are installed, you need to install dylibbundler and tweak its file permissions: + + <code> + $ sudo port install dylibbundler + $ sudo chmod u+w /opt/local/lib/libcrypto.1.0.0.dylib /opt/local/lib/libssl.1.0.0.dylib + </code> + + If you omit the file permission tweak, dylibbundler will fail. + + At last, checkout X2Go Client from Git: + <code> + $ git clone git://code.x2go.org/x2goclient.git + </code> + + If you want to build a specific version of X2Go Client, select that version with ''git checkout <version>''. If you want to look around what versions are available, use ''git tag'' which will present you a list of valid version tags to use for checkout. + + In the X2Go Client source directory, simply run the ''macbuild.sh'' script: + + <code> + $ ./macbuild.sh + </code> + + + ===== Build X2Go Client from Scratch (w/o Mac Ports) ===== + + ==== Variables ==== This document makes use of several variables to address paths in a generic, but distinct way. They are not meant to be used via shell, but for human parsing. No program of the x2go suite actually uses them for anything. You may "set" them to whatever value you want to (in your head), just don't change them half-way through the building process. The "default value" is merely a suggestion. ^ Name ^ Description ^ Default value ^ @@ -14,11 +52,11 @@ | $NX_LIBS_SRC | Directory containing the NX libs source tree | $NX_BASE_DIR/nx-libs-git | | $NX_DIST_SRC | Directory containing NX libs dependencies source trees | $NX_BASE_DIR/dist | | $NX_DIST_INST | Installation directory of NX libs dependencies | $NX_DIST_SRC/inst | - ===== Get the sources ===== + ==== Get the sources ==== - ==== x2goclient ==== + === x2goclient === Prepare $X2GO_BASE_DIR if need be. <code> @@ -39,9 +77,9 @@ # mkdir "$X2GO_DIST_INST" </code> - ==== NX libraries ==== + === NX libraries === Prepare $NX_BASE_DIR. <code> @@ -61,9 +99,9 @@ # mkdir "$NX_DIST_SRC" # mkdir "$NX_DIST_INST" </code> - ===== Dependencies ===== + ==== Dependencies ==== * for optional sound support: PulseAudio * build dependencies: * Apple Developer SDK @@ -72,16 +110,16 @@ * libjpeg or libjpeg-turbo * libpng * nx-binaries - ==== Qt4 ==== + === Qt4 === Qt4 is a hard dependency. You can either download and install the [[http://qt.nokia.com/downloads|SDK package for Mac OS X provided by Nokia]], or, if you want to redistribute/deploy x2goclient on other machines, build your own version from source. If you decide to build from source, follow these instructions, else skip to the NX part. - === Download === + == Download == Download the source package from [[http://qt.nokia.com/downloads/downloads#qt-lib|the official Qt site]] (.tar.gz recommended.) Put it into $X2GO_DIST_SRC. @@ -93,9 +131,9 @@ # tar -xzvf qt...tar.gz # cd qt-... </code> - === Configuration === + == Configuration == Configure the qt source tree. We will disable unused stuff and build universal (for deployment.) If you don't intend to deploy x2goclient, you can remove all -arch parameters and further speed up compilation. @@ -110,9 +148,9 @@ If everything went through cleanly, proceed to the next step. - === Building === + == Building == Run make and pray. Pray strongly. To whomever or whatever you want, just pray. <code> @@ -125,15 +163,15 @@ # make install </code> - ==== libssh ==== + === libssh === - === Dependencies === + == Dependencies == libssh uses CMake to configure the source build. Please download and install CMake from [[http://cmake.org/cmake/resources/software.html|the official CMake repository]]. - === Download === + == Download == Download the source package from [[http://www.libssh.org/files/|the libssh repository]]. Note that currently 0.5.2 is buggy, at least on Mac OS X. Please use 0.5.1 for now. Put it into $X2GO_DIST_SRC. @@ -144,9 +182,9 @@ # tar -xzvf libssh-...tar.gz # cd libssh-... </code> - === Configuration === + == Configuration == Create a build subdir. <code> @@ -161,9 +199,9 @@ <code> # cmake -D "CMAKE_BUILD_TYPE:STRING=Release" -D "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-4.2" -D "CMAKE_CXX_FLAGS:STRING=-pipe -Wall -Wextra" -D "CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG" -D "CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-4.2" -D "CMAKE_C_FLAGS:STRING=-pipe -Wall -Wextra" -D "CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG" -D "CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON" -D "CMAKE_INSTALL_PREFIX:PATH=$X2GO_DIST_INST" -D "CMAKE_OSX_ARCHITECTURES:STRING=i386 -arch x86_64 -arch ppc" -D "CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5" -D "CMAKE_OSX_SYSROOT:PATH=/Developer/SDKs/MacOSX10.5.sdk" -D "CMAKE_VERBOSE_MAKEFILE:BOOL=ON" -D "CMAKE_SKIP_RPATH:BOOL=NO" -D "CPACK_BINARY_BUNDLE:BOOL=OFF" -D "CPACK_BINARY_OSXX11:BOOL=OFF" -D "WITH_BENCHMARKS:BOOL=OFF" -D "WITH_CLIENT_TESTING:BOOL=OFF" -D "WITH_DEBUG_CALLTRACE:BOOL=ON" -D "WITH_DEBUG_CRYPTO:BOOL=OFF" -D "WITH_GCRYPT:BOOL=OFF" -D "WITH_INTERNAL_DOC:BOOL=OFF" -D "WITH_LIBZ:BOOL=ON" -D "WITH_PCAP:BOOL=OFF" -D "WITH_SERVER:BOOL=OFF" -D "WITH_SFTP:BOOL=ON" -D "WITH_SSH1:BOOL=ON" -D "WITH_STATIC_LIB:BOOL=ON" -D "WITH_TESTING:BOOL=OFF" </code> - === Building === + == Building == Build the source. <code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-macos:x2goclient
by wiki-admin＠x2go.org 26 Sep '13

26 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/26 08:32 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-macos:x2goclient Edit Summary: [Build X2GoClient on MacOS] User : sunweaver @@ -1,7 +1,5 @@ ====== Build X2GoClient on MacOS ====== - - wiki-writing-todo (FIXME) ===== Variables ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-34-gae5433d
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via ae5433d8653adaa364329001aa10f55d76f15a65 (commit) from 324b5abc92c9c242ebb6410b3938232055b73920 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ae5433d8653adaa364329001aa10f55d76f15a65 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 13:02:53 2013 +0200 retrieve session profile in get_agent_query_mode() ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 380e479..f98f984 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -462,7 +462,7 @@ class X2GoBroker(object): return unicode(_auth_mech) or unicode(_default_auth_mech) - def get_agent_query_mode(self): + def get_agent_query_mode(self, profile_id): """\ Get the agent query mode (LOCAL or SSH, normally) that is configured for this X2Go Session Broker instance. @@ -475,6 +475,7 @@ class X2GoBroker(object): _backend_agent_query_mode = "" _agent_query_mode = "" + _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: _agent_query_mode = _profile[u'broker-agent-query-mode'] logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) @@ -500,6 +501,7 @@ class X2GoBroker(object): """ _default_session_autologin = False _session_autologin = False + _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-session-autologin') and _profile['broker-session-autologin']: _session_autologin = _profile[u'broker-session-autologin'] @@ -807,7 +809,7 @@ class X2GoBroker(object): """ remote_agent = None - agent_query_mode = self.get_agent_query_mode().upper() + agent_query_mode = self.get_agent_query_mode(profile_id).upper() if agent_query_mode == u'SSH': profile = self.get_profile(profile_id) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-33-g324b5ab
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 324b5abc92c9c242ebb6410b3938232055b73920 (commit) from 9c790bec8229c1f6ea6fec0e13a64d6e3b0afb69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 324b5abc92c9c242ebb6410b3938232055b73920 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 12:57:04 2013 +0200 Rename base broker's use_session_autologin to get_session_autologin. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 26a2140..4ae73c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low that will work with every default setup. - New broker session profile parameter: broker-agent-query-mode. Define agent query methods per session profile. + - Rename base broker's use_session_autologin to get_session_autologin. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index aedce6f..380e479 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -489,7 +489,7 @@ class X2GoBroker(object): return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) - def use_session_autologin(self, profile_id): + def get_session_autologin(self, profile_id): """\ Detect if the given profile is configured to try automatic session logons. @@ -510,6 +510,8 @@ class X2GoBroker(object): logger_broker.debug('base_broker.X2GoBroker.get_session_autologin(): found default-session-autologin in global config section: {value}'.format(value=_default_session_autologin)) return _session_autologin or _default_session_autologin + # API compat name: + use_session_autologin = get_session_autologin def get_authorized_keys_file(self, profile_id): """\ @@ -858,7 +860,7 @@ class X2GoBroker(object): if key.startswith('host='): del profile[key] - if self.use_session_autologin(profile_id): + if self.get_session_autologin(profile_id): profile['autologin'] = True profile['key'] = '<will-be-provided-later>' @@ -1023,7 +1025,7 @@ class X2GoBroker(object): # session autologin feature - if remote_agent and self.use_session_autologin(profile_id) and username: + if remote_agent and self.get_session_autologin(profile_id) and username: # FIXME: we somehow have to find out about the username of the person at the broker client-side... # using the username used for broker login for now... hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-32-g9c790be
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 9c790bec8229c1f6ea6fec0e13a64d6e3b0afb69 (commit) from 02413b4ef4e3b0441715a298b9c23974489b677e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c790bec8229c1f6ea6fec0e13a64d6e3b0afb69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 12:38:14 2013 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 66698ab..aedce6f 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -487,7 +487,7 @@ class X2GoBroker(object): _default_agent_query_mode = self.config.get_value('global', 'default-agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found default-agent-query-mode in global config section: {value}'.format(value=_default_agent_query_mode)) - return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) unicode(_default_agent_query_mode) + return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) def use_session_autologin(self, profile_id): """\ hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.5-1-gbb53cc7
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, release/4.0.0.x has been updated via bb53cc7514668c05673040ad1ac1dd36683bf8c7 (commit) from ce2dadab56420e9d5563e19564b04699cd7e9615 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb53cc7514668c05673040ad1ac1dd36683bf8c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 12:23:37 2013 +0200 Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver/bin/x2gostartagent | 5 +++++ 2 files changed, 14 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4f7fddf..9e5a9af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.6): + - Work around buggy X2Go Client on Mac OS. If the keyboard type + is set to "query", we force X2GO_SET_KBD to 1. + (Partly resolves: #112). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 + x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e137368..932c051 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -55,6 +55,11 @@ X2GO_CMD="$1"; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +# Mac OS keyboard issue workaround: for old/broken clients that used to call type=query and usekbd=0... +if [ "$X2GO_KBD_TYPE" = "query" ]; then + X2GO_SET_KBD=1 +fi + XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-214-g6b7b203
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 6b7b20325f154f16a9c22c22187690521f90b213 (commit) from e6cdad130e1aebe7fa94022b3f7fe0d1cf6c4f8c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6b7b20325f154f16a9c22c22187690521f90b213 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 12:23:37 2013 +0200 Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). Conflicts (when cherry-picked from release/4.0.1.x branch, resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 ++++++++++- x2goserver/bin/x2gostartagent | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a70599..4af91da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -152,7 +152,16 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.6): + - Work around buggy X2Go Client on Mac OS. If the keyboard type + is set to "query", we force X2GO_SET_KBD to 1. + (Partly resolves: #112). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 + +x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): - Make x2goumount-session tolerant towards usernames that contain spaces diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 607a35e..bc399c2 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -60,6 +60,11 @@ X2GO_CMD="$1"; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +# Mac OS keyboard issue workaround: for old/broken clients that used to call type=query and usekbd=0... +if [ "$X2GO_KBD_TYPE" = "query" ]; then + X2GO_SET_KBD=1 +fi + XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.6-10-ga7d331d
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, release/4.0.1.x has been updated via a7d331d0fc0e2e1814a081d434fad5d5d1d6511a (commit) from 91230bdaf3133ede8cd23612d4e6593b2c5a98cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a7d331d0fc0e2e1814a081d434fad5d5d1d6511a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 12:23:37 2013 +0200 Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). Conflicts (when cherry-picked from release/4.0.0.x branch, resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver/bin/x2gostartagent | 5 +++++ 2 files changed, 14 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 67d32e5..46354a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,15 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.6): + - Work around buggy X2Go Client on Mac OS. If the keyboard type + is set to "query", we force X2GO_SET_KBD to 1. + (Partly resolves: #112). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 + x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c02b7b9..66b5e5e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -60,6 +60,11 @@ X2GO_CMD="$1"; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +# Mac OS keyboard issue workaround: for old/broken clients that used to call type=query and usekbd=0... +if [ "$X2GO_KBD_TYPE" = "query" ]; then + X2GO_SET_KBD=1 +fi + XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} if [ "$X2GO_STYPE" == "S" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013