[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.4.0-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 2376c067bd80cf68c425d51982deece3e6129e1a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jul 23 18:19:46 2011 +0200

    New patch 0001-Don-t-hardcode-sshport.patch
    
    Don't hardcode sshport. This unbreaks using different ports via
    .ssh/config.

diff --git a/debian/patches/0001-Don-t-hardcode-sshport.patch b/debian/patches/0001-Don-t-hardcode-sshport.patch
new file mode 100644
index 0000000..0ef1008
--- /dev/null
+++ b/debian/patches/0001-Don-t-hardcode-sshport.patch
@@ -0,0 +1,34 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 23 Jul 2011 18:01:29 +0200
+Subject: Don't hardcode sshport
+
+this unbreaks using different ports via .ssh/config
+---
+ src/virt-viewer.c |   12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/virt-viewer.c b/src/virt-viewer.c
+index 5321580..9622446 100644
+--- a/src/virt-viewer.c
++++ b/src/virt-viewer.c
+@@ -896,14 +896,12 @@ virt_viewer_open_tunnel_ssh(const char *sshhost,
+ 	char portstr[50];
+ 	int n = 0;
+ 
+-	if (!sshport)
+-		sshport = 22;
+-
+-	sprintf(portstr, "%d", sshport);
+-
+ 	cmd[n++] = "ssh";
+-	cmd[n++] = "-p";
+-	cmd[n++] = portstr;
++	if (!sshport) {
++		cmd[n++] = "-p";
++		sprintf(portstr, "%d", sshport);
++		cmd[n++] = portstr;
++	}
+ 	if (sshuser) {
+ 		cmd[n++] = "-l";
+ 		cmd[n++] = sshuser;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cffd5ef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-hardcode-sshport.patch

-- 
VirtViewer Debian packaging