[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.4.1-3-4-g1f94d54
Laurent Léonard
laurent at open-minds.org
Thu Nov 10 08:07:05 UTC 2011
The following commit has been merged in the master branch:
commit c29030319b87fc7d2b9f52342e8b76b343271df9
Author: Laurent Léonard <laurent at open-minds.org>
Date: Thu Nov 10 08:46:23 2011 +0100
Drop patches
0001-Really-fix-using-alternate-ssh-ports.patch - applied upstream
http://git.fedorahosted.org/git/?p=virt-viewer.git;a=commitdiff;h=754011f2bc5696466de5f45c3781c7a0cd961b9a
http://git.fedorahosted.org/git/?p=virt-viewer.git;a=commitdiff;h=1c00bc2b9541a553c0f6502dadc61eb56edfa355
http://git.fedorahosted.org/git/?p=virt-viewer.git;a=commitdiff;h=60145f31a6fb2c7331101ba4ee7d25d08dd7eb48
0002-ff-callbacks-must-be-invoked-from-a-clean-stack.patch - applied upstream http://git.fedorahosted.org/git/?p=virt-viewer.git;a=commitdiff;h=f3714e36625168fbd06b63e4b9979e7ea8258712
diff --git a/debian/patches/0001-Really-fix-using-alternate-ssh-ports.patch b/debian/patches/0001-Really-fix-using-alternate-ssh-ports.patch
deleted file mode 100644
index 431f4b5..0000000
--- a/debian/patches/0001-Really-fix-using-alternate-ssh-ports.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 12 Aug 2011 19:05:11 +0200
-Subject: Really fix using alternate ssh ports
-
-Many,many thanks to Luca Capello for debugging this.
-
-Closes: #637548
----
- src/virt-viewer-app.c | 18 ++++++++++++++----
- 1 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
-index 918e788..6d3d9be 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;
-@@ -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,14 +644,22 @@ 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%s\n",
-+ priv->user ? priv->user : "",
-+ 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,
- priv->gport, priv->unixsock)) < 0)
- return -1;
- } else if (priv->unixsock) {
-+
-+
- virt_viewer_app_trace(self, "Opening direct UNIX connection to display at %s",
- priv->unixsock);
- if ((fd = virt_viewer_app_open_unix_sock(priv->unixsock)) < 0)
-@@ -1311,7 +1321,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/debian/patches/0002-ff-callbacks-must-be-invoked-from-a-clean-stack.patch b/debian/patches/0002-ff-callbacks-must-be-invoked-from-a-clean-stack.patch
deleted file mode 100644
index d5f83a2..0000000
--- a/debian/patches/0002-ff-callbacks-must-be-invoked-from-a-clean-stack.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 16 Aug 2011 08:36:13 -0700
-Subject: ff callbacks must be invoked from a clean stack
-
-If 'ff' callbacks are invoked directly from the remove
-callback they will likely deadlock in libvirt. They must
-be invoked from a clean stack, so switch to using a
-glib idle callback.
----
- src/virt-viewer-events.c | 47 ++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 39 insertions(+), 8 deletions(-)
-
-diff --git a/src/virt-viewer-events.c b/src/virt-viewer-events.c
-index 108f97d..87df739 100644
---- a/src/virt-viewer-events.c
-+++ b/src/virt-viewer-events.c
-@@ -160,6 +160,23 @@ virt_viewer_events_update_handle(int watch,
- }
- }
-
-+
-+static gboolean
-+virt_viewer_events_cleanup_handle(gpointer user_data)
-+{
-+ struct virt_viewer_events_handle *data = user_data;
-+
-+ DEBUG_LOG("Cleanup of handle %p", data);
-+ g_return_val_if_fail(data != NULL, FALSE);
-+
-+ if (data->ff)
-+ (data->ff)(data->opaque);
-+
-+ free(data);
-+ return FALSE;
-+}
-+
-+
- static int
- virt_viewer_events_remove_handle(int watch)
- {
-@@ -172,13 +189,14 @@ virt_viewer_events_remove_handle(int watch)
-
- DEBUG_LOG("Remove handle %d %d", watch, data->fd);
-
-+ if (!data->source)
-+ return -1;
-+
- g_source_remove(data->source);
- data->source = 0;
- data->events = 0;
-- if (data->ff)
-- (data->ff)(data->opaque);
-- free(data);
-
-+ g_idle_add(virt_viewer_events_cleanup_handle, data);
- return 0;
- }
-
-@@ -279,6 +297,23 @@ virt_viewer_events_update_timeout(int timer,
- }
- }
-
-+
-+static gboolean
-+virt_viewer_events_cleanup_timeout(gpointer user_data)
-+{
-+ struct virt_viewer_events_timeout *data = user_data;
-+
-+ DEBUG_LOG("Cleanup of timeout %p", data);
-+ g_return_val_if_fail(data != NULL, FALSE);
-+
-+ if (data->ff)
-+ (data->ff)(data->opaque);
-+
-+ free(data);
-+ return FALSE;
-+}
-+
-+
- static int
- virt_viewer_events_remove_timeout(int timer)
- {
-@@ -297,11 +332,7 @@ virt_viewer_events_remove_timeout(int timer)
- g_source_remove(data->source);
- data->source = 0;
-
-- if (data->ff)
-- (data->ff)(data->opaque);
--
-- free(data);
--
-+ g_idle_add(virt_viewer_events_cleanup_timeout, data);
- return 0;
- }
-
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index dcd2d88..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Really-fix-using-alternate-ssh-ports.patch
-0002-ff-callbacks-must-be-invoked-from-a-clean-stack.patch
--
VirtViewer Debian packaging
More information about the Pkg-libvirt-commits
mailing list