x2go-commits

x2go-commits@lists.x2go.org

1 participants
37901 discussions

[x2goclient] 50/94: debian/changelog: Add closure for #1287.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit bee1402138e91941bbcbf9e0e16034ea7682273d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 09:12:46 2018 +0200 debian/changelog: Add closure for #1287. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f0e152aa..11ecdc90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium * New upstream version (0.5.99.1). - - Port to Python3. + - Port to Python3. (Fixes: #1287). - Add --force-password command line switch to override SSH key detection code. - Add --try-resume cmd line option and feature. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 49/94: Add --forward-sshagent / -A cmdline option for enabling SSH agent forwarding.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit d417c628e0ece776a3c0343110070dadcbee176a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 09:12:18 2018 +0200 Add --forward-sshagent / -A cmdline option for enabling SSH agent forwarding. --- debian/changelog | 7 ++++--- pyhoca-cli | 6 +++++- pyhoca/cli/frontend.py | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c76a862..f0e152aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium +pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium * New upstream version (0.5.99.1). - Port to Python3. @@ -11,6 +11,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium auto-detect the client-side keyboard in the X2Go session just fine. - pyhoca-cli main programme: Check for DISPLAY env var being set and having a usable / expectable value. + - Add --forward-sshagent / -A cmdline option for enabling SSH agent + forwarding. * debian/rules: + Build for Python3, not Python2. + Switch to pybuild DH build system. @@ -25,9 +27,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium + Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days. * debian/{control,compat}: Bump to DH version level 9. - * - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 12 May 2018 20:37:21 +0000 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Sep 2018 09:10:58 +0200 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium diff --git a/pyhoca-cli b/pyhoca-cli index 447969b1..1856777d 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -170,6 +170,9 @@ x2go_options = [ {'args':['--terminate-on-ctrl-c'], 'default': False, 'action': 'store_true', 'help': 'terminate the connected session when pressing CTRL+C (instead of suspending the session)', }, {'args':['--auth-attempts'], 'default': 3, 'help': 'number of authentication attempts before authentication fails (default: 3)', }, ] +ssh_options = [ + {'args':['-A', '--forward-sshagent'], 'default': False, 'action': 'store_true', 'help': 'forward SSH agent authentication socket', }, + ] print_options = [ {'args':['--print-action'], 'default': 'PDFVIEW', 'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2Go print jobs (default: \'PDFVIEW\')', }, {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF viewer command for displaying incoming X2Go print jobs (default: \'%s\'); this option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,}, @@ -250,13 +253,14 @@ Possible values for the --pack NX option are: p_actionopts = p.add_argument_group('client actions') p_debugopts = p.add_argument_group('debug options') p_x2goopts = p.add_argument_group('X2Go options') + p_sshopts = p.add_argument_group('SSH options') p_printopts = p.add_argument_group('X2Go print options') p_brokeropts = p.add_argument_group('X2Go Session Broker client options') p_nxopts = p.add_argument_group('NX options') p_backendopts = p.add_argument_group('Python X2Go backend options (for experts only)') p_compatopts = p.add_argument_group('compatibility options') - for (p_group, opts) in ((p_x2goopts, x2go_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)): + for (p_group, opts) in ((p_x2goopts, x2go_options), (p_sshopts, ssh_options), (p_printopts, print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)): for opt in opts: args = opt['args'] diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 6e54164e..a73dc2f0 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -459,6 +459,7 @@ class PyHocaCLI(x2go.X2GoClient): print_action=self.args.print_action, print_action_args=self.args.print_action_args, share_local_folders=self.args.share_local_folders, + forward_sshagent=self.args.forward_sshagent, cmd=self.args.command) def authenticate(self): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 46/94: update debian/changelog
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 6984ba62a583c6856ace6d963cc20bbc4578cf4a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 15:50:13 2018 +0200 update debian/changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 439dcb53..983689b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium - Add --try-resume cmd line option and feature. - setup.py: Fix version string detection. (Copy+paste flaw...). - Fix duplicate password prompt. Regression fix. + - keyboard handling: Switch to kbd-type auto and kbd-layout null. Should + auto-detect the client-side keyboard in the X2Go session just fine. * debian/rules: + Build for Python3, not Python2. + Switch to pybuild DH build system. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 47/94: pyhoca-cli main programme: Check for DISPLAY env var being set and having a usable / expectable value.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 48793e7f8420ddd902bb61c45fbb1ddf18341b54 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 16 08:45:01 2018 +0000 pyhoca-cli main programme: Check for DISPLAY env var being set and having a usable / expectable value. --- pyhoca-cli | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyhoca-cli b/pyhoca-cli index 34387415..447969b1 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -30,6 +30,7 @@ import x2go import sys import os +import re PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '') PROG_PID = os.getpid() @@ -424,6 +425,12 @@ if __name__ == '__main__': parser, args = parseargs() args.parser = parser + if not os.environ.get('DISPLAY'): + logger('the display environment variable is unset, can\'t go on without a DISPLAY...', x2go.loglevel_ERROR, ) + sys.exit(1) + elif not re.match("^.*:[0-9]+(|\.[0-9]+)$", os.environ.get('DISPLAY')): + logger('the display environment variable\'s value is weird ({val}), can\'t go on with that...'.format(val=os.environ.get('DISPLAY')), x2go.loglevel_ERROR, ) + sys.exit(1) try: # initialize the X2GoClient context and start the connection to the X2Go server -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 48/94: update debian/changelog
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit ac9452623b2afaa04cff93e06daf7b5c3389d0b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 16 08:46:51 2018 +0000 update debian/changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 983689b4..8c76a862 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium - Fix duplicate password prompt. Regression fix. - keyboard handling: Switch to kbd-type auto and kbd-layout null. Should auto-detect the client-side keyboard in the X2Go session just fine. + - pyhoca-cli main programme: Check for DISPLAY env var being set and having + a usable / expectable value. * debian/rules: + Build for Python3, not Python2. + Switch to pybuild DH build system. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 43/94: pyhoca/cli/frontend.py: Fix for previous commit (2).
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit bda4775a1ec550344ec9101a804a5954cbed5538 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 14:54:23 2018 +0200 pyhoca/cli/frontend.py: Fix for previous commit (2). --- pyhoca/cli/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index e7f40012..bd7e9cc2 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient): _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: - if self.args.force_password_auth: + if self.args.force_password: self.args.password = getpass.getpass() self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 44/94: Add --xinerama (or -x) command line option.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 2bc1ab0f4390c21b5f6adb76d13f7a680cd7ede4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 16:28:38 2018 +0200 Add --xinerama (or -x) command line option. --- pyhoca-cli | 1 + pyhoca/cli/frontend.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pyhoca-cli b/pyhoca-cli index 1df4cac5..4c43750a 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -183,6 +183,7 @@ broker_options = [ nx_options = [ {'args':['-g','--geometry'], 'default': '800x600','help': 'screen geometry: \'<width>x<height>\' or \'fullscreen\' (default: \'800x600\')',}, + {'args':['-x','--xinerama'], 'default': False, 'action': 'store_true', 'help': 'enable Xinerama support in remote X2Go session',}, {'args':['-q','--link'], 'default': 'adsl', 'choices': ('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: \'adsl\')',}, {'args':['-t','--session-type'], 'default': 'application', 'choices': ('desktop', 'application'), 'help': 'session type (default: \'application\')', }, {'args':['--pack'], 'default': '16m-jpeg-9', 'help': 'compression methods (see below for possible values)', }, diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index bd7e9cc2..6e54164e 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -435,6 +435,10 @@ class PyHocaCLI(x2go.X2GoClient): else: + xinerama = False + if self.args.xinerama: + xinerama = self.args.xinerama + # setup up the manually configured X2Go session self.x2go_session_hash = self._X2GoClient__register_session(args.server, port=int(self.args.remote_ssh_port), known_hosts=ssh_known_hosts_filename, @@ -444,6 +448,7 @@ class PyHocaCLI(x2go.X2GoClient): profile_name = 'Pyhoca-Client_Session', session_type=self.args.session_type, link=self.args.link, + xinerama=self.args.xinerama, geometry=self.args.geometry, pack=self.args.pack, cache_type='unix-kde', -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 45/94: keyboard handling: Switch to kbd-type auto and kbd-layout null. Should auto-detect the client-side keyboard in the X2Go session just fine.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 4de65701b754dcd981fcc63c5514ac8fdbe2f5af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 15:49:35 2018 +0200 keyboard handling: Switch to kbd-type auto and kbd-layout null. Should auto-detect the client-side keyboard in the X2Go session just fine. --- pyhoca-cli | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 4c43750a..34387415 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -187,8 +187,8 @@ nx_options = [ {'args':['-q','--link'], 'default': 'adsl', 'choices': ('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: \'adsl\')',}, {'args':['-t','--session-type'], 'default': 'application', 'choices': ('desktop', 'application'), 'help': 'session type (default: \'application\')', }, {'args':['--pack'], 'default': '16m-jpeg-9', 'help': 'compression methods (see below for possible values)', }, - {'args':['--kbd-layout'], 'default': 'us', 'help': 'use keyboard layout (default: \'us\')',}, - {'args':['--kbd-type'], 'default': 'pc105/us', 'help': 'set Keyboard type (default: \'pc105/us\')',}, + {'args':['--kbd-type'], 'default': 'auto', 'help': 'set Keyboard type (default: \'auto\', other allowed options: \'pc105/us\', \'pc105/de\', etc.)',}, + {'args':['--kbd-layout'], 'default': 'null', 'help': 'use keyboard layout (default: \'null\', allowed options: \'de\', \'fr\', etc.)',}, ] compat_options = [ {'args':['--port'], 'default': None, 'help': 'compatibility option, synonymous to --remote-ssh-port PORT', }, @@ -395,6 +395,14 @@ Possible values for the --pack NX option are: if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home): a.ssh_privkey = '%s/.ssh/id_dsa' % current_home + # hang around the keyboard chaos... + a.kbd_type = a.kbd_type.lower() + a.kbd_layout = a.kbd_layout.lower() + if a.kbd_layout == 'auto': + a.kbd_type = 'auto' + if a.kbd_type == 'auto': + a.kbd_layout = 'null' + # lightdm remote login magic takes place here if a.from_stdin: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 41/94: Fix duplicate password prompt. Regression fix.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 3a620cc2ec2bf9c54fe71fe7d5ed4af9bb3654b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 14:51:52 2018 +0200 Fix duplicate password prompt. Regression fix. --- debian/changelog | 2 ++ pyhoca/cli/frontend.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eefae437..439dcb53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium code. - Add --try-resume cmd line option and feature. - setup.py: Fix version string detection. (Copy+paste flaw...). + - Fix duplicate password prompt. Regression fix. * debian/rules: + Build for Python3, not Python2. + Switch to pybuild DH build system. @@ -20,6 +21,7 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium + Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days. * debian/{control,compat}: Bump to DH version level 9. + * -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 12 May 2018 20:37:21 +0000 diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 0eca99f5..5ef0d44e 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -462,7 +462,7 @@ class PyHocaCLI(x2go.X2GoClient): """ connected = False - force_password_auth = self.args.force_password + force_password_auth = False _username = self.args.username or self._X2GoClient__get_session_username(self.x2go_session_hash) @@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient): _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: - if force_password_auth: + if self.force_password_auth: self.args.password = getpass.getpass() self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 42/94: pyhoca/cli/frontend.py: Fix for previous commit.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit ca983f4270fa818338f66ea475b15a8d17c9f4e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 14:53:31 2018 +0200 pyhoca/cli/frontend.py: Fix for previous commit. --- pyhoca/cli/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 5ef0d44e..e7f40012 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient): _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: - if self.force_password_auth: + if self.args.force_password_auth: self.args.password = getpass.getpass() self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits