update patch & fix src_uri in 0.4.2

6 files changed, 63 insertions, 56 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 71b1a0f7088d..8780d69a9e2b 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2005/01/11 23:58:03 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.23 2005/01/12 14:54:54 foser Exp $
+
+  12 Jan 2005; foser <foser@gentoo.org> hal-0.4.4-r1.ebuild :
+  Change the iso label patch for a somewhat cleaner one
+
+  12 Jan 2005; foser <foser@gentoo.org> hal-0.4.2-r1.ebuild :
+  Fix SRC_URI (#77478) thnx to Gudleik Rasch for noticing
 
   11 Jan 2005; John Mylchreest <johnm@gentoo.org> hal-0.2.98-r1.ebuild,
   hal-0.4.1-r1.ebuild, hal-0.4.2-r1.ebuild, hal-0.4.4-r1.ebuild:
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index cef1bb40954e..66dd2bde92eb 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 50c1599b0db30b55a1d994b6998d4bd8 hal-0.4.2-r1.ebuild 2723
+MD5 faaf821c60bf4b6c663caeace3e21a95 hal-0.4.2-r1.ebuild 2728
 MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567
 MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102
-MD5 4d46262ef9a783ffed660298ef9fab1a hal-0.4.4-r1.ebuild 2748
-MD5 b9e0da31e9b94e9669dcc977874315ae ChangeLog 3240
+MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758
+MD5 2048e7a0ec1c8df30099a0a831d1079e ChangeLog 3480
 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 2396bfac6dd9b68615328b1b9325ed2c files/hal-0.4.4-iso_label_selection.patch 1541
 MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
 MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
-MD5 25eea3342c0a5a09afd0768e6e8c48ad files/hal-0.4.4-iso_label.patch 1020
 MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62
 MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62
 MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4-r1 62
@@ -20,10 +17,3 @@ MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fd
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB5TKqm/TpOlox+n8RAn6PAJwJOeR/zXFT6f3+3ob3hPMOJkwH4gCgoijV
-X8AgU6F34k9jsxNknu/auj8=
-=k5FT
------END PGP SIGNATURE-----
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
deleted file mode 100644
index 027bd6d86af9..000000000000
--- a/sys-apps/hal/files/hal-0.4.4-iso_label.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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-iso_label_selection.patch b/sys-apps/hal/files/hal-0.4.4-iso_label_selection.patch
new file mode 100644
index 000000000000..42204c396dd1
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.4-iso_label_selection.patch
@@ -0,0 +1,48 @@
+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/hal-0.4.2-r1.ebuild b/sys-apps/hal/hal-0.4.2-r1.ebuild
index 752d49676842..f4ff29a90e1e 100644
--- a/sys-apps/hal/hal-0.4.2-r1.ebuild
+++ b/sys-apps/hal/hal-0.4.2-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.2-r1.ebuild,v 1.4 2005/01/12 14:22:15 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.5 2005/01/12 14:54:54 foser Exp $
 
 inherit eutils python
 
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://freedesktop.org/~david/${P}.tar.gz"
+SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
diff --git a/sys-apps/hal/hal-0.4.4-r1.ebuild b/sys-apps/hal/hal-0.4.4-r1.ebuild
index cd314720e16f..7c15759cbe97 100644
--- a/sys-apps/hal/hal-0.4.4-r1.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-r1.ebuild,v 1.3 2005/01/12 14:22:15 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4-r1.ebuild,v 1.4 2005/01/12 14:54:54 foser Exp $
 
 inherit eutils python
 
@@ -41,7 +41,7 @@ src_unpack() {
 	# 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
+	epatch ${FILESDIR}/${P}-iso_label_selection.patch
 	# fix fat on large volumes
 	epatch ${FILESDIR}/${P}-volume_id_fat.patch