r36111 - in /desktop/experimental/gvfs/debian: changelog patches/metadata-nuke-junk-data.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Oct 23 08:52:35 2012
New Revision: 36111

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36111
Log:
Add patch from Christian Kellner, via Ubuntu, to erase broken metadata
files (related to LP #405432)

Added:
    desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=36111&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Oct 23 08:52:35 2012
@@ -19,6 +19,8 @@
     - add patch from Ubuntu to keep a ref to jobs while they run in a thread
     - Add patch from Christian Kellner, via Ubuntu, to not try to flush a
       tree that doesn't exist (LP: #405432)
+    - Add patch from Christian Kellner, via Ubuntu, to erase broken metadata
+      files (related to LP #405432)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 23 Oct 2012 09:21:04 +0100
 

Added: desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch?rev=36111&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch (added)
+++ desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch [utf-8] Tue Oct 23 08:52:35 2012
@@ -1,0 +1,32 @@
+From 1148581b7306d9e2505cbf0241809428cf6e6cc8 Mon Sep 17 00:00:00 2001
+From: Christian Kellner <gicmo at gnome.org>
+Date: Wed, 4 Nov 2009 16:40:24 +0100
+Subject: [PATCH] Nuke the metadata file if magic blob is wrong
+
+---
+ metadata/metatree.c |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+Index: gvfs-1.12.0/metadata/metatree.c
+===================================================================
+--- gvfs-1.12.0.orig/metadata/metatree.c	2012-04-11 11:22:44.483902765 -0400
++++ gvfs-1.12.0/metadata/metatree.c	2012-04-11 11:22:59.619902925 -0400
+@@ -473,7 +473,17 @@
+   tree->header = (MetaFileHeader *)data;
+ 
+   if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)
+-    goto err;
++    {
++      if (!tree->for_write)
++        goto err;
++
++      meta_tree_clear (tree);
++
++      if (g_unlink (tree->filename) != 0)
++        goto err;
++
++      goto retry;
++    }
+ 
+   if (tree->header->major != MAJOR_VERSION)
+     goto err;

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=36111&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Tue Oct 23 08:52:35 2012
@@ -3,6 +3,7 @@
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
 metadata-dont-flush-null-tree.patch
+metadata-nuke-junk-data.patch
 dont-crash-on-null-job.patch
 handle-inactive-vfs.patch
 ref-jobs-in-thread.patch