x2go-commits

x2go-commits@lists.x2go.org

1 participants
37901 discussions

[x2goclient] 80/94: pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory.
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 3fbced2fc6147ebe6d8e2ac216689330723cfb0c Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sun Nov 11 11:27:38 2018 +0100 pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory. Not great, as explained in pyhoca-gui, but necessary to make packaging easier. --- debian/changelog | 2 ++ pyhoca-cli.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d1e459f..3578f841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium out for now to let builds fail and get a file list. - Pick the files correctly. - Also pick files matching PyHoca_CLI* in the site-lib directory. + - Fully own %{python2_sitelib}/pyhoca directory. Not great, as explained + in pyhoca-gui, but necessary to make packaging easier. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index c83680da..421b0041 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -96,10 +96,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %doc COPYING README TODO %{_bindir}/%{name} %if 0%{?el6} || 0%{?el7} -%{python2_sitelib}/pyhoca/cli/ +%{python2_sitelib}/pyhoca/ %{python2_sitelib}/PyHoca_CLI* %else -%{python3_sitelib}/pyhoca/cli/ +%{python3_sitelib}/pyhoca/ %{python3_sitelib}/PyHoca_CLI* %if 0%{?suse_version} %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 79/94: Fix failing password-only authentication.
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 e86021e4a2a032e31b9fd8d65c894c8989856d30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 10 16:05:59 2018 +0000 Fix failing password-only authentication. --- debian/changelog | 2 +- pyhoca/cli/frontend.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 790599b4..2d1e459f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * New upstream release (0.6.0.1): - - Continue development... + - Fix failing password-only authentication. * debian/control: + Set Section: from "python" to "x11". More appropriate. diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 01732cfc..76ad7624 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -547,6 +547,8 @@ class PyHocaCLI(x2go.X2GoClient): force_password_auth = True password = None passphrase = None + _auth_count += 1 + continue except x2go.AuthenticationException as e: @@ -594,6 +596,7 @@ class PyHocaCLI(x2go.X2GoClient): # this error gets thrown when the passphrase for unlocking the SSH privkey was wrong if not force_password_auth and passphrase_unlock_counter >= 1: + if passphrase is not None and passphrase != '': self._pyhoca_logger('wrong SSH key passphrase (%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, ) self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, ) @@ -604,18 +607,22 @@ class PyHocaCLI(x2go.X2GoClient): continue if not force_password_auth and _auth_count >= 1: + self._pyhoca_logger('unlocking of SSH key failed, proceeding with interactive login', loglevel=x2go.loglevel_WARN, ) force_password_auth = True password = None passphrase = None + _auth_count += 1 + continue - elif not str(e).lower().startswith('not a valid dsa private key file') or \ - not str(e).lower().startswith('not a valid rsa private key file') or \ - not str(e).lower().startswith('incompatible ssh peer (no acceptable kex algorithm)') or \ + elif not str(e).lower().startswith('not a valid dsa private key file') and \ + not str(e).lower().startswith('not a valid rsa private key file') and \ + not str(e).lower().startswith('incompatible ssh peer (no acceptable kex algorithm)') and \ not str(e).lower().startswith('no authentication methods available') \ : if force_password_auth: + self._pyhoca_logger('password based login for ,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, ) else: self._pyhoca_logger('passwordless login for ,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, ) @@ -630,6 +637,7 @@ class PyHocaCLI(x2go.X2GoClient): force_password_auth = True password = None passphrase = None + _auth_count += 1 if not connected and _auth_count <= 0: if self.auth_attempts >= 2: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 76/94: pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise.
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 4b69e6117d11f2cd36fe5d4dfbfeed67e7d459d3 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 14:30:35 2018 +0100 pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise. Comment out for now to let builds fail and get a file list. --- debian/changelog | 2 ++ pyhoca-cli.spec | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a7998db..80f5d759 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Either EL6 or EL7, not both at the same time. - Use modern python build and install macros. - Build-Require python-rpm-macros for OpenSuSE builds. + - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment + out for now to let builds fail and get a file list. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 050dedfe..57d08cbd 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -95,7 +95,16 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %defattr(-,root,root) %doc COPYING README TODO %{_bindir}/%{name} -%{python3_sitelib}/* +%if 0%{?el6} || 0%{?el7} +#%%{python2_sitelib}/ +%else +#%%{python3_sitelib}/* +%if 0%{?suse_version} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +%pycache_only %{python3_sitelib}/__pycache__ +%endif +%endif +%endif %{_mandir}/man1/%{name}.1* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 78/94: pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib directory.
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 14eba70f4093a43e540e96a0c67d42305469607e Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 17:05:08 2018 +0100 pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib directory. --- debian/changelog | 1 + pyhoca-cli.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 211776fe..790599b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment out for now to let builds fail and get a file list. - Pick the files correctly. + - Also pick files matching PyHoca_CLI* in the site-lib directory. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 3afbc59c..c83680da 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -97,10 +97,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %{_bindir}/%{name} %if 0%{?el6} || 0%{?el7} %{python2_sitelib}/pyhoca/cli/ -%{python2_sitelib}/PyHoca_CLI*/ +%{python2_sitelib}/PyHoca_CLI* %else %{python3_sitelib}/pyhoca/cli/ -%{python3_sitelib}/PyHoca_CLI*/ +%{python3_sitelib}/PyHoca_CLI* %if 0%{?suse_version} %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) %pycache_only %{python3_sitelib}/__pycache__ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 77/94: pyhoca-cli.spec: pick the files correctly.
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 1bb1d2a3da3e66b705423824970a06f2b2e85f15 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 15:14:59 2018 +0100 pyhoca-cli.spec: pick the files correctly. --- debian/changelog | 1 + pyhoca-cli.spec | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80f5d759..211776fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Build-Require python-rpm-macros for OpenSuSE builds. - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment out for now to let builds fail and get a file list. + - Pick the files correctly. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 57d08cbd..3afbc59c 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -96,9 +96,11 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %doc COPYING README TODO %{_bindir}/%{name} %if 0%{?el6} || 0%{?el7} -#%%{python2_sitelib}/ +%{python2_sitelib}/pyhoca/cli/ +%{python2_sitelib}/PyHoca_CLI*/ %else -#%%{python3_sitelib}/* +%{python3_sitelib}/pyhoca/cli/ +%{python3_sitelib}/PyHoca_CLI*/ %if 0%{?suse_version} %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) %pycache_only %{python3_sitelib}/__pycache__ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 73/94: pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds.
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 6ebecc40fd9c0eb38e8063e056e6bc035be898c2 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 13:39:46 2018 +0100 pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds. --- debian/changelog | 1 + pyhoca-cli.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 087f1d21..28d16cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - It's still %endif, not %fi. - Either EL6 or EL7, not both at the same time. - Use modern python build and install macros. + - Build-Require python-rpm-macros for OpenSuSE builds. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index f35650e4..050dedfe 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -26,6 +26,9 @@ Requires: python3-x2go >= 0.6.0.1 %endif %if 0%{?suse_version} BuildRequires: fdupes +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +BuildRequires: python-rpm-macros +%endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 74/94: setup.py: we actually also need the version information, so import it.
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 0d50466707deb8336ac8cd483cd69e7f65927eeb Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 13:47:11 2018 +0100 setup.py: we actually also need the version information, so import it. --- debian/changelog | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28d16cbd..764f8729 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (0.6.0.1): - setup.py: backport Python 2 support via io.open. + - setup.py: we actually also need the version information, so import it. * pyhoca-cli.spec: - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). diff --git a/setup.py b/setup.py index 878e68b6..05507ff1 100755 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. import os +from sys import version_info from setuptools import setup -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 75/94: setup.py: need to import the sys module, not just version_info into global namespace.
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 b5d0ec9c0de36ee76fc38f7b38626b12da103e8d Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 13:54:55 2018 +0100 setup.py: need to import the sys module, not just version_info into global namespace. --- debian/changelog | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 764f8729..8a7998db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.6.0.1): - setup.py: backport Python 2 support via io.open. - setup.py: we actually also need the version information, so import it. + - setup.py: need to import the sys module, not just version_info into + global namespace. * pyhoca-cli.spec: - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). diff --git a/setup.py b/setup.py index 05507ff1..b30d8e6e 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. import os -from sys import version_info +import sys from setuptools import setup -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 71/94: pyhoca-cli.spec: use modern python build and install macros.
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 b050d3ed1a3a93a40214c4037fbbfefcd66cd413 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 13:16:47 2018 +0100 pyhoca-cli.spec: use modern python build and install macros. --- debian/changelog | 1 + pyhoca-cli.spec | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 68a85d4a..4f98e359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium dependency (part of stdlib). - It's still %endif, not %fi. - Either EL6 or EL7, not both at the same time. + - Use modern python build and install macros. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index e28e2257..f35650e4 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -52,13 +52,33 @@ on desktops and thin clients. %build %if 0%{?el6} || 0%{?el7} # Make sure we stay on Python 2 on CentOS for the time being. Maybe not for EL8. -%{__python2} setup.py build +%{py2_build} %else -%{__python3} setup.py build +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python3 setup.py build +%else +%{python3_build} +%endif +%else +%{py3_build} +%endif %endif %install -%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} +%if 0%{?el6} || 0%{?el7} +%{py2_install} +%else +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python3 setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} +%else +%{python3_install} -O1 --skip-build +%endif +%else +%{py3_install} +%endif +%endif mkdir -p %{buildroot}/%{_bindir}/ cp -p %{name} %{buildroot}/%{_bindir}/ mkdir -p %{buildroot}/%{_mandir}/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 72/94: setup.py: backport Python 2 support via io.open.
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 4f98092b4f933d4facfe26e1be9f5e19be6b256b Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat Nov 10 13:35:57 2018 +0100 setup.py: backport Python 2 support via io.open. --- debian/changelog | 1 + setup.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4f98e359..087f1d21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (0.6.0.1): + - setup.py: backport Python 2 support via io.open. * pyhoca-cli.spec: - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). diff --git a/setup.py b/setup.py index 6376de78..878e68b6 100755 --- a/setup.py +++ b/setup.py @@ -22,6 +22,12 @@ import os from setuptools import setup +# Specifying file encoding at open time only works with Python 3 directly, +# but Python >2.6 has some support for this in the IO module. +# It's said to be slow, but we can live with that. +if sys.version_info[0] < 3: + from io import open + __VERSION__ = "0.0.0.0" for line in open(os.path.join('pyhoca', 'cli', '__init__.py'),encoding='utf-8').readlines(): if (line.startswith('__VERSION__')): -- 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