r51765 - in /desktop/unstable/glib2.0/debian: changelog patches/0001-Fix-trashing-on-overlayfs.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Nov 23 15:15:53 2016
New Revision: 51765

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51765
Log:
debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
version from the upsstream report to hopefully fix trashing of files in
directories which are symlinks to different devices. (Closes: #800047)

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=51765&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Wed Nov 23 15:15:53 2016
@@ -1,6 +1,9 @@
 glib2.0 (2.50.2-2) UNRELEASED; urgency=medium
 
   * debian/rules: disable libmount on !linux (Closes: #844052)
+  * debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
+    version from the upsstream report to hopefully fix trashing of files in
+    directories which are symlinks to different devices. (Closes: #800047)
 
  -- Iain Lane <laney at debian.org>  Wed, 23 Nov 2016 13:01:05 +0000
 

Modified: desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch?rev=51765&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch	[utf-8] Wed Nov 23 15:15:53 2016
@@ -1,4 +1,4 @@
-From 4411742e5d5d0b68b7d1e781bc04a0a3182917b2 Mon Sep 17 00:00:00 2001
+From 09c11e5a2bd43e1459c7a2115f177e29ed92494e Mon Sep 17 00:00:00 2001
 From: Iain Lane <iain at orangesquash.org.uk>
 Date: Tue, 21 Apr 2015 15:00:09 +0100
 Subject: [PATCH] Fix trashing on overlayfs
@@ -14,17 +14,15 @@
 
 Fix this by checking st_dev of the parent directory when we are deleting
 a file.
+---
+ gio/glocalfile.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
 
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=748248
----
- gio/glocalfile.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-Index: b/gio/glocalfile.c
-===================================================================
+diff --git a/gio/glocalfile.c b/gio/glocalfile.c
+index 8f64777..544e0f2 100644
 --- a/gio/glocalfile.c
 +++ b/gio/glocalfile.c
-@@ -1909,7 +1909,7 @@
+@@ -1910,7 +1910,7 @@ g_local_file_trash (GFile         *file,
    char *basename, *trashname, *trashfile, *infoname, *infofile;
    char *original_name, *original_name_escaped;
    int i;
@@ -33,7 +31,7 @@
    gboolean is_homedir_trash;
    char delete_time[32];
    int fd;
-@@ -1933,6 +1933,19 @@
+@@ -1934,6 +1934,24 @@ g_local_file_trash (GFile         *file,
  
    is_homedir_trash = FALSE;
    trashdir = NULL;
@@ -44,12 +42,20 @@
 +   * this will have the same st_dev.
 +   */
 +  if (!S_ISDIR (file_stat.st_mode))
-+  {
++    {
 +      path = g_path_get_dirname (local->filename);
-+      g_lstat (path, &file_stat);
++      /* If the parent is a symlink to a different device then it might have
++       * st_dev equal to the home directory's, in which case we will end up
++       * trying to rename across a filesystem boundary, which doesn't work. So
++       * we use g_stat here instead of g_lstat, to know where the symlink
++       * points to. */
++      g_stat (path, &file_stat);
 +      g_free (path);
-+  }
++    }
 +
    if (file_stat.st_dev == home_stat.st_dev)
      {
        is_homedir_trash = TRUE;
+-- 
+2.10.2
+