[Pkg-xfce-commits] r8319 - in /desktop/trunk/exo/debian: changelog patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sat Mar  8 15:44:20 2014
New Revision: 8319

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8319
Log:
* debian/patches:
  - 0001-Fix-exo_str_looks_like_an_uri-bug-10098 added, cherry-picked from
    git master. Fix detection of uri schemes without / like magnet:,
    mailto: or sip: uris.                            closes: #740684, #720377

Added:
    desktop/trunk/exo/debian/patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
    desktop/trunk/exo/debian/patches/series
Modified:
    desktop/trunk/exo/debian/changelog

Modified: desktop/trunk/exo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/debian/changelog?rev=8319&op=diff
==============================================================================
--- desktop/trunk/exo/debian/changelog	(original)
+++ desktop/trunk/exo/debian/changelog	Sat Mar  8 15:44:20 2014
@@ -7,6 +7,12 @@
   * Bump standards-version to 3.9.4
   * debian/rules: Use --disable-silent-rules
   * debian/copyright: Use GFDL-1.1 instead on GFDL
+
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 0001-Fix-exo_str_looks_like_an_uri-bug-10098 added, cherry-picked from
+      git master. Fix detection of uri schemes without / like magnet:,
+      mailto: or sip: uris.                            closes: #740684, #720377
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Sun, 18 Aug 2013 17:57:37 +1000
 

Added: desktop/trunk/exo/debian/patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/debian/patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch?rev=8319&op=file
==============================================================================
--- desktop/trunk/exo/debian/patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch	(added)
+++ desktop/trunk/exo/debian/patches/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch	Sat Mar  8 15:44:20 2014
@@ -0,0 +1,53 @@
+From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at gmail.com>
+Date: Sat, 18 May 2013 22:50:01 -0500
+Subject: [PATCH] Fix exo_str_looks_like_an_uri() (bug #10098).
+
+Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to
+fix a hang in thunar by properly recognizing that 'http:' is not an URI,
+however, while doing so, it broke proper URIs like 'magnet:foo'.
+
+As the RFC clearly states:
+
+   The following are two example URIs and their component parts:
+
+         foo://example.com:8042/over/there?name=ferret#nose
+         \_/   \______________/\_________/ \_________/ \__/
+          |           |            |            |        |
+       scheme     authority       path        query   fragment
+          |   _____________________|__
+         / \ /                        \
+         urn:example:animal:ferret:nose
+
+But even with this succinct example exo_str_looks_like_an_uri() fails.
+
+There is an easy solution; fail only when component part is missing
+('urn:'), but succeed otherwise.
+
+This solution fixes 'magnet:foo', and doesn't break the current
+expectation from thunar that 'http:' should fail, having the best of
+both worlds.
+
+[1] http://www.ietf.org/rfc/rfc3986.txt
+
+Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>
+---
+ exo/exo-string.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exo/exo-string.c b/exo/exo-string.c
+index 33f86f9..056b36a 100644
+--- a/exo/exo-string.c
++++ b/exo/exo-string.c
+@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str)
+       for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s);
+ 
+       /* <scheme> must be followed by ":" */
+-      return (*s == ':' && *(s+1) == '/');
++      return (*s == ':' && *(s+1) != '\0');
+     }
+ 
+   return FALSE;
+-- 
+1.9.0
+

Added: desktop/trunk/exo/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/debian/patches/series?rev=8319&op=file
==============================================================================
--- desktop/trunk/exo/debian/patches/series	(added)
+++ desktop/trunk/exo/debian/patches/series	Sat Mar  8 15:44:20 2014
@@ -0,0 +1 @@
+0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch