x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

pyhoca-cli.git - master (branch) updated: 0.2.0.4-5-g49aa9fe
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via 49aa9fef7e76a274a62bdbc801244ba875565532 (commit) from 84999ab5f157d234b1854aa8b7f3ca13bdbcd9cb (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 49aa9fef7e76a274a62bdbc801244ba875565532 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:53:15 2012 +0200 /debian/rules: Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 089eb78..eea9c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pyhoca-cli (0.2.0.5-0~x2go1) UNRELEASED; urgency=low * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Reduce python version in Build-Depends to allow build on Ubuntu 10.04. + * /debian/rules: + + Allow package build on systems with missing dh_python2. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 diff --git a/debian/rules b/debian/rules index 8f217cb..c8ce66b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -PYVERS=$(shell pyversions -vr) +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_clean: rm -Rf PyHoca_CLI.egg-info/ hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-22-ge61da26
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via e61da26a3952164d7fced46dbaf9d8b71e3b030c (commit) from 684548520c09ff14d81f3be22f32676d5b3e7f29 (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 e61da26a3952164d7fced46dbaf9d8b71e3b030c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:51:21 2012 +0200 Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d325e05..cab0f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low + Depend on python-x2go (>=0.2.0.11-0~). + Reduce python version in Build-Depends to allow build against Ubuntu 10.04. * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + * /debian/rules: + + Allow package build on systems with missing dh_python2. [ Oleksandr Shneyder ] * New upstream version (0.2.0.5): diff --git a/debian/rules b/debian/rules index 3dca7bc..4e0c6f5 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_build: cp po/PyHoca-GUI.pot po/PyHoca-GUI.pot.bak hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-8-gfeac4d0
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via feac4d0816d71ffe3fb3bf46c5dd0b9b919917ea (commit) from b08887f153ce00d3501b0992ba4e37a332d8af72 (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 feac4d0816d71ffe3fb3bf46c5dd0b9b919917ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:40:07 2012 +0200 /debian/rules: Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8e2d929..dd87a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low - Prepare for staying compatible with new SSH proxy feature in X2Go Client. - Add sshproxy_port option to session (SSH proxy) options. + * /debian/rules: + + Allow package build on systems with missing dh_python2. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/debian/rules b/debian/rules index d0a0f1d..214d87b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_build: mkdir -p .epydoc/html hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-7-gb08887f
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via b08887f153ce00d3501b0992ba4e37a332d8af72 (commit) from 80bec3b0f51d6abcfee150bf932701dfdd368586 (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 b08887f153ce00d3501b0992ba4e37a332d8af72 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 10:18:32 2012 +0200 Add sshproxy_port option to session (SSH proxy) options. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 8 +++++--- x2go/session.py | 2 +- x2go/utils.py | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d783dfb..8e2d929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.11): - Prepare for staying compatible with new SSH proxy feature in X2Go Client. + - Add sshproxy_port option to session (SSH proxy) options. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 108d6ef..18458bd 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -605,7 +605,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return checkhosts.check_ssh_host_key(self, hostname, port=port) def connect(self, hostname, port=22, username='', password='', pkey=None, - use_sshproxy=False, sshproxy_host='', sshproxy_user='', sshproxy_password='', + use_sshproxy=False, sshproxy_host='', sshproxy_port=22, sshproxy_user='', sshproxy_password='', sshproxy_key_filename='', sshproxy_tunnel='', key_filename=None, timeout=None, allow_agent=False, look_for_keys=False, session_instance=None, @@ -667,9 +667,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @type session_instance: C{obj} @param use_sshproxy: connect through an SSH proxy @type use_sshproxy: C{True} if an SSH proxy is to be used for tunneling the connection - @param sshproxy_host: hostname of the SSH proxy server, use <hostname>:<port> to name a - non-standard SSH port + @param sshproxy_host: hostname of the SSH proxy server @type sshproxy_host: C{str} + @param sshproxy_port: port of the SSH proxy server + @type sshproxy_port: C{int} @param sshproxy_user: username that we use for authenticating against C{<sshproxy_host>} @type sshproxy_user: C{str} @param sshproxy_password: a password to use for SSH proxy authentication or for unlocking @@ -698,6 +699,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts, sshproxy_host=sshproxy_host, + sshproxy_port=sshproxy_port, sshproxy_user=sshproxy_user, sshproxy_password=sshproxy_password, sshproxy_key_filename=sshproxy_key_filename, diff --git a/x2go/session.py b/x2go/session.py index c04a391..8609cbe 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -111,7 +111,7 @@ _X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi', 'profiles_backend', 'settings_backend', 'printing_backend', ) """A list of allowed X2Go terminal session parameters.""" -_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password', +_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_port', 'sshproxy_user', 'sshproxy_password', 'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel', ) """A list of allowed X2Go SSH proxy parameters.""" diff --git a/x2go/utils.py b/x2go/utils.py index 189e875..4e8d468 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -323,6 +323,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'sshproxytype', 'sshproxysameuser', 'sshproxysamepass', + 'sshproxyautologin', ] for i in _ignored_options: del _params[i] hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-21-g6845485
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via 684548520c09ff14d81f3be22f32676d5b3e7f29 (commit) from d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (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 684548520c09ff14d81f3be22f32676d5b3e7f29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 09:16:56 2012 +0200 Make sure that SSH proxy port migration works flawlessly. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4dbda61..d325e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low - Do not offer DirectRDP sessions in profile manager while connected to a real X2Go server via SSH. - Configure SSH proxy port in a separate session profile option (sshproxyport). + - Make sure that SSH proxy port migration works flawlessly. * /debian/control: + Add Oleksandr Shneyder to Uploaders. + Depend on python-x2go (>=0.2.0.11-0~). diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 95566cc..0b52f4a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -836,11 +836,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _ssh_proxy = self.profile_config['usesshproxy'] _ssh_proxy_host = self.profile_config['sshproxyhost'] _ssh_proxy_port = 22 + if self.profile_config['sshproxyport']: + _ssh_proxy_port = int(self.profile_config['sshproxyport']) if ":" in _ssh_proxy_host: _ssh_proxy_port = _ssh_proxy_host.split(":")[1] _ssh_proxy_host = _ssh_proxy_host.split(":")[0] - if self.profile_config['sshproxyport']: - _ssh_proxy_port = int(self.profile_config['sshproxyport']) self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port)) self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-6-g80bec3b
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via 80bec3b0f51d6abcfee150bf932701dfdd368586 (commit) from 302db0f93eadd030c49eea9ceed308c779dfbb46 (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 80bec3b0f51d6abcfee150bf932701dfdd368586 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 21:06:13 2012 +0200 changelog fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ff9cad..d783dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.2.0.10-0~x2go3) UNRELEASED; urgency=low +python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.11): - Prepare for staying compatible with new SSH proxy feature hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-5-g302db0f
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via 302db0f93eadd030c49eea9ceed308c779dfbb46 (commit) from f0c1eb56cb7a54b762f1d9f651399b48e0ba04aa (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 302db0f93eadd030c49eea9ceed308c779dfbb46 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 21:04:39 2012 +0200 increment egg version ----------------------------------------------------------------------- Summary of changes: x2go/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index 706d488..4292a8d 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.10' +__VERSION__ = '0.2.0.11' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-4-gf0c1eb5
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via f0c1eb56cb7a54b762f1d9f651399b48e0ba04aa (commit) from a1805270345b3eebe19a2d99cd78d1a24b351d55 (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 f0c1eb56cb7a54b762f1d9f651399b48e0ba04aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 21:03:20 2012 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 77c996c..61022c3 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -296,7 +296,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', - 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin'; False, + 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': False, 'useexports': True, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-20-gd2ed0cc
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (commit) via 77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae (commit) via 9d891f82dd2fee56ecb5f8774315340fdd0a19ce (commit) from f7c2451f34638bc25b1f3485e5c360fac3243cd1 (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 d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 21:02:23 2012 +0200 Depend on python-x2go (>=0.2.0.11-0~). commit 77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 20:59:51 2012 +0200 Configure SSH proxy port in a separate session profile option (sshproxyport). commit 9d891f82dd2fee56ecb5f8774315340fdd0a19ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 20:17:44 2012 +0200 Reduce python version in Build-Depends to allow build against Ubuntu 10.04. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- debian/control | 4 ++-- pyhoca/wxgui/profilemanager.py | 17 +++++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 088f0b3..4dbda61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,9 +17,11 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low in. - Do not offer DirectRDP sessions in profile manager while connected to a real X2Go server via SSH. + - Configure SSH proxy port in a separate session profile option (sshproxyport). * /debian/control: + Add Oleksandr Shneyder to Uploaders. - + Depend on python-x2go (>=0.2.0.10-0~). + + Depend on python-x2go (>=0.2.0.11-0~). + + Reduce python version in Build-Depends to allow build against Ubuntu 10.04. * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. [ Oleksandr Shneyder ] diff --git a/debian/control b/debian/control index b823f63..fcfdd9a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), man2html-base | man2html, - python (>=2.6.6-3~), + python (>=2.6.5-0~), python-setuptools, python-support, python-distutils-extra, @@ -30,7 +30,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.2.0.10-0~), + python-x2go (>=0.2.0.11-0~), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 2e9449b..95566cc 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -834,7 +834,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseSSHProxy.SetValue(self.profile_config['usesshproxy']) _ssh_proxy = self.profile_config['usesshproxy'] - self.SSHProxyHost.SetValue(self.profile_config['sshproxyhost']) + _ssh_proxy_host = self.profile_config['sshproxyhost'] + _ssh_proxy_port = 22 + if ":" in _ssh_proxy_host: + _ssh_proxy_port = _ssh_proxy_host.split(":")[1] + _ssh_proxy_host = _ssh_proxy_host.split(":")[0] + if self.profile_config['sshproxyport']: + _ssh_proxy_port = int(self.profile_config['sshproxyport']) + self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port)) self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) @@ -1201,7 +1208,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['host'] = self.Host.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() - self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue() + _ssh_proxy_host = self.SSHProxyHost.GetValue() + _ssh_proxy_port = 22 + if ":" in _ssh_proxy_host: + _ssh_proxy_port = _ssh_proxy_host.split(":")[1] + _ssh_proxy_host = _ssh_proxy_host.split(":")[0] + self.profile_config['sshproxyhost'] = _ssh_proxy_host + self.profile_config['sshproxyport'] = _ssh_proxy_port self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue() self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(), self.SSHProxyTunnelFromPort.GetValue(), hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-3-ga180527
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via a1805270345b3eebe19a2d99cd78d1a24b351d55 (commit) from 38373f3f05f4b34858f236f48c23e56b370112b8 (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 a1805270345b3eebe19a2d99cd78d1a24b351d55 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 20:50:28 2012 +0200 Prepare for staying compatible with new SSH proxy feature in X2Go Client. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2go/defaults.py | 3 ++- x2go/sshproxy.py | 5 +++-- x2go/utils.py | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f82a5fd..7ff9cad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-x2go (0.2.0.10-0~x2go3) UNRELEASED; urgency=low + + * New upstream version (0.2.0.11): + - Prepare for staying compatible with new SSH proxy feature + in X2Go Client. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 + python-x2go (0.2.0.10-0~x2go2) unstable; urgency=low * /debian/control: diff --git a/x2go/defaults.py b/x2go/defaults.py index a9562bf..77c996c 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -295,7 +295,8 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'autologin': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, - 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', + 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', + 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin'; False, 'useexports': True, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 5cecf17..f595388 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -93,9 +93,9 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): @type hostname: C{str} @param port: alias for C{local_port} @type port: C{int} - @param sshproxy_host: alias for C{remote_host} + @param sshproxy_host: alias for C{hostname} @type sshproxy_host: C{str} - @param sshproxy_port: alias for C{remote_port} + @param sshproxy_port: alias for C{post} @type sshproxy_port: C{int} @param sshproxy_user: alias for C{username} @type sshproxy_user: C{str} @@ -141,6 +141,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): else: self.hostname = sshproxy_host + if sshproxy_port: self.port = sshproxy_port if sshproxy_user: self.username = sshproxy_user if sshproxy_password: password = sshproxy_password if sshproxy_key_filename: key_filename = sshproxy_key_filename diff --git a/x2go/utils.py b/x2go/utils.py index 9dc38c4..189e875 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -200,6 +200,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'iconvfrom': 'client_encoding', 'usesshproxy': 'use_sshproxy', 'sshproxyhost': 'sshproxy_host', + 'sshproxyport': 'sshproxy_port', 'sshproxyuser': 'sshproxy_user', 'sshproxykeyfile': 'sshproxy_key_filename', 'sshproxytunnel': 'sshproxy_tunnel', @@ -319,6 +320,9 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'directrdpsettings', 'rdpclient', 'rdpport', + 'sshproxytype', + 'sshproxysameuser', + 'sshproxysamepass', ] for i in _ignored_options: del _params[i] hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012