diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2005-01-09 21:19:44 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2005-01-09 21:19:44 +0000 |
| commit | fca894fed1042dc204e507f13a8aed8bfc4ced6e (patch) | |
| tree | 6b7cefb9d8d922f81f4721873fa36f1e969a8f3f /sys-apps/hal/files | |
| parent | remove ugly || ( ) (diff) | |
| download | historical-fca894fed1042dc204e507f13a8aed8bfc4ced6e.tar.gz historical-fca894fed1042dc204e507f13a8aed8bfc4ced6e.tar.bz2 historical-fca894fed1042dc204e507f13a8aed8bfc4ced6e.zip | |
bump with patches, jolly it's that time of the year again
Diffstat (limited to 'sys-apps/hal/files')
| -rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.4-r1 (renamed from sys-apps/hal/files/digest-hal-0.4.4) | 0 | ||||
| -rw-r--r-- | sys-apps/hal/files/hal-0.4.4-iso_label.patch | 37 | ||||
| -rw-r--r-- | sys-apps/hal/files/hal-0.4.4-volume_id_fat.patch | 25 |
3 files changed, 62 insertions, 0 deletions
diff --git a/sys-apps/hal/files/digest-hal-0.4.4 b/sys-apps/hal/files/digest-hal-0.4.4-r1 index fe307283dc7c..fe307283dc7c 100644 --- a/sys-apps/hal/files/digest-hal-0.4.4 +++ b/sys-apps/hal/files/digest-hal-0.4.4-r1 diff --git a/sys-apps/hal/files/hal-0.4.4-iso_label.patch b/sys-apps/hal/files/hal-0.4.4-iso_label.patch new file mode 100644 index 000000000000..027bd6d86af9 --- /dev/null +++ b/sys-apps/hal/files/hal-0.4.4-iso_label.patch @@ -0,0 +1,37 @@ +--- hal-0.4.4/hald/linux/volume_id/volume_id.c 2005-01-07 04:25:58.000000000 +0100 ++++ hal-0.4.4.patched/hald/linux/volume_id/volume_id.c 2005-01-09 19:26:22.000000000 +0100 +@@ -1239,15 +1239,20 @@ + } __attribute__((__packed__)) hs; + } __attribute__((__packed__)) *is; + ++ char vd_primary_label[32]; ++ + is = (union iso_super_block *) + get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200); + if (is == NULL) + return -1; + ++ memcpy (vd_primary_label, is->iso.volume_id, 32); ++ + if (strncmp(is->iso.id, "CD001", 5) == 0) { + int vd_offset; +- int i; ++ int i, j; + __u8 found_svd; ++ char tmp_label[32]; + + found_svd = 0; + vd_offset = ISO_VD_OFFSET; +@@ -1264,7 +1269,11 @@ + vd_offset += ISO_SECTOR_SIZE; + } + +- if (!found_svd) { ++ j = 0; ++ for (i = 0; i+2 <= 32; i+=2) ++ tmp_label[j++] = is->iso.volume_id[i+1]; ++ ++ if (!found_svd || !strncmp(tmp_label, vd_primary_label, 16)) { + is = (union iso_super_block *) + get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200); + if (is == NULL) 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 new file mode 100644 index 000000000000..239af170a282 --- /dev/null +++ b/sys-apps/hal/files/hal-0.4.4-volume_id_fat.patch @@ -0,0 +1,25 @@ +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; |