more cleanouts

(Portage version: 2.0.51.19)

7 files changed, 0 insertions, 208 deletions

diff --git a/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch b/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
deleted file mode 100644
index 6a8dff4cc6ec..000000000000
--- a/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: fdi/90defaultpolicy/storage-policy.fdi
-===================================================================
-RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
-retrieving revision 1.5
-diff -u -p -r1.5 storage-policy.fdi
---- fdi/90defaultpolicy/storage-policy.fdi	15 Oct 2004 20:46:08 -0000	1.5
-+++ fdi/90defaultpolicy/storage-policy.fdi	18 Oct 2004 23:51:33 -0000
-@@ -30,6 +30,9 @@
-       <match key="storage.bus" string="sata">
- 	<merge key="storage.policy.should_mount" type="bool">true</merge>
-       </match>
-+      <match key="storage.bus" string="platform">
-+	<merge key="storage.policy.should_mount" type="bool">true</merge>
-+      </match>
-     </match>
- 
-     <!-- Handle drives with non-partitioned media  -->
diff --git a/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch b/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch
deleted file mode 100644
index 9164a3d5444e..000000000000
--- a/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: DeviceManager.py
-===================================================================
-RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
-retrieving revision 1.15
-diff -u -b -B -r1.15 DeviceManager.py
---- DeviceManager.py    1 Sep 2004 17:38:59 -0000       1.15
-+++ DeviceManager.py    1 Nov 2004 23:22:48 -0000
-@@ -355,8 +355,15 @@
-             product.set_label("Unknown")
-             vendor.set_label("Unknown")
- 
--        # clear category, capabilities
-+        # set category, capabilities
-+        if device.properties.has_key("info.category"):
-+            category.set_label("%s"%device.properties["info.category"])
-+        else:
--        category.set_label("Unknown")
-+            category.set_label("Unknown")
-+
-+        if device.properties.has_key("info.capabilities"):
-+            capabilities.set_label("%s"%device.properties["info.capabilities"])
-+        else:
--        capabilities.set_label("Unknown")
-+            capabilities.set_label("Unknown")
- 
-     def update_tab_usb(self, device):
diff --git a/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch b/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch
deleted file mode 100644
index 979531d77767..000000000000
--- a/sys-apps/hal/files/hal-0.4.2-cdrom_media_check.patch
+++ /dev/null
@@ -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:
diff --git a/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch b/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch
deleted file mode 100644
index 955652cc09d2..000000000000
--- a/sys-apps/hal/files/hal-0.4.2-fstab_sync_crash.patch
+++ /dev/null
@@ -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;
- 
diff --git a/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch b/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch
deleted file mode 100644
index 561094cbedc3..000000000000
--- a/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: fdi/20freedesktop/ide-drives.fdi
-===================================================================
-RCS file: /cvs/hal/hal/fdi/20freedesktop/ide-drives.fdi,v
-retrieving revision 1.1.2.4
-diff -u -p -r1.1.2.4 ide-drives.fdi
---- fdi/20freedesktop/ide-drives.fdi	31 Dec 2004 12:01:52 -0000	1.1.2.4
-+++ fdi/20freedesktop/ide-drives.fdi	7 Jan 2005 19:24:46 -0000
-@@ -48,6 +48,37 @@
- 	</match>
-       </match>
-     </match>
-+
-+    <match key="storage.bus" string="ide">
-+      <match key="storage.drive_type" string="floppy">
-+	<!-- IOMEGA Zip Drive -->
-+	<match key="storage.model" contains_ncase="ZIP">
-+          <merge key="storage.drive_type" type="string">zip</merge>
-+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-+          <merge key="storage.requires_eject" type="bool">true</merge>
-+          <!-- treat as floppy and data at partition 4; adjust device file -->
-+	  <append key="block.device" type="string">4</append>
-+	</match>
-+	
-+	<!-- IOMEGA CLIK! Drive -->
-+	<match key="storage.model" contains_ncase="CLIK">
-+          <merge key="storage.drive_type" type="string">zip</merge>
-+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-+          <merge key="storage.requires_eject" type="bool">true</merge>
-+          <!-- treat as floppy and data at partition 4; adjust device file -->
-+	  <append key="block.device" type="string">4</append>
-+	</match>
-+	
-+	<!-- Jaz -->
-+	<match key="storage.model" contains_ncase="JAZ">
-+          <merge key="storage.drive_type" type="string">jaz</merge>
-+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-+          <merge key="storage.requires_eject" type="bool">true</merge>
-+          <!-- treat as floppy and data at partition 4; adjust device file -->
-+	  <append key="block.device" type="string">4</append>
-+	</match>
-+      </match>
-+    </match>
-       
-     </device>
- </deviceinfo>
diff --git a/sys-apps/hal/files/hal-0.4.4-iso_label_selection.patch b/sys-apps/hal/files/hal-0.4.4-iso_label_selection.patch
deleted file mode 100644
index 42204c396dd1..000000000000
--- a/sys-apps/hal/files/hal-0.4.4-iso_label_selection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -uNr hal-0.4.4.orig/hald/linux/volume_id/volume_id.c hal-0.4.4/hald/linux/volume_id/volume_id.c
---- hal-0.4.4.orig/hald/linux/volume_id/volume_id.c	2005-01-07 16:25:58.000000000 +1300
-+++ hal-0.4.4/hald/linux/volume_id/volume_id.c	2005-01-12 13:19:06.930597976 +1300
-@@ -1245,10 +1245,14 @@
- 		return -1;
- 
- 	if (strncmp(is->iso.id, "CD001", 5) == 0) {
-+		char root_label[VOLUME_ID_LABEL_SIZE+1];
- 		int vd_offset;
- 		int i;
- 		__u8 found_svd;
- 
-+		memset(root_label, 0, sizeof(root_label));
-+		strncpy(root_label, is->iso.volume_id, sizeof(root_label)-1);
-+
- 		found_svd = 0;
- 		vd_offset = ISO_VD_OFFSET;
- 		for (i = 0; i < ISO_VD_MAX; i++) {
-@@ -1258,22 +1262,19 @@
- 				break;
- 			if (is->iso.type == ISO_VD_SUPPLEMENTARY) {
- 				dbg("found ISO supplementary VD at offset 0x%x", off + vd_offset);
-+				set_label_raw(id, is->iso.volume_id, 32);
-+				set_label_unicode16(id, is->iso.volume_id, BE, 32);
- 				found_svd = 1;
- 				break;
- 			}
- 			vd_offset += ISO_SECTOR_SIZE;
- 		}
- 
--		if (!found_svd) {
--			is = (union iso_super_block *)
--			     get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200);
--			if (is == NULL)
--				return -1;
--			set_label_raw(id, is->iso.volume_id, 32);
--			set_label_string(id, is->iso.volume_id, 32);
--		} else {
--			set_label_raw(id, is->iso.volume_id, 32);
--			set_label_unicode16(id, is->iso.volume_id, BE, 32);
-+		if (!found_svd ||
-+		    (found_svd && !strncmp(root_label, id->label, 16)))
-+		{
-+			set_label_raw(id, root_label, 32);
-+			set_label_string(id, root_label, 32);
- 		}
- 		goto found;
- 	}
diff --git a/sys-apps/hal/files/hal-0.4.4-volume_id_fat.patch b/sys-apps/hal/files/hal-0.4.4-volume_id_fat.patch
deleted file mode 100644
index 239af170a282..000000000000
--- a/sys-apps/hal/files/hal-0.4.4-volume_id_fat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: hald/linux/volume_id/volume_id.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
-retrieving revision 1.45.2.2
-diff -u -p -r1.45.2.2 volume_id.c
---- hald/linux/volume_id/volume_id.c	7 Jan 2005 03:26:51 -0000	1.45.2.2
-+++ hald/linux/volume_id/volume_id.c	9 Jan 2005 13:04:30 -0000
-@@ -78,7 +78,7 @@
- /* size of superblock buffer, reiserfs block is at 64k */
- #define SB_BUFFER_SIZE				0x11000
- /* size of seek buffer 4k */
--#define SEEK_BUFFER_SIZE			0x1000
-+#define SEEK_BUFFER_SIZE			0x10000
- 
- 
- static void set_label_raw(struct volume_id *id,
-@@ -832,7 +832,7 @@ static int probe_vfat(struct volume_id *
- 	__u16 dir_entries;
- 	__u32 sect_count;
- 	__u16 reserved;
--	__u16 fat_size;
-+	__u32 fat_size;
- 	__u32 root_cluster;
- 	__u32 dir_size;
- 	__u32 cluster_count;