[Pkg-utopia-commits] r58 - in packages/hal/trunk/debian: . patches
Sjoerd Simons
sjoerd@haydn.debian.org
Thu, 04 Nov 2004 12:08:20 -0700
Author: sjoerd
Date: 2004-11-04 12:08:02 -0700 (Thu, 04 Nov 2004)
New Revision: 58
Removed:
packages/hal/trunk/debian/patches/fstab-sync.patch
packages/hal/trunk/debian/patches/nonblock.patch
packages/hal/trunk/debian/patches/storage-policy-uudi.patch
Modified:
packages/hal/trunk/debian/changelog
Log:
New upstream release !
Remove patch that are already there and close fixed bugs :)
Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog 2004-11-03 02:56:22 UTC (rev 57)
+++ packages/hal/trunk/debian/changelog 2004-11-04 19:08:02 UTC (rev 58)
@@ -1,11 +1,19 @@
-hal (0.4.0-2) experimental; urgency=low
+hal (0.4.1-1) UNRELEASED; urgency=low
+ * New upstream release
+ + Opens cdrom devices with O_NONBLOCK for polling (Closes: #271989)
+ + Fixes fstab-sync crash when called without options (Closes: #278468)
* debian/hald.8: Fixed typos
* debian/rules: Correctly generate the python dependencies for
hal-device-manager
* debian/hal.postinst: Don't fail when the dbus-1 init script isn't
available yet
+ * Removed patches (adoted upstream):
+ + debian/patches/fstab-sync.patch
+ + debian/patches/nonblock.patch
+ + debian/patches/storage-policy-uudi.patch
+
-- Sjoerd Simons <sjoerd@debian.org> Tue, 19 Oct 2004 16:59:21 +0200
hal (0.4.0-1) experimental; urgency=low
Deleted: packages/hal/trunk/debian/patches/fstab-sync.patch
===================================================================
--- packages/hal/trunk/debian/patches/fstab-sync.patch 2004-11-03 02:56:22 UTC (rev 57)
+++ packages/hal/trunk/debian/patches/fstab-sync.patch 2004-11-04 19:08:02 UTC (rev 58)
@@ -1,67 +0,0 @@
-Index: tools/fstab-sync.c
-===================================================================
-RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
-retrieving revision 1.23
-retrieving revision 1.25
-diff -u -r1.23 -r1.25
---- tools/fstab-sync.c 14 Oct 2004 18:37:28 -0000 1.23
-+++ tools/fstab-sync.c 15 Oct 2004 20:53:45 -0000 1.25
-@@ -74,11 +74,6 @@
- #define TEMP_FSTAB_PREFIX ".fstab.hal."
- #define TEMP_FSTAB_MAX_LENGTH 64
-
--#undef FSTAB_SYNC_MOUNT_ROOT
--#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD
--#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC
--#undef FSTAB_SYNC_MOUNT_ACCESS
--
- #ifndef TRUE
- #define TRUE 1
- #endif
-@@ -1327,6 +1322,7 @@
- char *dir = NULL;
- char *last_slash;
- char *mount_point;
-+ char *device_file;
-
- dir = strdup (_PATH_FSTAB);
- last_slash = strrchr (dir, '/');
-@@ -1373,11 +1369,15 @@
-
- if (!create_mount_point_for_volume (mount_point))
- goto error;
-+
-+ device_file = hal_device_get_property_string (hal_context, udi, "block.device");
-
- fstab_update_debug (_("%d: added mount point '%s' for device '%s'\n"),
-- pid, mount_point, "foo");
-+ pid, mount_point, device_file);
- syslog (LOG_INFO, _("added mount point %s for %s"),
-- mount_point, "foo");
-+ mount_point, device_file);
-+
-+ hal_free_string (device_file);
-
- close (fd);
-
-@@ -1657,10 +1657,8 @@
- N_("add an entry to fstab"), N_("UDI")},
- {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
- N_("remove an entry from fstab"), N_("UDI")},
--#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
- {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
- N_("Remove all generated entries from fstab")},
--#endif
- {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
- N_("Report detailed information about operation progress")},
-
-@@ -1694,9 +1692,7 @@
-
- /* when invoked for the /org/freedesktop/Hal/devices/computer UDI we clean the fstab */
- if (getenv ("HALD_STARTUP") != NULL && strcmp (hal_device_udi, "/org/freedesktop/Hal/devices/computer") == 0) {
--#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
- should_clean = TRUE;
--#endif
- } else {
-
- /* when we are invoked by hald, make some early tests using the
Deleted: packages/hal/trunk/debian/patches/nonblock.patch
===================================================================
--- packages/hal/trunk/debian/patches/nonblock.patch 2004-11-03 02:56:22 UTC (rev 57)
+++ packages/hal/trunk/debian/patches/nonblock.patch 2004-11-04 19:08:02 UTC (rev 58)
@@ -1,100 +0,0 @@
-Index: hald/linux/block_class_device.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
-retrieving revision 1.84
-retrieving revision 1.85
-diff -u -r1.84 -r1.85
---- hald/linux/block_class_device.c 8 Oct 2004 16:40:24 -0000 1.84
-+++ hald/linux/block_class_device.c 15 Oct 2004 20:39:51 -0000 1.85
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- * CVSID: $Id: block_class_device.c,v 1.84 2004/10/08 16:40:24 david Exp $
-+ * CVSID: $Id: block_class_device.c,v 1.85 2004/10/15 20:39:51 david Exp $
- *
- * Block device class
- *
-@@ -911,6 +911,8 @@
- if (fd < 0)
- return FALSE;
-
-+ close (fd);
-+
- /* Now got_media==TRUE and fd>0.. So, Yay!, we got media
- *
- * See if we already got children (or children underway :-),
-@@ -923,7 +925,6 @@
- get_child_device_tdl (d);
- }
- if (child != NULL) {
-- close (fd);
- return FALSE;
- }
-
-@@ -1000,9 +1001,8 @@
-
- HAL_INFO (("Detecting if %s contains a fs", device_file));
-
-- vid = volume_id_open_fd (fd);
-+ vid = volume_id_open_node (device_file);
- if (vid == NULL) {
-- close (fd);
- g_object_unref (child);
- return FALSE;
- }
-@@ -1011,15 +1011,14 @@
- if (is_cdrom) {
- /* volume_id cannot probe blank/audio discs etc,
- * so don't fail for them, just set vid to NULL */
-- volume_id_close (vid);
- vid = NULL;
- } else {
-- close (fd);
- g_object_unref (child);
- volume_id_close (vid);
- return FALSE;
- }
- }
-+
- }
-
- /* Unfortunally, linux doesn't scan optical discs for partition
-@@ -1032,7 +1031,6 @@
- if (!no_partitions) {
- if (vid != NULL)
- volume_id_close (vid);
-- close (fd);
- g_object_unref (child);
- return FALSE;
- }
-@@ -1072,12 +1070,11 @@
- G_CALLBACK (class_device_move_from_tdl_to_gdl), cad);
- hal_callout_device (child, TRUE);
-
-- volume_id_close (vid);
-- close (fd);
-+ if (vid != NULL)
-+ volume_id_close (vid);
- return TRUE;
- }
-
-- close (fd);
- return FALSE;
- }
-
-Index: hald/linux/volume_id/volume_id.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
-retrieving revision 1.42
-retrieving revision 1.43
-diff -u -r1.42 -r1.43
---- hald/linux/volume_id/volume_id.c 29 Sep 2004 16:29:45 -0000 1.42
-+++ hald/linux/volume_id/volume_id.c 15 Oct 2004 20:39:51 -0000 1.43
-@@ -2128,7 +2128,7 @@
- struct volume_id *id;
- int fd;
-
-- fd = open(path, O_RDONLY | O_NONBLOCK);
-+ fd = open(path, O_RDONLY /*| O_NONBLOCK */);
- if (fd < 0) {
- dbg("unable to open '%s'", path);
- return NULL;
Deleted: packages/hal/trunk/debian/patches/storage-policy-uudi.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-uudi.patch 2004-11-03 02:56:22 UTC (rev 57)
+++ packages/hal/trunk/debian/patches/storage-policy-uudi.patch 2004-11-04 19:08:02 UTC (rev 58)
@@ -1,26 +0,0 @@
-Index: fdi/90defaultpolicy/storage-policy.fdi
-===================================================================
-RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- fdi/90defaultpolicy/storage-policy.fdi 14 Oct 2004 21:58:55 -0000 1.4
-+++ fdi/90defaultpolicy/storage-policy.fdi 15 Oct 2004 20:46:08 -0000 1.5
-@@ -83,13 +83,10 @@
- <merge key="volume.policy.should_mount" type="bool">true</merge>
- <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
-
-- <!-- Fallback is '<storage.drive_type>', e.g. disk, compact_flash etc. -->
-- <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.drive_type</merge>
--
-- <!-- Better: if available use UUID -->
-- <match key="volume.uuid" empty="false">
-- <merge key="volume.policy.desired_mount_point" type="copy_property">volume.uuid</merge>
-- </match>
-+ <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
-+ idedisk, scsidisk etc. -->
-+ <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
-+ <append key="volume.policy.desired_mount_point" type="string">disk</append>
-
- <!-- Best: If available use filesystem label -->
- <match key="volume.label" empty="false">