rpms/gvfs/F-9 gvfs-0.2.4-libarchive-iso.patch, NONE, 1.1 gvfs-0.2.4-smb-enable-debug.patch, NONE, 1.1 gvfs-0.2.4-smb-recurse.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 gvfs.spec, 1.52, 1.53 sources, 1.16, 1.17

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24192

Modified Files:
	.cvsignore gvfs.spec sources 
Added Files:
	gvfs-0.2.4-libarchive-iso.patch 
	gvfs-0.2.4-smb-enable-debug.patch gvfs-0.2.4-smb-recurse.patch 
Log Message:
* Fri Jun  6 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-1
- Update to 0.2.4
- Drop upstreamed patches
- Fix copying directories from samba shares (gnome #522933)
- Fix mounting of non-standard ISO images
- Enable debug output from smb backend


gvfs-0.2.4-libarchive-iso.patch:

--- NEW FILE gvfs-0.2.4-libarchive-iso.patch ---
Index: daemon/gvfsbackendarchive.c
===================================================================
--- daemon/gvfsbackendarchive.c	(revision 1776)
+++ daemon/gvfsbackendarchive.c	(revision 1777)
@@ -457,8 +457,14 @@
   do
     {
       result = archive_read_next_header (archive->archive, &entry);
-      if (result == ARCHIVE_OK)
+      if (result >= ARCHIVE_WARN && result <= ARCHIVE_OK)
 	{
+  	  if (result < ARCHIVE_OK) {
+  	    DEBUG ("archive_read_next_header: result = %d, error = '%s'\n", result, archive_error_string (archive->archive));
+  	    archive_set_error (archive->archive, ARCHIVE_OK, "No error");
+  	    archive_clear_error (archive->archive);
+	  }
+  
 	  ArchiveFile *file = archive_file_get_from_path (ba->files, 
 	                                                  archive_entry_pathname (entry), 
 							  TRUE);
@@ -600,8 +606,14 @@
   do
     {
       result = archive_read_next_header (archive->archive, &entry);
-      if (result == ARCHIVE_OK)
+      if (result >= ARCHIVE_WARN && result <= ARCHIVE_OK)
         {
+	  if (result < ARCHIVE_OK) {
+	    DEBUG ("do_open_for_read: result = %d, error = '%s'\n", result, archive_error_string (archive->archive));
+	    archive_set_error (archive->archive, ARCHIVE_OK, "No error");
+	    archive_clear_error (archive->archive);
+	  }
+                              
           if (g_str_equal (archive_entry_pathname (entry), filename + 1))
             {
               /* SUCCESS */

gvfs-0.2.4-smb-enable-debug.patch:

--- NEW FILE gvfs-0.2.4-smb-enable-debug.patch ---
diff -up gvfs-0.2.4/daemon/gvfsbackendsmb.c.bak gvfs-0.2.4/daemon/gvfsbackendsmb.c
--- gvfs-0.2.4/daemon/gvfsbackendsmb.c.bak	2008-06-06 14:24:12.000000000 +0200
+++ gvfs-0.2.4/daemon/gvfsbackendsmb.c	2008-06-06 14:26:59.383920226 +0200
@@ -470,7 +470,7 @@ do_mount (GVfsBackend *backend,
     }
   smbc_setOptionUserData (smb_context, backend);
 
-  smbc_setDebug (smb_context, 0);
+  smbc_setDebug (smb_context, 19);
   smbc_setFunctionAuthDataWithContext (smb_context, auth_callback);
   
   smbc_setFunctionAddCachedServer (smb_context, add_cached_server);

gvfs-0.2.4-smb-recurse.patch:

--- NEW FILE gvfs-0.2.4-smb-recurse.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1787)
+++ ChangeLog	(revision 1800)
@@ -1,3 +1,9 @@
+2008-05-28  Tomas Bzatek  <tbzatek at redhat.com>
+
+        * daemon/gvfsbackendsmb.c: (do_open_for_read):
+        Return G_IO_ERROR_IS_DIRECTORY when attempting
+        to read a directory (fixes #522933 for SMB)
+
 2008-05-27  Christian Kellner  <gicmo at gnome.org>
 
 	* configure.ac: Post release version bump
Index: daemon/gvfsbackendsmb.c
===================================================================
--- daemon/gvfsbackendsmb.c	(revision 1787)
+++ daemon/gvfsbackendsmb.c	(revision 1800)
@@ -612,17 +612,33 @@
   GVfsBackendSmb *op_backend = G_VFS_BACKEND_SMB (backend);
   char *uri;
   SMBCFILE *file;
+  struct stat st;
   smbc_open_fn smbc_open;
+  smbc_stat_fn smbc_stat;
+  int res;
+  int olderr;
 
+
   uri = create_smb_uri (op_backend->server, op_backend->share, filename);
   smbc_open = smbc_getFunctionOpen (op_backend->smb_context);
   file = smbc_open (op_backend->smb_context, uri, O_RDONLY, 0);
-  g_free (uri);
 
   if (file == NULL)
-    g_vfs_job_failed_from_errno (G_VFS_JOB (job), errno);
+    {
+      olderr = errno;
+      smbc_stat = smbc_getFunctionStat (op_backend->smb_context);
+      res = smbc_stat (op_backend->smb_context, uri, &st);
+      g_free (uri);
+      if ((res == 0) && (S_ISDIR (st.st_mode)))
+            g_vfs_job_failed (G_VFS_JOB (job),
+                              G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
+                             _("Can't open directory"));
+      else
+        g_vfs_job_failed_from_errno (G_VFS_JOB (job), olderr);
+  }
   else
     {
+      
       g_vfs_job_open_for_read_set_can_seek (job, TRUE);
       g_vfs_job_open_for_read_set_handle (job, file);
       g_vfs_job_succeeded (G_VFS_JOB (job));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Apr 2008 02:46:49 -0000	1.16
+++ .cvsignore	6 Jun 2008 14:21:21 -0000	1.17
@@ -1 +1 @@
-gvfs-0.2.3.tar.bz2
+gvfs-0.2.4.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-9/gvfs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gvfs.spec	2 Jun 2008 21:16:41 -0000	1.52
+++ gvfs.spec	6 Jun 2008 14:21:21 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 0.2.3
-Release: 11%{?dist}.1
+Version: 0.2.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,21 +34,12 @@
 BuildRequires: automake autoconf
 BuildRequires: libtool
 Patch1: gvfs-0.2.2-archive-integration.patch
-Patch2: gvfs-64clean.patch
-Patch3: regexxer-crash.patch
-Patch4: gvfs-0.2.2-only-show-allowed-mounts.patch
-Patch5: gphoto-unmount-hang.patch
-Patch6: gvfs-gphoto-automount.patch
-Patch7: gvfs-unmount-scheme.patch
 
-# http://mail.gnome.org/archives/gvfs-list/2008-April/msg00017.html
-Patch8: gvfs-fuse-threading.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=448560
+Patch2: gvfs-0.2.4-smb-recurse.patch
 
-#
-Patch9: gvfs-dbus-exit.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=528950
-Patch10: gvfs-archive-minor-fixes-2.patch
+Patch3: gvfs-0.2.4-libarchive-iso.patch
+Patch4: gvfs-0.2.4-smb-enable-debug.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -78,15 +69,10 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
-%patch2 -p1 -b .64clean
-%patch3 -p1 -b .regexxer-crash
-%patch4 -p0 -b .only-show-allowed-mounts
-%patch5 -p1 -b .gphoto-unmount-hang
-%patch6 -p1 -b .gphoto-automount
-%patch7 -p1 -b .unmount-scheme
-%patch8 -p0 -b .fuse-threading
-%patch9 -p1 -b .dbus-exit
-%patch10 -p0 -b .archive-fixes
+%patch2 -p0 -b .smb-recurse
+%patch3 -p0 -b .archive-iso
+%patch4 -p1 -b .debug
+
 
 %build
 
@@ -201,6 +187,13 @@
 
 
 %changelog
+* Fri Jun  6 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-1
+- Update to 0.2.4
+- Drop upstreamed patches
+- Fix copying directories from samba shares (gnome #522933)
+- Fix mounting of non-standard ISO images
+- Enable debug output from smb backend
+
 * Mon Jun 02 2008 Dennis Gilmore <dennis at ausil.us> - 0.2.3-11.1
 - minor rebuild for sparc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Apr 2008 02:46:49 -0000	1.16
+++ sources	6 Jun 2008 14:21:21 -0000	1.17
@@ -1 +1 @@
-cefc1279b98838f26bc7878029ed13b3  gvfs-0.2.3.tar.bz2
+08fc85c24ccaf15913dbcc43ea4d8ae8  gvfs-0.2.4.tar.bz2