Date: Friday, April 16, 2010 @ 16:38:27 Author: jgc Revision: 77663 upgpkg: vinagre 2.30.0-2 Add upstream patch to fix FS#18996
Added: vinagre/trunk/vinagre-ssh-connect.patch Modified: vinagre/trunk/PKGBUILD ---------------------------+ PKGBUILD | 9 ++++-- vinagre-ssh-connect.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-04-16 20:26:30 UTC (rev 77662) +++ PKGBUILD 2010-04-16 20:38:27 UTC (rev 77663) @@ -5,7 +5,7 @@ pkgname=vinagre pkgver=2.30.0 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') license=('GPL') @@ -16,11 +16,14 @@ optdepends=('gnome-panel') groups=('gnome-extra') options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/vinagre/2.30/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('776de79919d7a4420e5fa3575111f9be86f4503d05eab9217e258985fad34825') +source=(http://ftp.gnome.org/pub/GNOME/sources/vinagre/2.30/${pkgname}-${pkgver}.tar.bz2 + vinagre-ssh-connect.patch) +sha256sums=('776de79919d7a4420e5fa3575111f9be86f4503d05eab9217e258985fad34825' + 'a4227c1c18bdbb7f0c77b73f70dee273adbcb69c435e953c4c564eb74c45728c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/vinagre-ssh-connect.patch" || return 1 ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ --libexecdir=/usr/lib/vinagre || return 1 make || return 1 Added: vinagre-ssh-connect.patch =================================================================== --- vinagre-ssh-connect.patch (rev 0) +++ vinagre-ssh-connect.patch 2010-04-16 20:38:27 UTC (rev 77663) @@ -0,0 +1,65 @@ +From 6b1c01f15e5a698fc5f7e8f62e230adab94618bb Mon Sep 17 00:00:00 2001 +From: Jonh Wendell <jwend...@gnome.org> +Date: Wed, 14 Apr 2010 13:17:42 +0000 +Subject: Make ssh_vinagre_connect() symbol visible in .so. + +This fixes a crash when using SSH tunnel in VNC plugin. + +Closes Ubuntu #516847. +--- +diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c +index 4f6f3bf..b2d224b 100644 +--- a/vinagre/vinagre-main.c ++++ b/vinagre/vinagre-main.c +@@ -40,6 +40,7 @@ + #include "vinagre-plugin-info.h" + #include "vinagre-plugin-info-priv.h" + #include "vinagre-debug.h" ++#include "vinagre-ssh.h" + + #ifdef HAVE_TELEPATHY + #include "vinagre-tubes-manager.h" +@@ -223,6 +224,9 @@ int main (int argc, char **argv) { + vinagre_tubes_manager = vinagre_tubes_manager_new (window); + #endif + ++ /* fake call, just to ensure this symbol will be present at vinagre.so */ ++ vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL); ++ + gtk_main (); + + #ifdef HAVE_TELEPATHY +diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c +index e26c63f..0d59ed9 100644 +--- a/vinagre/vinagre-ssh.c ++++ b/vinagre/vinagre-ssh.c +@@ -664,7 +664,8 @@ vinagre_ssh_connect (GtkWindow *parent, + GInputStream *is; + GDataInputStream *error_stream; + +- g_return_val_if_fail (hostname != NULL, FALSE); ++ if (!hostname) ++ return FALSE; + + if (vendor == SSH_VENDOR_INVALID) + vendor = get_ssh_client_vendor (); +diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c +index 03181f1..0b00045 100644 +--- a/vinagre/vinagre-utils.c ++++ b/vinagre/vinagre-utils.c +@@ -607,13 +607,6 @@ vinagre_utils_ask_question (GtkWindow *parent, + return TRUE; + } + +-#include "vinagre-ssh.h" +-static void +-shit (void) +-{ +- vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL); +-} +- + typedef struct { + GtkWidget *uname, *pw, *button; + } ControlOKButton; +-- +cgit v0.8.3.1