SOURCES: gnome-vfs2-fstab_edit_crash.patch (NEW), gnome-vfs2-get_v...

[freetz]

Author: freetz                       Date: Sun Aug  7 20:19:44 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- misc fixes (stolen from ubuntu/debian)

---- Files affected:
SOURCES:
   gnome-vfs2-fstab_edit_crash.patch (NONE -> 1.1)  (NEW), gnome-vfs2-get_volume_for_path.patch (NONE -> 1.1)  (NEW), gnome-vfs2-resolve_fstab_symlinks.patch (NONE -> 1.1)  (NEW), gnome-vfs2-user_visible_drives.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gnome-vfs2-fstab_edit_crash.patch
diff -u /dev/null SOURCES/gnome-vfs2-fstab_edit_crash.patch:1.1
--- /dev/null	Sun Aug  7 22:19:44 2005
+++ SOURCES/gnome-vfs2-fstab_edit_crash.patch	Sun Aug  7 22:19:39 2005
@@ -0,0 +1,15 @@
+# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547
+
+diff -Nur gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+--- gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2004-12-14 17:23:33.000000000 +0100
++++ gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2005-03-17 12:01:07.245801992 +0100
+@@ -718,6 +718,9 @@
+ 			mount = l->data;
+ 			uri = gnome_vfs_get_uri_from_local_path (mount->mount_path);
+ 
++			if (uri == NULL)
++			    continue;
++
+ 			drive = _gnome_vfs_volume_monitor_find_fstab_drive_by_activation_uri (volume_monitor, uri);
+ 
+ 			if (drive != NULL) {

================================================================
Index: SOURCES/gnome-vfs2-get_volume_for_path.patch
diff -u /dev/null SOURCES/gnome-vfs2-get_volume_for_path.patch:1.1
--- /dev/null	Sun Aug  7 22:19:44 2005
+++ SOURCES/gnome-vfs2-get_volume_for_path.patch	Sun Aug  7 22:19:39 2005
@@ -0,0 +1,41 @@
+diff -Nur gnome-vfs2-2.10.1cvs20050510.orig/libgnomevfs/gnome-vfs-volume-monitor.c gnome-vfs2-2.10.1cvs20050510/libgnomevfs/gnome-vfs-volume-monitor.c
+--- gnome-vfs2-2.10.1cvs20050510.orig/libgnomevfs/gnome-vfs-volume-monitor.c	2005-04-21 01:58:14.000000000 +0200
++++ gnome-vfs2-2.10.1cvs20050510/libgnomevfs/gnome-vfs-volume-monitor.c	2005-05-10 15:30:29.165933432 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ 
+ #include "gnome-vfs-private.h"
++#include "gnome-vfs-utils.h"
+ #include "gnome-vfs-volume-monitor.h"
+ #include "gnome-vfs-volume-monitor-private.h"
+ #include "gnome-vfs-volume-monitor-client.h"
+@@ -868,22 +869,28 @@
+ 	dev_t device;
+ 	GList *l;
+ 	GnomeVFSVolume *volume, *res;
++	char *uri;
+ 
+ 	if (g_stat (path, &statbuf) != 0)
+ 		return NULL;
+ 
+ 	device = statbuf.st_dev;
+ 
++	uri = gnome_vfs_get_uri_from_local_path(path);
++
+ 	res = NULL;
+ 	g_mutex_lock (volume_monitor->priv->mutex);
+ 	for (l = volume_monitor->priv->mtab_volumes; l != NULL; l = l->next) {
+ 		volume = l->data;
+-		if (volume->priv->unix_device == device) {
++		if (volume->priv->unix_device == device &&
++		    strncmp(volume->priv->activation_uri,uri,strlen(volume->priv->activation_uri)) == 0) {
+ 			res = gnome_vfs_volume_ref (volume);
+ 			break;
+ 		}
+ 	}
+ 	g_mutex_unlock (volume_monitor->priv->mutex);
+ 	
++	g_free(uri);
++
+ 	return res;
+ }

================================================================
Index: SOURCES/gnome-vfs2-resolve_fstab_symlinks.patch
diff -u /dev/null SOURCES/gnome-vfs2-resolve_fstab_symlinks.patch:1.1
--- /dev/null	Sun Aug  7 22:19:44 2005
+++ SOURCES/gnome-vfs2-resolve_fstab_symlinks.patch	Sun Aug  7 22:19:39 2005
@@ -0,0 +1,27 @@
+# upstream http://bugzilla.gnome.org/show_bug.cgi?id=132797
+
+diff -Nur gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c
+--- gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c	2004-10-15 10:00:02.000000000 +0200
++++ gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c	2004-11-23 17:19:09.426568360 +0100
+@@ -538,6 +538,7 @@
+ 	char *opt, *opt_end;
+ 	struct stat sb;
+ 	GnomeVFSUnixMountPoint *mount_entry;
++        char rpath[PATH_MAX];
+ 	
+ 	stat_file = read_file = get_fstab_file ();
+ 
+@@ -569,7 +570,12 @@
+ 		
+ 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
+ 
+-		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
++                /* resolve symlinks */
++                if (realpath (mntent->mnt_dir, rpath))
++                    mount_entry->mount_path = g_strdup (rpath);
++                else
++                    mount_entry->mount_path = g_strdup (mntent->mnt_dir);
++
+ 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 

================================================================
Index: SOURCES/gnome-vfs2-user_visible_drives.patch
diff -u /dev/null SOURCES/gnome-vfs2-user_visible_drives.patch:1.1
--- /dev/null	Sun Aug  7 22:19:44 2005
+++ SOURCES/gnome-vfs2-user_visible_drives.patch	Sun Aug  7 22:19:39 2005
@@ -0,0 +1,15 @@
+Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch.
+diff -ru gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+--- gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2004-09-23 15:20:46.099901960 +0200
++++ gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2004-09-23 15:23:00.649447320 +0200
+@@ -954,6 +954,10 @@
+ 		vol->priv->is_user_visible = 1;
+ 		break;
+ 	default:
++		/* additionally mark devices below /media/ as user visible, in
++		 * case they are not recognized as devices above */
++		if (!strncmp (mount->mount_path, "/media/", 7))
++			vol->priv->is_user_visible = 1;
+ 		break;
+ 	}
+ 	
================================================================