Merge lp:~noskcaj/ubuntu/trusty/ristretto/bugfix into lp:ubuntu/trusty/ristretto

[Jackson Doak]

Take a patch from upstream git to stop an overflow when filenames contain large numbers

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-22 07:32:36 +0000
+++ debian/changelog	2014-04-05 03:55:42 +0000
@@ -1,3 +1,10 @@
+ristretto (0.6.3-2ubuntu1) trusty; urgency=medium
+
+  * Add git-large-numbers-overflow.patch from upstream git
+    - Fixed an overflow when comparing filenames with large numbers in them.
+
+ -- Jackson Doak <[e-mail]>  Sat, 05 Apr 2014 14:52:07 +1100
+
 ristretto (0.6.3-2) unstable; urgency=low
 
   * Upload to unstable.

=== modified file 'debian/control'
--- debian/control	2012-05-05 14:54:49 +0000
+++ debian/control	2014-04-05 03:55:42 +0000
@@ -1,7 +1,8 @@
 Source: ristretto
 Section: xfce
 Priority: optional
-Maintainer: Debian Xfce Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Xfce Maintainers <[e-mail]>
 Uploaders: Yves-Alexis Perez <[e-mail]>,
  Lionel Le Folgoc <[e-mail]>
 Build-Depends: debhelper (>= 9), libexif-dev, libgtk2.0-dev,

=== added file 'debian/patches/git-large-numbers-overflow.patch'
--- debian/patches/git-large-numbers-overflow.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-large-numbers-overflow.patch	2014-04-05 03:55:42 +0000
@@ -0,0 +1,43 @@
+Origin: http://git.xfce.org/apps/ristretto/commit/?h=ristretto-0.6&id=1a5e3f1aade3d5d460510a31cbdf9e0fb5b648a3
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9485
+Description: Fixed an overflow when comparing filenames with large numbers in them.
+
+---
+ src/image_list.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/src/image_list.c
++++ b/src/image_list.c
+@@ -1363,8 +1363,8 @@ cb_rstto_image_list_image_name_compare_f
+     const gchar *bp = b_base;
+ 
+     gint result = 0;
+-    guint a_num = 0;
+-    guint b_num = 0;
++    guint64 a_num = 0;
++    guint64 b_num = 0;
+ 
+     /* try simple (fast) ASCII comparison first */
+     for (;; ++ap, ++bp)
+@@ -1404,8 +1404,8 @@ cb_rstto_image_list_image_name_compare_f
+              */
+             if (g_ascii_isdigit (ac) && g_ascii_isdigit (bc))
+             {
+-                a_num = strtoul (ap, NULL, 10); 
+-                b_num = strtoul (bp, NULL, 10); 
++                a_num = strtoull (ap, NULL, 10);
++                b_num = strtoull (bp, NULL, 10);
+ 
+                 if (a_num < b_num)
+                     result = -1;
+@@ -1418,8 +1418,8 @@ cb_rstto_image_list_image_name_compare_f
+                 g_ascii_isdigit (*(ap -1)) &&
+                 g_ascii_isdigit (*(bp -1)) )
+             {
+-                a_num = strtoul (ap-1, NULL, 10); 
+-                b_num = strtoul (bp-1, NULL, 10); 
++                a_num = strtoull (ap-1, NULL, 10);
++                b_num = strtoull (bp-1, NULL, 10);
+ 
+                 if (a_num < b_num)
+                     result = -1;

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-04-05 03:55:42 +0000
@@ -0,0 +1,1 @@
+git-large-numbers-overflow.patch