[Pkg-utopia-commits] r1256 - in packages/unstable/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-07 00:48:16 +0000 (Wed, 07 Mar 2007)
New Revision: 1256

Added:
   packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch
Removed:
   packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi
Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal.install
Log:
Drop the  debian-storage-policy-fixed-drives.fdi hack which set volume.ignore=true for local partitions.
Pull the patch  55_nonpolkit-mount-policy.patch from Ubuntu which solves this problem more nicely.


Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2007-03-05 21:30:03 UTC (rev 1255)
+++ packages/unstable/hal/debian/changelog	2007-03-07 00:48:16 UTC (rev 1256)
@@ -12,7 +12,11 @@
       0.80. https://bugs.freedesktop.org/show_bug.cgi?id=9343
 
   [ Michael Biebl ]
-  *  Add XS-Vcs-* fields to debian/control. 
+  * Add XS-Vcs-* fields to debian/control. 
+  * Drop debian-storage-policy-fixed-drives.fdi in favor of
+    debian/patches/55_nonpolkit-mount-policy.patch.
+    This fixes the problem that local devices are not shown in nautilus.
+    (Closes: #394155, #395169, #409879) 
 
  -- Michael Biebl <biebl at debian.org>  Mon,  5 Mar 2007 22:20:55 +0100
 

Deleted: packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi
===================================================================
--- packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi	2007-03-05 21:30:03 UTC (rev 1255)
+++ packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi	2007-03-07 00:48:16 UTC (rev 1256)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
-
-<deviceinfo version="0.2">
-<device>
-  <match key="@block.storage_device:storage.hotpluggable" bool="false">
-    <match key="@block.storage_device:storage.removable" bool="false">
-      <merge key="volume.ignore" type="bool">true</merge>
-    </match>
-  </match>
-</device>
-</deviceinfo>

Modified: packages/unstable/hal/debian/hal.install
===================================================================
--- packages/unstable/hal/debian/hal.install	2007-03-05 21:30:03 UTC (rev 1255)
+++ packages/unstable/hal/debian/hal.install	2007-03-07 00:48:16 UTC (rev 1256)
@@ -9,4 +9,3 @@
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi
 debian/preferences.fdi  etc/hal/fdi/policy
-debian/debian-storage-policy-fixed-drives.fdi usr/share/hal/fdi/policy/10osvendor

Added: packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch
===================================================================
--- packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch	2007-03-05 21:30:03 UTC (rev 1255)
+++ packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch	2007-03-07 00:48:16 UTC (rev 1256)
@@ -0,0 +1,32 @@
+diff -Nur hal/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c hal.new/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c
+--- hal-0.5.8.1/tools/hal-storage-mount.c	2006-12-06 14:59:34.000000000 +0100
++++ hal-0.5.8.1/tools/hal-storage-mount.c	2006-12-06 14:59:57.000000000 +0100
+@@ -143,7 +143,6 @@
+ 	exit (1);
+ }
+ 
+-#ifdef HAVE_POLKIT
+ static void
+ permission_denied_privilege (const char *privilege, const char *uid)
+ {
+@@ -151,7 +150,6 @@
+ 	fprintf (stderr, "%s refused uid %s\n", privilege, uid);
+ 	exit (1);
+ }
+-#endif
+ 
+ 
+ /* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
+@@ -769,6 +767,12 @@
+ 		printf ("caller don't possess privilege\n");
+ 		permission_denied_privilege (privilege, invoked_by_uid);
+ 	}
++#else
++        /* root can do everything; only allow handling removable devices
++         * without uid change to non-root users */
++        if (!invoked_by_uid || strcmp(invoked_by_uid, "0"))
++                if (!privilege || strcmp (privilege, "hal-storage-removable-mount"))
++                        permission_denied_privilege (privilege, invoked_by_uid);
+ #endif
+ 
+ #ifdef DEBUG