[Pkg-mc-commits] r296 - in trunk/debian: . patches patches/vfs

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2009-11-29 19:41:26 +0000 (Sun, 29 Nov 2009)
New Revision: 296

Removed:
   trunk/debian/patches/vfs/01_ftpfs_symlink.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Removed VFS patch for an issue, that is fixed upstream for 4.7.0.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-12 12:23:23 UTC (rev 295)
+++ trunk/debian/changelog	2009-11-29 19:41:26 UTC (rev 296)
@@ -38,7 +38,8 @@
     (Closes: #549658).
 
   [ Yury V. Zaytsev ]
-  * Remove FTP chattr patch, because the problem was solved upstream.
+  * Remove FTP chattr patch (upstream ticket #1708).
+  * Remove symlink patch (upstream ticket #1828).
 
  -- Denis Briand <denis at narcan.fr>  Tue, 27 Oct 2009 23:23:38 +0100
 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-11-12 12:23:23 UTC (rev 295)
+++ trunk/debian/patches/series	2009-11-29 19:41:26 UTC (rev 296)
@@ -7,6 +7,5 @@
 debian/08_use_sensible-editor.patch
 debian/09_uzip_broken_528239.patch
 debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
-vfs/01_ftpfs_symlink.patch
 bugs/84_use_dvicat_instead_of_dvi2tty.patch
 bugs/85_add_djvu_files_support.patch

Deleted: trunk/debian/patches/vfs/01_ftpfs_symlink.patch
===================================================================
--- trunk/debian/patches/vfs/01_ftpfs_symlink.patch	2009-11-12 12:23:23 UTC (rev 295)
+++ trunk/debian/patches/vfs/01_ftpfs_symlink.patch	2009-11-29 19:41:26 UTC (rev 296)
@@ -1,34 +0,0 @@
-diff --git a/vfs/direntry.c b/vfs/direntry.c
-index 3a52d22..b1dfdca 100644
---- a/vfs/direntry.c
-+++ b/vfs/direntry.c
-@@ -251,7 +251,13 @@ vfs_s_find_entry_tree (struct vfs_class *me, struct vfs_s_inode *root,
-     char * const pathref = g_strdup (a_path);
-     char *path = pathref;
- 
--    canonicalize_pathname (path);
-+    if (strncmp(me->name, "ftpfs", 5) != 0)
-+	canonicalize_pathname (path);
-+    else {
-+	char *p = path + strlen (path) - 1;
-+	while (p > path && *p == PATH_SEP)
-+	    *p-- = 0;
-+    }
- 
-     while (root) {
- 	while (*path == PATH_SEP)	/* Strip leading '/' */
-@@ -324,7 +330,13 @@ vfs_s_find_entry_linear (struct vfs_class *me, struct vfs_s_inode *root,
-     if (root->super->root != root)
- 	vfs_die ("We have to use _real_ root. Always. Sorry.");
- 
--    canonicalize_pathname (path);
-+    if (strncmp (me->name, "ftpfs", 5) != 0)
-+	canonicalize_pathname (path);
-+    else {
-+	char *p = path + strlen (path) - 1;
-+	while (p > path && *p == PATH_SEP)
-+	    *p-- = 0;
-+    }
- 
-     if (!(flags & FL_DIR)) {
- 	char *dirname, *name, *save;