[virt-viewer/f16] Fix ssh tunnelling

[Daniel P. Berrange]

commit 3d3e6fee9885b4012caa135ad803cba0e8ea2a95
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Fri Aug 12 15:44:16 2011 +0100

    Fix ssh tunnelling

 virt-viewer-0.4.1-sshport.patch |   19 +++++++++++++++++++
 virt-viewer.spec                |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/virt-viewer-0.4.1-sshport.patch b/virt-viewer-0.4.1-sshport.patch
new file mode 100644
index 0000000..945804e
--- /dev/null
+++ b/virt-viewer-0.4.1-sshport.patch
@@ -0,0 +1,19 @@
+commit 754011f2bc5696466de5f45c3781c7a0cd961b9a
+Author: Daniel P. Berrange <berrange at redhat.com>
+Date:   Fri Aug 12 15:37:51 2011 +0100
+
+    Fix inverted sshport test that broke SSH tunnelling
+
+diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
+index cf7811e..71284b6 100644
+--- a/src/virt-viewer-app.c
++++ b/src/virt-viewer-app.c
+@@ -319,7 +319,7 @@ virt_viewer_app_open_tunnel_ssh(const char *sshhost,
+ 	int n = 0;
+ 
+ 	cmd[n++] = "ssh";
+-	if (!sshport) {
++	if (sshport) {
+ 		cmd[n++] = "-p";
+ 		sprintf(portstr, "%d", sshport);
+ 		cmd[n++] = portstr;
diff --git a/virt-viewer.spec b/virt-viewer.spec
index e0dd965..643aa9b 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -21,12 +21,13 @@
 
 Name: virt-viewer
 Version: 0.4.1
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 Summary: Virtual Machine Viewer
 Group: Applications/System
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-sshport.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: openssh-clients
 
@@ -81,6 +82,7 @@ browsers.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -136,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 12 2011 Daniel P. Berrange <berrange at redhat.com> - 0.4.1-2
+- Fix ssh tunnelling
+
 * Thu Aug  4 2011 Daniel P. Berrange <berrange at redhat.com> - 0.4.1-1
 - Update to 0.4.1 release