[Pkg-utopia-commits] r154 - in packages/hal/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Tue, 04 Jan 2005 16:27:03 +0100
Author: sjoerd
Date: 2005-01-04 16:27:02 +0100 (Tue, 04 Jan 2005)
New Revision: 154
Removed:
packages/hal/trunk/debian/patches/cdrom-fdleak.patch
packages/hal/trunk/debian/patches/cdrom-media-check.patch
packages/hal/trunk/debian/patches/fix-ide-fdi.patch
packages/hal/trunk/debian/patches/fstab-sync-crash.patch
packages/hal/trunk/debian/patches/poll-only-cdroms.patch
packages/hal/trunk/debian/patches/special_mtab_chars.patch
Modified:
packages/hal/trunk/debian/changelog
Log:
Remove patches merged into hal 0.4.3
Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/changelog 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,3 +1,16 @@
+hal (0.4.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed patched that were merged/fixed upstream:
+ + debian/patches/cdrom-fdleak.patch
+ + debian/patches/cdrom-media-check.patch
+ + debian/patches/fix-ide-fdi.patch
+ + debian/patches/fstab-sync-crash.patch
+ + debian/patches/poll-only-cdroms.patch
+ + debian/patches/special_mtab_chars.patch
+
+ -- Sjoerd Simons <sjoerd@debian.org> Tue, 4 Jan 2005 16:01:00 +0100
+
hal (0.4.2-6) unstable; urgency=low
* debian/patches/cdrom-fdleak.patch
Deleted: packages/hal/trunk/debian/patches/cdrom-fdleak.patch
===================================================================
--- packages/hal/trunk/debian/patches/cdrom-fdleak.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/cdrom-fdleak.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,15 +0,0 @@
-Index: hald/linux/block_class_device.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
-retrieving revision 1.86.2.4
-diff -u -r1.86.2.4 block_class_device.c
---- hald/linux/block_class_device.c 9 Dec 2004 03:15:22 -0000 1.86.2.4
-+++ hald/linux/block_class_device.c 30 Dec 2004 14:28:42 -0000
-@@ -1065,6 +1065,7 @@
- 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 {
- g_object_unref (child);
Deleted: packages/hal/trunk/debian/patches/cdrom-media-check.patch
===================================================================
--- packages/hal/trunk/debian/patches/cdrom-media-check.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/cdrom-media-check.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,31 +0,0 @@
---- hal-0.4.2/hald/linux/block_class_device.c
-+++ hal-0.4.2.new/hald/linux/block_class_device.c
-@@ -354,7 +354,7 @@
- }
-
- /* while we're at it, check if we support media changed */
-- if (ioctl (fd, CDROM_MEDIA_CHANGED) >= 0) {
-+ if (capabilities & CDC_MEDIA_CHANGED) {
- hal_device_property_set_bool (d, "storage.cdrom.support_media_changed", TRUE);
- } else {
- hal_device_property_set_bool (d, "storage.cdrom.support_media_changed", FALSE);
-@@ -879,7 +879,18 @@
- break;
-
- case CDS_DISC_OK:
-- got_media = TRUE;
-+ HAL_INFO (("CD-ROM drive %s is reported to contain a CD.", device_file));
-+
-+ /* some CD-ROMs report CDS_DISK_OK even with an open
-+ * tray; if media check has the same value two times in
-+ * a row then this seems to be the case and we must not
-+ * report that there is a media in it. */
-+ if (hal_device_property_get_bool (d, "storage.cdrom.support_media_changed") &&
-+ ioctl (fd, CDROM_MEDIA_CHANGED, CDSL_CURRENT) &&
-+ ioctl (fd, CDROM_MEDIA_CHANGED, CDSL_CURRENT))
-+ HAL_INFO (("CD-ROM drive %s: media checking is broken, assuming no CD is inside.", device_file));
-+ else
-+ got_media = TRUE;
- break;
-
- case -1:
Deleted: packages/hal/trunk/debian/patches/fix-ide-fdi.patch
===================================================================
--- packages/hal/trunk/debian/patches/fix-ide-fdi.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/fix-ide-fdi.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,10 +0,0 @@
-diff -Nur hal-0.4.2/fdi/20freedesktop/ide-drives.fdi hal-0.4.2.new/fdi/20freedesktop/ide-drives.fdi
---- hal-0.4.2/fdi/20freedesktop/ide-drives.fdi 2004-12-01 05:22:07.000000000 +0100
-+++ hal-0.4.2.new/fdi/20freedesktop/ide-drives.fdi 2004-12-06 14:57:54.374932000 +0100
-@@ -47,5 +47,5 @@
- </match>
- </match>
-
-- <device>
-+ </device>
- </deviceinfo>
Deleted: packages/hal/trunk/debian/patches/fstab-sync-crash.patch
===================================================================
--- packages/hal/trunk/debian/patches/fstab-sync-crash.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/fstab-sync-crash.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,16 +0,0 @@
-Index: tools/fstab-sync.c
-===================================================================
-RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
-retrieving revision 1.27
-diff -u -r1.27 fstab-sync.c
---- tools/fstab-sync.c 21 Oct 2004 21:27:44 -0000 1.27
-+++ tools/fstab-sync.c 8 Dec 2004 13:14:04 -0000
-@@ -1506,7 +1506,7 @@
-
- static boolean fs_table_line_is_mounted (FSTableLine *line)
- {
-- FILE *f;
-+ FILE *f = NULL;
- boolean is_mounted = FALSE;
- struct mntent *m;
-
Deleted: packages/hal/trunk/debian/patches/poll-only-cdroms.patch
===================================================================
--- packages/hal/trunk/debian/patches/poll-only-cdroms.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/poll-only-cdroms.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -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.86.2.2
-diff -u -p -r1.86.2.2 block_class_device.c
---- hald/linux/block_class_device.c 1 Dec 2004 03:39:01 -0000 1.86.2.2
-+++ hald/linux/block_class_device.c 6 Dec 2004 22:38:52 -0000
-@@ -1384,43 +1384,19 @@ block_class_pre_process (ClassDeviceHand
- HAL_INFO (("Bus type is %s!",
- hal_device_property_get_string (parent, "info.bus")));
-
-- if (strcmp (hal_device_property_get_string (parent, "info.bus"),
-- "ide") == 0) {
-+ if (strcmp (hal_device_property_get_string (parent, "info.bus"), "ide") == 0) {
- const char *ide_name;
- char *model;
- char *media;
-
-+ /* Be conservative and don't poll IDE drives at all */
-+ hal_device_property_set_bool (d, "storage.media_check_enabled", FALSE);
-
-- /* blacklist the broken ide-cs driver */
-- if (physdev != NULL) {
-- size_t len;
-- char buf[256];
-- const char *physdev_sysfs_path;
--
-- snprintf (buf, 256, "%s/devices/ide", sysfs_mount_path);
-- len = strlen (buf);
--
-- physdev_sysfs_path = hal_device_property_get_string (physdev, "linux.sysfs_path");
--
-- if (strncmp (physdev_sysfs_path, buf, len) == 0) {
-- hal_device_property_set_bool (stordev, "storage.media_check_enabled", FALSE);
-- }
--
-- HAL_INFO (("Working around broken ide-cs driver for %s", physdev->udi));
-- }
--
--
-- ide_name = get_last_element (hal_device_property_get_string
-- (d, "linux.sysfs_path"));
--
-+ ide_name = get_last_element (hal_device_property_get_string (d, "linux.sysfs_path"));
- model = read_single_line ("/proc/ide/%s/model", ide_name);
- if (model != NULL) {
-- hal_device_property_set_string (stordev,
-- "storage.model",
-- model);
-- hal_device_property_set_string (d,
-- "info.product",
-- model);
-+ hal_device_property_set_string (stordev, "storage.model", model);
-+ hal_device_property_set_string (d, "info.product", model);
- }
-
- /* According to the function proc_ide_read_media() in
-@@ -1429,38 +1405,21 @@ block_class_pre_process (ClassDeviceHand
- * "UNKNOWN"
- */
-
-- /** @todo Given floppy how
-- * do we determine it's LS120?
-- */
--
-- media = read_single_line ("/proc/ide/%s/media",
-- ide_name);
-+ media = read_single_line ("/proc/ide/%s/media", ide_name);
- if (media != NULL) {
-- hal_device_property_set_string (stordev,
-- "storage.drive_type",
-- media);
-+ hal_device_property_set_string (stordev, "storage.drive_type", media);
-
- /* Set for removable media */
- if (strcmp (media, "disk") == 0) {
- /* left blank */
- } else if (strcmp (media, "cdrom") == 0) {
- has_removable_media = TRUE;
-+ /* cdroms are the only IDE devices that are safe to poll */
-+ hal_device_property_set_bool (d, "storage.media_check_enabled", TRUE);
- } else if (strcmp (media, "floppy") == 0) {
- has_removable_media = TRUE;
--
-- /* I've got a LS120 that identifies as a
-- * floppy; polling doesn't work so disable
-- * media check and automount
-- */
-- hal_device_property_set_bool (
-- d, "storage.media_check_enabled", FALSE);
-- hal_device_property_set_bool (
-- d, "storage.automount_enabled_hint", FALSE);
--
- } else if (strcmp (media, "tape") == 0) {
- has_removable_media = TRUE;
--
-- /* TODO: Someone test with tape drives! */
- }
- }
-
Deleted: packages/hal/trunk/debian/patches/special_mtab_chars.patch
===================================================================
--- packages/hal/trunk/debian/patches/special_mtab_chars.patch 2005-01-02 17:17:11 UTC (rev 153)
+++ packages/hal/trunk/debian/patches/special_mtab_chars.patch 2005-01-04 15:27:02 UTC (rev 154)
@@ -1,20 +0,0 @@
-Index: hald/linux/block_class_device.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
-retrieving revision 1.86.2.4
-diff -u -r1.86.2.4 block_class_device.c
---- hald/linux/block_class_device.c 9 Dec 2004 03:15:22 -0000 1.86.2.4
-+++ hald/linux/block_class_device.c 19 Dec 2004 16:10:21 -0000
-@@ -1924,8 +1924,10 @@
- mount_points[num_mount_points].minor = minor;
- strncpy (mount_points[num_mount_points].device, device,
- MOUNT_POINT_STRING_SIZE);
-- strncpy (mount_points[num_mount_points].mount_point, mount_point,
-- MOUNT_POINT_STRING_SIZE);
-+ p = g_strcompress(mount_point);
-+ strncpy (mount_points[num_mount_points].mount_point, p,
-+ MOUNT_POINT_STRING_SIZE);
-+ g_free(p);
- strncpy (mount_points[num_mount_points].fs_type, fs_type,
- MOUNT_POINT_STRING_SIZE);
-