bump with patches, jolly it's that time of the year again

6 files changed, 86 insertions, 23 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 7ea2adec385c..b0789616657c 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.20 2005/01/08 23:11:02 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.21 2005/01/09 21:19:44 foser Exp $
+
+*hal-0.4.4-r1 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> hal-0.4.4-r1.ebuild :
+  Add patch to fix #77140 & another patch from the mailinglist
 
   08 Jan 2005; Tom Martin <slarti@gentoo.org> hal-0.4.1-r1.ebuild:
   Stable on amd64.
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 04537d93639c..b344129ee02e 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d9bed60ec59e6c2c5aa8708afde490db ChangeLog 2874
-MD5 4aad3f8d293e5588d0710b7dceaca116 hal-0.4.1-r1.ebuild 2530
 MD5 bfbd716101b6fbb11494bb0d514e598f hal-0.4.2-r1.ebuild 2685
-MD5 e1cdd8db96c5129b4983eaf86e322b0f hal-0.4.4.ebuild 2564
-MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
+MD5 4aad3f8d293e5588d0710b7dceaca116 hal-0.4.1-r1.ebuild 2530
 MD5 3e506a597274c818f662edbe0c7d2b59 hal-0.2.98-r1.ebuild 2062
-MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
-MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
+MD5 f94b574eba8e2839db320ac27d9d0fe1 hal-0.4.4-r1.ebuild 2710
+MD5 b15e1384fff30816a3fde4ed4b7a94f2 ChangeLog 3028
+MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
 MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
-MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920
-MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4 62
-MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194
+MD5 25eea3342c0a5a09afd0768e6e8c48ad files/hal-0.4.4-iso_label.patch 1020
 MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
-MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
+MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4-r1 62
+MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194
 MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028
-MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB4GkcCHk4+ZoBpvsRAkGJAJ0W22e4EpSE4tEXiHGGKGkrN8fueQCdFH8w
-vCxq7+/zCaNlELkZtMV3Q5I=
-=zVQQ
------END PGP SIGNATURE-----
+MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920
+MD5 2b00af86c624d74107035a007ac3c9da files/hal-0.4.4-volume_id_fat.patch 849
+MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468
+MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
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;
diff --git a/sys-apps/hal/hal-0.4.4.ebuild b/sys-apps/hal/hal-0.4.4-r1.ebuild
index db1a76228aeb..9bcd56197a6b 100644
--- a/sys-apps/hal/hal-0.4.4.ebuild
+++ b/sys-apps/hal/hal-0.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4.ebuild,v 1.1 2005/01/08 13:18:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4-r1.ebuild,v 1.1 2005/01/09 21:19:44 foser Exp $
 
 inherit eutils python
 
@@ -40,6 +40,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
 	# support IDE zip drives as floppy
 	epatch ${FILESDIR}/${P}-check_ide_floppy_for_zip_fdi.patch
+	# fix joliet label (#77140)
+	epatch ${FILESDIR}/${P}-iso_label.patch
+	# fix fat on large volumes
+	epatch ${FILESDIR}/${P}-volume_id_fat.patch
 
 }