updated ebuild

3 files changed, 92 insertions, 0 deletions

diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1
new file mode 100644
index 000000000000..d2c566716b9a
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1
@@ -0,0 +1 @@
+MD5 d5801767ad80e082de6e13118a0712a0 gnome-volume-manager-1.0.2.tar.bz2 180824
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
new file mode 100644
index 000000000000..be6603ac63be
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
@@ -0,0 +1,33 @@
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
+retrieving revision 1.31
+retrieving revision 1.32
+diff -u -r1.31 -r1.32
+--- manager.c	2004/09/01 19:17:41	1.31
++++ manager.c	2004/09/20 16:12:22	1.32
+@@ -38,7 +38,7 @@
+ # define N_(String) (String)
+ #endif
+ 
+-/*#define GVM_DEBUG*/
++#define GVM_DEBUG
+ #ifdef GVM_DEBUG
+ # define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
+ #else
+@@ -664,6 +664,16 @@
+ {
+ 	char *media_type;
+ 
++	/* Refuse to enforce policy on removable media if drive is locked */
++	if (hal_device_property_exists (
++		    hal_ctx, storage_device, "info.locked") &&
++	    hal_device_get_property_bool (
++		    hal_ctx, storage_device, "info.locked")) {
++		dbg ("Drive with udi %s is locked through hal; "
++		     "skipping policy\n", storage_device);
++		return;
++	}
++
+ 	/*
+ 	 * Get HAL's interpretation of our media type.  Note that we must check
+ 	 * the storage device and not this UDI
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
new file mode 100644
index 000000000000..0c19cfe1b4fa
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
@@ -0,0 +1,58 @@
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- manager.c	2004/08/30 14:53:09	1.30
++++ manager.c	2004/09/01 19:17:41	1.31
+@@ -659,7 +659,8 @@
+  * At the moment, we only handle CD-ROM and DVD drives.
+  */
+ static void
+-gvm_media_changed (const char *udi, const char *storage_device)
++gvm_media_changed (const char *udi, const char *storage_device, 
++		   const char *device)
+ {
+ 	char *media_type;
+ 
+@@ -674,10 +675,14 @@
+ 		return;
+ 	}
+ 
+-	if (!g_strcasecmp (media_type, "cdrom"))
++	if (!g_strcasecmp (media_type, "cdrom")) {
+ 		gvm_cdrom_policy (udi);
+-
+-	/* other media_types go here */
++	} else {
++		dbg ("Added: %s\n", device);
++		
++		if (config.automount_drives)
++			gvm_device_mount (device);
++	}
+ 
+ 	hal_free_string (media_type);
+ }
+@@ -730,7 +735,7 @@
+ 					  "storage.removable")) {
+ 		/* we handle media change events separately */
+ 		dbg ("Changed: %s\n", device);
+-		gvm_media_changed (udi, storage_device);
++		gvm_media_changed (udi, storage_device, device);
+ 		goto out;
+ 	}
+ 	
+@@ -952,9 +957,10 @@
+ 
+ 		/* only mount if the block device got a sensible filesystem */
+ 		if (!hal_device_property_exists (ctx, udi, 
+-						"volume.is_filesystem") ||
+-		    !hal_device_get_property_bool (ctx, udi, 
+-						   "volume.is_filesystem"))
++						"volume.fsusage") ||
++		    strcmp (hal_device_get_property_string (ctx, udi, 
++							    "volume.fsusage"), 
++			    "filesystem") != 0)
+ 			continue;
+ 
+ 		device_file = hal_device_get_property_string (ctx, udi,