Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2014-06-16 21:37:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2014-03-28 16:29:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2014-06-16 21:37:22.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 10 10:50:17 MDT 2014 - carn...@suse.com + +- Upstream bug fix + 5396d3dd-dont-connect-to-localhost-when-using-direct.patch + +------------------------------------------------------------------- +Wed Jun 4 09:02:02 MDT 2014 - carn...@suse.com + +- Upstream bug fix + 538df41a-set-freed-variables-to-null.patch + +------------------------------------------------------------------- New: ---- 538df41a-set-freed-variables-to-null.patch 5396d3dd-dont-connect-to-localhost-when-using-direct.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.k9r6yf/_old 2014-06-16 21:37:23.000000000 +0200 +++ /var/tmp/diff_new_pack.k9r6yf/_new 2014-06-16 21:37:23.000000000 +0200 @@ -33,6 +33,8 @@ Patch7: 53219d1a-silence-message-about-missing-config-file.patch Patch8: 5322b75b-dont-show-quit-dialog-in-kiosk-mode.patch Patch9: 5322b929-fix-building-with-older-spice-gtk.patch +Patch10: 538df41a-set-freed-variables-to-null.patch +Patch11: 5396d3dd-dont-connect-to-localhost-when-using-direct.patch Patch20: netcat.patch Patch21: windows-keycombo.patch Patch22: netware-keycombo.patch @@ -80,6 +82,8 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 @@ -92,7 +96,7 @@ %if %suse_version >= 1230 %configure --with-spice-gtk --with-gtk=2.0 --disable-update-mimedb %else -%configure GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-1.0 GTKVNC_LIBS=-lgtk-vnc-1.0 +%configure --with-gtk=2.0 --disable-update-mimedb GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-1.0 GTKVNC_LIBS=-lgtk-vnc-1.0 %endif make %{?_smp_mflags} ++++++ 538df41a-set-freed-variables-to-null.patch ++++++ Subject: Set freed variables to NULL in remote_viewer_start() From: Jonathon Jongsma jjong...@redhat.com Tue Jun 3 11:13:14 2014 -0500 Date: Tue Jun 3 11:13:14 2014 -0500: Git: e23f6fa4c4d6d4a9adb05cf10086c4dd85b783cf Coverity warns that 'type' can sometimes be used or free after already having been freed. This can happen when open_recent_dialog is true and we jump back up to the retry_dialog label. To prevent this, make sure the freed variables are set to NULL after freeing. Index: virt-viewer-0.6.0/src/remote-viewer.c =================================================================== --- virt-viewer-0.6.0.orig/src/remote-viewer.c +++ virt-viewer-0.6.0/src/remote-viewer.c @@ -1043,7 +1043,9 @@ cleanup: g_clear_object(&file); g_clear_object(&vvfile); g_free(guri); + guri = NULL; g_free(type); + type = NULL; if (!ret && priv->open_recent_dialog) { goto retry_dialog; ++++++ 5396d3dd-dont-connect-to-localhost-when-using-direct.patch ++++++ Subject: Don't connect to localhost when using --direct From: Christophe Fergeau cferg...@redhat.com Thu Apr 3 14:06:22 2014 +0200 Date: Tue Jun 10 11:46:05 2014 +0200: Git: e214d6b1d5f3f8b526ebc4f97045d29c1819d0b2 Trying to connect to a remote virtual machine using virt-viewer -c qemu+ssh://example.com/system --direct $vm_name will currently fail with an error message saying it's not possible to localhost. This happens with VMs which listen on a wildcard address (eg '0.0.0.0'). This was introduced by commit 74b1b62 which changes the host to connect to to 'localhost' when trying to connect through ssh to a VM listening on a wildcard address. This is only valid when using a ssh tunnel, and should not be done with --direct. The fallback code which uses the hostname from the libvirt URI is what makes the most sense in this situation (wildcard listen address + --direct). This commit introduces a virt_viewer_app_get_direct() so that this can be implemented. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1079211 Index: virt-viewer-0.6.0/src/virt-viewer-app.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-app.c +++ virt-viewer-0.6.0/src/virt-viewer-app.c @@ -1835,6 +1835,13 @@ virt_viewer_app_set_direct(VirtViewerApp self->priv->direct = direct; } +gboolean virt_viewer_app_get_direct(VirtViewerApp *self) +{ + g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), FALSE); + + return self->priv->direct; +} + void virt_viewer_app_clear_hotkeys(VirtViewerApp *self) { Index: virt-viewer-0.6.0/src/virt-viewer-app.h =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer-app.h +++ virt-viewer-0.6.0/src/virt-viewer-app.h @@ -75,6 +75,7 @@ gboolean virt_viewer_app_activate(VirtVi gboolean virt_viewer_app_initial_connect(VirtViewerApp *self, GError **error); void virt_viewer_app_start_reconnect_poll(VirtViewerApp *self); void virt_viewer_app_set_zoom_level(VirtViewerApp *self, gint zoom_level); +gboolean virt_viewer_app_get_direct(VirtViewerApp *self); void virt_viewer_app_set_direct(VirtViewerApp *self, gboolean direct); void virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys); void virt_viewer_app_set_attach(VirtViewerApp *self, gboolean attach); Index: virt-viewer-0.6.0/src/virt-viewer.c =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer.c +++ virt-viewer-0.6.0/src/virt-viewer.c @@ -365,7 +365,8 @@ virt_viewer_extract_connect_info(VirtVie */ if (virt_viewer_replace_host(ghost)) { gchar *replacement_host = NULL; - if (g_strcmp0(transport, "ssh") == 0) { + if ((g_strcmp0(transport, "ssh") == 0) + && !virt_viewer_app_get_direct(app)) { replacement_host = g_strdup("localhost"); } else { replacement_host = g_strdup(host); ++++++ report-error.patch ++++++ --- /var/tmp/diff_new_pack.k9r6yf/_old 2014-06-16 21:37:23.000000000 +0200 +++ /var/tmp/diff_new_pack.k9r6yf/_new 2014-06-16 21:37:23.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-viewer-0.6.0.orig/src/virt-viewer.c +++ virt-viewer-0.6.0/src/virt-viewer.c -@@ -551,6 +551,7 @@ virt_viewer_initial_connect(VirtViewerAp +@@ -552,6 +552,7 @@ virt_viewer_initial_connect(VirtViewerAp } else { virt_viewer_app_simple_message_dialog(app, _("Cannot find guest domain %s"), priv->domkey); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org