rev bump to 0.5.4, yay for the Gnome herd and mobile herd for new features

(Portage version: 2.0.51.22-r2)

6 files changed, 12 insertions, 379 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 514bb453fefe..633bea486362 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.44 2005/08/26 05:40:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.45 2005/08/27 04:09:31 cardoe Exp $
+
+*hal-0.5.4 (27 Aug 2005)
+
+  27 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -files/hal-udev-63.patch,
+  -hal-0.5.2.ebuild, +hal-0.5.4.ebuild:
+  rev bump to 0.5.4, yay for the Gnome herd and mobile herd for new features
 
   26 Aug 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.5.2.ebuild:
   -m Fixing bug #103421
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 4b137d02df52..742140a10786 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4296971e8f0736d08ffb0f86579e58c5 ChangeLog 6319
-MD5 76cfae7b036648e82e1b083758f1955d hal-0.5.2.ebuild 4107
+MD5 1024ef340d61e6d8bc76902ea9ecff6e ChangeLog 6539
 MD5 3305724319ca1a9b454eb5dc7565ba13 hal-0.4.8.ebuild 3375
+MD5 5b389a71e55f66f75da09825c0b3f4a6 hal-0.5.4.ebuild 4069
 MD5 2cf5b3c9219c87b1d9aee01f4f5f19bb hal-0.4.5-r2.ebuild 3118
 MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303
@@ -11,10 +8,9 @@ MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
 MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62
 MD5 e3ecbfe57c0833d32f0ea57a0de58aee files/hal-0.4.8-fix_dvdram.patch 465
 MD5 25cb64ec27a48a80126b6de5ff6c3340 files/hal-0.5.1-old_storage_policy.patch 856
-MD5 59350c54dd02ac43fb991dfc0390d488 files/hal-udev-63.patch 11451
+MD5 27cab5d91e93d8b692246d0ce4110122 files/digest-hal-0.5.4 62
 MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
 MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
-MD5 edc428d4dcf7103d2fc8dfeb961e2f43 files/digest-hal-0.5.2 62
 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
@@ -25,10 +21,3 @@ MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.pa
 MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568
 MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDqtoBtvusYtCZMsRAlinAJ4g/CU2rouEx+6s9buy8E1IiF0WZACcCdm3
-qX3ZviAdjWHoADfHM13us+Y=
-=jgJ3
------END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/digest-hal-0.5.2 b/sys-apps/hal/files/digest-hal-0.5.2
deleted file mode 100644
index 23f8913cc44d..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b351822ba359669646026013a3d5a03 hal-0.5.2.tar.gz 1419810
diff --git a/sys-apps/hal/files/digest-hal-0.5.4 b/sys-apps/hal/files/digest-hal-0.5.4
new file mode 100644
index 000000000000..f7981d006cfc
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.4
@@ -0,0 +1 @@
+MD5 2f84ddbc22bc35baa9388e7794d1fa31 hal-0.5.4.tar.gz 1476396
diff --git a/sys-apps/hal/files/hal-udev-63.patch b/sys-apps/hal/files/hal-udev-63.patch
deleted file mode 100644
index 4dbcdda7f42f..000000000000
--- a/sys-apps/hal/files/hal-udev-63.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-Index: hald/linux2/coldplug.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux2/coldplug.c,v
-retrieving revision 1.15
-diff -u -p -r1.15 coldplug.c
---- hald/linux2/coldplug.c	27 Apr 2005 18:53:39 -0000	1.15
-+++ hald/linux2/coldplug.c	5 Jul 2005 17:31:18 -0000
-@@ -53,6 +53,8 @@
- #define DMPREFIX "dm-"
- 
- 
-+static GHashTable *sysfs_to_dev_map;
-+static char dev_root[HAL_PATH_MAX];
- 
- /* Returns the path of the udevinfo program 
-  *
-@@ -65,14 +67,14 @@ hal_util_get_udevinfo_path (void)
- 	struct stat s;
- 	static gchar *path = NULL;
- 	gchar *possible_paths[] = { 
--		"/sbin/udevinfo",
- 		"/usr/bin/udevinfo",
-+		"/bin/udevinfo",
- 		"/usr/sbin/udevinfo",
--		"/usr/local/sbin/udevinfo"
-+		"/sbin/udevinfo",
- 	};
- 
- 	if (path != NULL)
--		return path;
-+		 return path;
- 
- 	for (i = 0; i < sizeof (possible_paths) / sizeof (char *); i++) {
- 		if (stat (possible_paths[i], &s) == 0 && S_ISREG (s.st_mode)) {
-@@ -83,15 +85,15 @@ hal_util_get_udevinfo_path (void)
- 	return path;
- }
- 
--static GHashTable *
--hal_util_get_sysfs_to_dev_map (void)
-+
-+static gboolean
-+hal_util_init_sysfs_to_dev_map (void)
- {
--	GHashTable *sysfs_to_dev_map;
--	char *udevinfo_argv[7] = {NULL, "-d", NULL};
-+	char *udevdump_argv[] = { "/usr/bin/udevinfo", "-d", NULL };
-+	char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
- 	char *udevinfo_stdout;
--	char *udevinfo_stderr;
- 	int udevinfo_exitcode;
--        char *p;
-+	char *p;
- 	char *q;
- 	char *r;
- 	int len;
-@@ -101,37 +103,48 @@ hal_util_get_sysfs_to_dev_map (void)
- 	gboolean has_more_lines;
- 
- 	sysfs_mount_path = get_hal_sysfs_path ();
--
- 	sysfs_to_dev_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-+	udevdump_argv[0] = (char *) hal_util_get_udevinfo_path ();
-+	udevroot_argv[0] = (char *) hal_util_get_udevinfo_path ();
- 
--	/* get path to udevinfo */
--	udevinfo_argv[0] = (char *) hal_util_get_udevinfo_path ();
--	if (udevinfo_argv[0] == NULL)
-+	/* get udevroot */
-+	if (g_spawn_sync ("/", udevroot_argv, NULL, 0, NULL, NULL,
-+			  &udevinfo_stdout,
-+			  NULL,
-+			  &udevinfo_exitcode,
-+			  NULL) != TRUE) {
-+		HAL_ERROR (("Couldn't invoke %s", udevroot_argv[0]));
- 		goto error;
-+	}
-+	if (udevinfo_exitcode != 0) {
-+		HAL_ERROR (("%s returned %d", udevroot_argv[0], udevinfo_exitcode));
-+		goto error;
-+	}
- 
--
--	/* Invoke udevinfo */
--	if (udevinfo_argv[0] == NULL || g_spawn_sync ("/",
--						  udevinfo_argv,
--						  NULL,
--						  0,
--						  NULL,
--						  NULL,
--						  &udevinfo_stdout,
--						  &udevinfo_stderr,
--						  &udevinfo_exitcode,
--						  NULL) != TRUE) {
--		HAL_ERROR (("Couldn't invoke %s", udevinfo_argv[0]));
-+	g_strlcpy(dev_root, udevinfo_stdout, sizeof(dev_root));
-+	p = strchr(dev_root, '\n');
-+	if (p)
-+		p[0] = '\0';
-+	g_free(udevinfo_stdout);
-+	HAL_INFO (("dev_root is %s", dev_root));
-+
-+	/* get udevdump */
-+	if (g_spawn_sync ("/", udevdump_argv, NULL, 0, NULL, NULL,
-+			  &udevinfo_stdout,
-+			  NULL,
-+			  &udevinfo_exitcode,
-+			  NULL) != TRUE) {
-+		HAL_ERROR (("Couldn't invoke %s", udevdump_argv[0]));
-+		g_free(udevinfo_stdout);
- 		goto error;
- 	}
- 
- 	if (udevinfo_exitcode != 0) {
--		HAL_ERROR (("%s returned %d", udevinfo_argv[0], udevinfo_exitcode));
-+		HAL_ERROR (("%s returned %d", udevdump_argv[0], udevinfo_exitcode));
- 		goto error;
- 	}
- 
- 	has_more_lines = TRUE;
--
- 	p = udevinfo_stdout;
- 
- 	do {
-@@ -142,7 +155,7 @@ hal_util_get_sysfs_to_dev_map (void)
- 
- 		for (q = p; *q != '\n' && *q != '\0' && *q != '='; q++)
- 			;
--		
-+
- 		len = q - p;
- 		switch (*q) {
- 		case '=':
-@@ -162,12 +175,12 @@ hal_util_get_sysfs_to_dev_map (void)
- 			HAL_ERROR (("Expected '=', not '%c' in line '%s'", *q, p));
- 			goto error;
- 		}
--		
-+
- 		q++;
- 		r = q;
- 		for ( ; *q != '\n' && *q != '\0'; q++)
- 			;
--		
-+
- 		len = q - r;
- 		switch (*q) {
- 		case '\0':
-@@ -178,7 +191,6 @@ hal_util_get_sysfs_to_dev_map (void)
- 			strncpy (device_file, r, len > PATH_MAX ? PATH_MAX : len);
- 			device_file [len > PATH_MAX ? PATH_MAX : len] = '\0';
- 			break;
--			
- 		default:
- 			HAL_ERROR (("Expected '\\n' or '\\0', not '%c' in line '%s'", *q, p));
- 			goto error;
-@@ -186,7 +198,7 @@ hal_util_get_sysfs_to_dev_map (void)
- 
- 		g_hash_table_insert (sysfs_to_dev_map, g_strdup_printf ("%s%s", sysfs_mount_path, sysfs_path), 
- 				     g_strdup(device_file));
--		
-+
- #ifdef HAL_COLDPLUG_VERBOSE
- 		printf ("Got '%s' -> '%s'\n", sysfs_path, device_file);
- #endif
-@@ -194,22 +206,54 @@ hal_util_get_sysfs_to_dev_map (void)
- 
- 	} while (has_more_lines);
- 
--	return sysfs_to_dev_map;
-+	g_free(udevinfo_stdout);
-+	return TRUE;
- 
- error:
-+	g_free(udevinfo_stdout);
- 	g_hash_table_destroy (sysfs_to_dev_map);
--	return NULL;
-+	return FALSE;
- }
- 
-+static gchar
-+*coldplug_get_device_file(const gchar *sysfs_path)
-+{
-+	const gchar *device_file;
-+	const char *pos;
-+	gchar path[HAL_PATH_MAX];
-+	struct stat statbuf;
-+
-+	device_file = (gchar *) g_hash_table_lookup (sysfs_to_dev_map, sysfs_path);
-+	if (device_file != NULL)
-+		return g_strdup(device_file);
-+
-+	HAL_INFO (("sysfs_path %s not in udevdb", sysfs_path));
-+
-+	/* device is not in udevdb, use the default kernel name  */
-+	pos = strrchr(sysfs_path, '/');
-+	if (pos == NULL)
-+		return NULL;
-+
-+	g_strlcpy(path, dev_root, sizeof(path));
-+	g_strlcat(path, pos, sizeof(path));
-+	if (stat (path, &statbuf))
-+		return NULL;
-+
-+	if (!S_ISBLK (statbuf.st_mode) && !S_ISCHR (statbuf.st_mode))
-+		return NULL;
-+
-+	HAL_INFO (("return sysfs_path %s", path));
-+
-+	return g_strdup(path);
-+}
- 
- static gboolean
--coldplug_synthesize_block_event(const gchar *f, GHashTable *sysfs_to_dev_map);
-+coldplug_synthesize_block_event(const gchar *f);
- 
- static void
- coldplug_compute_visit_device (const gchar *path, 
- 			       GHashTable *sysfs_to_bus_map, 
--			       GHashTable *sysfs_to_class_in_devices_map,
--			       GHashTable *sysfs_to_dev_map);
-+			       GHashTable *sysfs_to_class_in_devices_map);
- 
- /* For debugging */
- /*#define HAL_COLDPLUG_VERBOSE*/
-@@ -297,15 +341,11 @@ coldplug_synthesize_events (void)
- 	 */
- 	GSList *sysfs_dm_dev = NULL;
- 
--	GHashTable *sysfs_to_dev_map = NULL;
--
--	
--	if ((sysfs_to_dev_map = hal_util_get_sysfs_to_dev_map ()) == NULL) {
-+	if (hal_util_init_sysfs_to_dev_map () == FALSE) {
- 		HAL_ERROR (("Unable to get sysfs to dev map"));
- 		goto error;
- 	}
- 
--
- 	/* build bus map */
- 	sysfs_to_bus_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- 	g_snprintf (path, HAL_PATH_MAX, "%s/bus", get_hal_sysfs_path ());
-@@ -431,7 +471,7 @@ coldplug_synthesize_events (void)
- 		while ((f1 = g_dir_read_name (dir1)) != NULL) {
- 
- 			g_snprintf (path, HAL_PATH_MAX, "%s/devices/%s/%s", get_hal_sysfs_path (), f, f1);
--			coldplug_compute_visit_device (path, sysfs_to_bus_map, sysfs_to_class_in_devices_map, sysfs_to_dev_map);
-+			coldplug_compute_visit_device (path, sysfs_to_bus_map, sysfs_to_class_in_devices_map);
- 		}
- 		g_dir_close (dir1);
- 	}
-@@ -461,9 +501,10 @@ coldplug_synthesize_events (void)
- 		g_strlcpy (hotplug_event->sysfs.subsystem, subsystem, sizeof (hotplug_event->sysfs.subsystem));
- 		g_strlcpy (hotplug_event->sysfs.sysfs_path, sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path));
- 
--		device_file = (gchar *) g_hash_table_lookup (sysfs_to_dev_map, sysfs_path);
-+		device_file = coldplug_get_device_file (sysfs_path);
- 		if (device_file != NULL) {
- 			strncpy (hotplug_event->sysfs.device_file, device_file, sizeof (hotplug_event->sysfs.device_file));
-+			g_free (device_file);
- 		}
- 		hotplug_event->sysfs.net_ifindex = -1;
- 		
-@@ -487,12 +528,12 @@ coldplug_synthesize_events (void)
- 			sysfs_dm_dev = g_slist_append(sysfs_dm_dev, g_strdup(f));
- 			continue;
- 		}
--		if (coldplug_synthesize_block_event(f, sysfs_to_dev_map) == FALSE)
-+		if (coldplug_synthesize_block_event(f) == FALSE)
- 			goto error;
- 	}
- 	/* process all dm devices last so that their backing devices exist */
- 	for (li = sysfs_dm_dev; li != NULL; li = g_slist_next (g_slist_next (li))) {
--		if (coldplug_synthesize_block_event (li->data, sysfs_to_dev_map) == FALSE)
-+		if (coldplug_synthesize_block_event (li->data) == FALSE)
- 			goto error;
- 		g_free (li->data);
- 	}
-@@ -500,7 +541,7 @@ coldplug_synthesize_events (void)
- 	g_dir_close (dir);
- 
- 	g_hash_table_destroy (sysfs_to_dev_map);
--       
-+
- 	return TRUE;
- error:
- 	HAL_ERROR (("Error building the orderered list of sysfs paths"));
-@@ -508,7 +549,7 @@ error:
- }
- 
- static gboolean
--coldplug_synthesize_block_event(const gchar *f, GHashTable *sysfs_to_dev_map)
-+coldplug_synthesize_block_event(const gchar *f)
- {
- 	GDir *dir1;
- 	gsize flen;
-@@ -540,9 +581,10 @@ coldplug_synthesize_block_event(const gc
- 	g_strlcpy (hotplug_event->sysfs.subsystem, "block", sizeof (hotplug_event->sysfs.subsystem));
- 	g_strlcpy (hotplug_event->sysfs.sysfs_path, path, sizeof (hotplug_event->sysfs.sysfs_path));
- 
--	device_file = (gchar *) g_hash_table_lookup (sysfs_to_dev_map, path);
-+	device_file = coldplug_get_device_file (path);
- 	if (device_file != NULL) {
- 		strncpy (hotplug_event->sysfs.device_file, device_file, sizeof (hotplug_event->sysfs.device_file));
-+		g_free (device_file);
- 	}
- 
- 	if (normalized_target != NULL)
-@@ -573,9 +615,10 @@ coldplug_synthesize_block_event(const gc
- 			g_strlcpy (hotplug_event->sysfs.subsystem, "block", sizeof (hotplug_event->sysfs.subsystem));
- 			g_strlcpy (hotplug_event->sysfs.sysfs_path, path1, sizeof (hotplug_event->sysfs.sysfs_path));
- 			g_strlcpy (hotplug_event->sysfs.wait_for_sysfs_path, path, sizeof (hotplug_event->sysfs.wait_for_sysfs_path));
--			device_file = (gchar *) g_hash_table_lookup (sysfs_to_dev_map, path1);
-+			device_file = coldplug_get_device_file (path1);
- 			if (device_file != NULL) {
- 				strncpy (hotplug_event->sysfs.device_file, device_file, sizeof (hotplug_event->sysfs.device_file));
-+				g_free (device_file);
- 			}
- 			hotplug_event->sysfs.net_ifindex = -1;
- 			hotplug_event_enqueue (hotplug_event);
-@@ -592,8 +635,7 @@ error:
- static void
- coldplug_compute_visit_device (const gchar *path, 
- 			       GHashTable *sysfs_to_bus_map, 
--			       GHashTable *sysfs_to_class_in_devices_map,
--			       GHashTable *sysfs_to_dev_map)
-+			       GHashTable *sysfs_to_class_in_devices_map)
- {
- 	gchar *bus;
- 	GError *err = NULL;
-@@ -647,9 +689,10 @@ coldplug_compute_visit_device (const gch
- 		g_strlcpy (hotplug_event->sysfs.subsystem, subsystem, sizeof (hotplug_event->sysfs.subsystem));
- 		g_strlcpy (hotplug_event->sysfs.sysfs_path, sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path));
- 
--		device_file = (gchar *) g_hash_table_lookup (sysfs_to_dev_map, sysfs_path);
-+		device_file = coldplug_get_device_file (sysfs_path);
- 		if (device_file != NULL) {
- 			strncpy (hotplug_event->sysfs.device_file, device_file, sizeof (hotplug_event->sysfs.device_file));
-+			g_free (device_file);
- 		}
- 		if (path != NULL)
- 			g_strlcpy (hotplug_event->sysfs.wait_for_sysfs_path, path, sizeof (hotplug_event->sysfs.wait_for_sysfs_path));
-@@ -669,7 +712,7 @@ coldplug_compute_visit_device (const gch
- 	while ((f = g_dir_read_name (dir)) != NULL) {
- 		gchar path_child[HAL_PATH_MAX];
- 		struct stat statbuf;
--	
-+
- 		g_snprintf (path_child, HAL_PATH_MAX, "%s/%s", path, f);
- 
- 		if (lstat (path_child, &statbuf) == 0) {
-@@ -678,8 +721,7 @@ coldplug_compute_visit_device (const gch
- 				/* recursion fun */
- 				coldplug_compute_visit_device (path_child, 
- 							       sysfs_to_bus_map, 
--							       sysfs_to_class_in_devices_map,
--							       sysfs_to_dev_map);
-+							       sysfs_to_class_in_devices_map);
- 			}
- 		}
- 	}
diff --git a/sys-apps/hal/hal-0.5.2.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
index d439c77bc8f2..d4d99e575a3b 100644
--- a/sys-apps/hal/hal-0.5.2.ebuild
+++ b/sys-apps/hal/hal-0.5.4.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.5.2.ebuild,v 1.2 2005/08/26 05:40:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.1 2005/08/27 04:09:31 cardoe Exp $
 
 inherit eutils linux-info versionator flag-o-matic
 
@@ -62,7 +62,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/hal-udev-63.patch
 	# remove pamconsole option
 	use pam_console || epatch ${FILESDIR}/${PN}-0.5.1-old_storage_policy.patch
 }