[pkg-remote-commits] [python-x2go] 09/15: Revert "debian/patches: Cherry-pick some recent commits from upstream: 0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch, 0002_x2go-backends-control-plain.py-Handle-password-based.patch, 0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch."
Mike Gabriel
sunweaver at debian.org
Mon Sep 25 12:43:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository python-x2go.
commit 5f94120e94f728515a953da12823b5f97220a546
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Sep 25 14:28:33 2017 +0200
Revert "debian/patches: Cherry-pick some recent commits from upstream: 0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch, 0002_x2go-backends-control-plain.py-Handle-password-based.patch, 0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch."
This reverts commit 11ef99169789de78abb8e226fa25150516b62b97.
---
...ds-control-plain.p-Fix-passphrase-unlocki.patch | 27 ---------------
...ds-control-plain.py-Handle-password-based.patch | 39 ----------------------
...ds-profiles-httpbroker.py-Fix-broker-URL-.patch | 26 ---------------
debian/patches/series | 3 --
4 files changed, 95 deletions(-)
diff --git a/debian/patches/0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch b/debian/patches/0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch
deleted file mode 100644
index 19fc2e3..0000000
--- a/debian/patches/0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fc4c50c2e15a65fb677f2e207bcc4f4ea865b4d0 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date: Sun, 24 Sep 2017 19:22:36 +0200
-Subject: [PATCH 1/3] x2go/backends/control/plain.p: Fix passphrase unlocking
- of private keys.
-
----
- x2go/backends/control/plain.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/x2go/backends/control/plain.py
-+++ b/x2go/backends/control/plain.py
-@@ -991,12 +991,12 @@
- look_for_keys=False)
- elif (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey:
- self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG)
-- paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey,
-+ paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, password=passphrase,
- key_filename=key_filename, timeout=timeout, allow_agent=False,
- look_for_keys=False)
- else:
- self.logger('trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG)
-- paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None,
-+ paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, password=passphrase,
- key_filename=None, timeout=timeout, allow_agent=allow_agent,
- look_for_keys=look_for_keys)
-
diff --git a/debian/patches/0002_x2go-backends-control-plain.py-Handle-password-based.patch b/debian/patches/0002_x2go-backends-control-plain.py-Handle-password-based.patch
deleted file mode 100644
index 06bb932..0000000
--- a/debian/patches/0002_x2go-backends-control-plain.py-Handle-password-based.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 351ab49aabddb32258e431561a586b224b17815f Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date: Sun, 24 Sep 2017 19:56:10 +0200
-Subject: [PATCH 2/3] x2go/backends/control/plain.py: Handle password based
- authentication failures graceful. Uncomment previously commented out code.
-
----
- x2go/backends/control/plain.py | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
---- a/x2go/backends/control/plain.py
-+++ b/x2go/backends/control/plain.py
-@@ -1092,19 +1092,14 @@
- if not password:
- password = "".join([random.choice(string.letters+string.digits) for x in range(1, 20)])
- self.logger('performing SSH password authentication with server', loglevel=log.loglevel_DEBUG)
-- #try:
-- paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password,
-+ try:
-+ paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password,
- timeout=timeout, allow_agent=False, look_for_keys=False)
-- #except paramiko.AuthenticationException, e:
-- # self.close()
-- # if self.sshproxy_session:
-- # self.sshproxy_session.stop_thread()
-- # raise e
-- #except:
-- # self.close()
-- # if self.sshproxy_session:
-- # self.sshproxy_session.stop_thread()
-- # raise
-+ except:
-+ self.close()
-+ if self.sshproxy_session:
-+ self.sshproxy_session.stop_thread()
-+ raise
-
- self.set_missing_host_key_policy(paramiko.RejectPolicy())
-
diff --git a/debian/patches/0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch b/debian/patches/0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch
deleted file mode 100644
index 4ac8fb2..0000000
--- a/debian/patches/0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5aefebf4b3988d35292fd77ff52e2d5ad68b5e01 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date: Mon, 25 Sep 2017 12:43:12 +0200
-Subject: [PATCH 3/3] x2go/backends/profiles/httpbroker.py: Fix broker URL
- assembling when no port is given (i.e. convert None to '' manually).
-
----
- x2go/backends/profiles/httpbroker.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py
-index 7925a5d..694bdc6 100644
---- a/x2go/backends/profiles/httpbroker.py
-+++ b/x2go/backends/profiles/httpbroker.py
-@@ -89,6 +89,8 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles):
- p['path'] = "/{path}".format(**p)
- if p['port'] is not None:
- p['port'] = ":{port}".format(**p)
-+ else:
-+ p['port'] = ''
-
- self.broker_url = "{protocol}://{hostname}{port}{path}".format(**p)
-
---
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 674ace0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001_x2go-backends-control-plain.p-Fix-passphrase-unlocki.patch
-0002_x2go-backends-control-plain.py-Handle-password-based.patch
-0003_x2go-backends-profiles-httpbroker.py-Fix-broker-URL-.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/python-x2go.git
More information about the pkg-remote-commits
mailing list