r26065 - in /desktop/experimental/gvfs: ./ debian/changelog debian/patches/07_smb_initialdir.patch debian/patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Dec 22 19:47:17 2010
New Revision: 26065

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26065
Log:
07_smb_initialdir.patch: new patch by Tomas Bzatek and myself. Take 
into account initial path when doing a SMB mount, to avoid 
permission issues. Closes: #533417.

Added:
    desktop/experimental/gvfs/debian/patches/07_smb_initialdir.patch
      - copied, changed from r26061, desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch
Modified:
    desktop/experimental/gvfs/   (props changed)
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/series

Propchange: desktop/experimental/gvfs/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/unstable/gvfs:26061

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=26065&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Wed Dec 22 19:47:17 2010
@@ -1,3 +1,11 @@
+gvfs (1.7.0-2) UNRELEASED; urgency=low
+
+  * 07_smb_initialdir.patch: new patch by Tomas Bzatek and myself. Take 
+    into account initial path when doing a SMB mount, to avoid 
+    permission issues. Closes: #533417.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 17 Dec 2010 18:01:11 +0100
+
 gvfs (1.7.0-1) experimental; urgency=low
 
   * New upstream release.

Copied: desktop/experimental/gvfs/debian/patches/07_smb_initialdir.patch (from r26061, desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/07_smb_initialdir.patch?rev=26065&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/07_smb_initialdir.patch [utf-8] Wed Dec 22 19:47:17 2010
@@ -1,16 +1,16 @@
-Index: gvfs-1.6.4/daemon/gvfsbackendsmb.c
+Index: gvfs-1.7.0/daemon/gvfsbackendsmb.c
 ===================================================================
---- gvfs-1.6.4.orig/daemon/gvfsbackendsmb.c	2010-12-17 17:58:05.000000000 +0100
-+++ gvfs-1.6.4/daemon/gvfsbackendsmb.c	2010-12-21 19:39:35.000000000 +0100
-@@ -68,6 +68,7 @@
+--- gvfs-1.7.0.orig/daemon/gvfsbackendsmb.c	2010-11-29 17:29:23.000000000 +0100
++++ gvfs-1.7.0/daemon/gvfsbackendsmb.c	2010-12-22 20:47:05.390012499 +0100
+@@ -61,6 +61,7 @@ struct _GVfsBackendSmb
    char *share;
    char *user;
    char *domain;
 +  char *path;
+   char *default_workgroup;
    
    SMBCCTX *smb_context;
- 
-@@ -579,7 +580,7 @@
+@@ -565,7 +566,7 @@ do_mount (GVfsBackend *backend,
    g_vfs_backend_set_mount_spec (backend, smb_mount_spec);
    g_mount_spec_unref (smb_mount_spec);
  
@@ -19,7 +19,7 @@
  
  
    /*  Samba mount loop  */
-@@ -636,6 +637,7 @@
+@@ -622,6 +623,7 @@ do_mount (GVfsBackend *backend,
  
    /* Mount was successful */
  
@@ -27,7 +27,7 @@
    g_vfs_keyring_save_password (op_backend->last_user,
  			       op_backend->server,
  			       op_backend->last_domain,
-@@ -657,7 +659,7 @@
+@@ -643,7 +645,7 @@ try_mount (GVfsBackend *backend,
  	   gboolean is_automount)
  {
    GVfsBackendSmb *op_backend = G_VFS_BACKEND_SMB (backend);
@@ -36,7 +36,7 @@
  
    server = g_mount_spec_get (mount_spec, "server");
    share = g_mount_spec_get (mount_spec, "share");
-@@ -672,11 +674,13 @@
+@@ -658,11 +660,13 @@ try_mount (GVfsBackend *backend,
  
    user = g_mount_spec_get (mount_spec, "user");
    domain = g_mount_spec_get (mount_spec, "domain");

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=26065&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Wed Dec 22 19:47:17 2010
@@ -3,5 +3,6 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+07_smb_initialdir.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch