[Pkg-utopia-commits] r1289 - in packages/experimental/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-21 00:02:43 +0000 (Wed, 21 Mar 2007)
New Revision: 1289

Removed:
   packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
Modified:
   packages/experimental/hal/debian/changelog
Log:
hal 0.5.9 uses (and depends) on PolicyKit now to decide about who is authorized to mount partitions. So drop this patch.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-20 23:59:06 UTC (rev 1288)
+++ packages/experimental/hal/debian/changelog	2007-03-21 00:02:43 UTC (rev 1289)
@@ -15,6 +15,9 @@
     - debian/patches/25_correctly_free_lists.patch
     - debian/patches/26_fix_hald_not_running_coredump.patch
     - debian/patches/27_hal_fix_dbus_error_is_set.patch
+  * debian/patches/55_nonpolkit-mount-policy.patch
+    - Removed. We depend on PolicyKit now to check if a user is authorized to
+      mount local partitions.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 20 Mar 2007 21:01:01 +0100
 

Deleted: packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
===================================================================
--- packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch	2007-03-20 23:59:06 UTC (rev 1288)
+++ packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch	2007-03-21 00:02:43 UTC (rev 1289)
@@ -1,32 +0,0 @@
-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