[Pkg-utopia-commits] r189 - in packages/hal/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Fri, 18 Mar 2005 22:00:12 +0100
Author: sjoerd
Date: 2005-03-18 22:00:12 +0100 (Fri, 18 Mar 2005)
New Revision: 189
Added:
packages/hal/trunk/debian/patches/hal-dbus_max_match_rules_per_connection.diff
packages/hal/trunk/debian/patches/harddisk-volumes.patch
packages/hal/trunk/debian/patches/hotplug_timeout.patch
Modified:
packages/hal/trunk/debian/changelog
packages/hal/trunk/debian/rules
Log:
* Disable fstab-sync in the default config
* Ensure that the hotplug timeout handler isn't run while an hotplug event is
being handled
* Integrate fixes from the ubuntu package:
- Allow more matching rules per connection.
- Work around
Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog 2005-03-18 12:36:39 UTC (rev 188)
+++ packages/hal/trunk/debian/changelog 2005-03-18 21:00:12 UTC (rev 189)
@@ -1,3 +1,24 @@
+hal (0.4.7-3) unstable; urgency=low
+
+ * Remove 50-fstab-sync.hal symlink from the package, it's not supposed to be
+ used in hal's default config. (Closes: #298562)
+ * Added debian/patches/hotplug_timeout.patch
+ + Don't run the hotplug timeout handler while processing hotplug events.
+ (Closes: #292256)
+ * Fixes from the ubuntu package:
+ + Added debian/patches/hal-dbus_max_match_rules_per_connection.diff
+ - Allow more matching rules per connection. Fixes problems with
+ hal-device-manager on systems with lots of devices.
+ + Added debian/patches/harddisk-volumes.patch
+ - fdi/90defaultpolicy/storage-policy.fdi: If a volume has an empty
+ fsusage, set it to "filesystem" to work around the fact that the
+ non-root hald cannot read harddisk partitions.
+ - libhal-storage/libhal-storage.c: Do not declare a volume as invisible
+ if hal does not know the file system (hald cannot read harddisk
+ partitions).
+
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 18 Mar 2005 19:25:04 +0100
+
hal (0.4.7-2) unstable; urgency=low
* debian/patches/storage-policy-debian.patch
Added: packages/hal/trunk/debian/patches/hal-dbus_max_match_rules_per_connection.diff
===================================================================
--- packages/hal/trunk/debian/patches/hal-dbus_max_match_rules_per_connection.diff 2005-03-18 12:36:39 UTC (rev 188)
+++ packages/hal/trunk/debian/patches/hal-dbus_max_match_rules_per_connection.diff 2005-03-18 21:00:12 UTC (rev 189)
@@ -0,0 +1,11 @@
+diff -u hal-0.4.7.orig/hal.conf hal-0.4.7/hal.conf
+--- hal-0.4.7.orig/hal.conf.in 2005-01-25 03:46:38.000000000 +0100
++++ hal-0.4.7/hal.conf.in 2005-03-07 13:25:33.532788600 +0100
+@@ -25,5 +25,7 @@
+ receive_sender="org.freedesktop.Hal"/>
+ </policy>
+
++ <limit name="max_match_rules_per_connection">512</limit>
++
+ </busconfig>
+
Added: packages/hal/trunk/debian/patches/harddisk-volumes.patch
===================================================================
--- packages/hal/trunk/debian/patches/harddisk-volumes.patch 2005-03-18 12:36:39 UTC (rev 188)
+++ packages/hal/trunk/debian/patches/harddisk-volumes.patch 2005-03-18 21:00:12 UTC (rev 189)
@@ -0,0 +1,44 @@
+diff -ruN hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi
+--- hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi 2005-03-17 12:53:44.847773000 +0100
++++ hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi 2005-03-17 12:57:03.976501360 +0100
+@@ -15,6 +15,17 @@
+ </match>
+ </device>
+
++ <!-- non-root hald cannot read harddrive partitions; workaround for correct fsusage -->
++ <device>
++ <match key="info.category" string="volume">
++ <match key="block.is_volume" bool="true">
++ <match key="volume.fsusage" string="">
++ <merge key="volume.fsusage" type="string">filesystem</merge>
++ </match>
++ </match>
++ </match>
++ </device>
++
+ <device>
+ <!-- Whitelist bus types of storage devices we care about -->
+ <match key="info.category" string="storage">
+diff -ruN hal-0.4.7-old/libhal-storage/libhal-storage.c hal-0.4.7/libhal-storage/libhal-storage.c
+--- hal-0.4.7-old/libhal-storage/libhal-storage.c 2005-01-25 03:37:02.000000000 +0100
++++ hal-0.4.7/libhal-storage/libhal-storage.c 2005-03-17 12:54:08.864122488 +0100
+@@ -592,10 +595,6 @@
+ if (mount_point == NULL)
+ mount_point = target_mount_point;
+
+- /* bail out if we don't know the filesystem */
+- if (fstype == NULL)
+- goto out;
+-
+ /* blacklist fhs2.3 top level mount points */
+ if (mount_point != NULL) {
+ for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) {
+@@ -605,7 +604,7 @@
+ }
+
+ /* blacklist partitions with name 'bootstrap' of type HFS (Apple uses that) */
+- if (label != NULL && strcmp (label, "bootstrap") == 0 && strcmp (fstype, "hfs") == 0)
++ if (label != NULL && fstype != NULL && strcmp (label, "bootstrap") == 0 && strcmp (fstype, "hfs") == 0)
+ goto out;
+
+ /* only the real lucky mount points will make it this far :-) */
Added: packages/hal/trunk/debian/patches/hotplug_timeout.patch
===================================================================
--- packages/hal/trunk/debian/patches/hotplug_timeout.patch 2005-03-18 12:36:39 UTC (rev 188)
+++ packages/hal/trunk/debian/patches/hotplug_timeout.patch 2005-03-18 21:00:12 UTC (rev 189)
@@ -0,0 +1,27 @@
+Index: hald/linux/osspec.c
+===================================================================
+RCS file: /cvs/hal/hal/hald/linux/Attic/osspec.c,v
+retrieving revision 1.52.2.5
+diff -u -r1.52.2.5 osspec.c
+--- hald/linux/osspec.c 21 Jan 2005 15:46:55 -0000 1.52.2.5
++++ hald/linux/osspec.c 18 Mar 2005 15:57:46 -0000
+@@ -1496,6 +1496,9 @@
+ GList *i;
+ struct hald_helper_msg *msg;
+
++ if (hotplug_counter > 0 ) {
++ return;
++ }
+ now = time (NULL);
+
+ /* See if there was a last hotplug event */
+@@ -1521,9 +1524,6 @@
+ last_hotplug_seqnum + 1, new_min_seqnum));
+ last_hotplug_seqnum = new_min_seqnum - 1;
+ last_hotplug_time_stamp = 0;
+-
+-
+-
+ /* process that event now */
+ hald_helper_hotplug_process_queue ();
+ }
Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules 2005-03-18 12:36:39 UTC (rev 188)
+++ packages/hal/trunk/debian/rules 2005-03-18 21:00:12 UTC (rev 189)
@@ -14,7 +14,7 @@
--with-pid-file=/var/run/hal/hald.pid \
--enable-pcmcia-support \
--with-stab-file=/var/run/stab \
- --enable-fstab-sync
+ --enable-fstab-sync
binary-predeb/hal-device-manager::
dh_python -phal-device-manager
@@ -39,3 +39,6 @@
# sony_dsc.fdi only causes troubles
rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/20freedesktop/sony_dsc.fdi
+ # remove the fstab-sync symlink
+ rm -f $(DEB_DESTDIR)/etc/hal/device.d/50-fstab-sync.hal
+