From 5279228ba72afd4250b2947af0957954a83f8419 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 3 Nov 2015 11:38:21 +0100 Subject: [PATCH] vinagre: add patch to fix connection issues when using explicit port fix is committed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=757513 --- .../patches/fix-ipv6-interpretation.patch | 29 +++++++++++++++++++ srcpkgs/vinagre/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch diff --git a/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch b/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch new file mode 100644 index 0000000000..db930ad347 --- /dev/null +++ b/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch @@ -0,0 +1,29 @@ +diff -upr vinagre-3.18.1.orig/vinagre/vinagre-connection.c vinagre-3.18.1/vinagre/vinagre-connection.c +--- vinagre/vinagre-connection.c.orig 2015-09-25 13:35:42.000000000 +0200 ++++ vinagre/vinagre-connection.c 2015-11-03 11:26:15.058608241 +0100 +@@ -582,7 +582,7 @@ vinagre_connection_split_string (const g + gchar **server, **url; + gint lport; + gchar *lhost; +- gboolean is_ipv6; ++ gchar *tmphost; + gchar ipv6_host[255] = {0,}; + VinagreProtocol *ext; + +@@ -619,10 +619,12 @@ vinagre_connection_split_string (const g + return FALSE; + } + +- is_ipv6 = g_strstr_len (lhost, -1, ":") != NULL; +- +- if (is_ipv6) +- lhost = g_strconcat ("[", lhost, "]", NULL); ++ /* Assume an hostname contains more than 1 colons as an ipv6 address */ ++ if(lhost[0] != '[') { ++ tmphost = g_strstr_len (lhost, -1, ":"); ++ if(tmphost && g_strstr_len (tmphost+1, -1, ":") != NULL) ++ lhost = g_strconcat ("[", lhost, "]", NULL); ++ } + + if (lhost[0] == '[') + { diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template index 448562fe39..27f44ccdc3 100644 --- a/srcpkgs/vinagre/template +++ b/srcpkgs/vinagre/template @@ -1,7 +1,7 @@ # Template file for 'vinagre' pkgname=vinagre version=3.18.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils"