x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

python-x2go.git - build-baikal (branch) updated: 0.4.0.4-2-g501a5bd
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-baikal has been updated via 501a5bd5efc4f91ae8f5d27148cd587ba858b06b (commit) from 7c131c82ddb09a70600b6b2e0b08f09fbf540194 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2go/_paramiko.py | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fe3c4aa..76b4db6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.5): + - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored + in hostname-only format to the known_hosts file. Fixes redundant requests + for confirming the remote host's fingerprint if port 22 is used. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index dd83bd0..a7663f3 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -23,6 +23,8 @@ Monkey Patch and feature map for Python Paramiko """ import paramiko +import re +from paramiko.config import SSH_PORT import platform from utils import compare_versions @@ -117,6 +119,11 @@ def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True): @type key: L{PKey} """ + # IPv4 and IPv6 addresses using the SSH default port need to be stripped off the port number + if re.match('^\[.*\]\:'+str(SSH_PORT)+'$', hostname): + # so stripping off the port and the square brackets here... + hostname = hostname.split(':')[-2].lstrip('[').rstrip(']') + for e in self._entries: if (hostname in e.hostnames) and (e.key.get_name() == keytype): e.key = key 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

buildscripts.git - master (branch) updated: 88e9aff58cc70500493798fd9223287ce6ae73e0
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via 88e9aff58cc70500493798fd9223287ce6ae73e0 (commit) from f4f2ddf5361259bb3e91d6b33db32ad8053ceb8b (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 88e9aff58cc70500493798fd9223287ce6ae73e0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 19 14:08:49 2013 +0200 automatically detect bug reports that got fixed with this release ----------------------------------------------------------------------- Summary of changes: bin/x2go-release-announcement | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2go-release-announcement b/bin/x2go-release-announcement index 3e0d782..24e2a40 100755 --- a/bin/x2go-release-announcement +++ b/bin/x2go-release-announcement @@ -37,11 +37,12 @@ New gains of this version of ,,$project'' are: o <gain-1> o <gain-2> o <gain-3> - o Bug closures: #<n>, #<m> (see below) " -dpkg-parsechangelog --offset $offset -c$count | sed -e 's/^Source: /X2Go Component: /' \ +cat debian/changelog | sed -e 's/Fixes:/Closes:/i' | dpkg-parsechangelog --offset $offset -c$count -l- | \ + sed -e 's/Closes:/Fixes these bug report(s):/i' \ + -e 's/^Source: /X2Go Component: /' \ -e 's/-0~x2go[0-9]//' \ -e 's/-0$//' \ -e 's/^Distribution: unstable/Status: RELEASE/' \ hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: f4f2ddf5361259bb3e91d6b33db32ad8053ceb8b
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via f4f2ddf5361259bb3e91d6b33db32ad8053ceb8b (commit) from d114903e52e532fcb1587ceaf5eadbe9d26e45ac (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 f4f2ddf5361259bb3e91d6b33db32ad8053ceb8b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 21 21:35:07 2012 +0200 improve quilt builder, open issue: we force to include orig tarballs in uploads, this fails on uploads with the same upstream version ----------------------------------------------------------------------- Summary of changes: bin/build-package | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index 59da3ea..8545b6b 100755 --- a/bin/build-package +++ b/bin/build-package @@ -199,6 +199,7 @@ build_packages() { SA_OPTION="" # we always build native packages for our repos + SA_OPTION="" test -f debian/source/format && cat debian/source/format | egrep '^3.0.*$quilt$$' >/dev/null && { git fetch origin upstream:upstream UPSTREAM_VERSION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/-.*//' -e 's/^.*://') hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: d114903e52e532fcb1587ceaf5eadbe9d26e45ac
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via d114903e52e532fcb1587ceaf5eadbe9d26e45ac (commit) via 0fe6d2898a908e40d1cde9669ebc450a8792c3b6 (commit) from 984f0ae8ce1212d1b0503e9dbd0c45ddadf90c0d (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 d114903e52e532fcb1587ceaf5eadbe9d26e45ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 19 13:48:49 2013 +0200 build 3.0 (quilt) packages, as well commit 0fe6d2898a908e40d1cde9669ebc450a8792c3b6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 21 21:01:10 2012 +0200 add support quilt format, extracting upstream orig tarballs from git, if possible ----------------------------------------------------------------------- Summary of changes: bin/build-package | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/bin/build-package b/bin/build-package index c510799..59da3ea 100755 --- a/bin/build-package +++ b/bin/build-package @@ -103,13 +103,19 @@ prepare_workspace() { cd "$PROJECT_DIR" && git reset --hard git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT git pull origin $CHECKOUT + git fetch origin upstream:upstream || true + git fetch origin pristine-tar:pristine-tar || true # and again, get the $CHECKOUT refspec in pure state git reset --hard + git clean -df else cd "$(dirname $PROJECT_DIR)" git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git cd "$PROJECT" git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; + git fetch origin upstream:upstream + git fetch origin pristine-tar:pristine-tar || true + git clean -df fi cd "$PROJECT_DIR" @@ -188,10 +194,19 @@ build_packages() { git checkout $CHECKOUT || git checkout master find $PROJECT_DIR/../ -type f -maxdepth 0 -mindepth 0 | grep $PROJECT_*.orig.tar.gz &>/dev/null && cp $PROJECT_DIR/../$PROJECT_*.orig.tar.gz .. GITREV=$(gitrevno) + + # we always build native packages for our repos + SA_OPTION="" + # we always build native packages for our repos test -f debian/source/format && cat debian/source/format | egrep '^3.0.*$quilt$$' >/dev/null && { - echo "3.0 (native)" > debian/source/format - } + git fetch origin upstream:upstream + UPSTREAM_VERSION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/-.*//' -e 's/^.*://') + REVISION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/.*-//') + git archive --prefix=${PROJECT}-${UPSTREAM_VERSION}/ -o ../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz upstream/${UPSTREAM_VERSION} && { + SA_OPTION="--debbuildopts=-sa" + } || echo "3.0 (native)" > debian/source/format + } # for Ubuntu version is the codename of the distribution release VERSION=$l_CODENAME @@ -221,32 +236,32 @@ build_packages() { [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

python-x2go.git - build-main (branch) updated: 0.4.0.4-1-g7c131c8
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via 7c131c82ddb09a70600b6b2e0b08f09fbf540194 (commit) from 349717f7568a66089965fdce13c5344e6e3a7975 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2e521ad..fe3c4aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 + python-x2go (0.4.0.4-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.4): diff --git a/x2go/__init__.py b/x2go/__init__.py index 90896b8..2122729 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -183,7 +183,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.4.0.4' +__VERSION__ = '0.4.0.5' 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 - build-main (branch) updated: 0.4.0.4-5-gc0a3832
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via c0a38324905a2934fd0115627f20914b057273da (commit) from 2fa59c45db1c0d657dfe55ece4ed64c15edf4c0d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/backends/proxy/base.py | 3 --- 1 file changed, 3 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 01b3855..886abc2 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -281,9 +281,6 @@ class X2GoProxyBASE(threading.Thread): _count = 0 _maxwait = 40 while (not self.fw_tunnel.is_active) and (not self.fw_tunnel.failed) and (_count < _maxwait): - print self.fw_tunnel.is_active - print self.fw_tunnel.failed - print _count _count += 1 self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG) gevent.sleep(.5) 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 - build-main (branch) updated: 0.4.0.4-3-ga0f8350
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via a0f8350668c13bc6a7ac9f37535e4f5ae423de4d (commit) from 501a5bd5efc4f91ae8f5d27148cd587ba858b06b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/base.py | 5 ++++- x2go/forward.py | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 76b4db6..8eae08b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored in hostname-only format to the known_hosts file. Fixes redundant requests for confirming the remote host's fingerprint if port 22 is used. + - Improve log message when setting up port forwarding tunnel. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 3e9d11e..01b3855 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -183,7 +183,7 @@ class X2GoProxyBASE(threading.Thread): raise x2go_exceptions.X2GoControlSessionException('The control session has died unexpectedly.') local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port) - self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, + self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, remote_port=self.session_info.graphics_port, ssh_transport=self.ssh_transport, session_instance=self.session_instance, @@ -281,6 +281,9 @@ class X2GoProxyBASE(threading.Thread): _count = 0 _maxwait = 40 while (not self.fw_tunnel.is_active) and (not self.fw_tunnel.failed) and (_count < _maxwait): + print self.fw_tunnel.is_active + print self.fw_tunnel.failed + print _count _count += 1 self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG) gevent.sleep(.5) diff --git a/x2go/forward.py b/x2go/forward.py index e9e776a..3f355d3 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -78,6 +78,7 @@ class X2GoFwServer(StreamServer): self.is_active = False self.failed = False self.keepalive = False + self.listener = listener self.chain_host = remote_host self.chain_port = remote_port self.ssh_transport = ssh_transport @@ -86,7 +87,7 @@ class X2GoFwServer(StreamServer): self.fw_socket = None - StreamServer.__init__(self, listener, self.x2go_forward_tunnel_handle) + StreamServer.__init__(self, self.listener, self.x2go_forward_tunnel_handle) def x2go_forward_tunnel_handle(self, fw_socket, address): """\ @@ -142,8 +143,9 @@ class X2GoFwServer(StreamServer): else: - self.logger('connected! Tunnel open %r -> %r -> %r' % (self.fw_socket.getpeername(), - chan_peername, (self.chain_host, self.chain_port)), + self.logger('connected! Tunnel open %r -> %r (on master connection %r -> %r)' % ( + self.listener, (self.chain_host, self.chain_port), + self.fw_socket.getpeername(), chan_peername), loglevel=log.loglevel_INFO) # once we are here, we can presume the tunnel to be active... @@ -167,6 +169,7 @@ class X2GoFwServer(StreamServer): self.close_socket() except socket.error: pass + raise self.is_active = False self.logger('Tunnel closed from %r' % (chan_peername,), @@ -262,7 +265,6 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022, except socket.error: fw_server.failed = True fw_server.is_active = False - pass return fw_server 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 - build-main (branch) updated: 0.4.0.4-2-g501a5bd
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via 501a5bd5efc4f91ae8f5d27148cd587ba858b06b (commit) from 7c131c82ddb09a70600b6b2e0b08f09fbf540194 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2go/_paramiko.py | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fe3c4aa..76b4db6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.5): + - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored + in hostname-only format to the known_hosts file. Fixes redundant requests + for confirming the remote host's fingerprint if port 22 is used. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index dd83bd0..a7663f3 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -23,6 +23,8 @@ Monkey Patch and feature map for Python Paramiko """ import paramiko +import re +from paramiko.config import SSH_PORT import platform from utils import compare_versions @@ -117,6 +119,11 @@ def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True): @type key: L{PKey} """ + # IPv4 and IPv6 addresses using the SSH default port need to be stripped off the port number + if re.match('^\[.*\]\:'+str(SSH_PORT)+'$', hostname): + # so stripping off the port and the square brackets here... + hostname = hostname.split(':')[-2].lstrip('[').rstrip(']') + for e in self._entries: if (hostname in e.hostnames) and (e.key.get_name() == keytype): e.key = key 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 - build-main (branch) updated: 0.4.0.4-4-g2fa59c4
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via 2fa59c45db1c0d657dfe55ece4ed64c15edf4c0d (commit) from a0f8350668c13bc6a7ac9f37535e4f5ae423de4d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/forward.py | 1 - 1 file changed, 1 deletion(-) The diff of changes is: diff --git a/x2go/forward.py b/x2go/forward.py index 3f355d3..8e63bf1 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -169,7 +169,6 @@ class X2GoFwServer(StreamServer): self.close_socket() except socket.error: pass - raise self.is_active = False self.logger('Tunnel closed from %r' % (chan_peername,), 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 - build-main (branch) updated: 0.4.0.5
by git-admin＠x2go.org 18 Jul '13

18 Jul '13

The branch, build-main has been updated via f64a407ed4f5d6fdcdde689ce7e7697f65905bc6 (commit) from c0a38324905a2934fd0115627f20914b057273da (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8eae08b..c421798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.4.0.5-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.5): - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored @@ -6,7 +6,7 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low for confirming the remote host's fingerprint if port 22 is used. - Improve log message when setting up port forwarding tunnel. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 18 Jul 2013 22:32:11 +0200 python-x2go (0.4.0.4-0~x2go1) unstable; urgency=low 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits