From b6a7e3bbb57ecc0f24dc034f39c8dba2c55b0800 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 9 Nov 2011 15:22:54 +0000 Subject: [PATCH] Updated to 0.4.3 release --- sources | 2 +- virt-viewer-0.4.1-sshport1.patch | 19 ---------------- virt-viewer-0.4.1-sshport2.patch | 21 ------------------ virt-viewer-0.4.1-sshport3.patch | 37 -------------------------------- virt-viewer.spec | 19 +++++++--------- 5 files changed, 9 insertions(+), 89 deletions(-) delete mode 100644 virt-viewer-0.4.1-sshport1.patch delete mode 100644 virt-viewer-0.4.1-sshport2.patch delete mode 100644 virt-viewer-0.4.1-sshport3.patch diff --git a/sources b/sources index cffa5b6..c39c76b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cc86ed3fbbe37a56faa6476b2e6dbcd virt-viewer-0.4.1.tar.gz +4fc003cb655aa45b77c9f2ee45ba6d4f virt-viewer-0.4.2.tar.gz diff --git a/virt-viewer-0.4.1-sshport1.patch b/virt-viewer-0.4.1-sshport1.patch deleted file mode 100644 index 945804e..0000000 --- a/virt-viewer-0.4.1-sshport1.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 754011f2bc5696466de5f45c3781c7a0cd961b9a -Author: Daniel P. Berrange -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-0.4.1-sshport2.patch b/virt-viewer-0.4.1-sshport2.patch deleted file mode 100644 index 0c48477..0000000 --- a/virt-viewer-0.4.1-sshport2.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 1c00bc2b9541a553c0f6502dadc61eb56edfa355 -Author: Guido Günther -Date: Fri Aug 12 19:50:22 2011 +0200 - - Don't hardcode ssh port to 0 - - Many thanks to Luca Capello for debugging this. - -diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c -index 71284b6..2ad5710 100644 ---- a/src/virt-viewer-app.c -+++ b/src/virt-viewer-app.c -@@ -1311,7 +1311,7 @@ virt_viewer_app_set_connect_info(VirtViewerApp *self, - priv->transport = g_strdup(transport); - priv->unixsock = g_strdup(unixsock); - priv->user = g_strdup(user); -- priv->port = 0; -+ priv->port = port; - - virt_viewer_app_update_pretty_address(self); - } diff --git a/virt-viewer-0.4.1-sshport3.patch b/virt-viewer-0.4.1-sshport3.patch deleted file mode 100644 index aa4392c..0000000 --- a/virt-viewer-0.4.1-sshport3.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 60145f31a6fb2c7331101ba4ee7d25d08dd7eb48 -Author: Guido Günther -Date: Fri Aug 12 19:50:29 2011 +0200 - - Don't print incorrect port numbers - - The port isn't 22 when we connect to an alternate port given in - .ssh/config. - -diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c -index 2ad5710..c80d52f 100644 ---- a/src/virt-viewer-app.c -+++ b/src/virt-viewer-app.c -@@ -635,6 +635,8 @@ virt_viewer_app_activate(VirtViewerApp *self) - if (priv->transport && - g_strcasecmp(priv->transport, "ssh") == 0 && - !priv->direct) { -+ gchar *p = NULL; -+ - if (priv->gport) { - virt_viewer_app_trace(self, "Opening indirect TCP connection to display at %s:%s\n", - priv->ghost, priv->gport); -@@ -642,8 +644,12 @@ virt_viewer_app_activate(VirtViewerApp *self) - virt_viewer_app_trace(self, "Opening indirect UNIX connection to display at %s\n", - priv->unixsock); - } -- virt_viewer_app_trace(self, "Setting up SSH tunnel via %s@%s:%d\n", -- priv->user, priv->host, priv->port ? priv->port : 22); -+ if (priv->port) -+ p = g_strdup_printf(":%d", priv->port); -+ -+ virt_viewer_app_trace(self, "Setting up SSH tunnel via %s@%s%s\n", -+ priv->user, priv->host, p ? p : ""); -+ g_free(p); - - if ((fd = virt_viewer_app_open_tunnel_ssh(priv->host, priv->port, - priv->user, priv->ghost, diff --git a/virt-viewer.spec b/virt-viewer.spec index 088e829..c41c654 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -20,16 +20,13 @@ %endif Name: virt-viewer -Version: 0.4.1 -Release: 3%{?dist}%{?extra_release} +Version: 0.4.2 +Release: 1%{?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}-sshport1.patch -Patch2: %{name}-%{version}-sshport2.patch -Patch3: %{name}-%{version}-sshport3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients @@ -43,7 +40,7 @@ BuildRequires: libxml2-devel %if %{with_gtk3} BuildRequires: gtk-vnc2-devel >= 0.4.3 %else -BuildRequires: gtk-vnc-devel >= 0.3.8 +BuildRequires: gtk-vnc-devel >= 0.4.3 %endif %if %{with_spice} %if %{with_gtk3} @@ -84,9 +81,6 @@ browsers. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build @@ -97,9 +91,9 @@ browsers. %endif %if %{with_spice} -%define spice_arg --enable-spice +%define spice_arg --with-spice-gtk %else -%define spice_arg --disable-spice +%define spice_arg --without-spice-gtk %endif %if %{with_gtk3} @@ -142,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Nov 9 2011 Daniel P. Berrange - 0.4.2-1 +- Update to 0.4.2 release + * Sun Aug 14 2011 Daniel P. Berrange - 0.4.1-3 - More ssh tunnelling port fixes