Turn dmi on always for amd64, ia64, and x86. Fix ACPI support, prefering ACPI proc vs ACPId. bug #165822, bug #157220, bug #164652, & bug #152923

Package-Manager: portage-2.1.2-r9

4 files changed, 320 insertions, 0 deletions

diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1-r5 b/sys-apps/hal/files/digest-hal-0.5.7.1-r5
new file mode 100644
index 000000000000..3042516ecf0a
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.7.1-r5
@@ -0,0 +1,3 @@
+MD5 d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz 1503156
+RMD160 2861818b29546bd3628b1bda3d41238cf644c644 hal-0.5.7.1.tar.gz 1503156
+SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b hal-0.5.7.1.tar.gz 1503156
diff --git a/sys-apps/hal/files/hal-0.5.7.1-fix-dbus.patch b/sys-apps/hal/files/hal-0.5.7.1-fix-dbus.patch
new file mode 100644
index 000000000000..03fd76cb1bb8
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.7.1-fix-dbus.patch
@@ -0,0 +1,184 @@
+--- hal-0.5.7.1/tools/hal-device.c.fixdbus	2006-11-21 15:30:47.000000000 +0100
++++ hal-0.5.7.1/tools/hal-device.c	2006-11-21 15:30:48.000000000 +0100
+@@ -155,7 +155,6 @@
+ 
+ 	libhal_ctx_shutdown(hal_ctx, &error);
+ 	libhal_ctx_free(hal_ctx);
+-	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 	dbus_error_free(&error);
+ 
+--- hal-0.5.7.1/tools/lshal.c.fixdbus	2006-11-21 15:30:47.000000000 +0100
++++ hal-0.5.7.1/tools/lshal.c	2006-11-21 15:30:48.000000000 +0100
+@@ -701,7 +701,6 @@
+ 	libhal_ctx_shutdown (hal_ctx, &error);
+ 	libhal_ctx_free (hal_ctx);
+ 
+-	dbus_connection_close (conn);
+ 	dbus_connection_unref (conn);
+ 
+ 	if (show_device)
+--- hal-0.5.7.1/libhal/libhal.c.fixdbus	2006-02-12 22:47:28.000000000 +0100
++++ hal-0.5.7.1/libhal/libhal.c	2006-11-21 15:33:31.000000000 +0100
+@@ -1525,7 +1525,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1710,7 +1710,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1762,7 +1762,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1814,7 +1814,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1865,7 +1865,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1926,7 +1926,7 @@
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		if (strcmp (error->name,
+ 			    "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {
+ 			if (reason_why_locked != NULL) {
+@@ -1985,7 +1985,7 @@
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2040,7 +2040,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return NULL;
+ 	}
+@@ -2125,7 +2125,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2179,7 +2179,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2365,7 +2365,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2652,7 +2652,7 @@
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2788,7 +2788,7 @@
+ 			    "type='signal',"
+ 			    "interface='org.freedesktop.Hal.Device',"
+ 			    "sender='org.freedesktop.Hal'", error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -2820,7 +2820,7 @@
+ 		  "sender='org.freedesktop.Hal'," "path=%s", udi);
+ 
+ 	dbus_bus_add_match (ctx->connection, buf, error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -2848,7 +2848,7 @@
+ 		  "sender='org.freedesktop.Hal'," "path=%s", udi);
+ 
+ 	dbus_bus_remove_match (ctx->connection, buf, error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -3223,7 +3223,7 @@
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3273,7 +3273,7 @@
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3342,7 +3342,7 @@
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
diff --git a/sys-apps/hal/files/hal-0.5.7.1-indirection-fix.patch b/sys-apps/hal/files/hal-0.5.7.1-indirection-fix.patch
new file mode 100644
index 000000000000..198297251f9e
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.7.1-indirection-fix.patch
@@ -0,0 +1,117 @@
+diff -uNr hal-0.5.7.orig/hald/device_info.c hal-0.5.7/hald/device_info.c
+--- hal-0.5.7.orig/hald/device_info.c	2006-01-21 07:36:51.000000000 +0100
++++ hal-0.5.7/hald/device_info.c	2006-10-26 23:00:26.000000000 +0200
+@@ -1114,56 +1114,22 @@
+ 				    pc->merge_type, pc->merge_type));
+ 			break;
+ 		}
+-	} else if (pc->curelem == CURELEM_APPEND && pc->match_ok && 
++	} else if ((pc->curelem == CURELEM_APPEND || pc->curelem == CURELEM_PREPEND) && pc->match_ok && 
+ 		   (hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_STRING ||
+ 		    hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_STRLIST ||
+ 		    hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_INVALID)) {
+ 		char buf[256];
+ 		char buf2[256];
+ 
+-		/* As soon as we are appending, we have matched the device... */
++		/* As soon as we are appending/prepending, we have matched the device... */
+ 		pc->device_matched = TRUE;
+ 
+ 		if (pc->merge_type == MERGE_TYPE_STRLIST) {
+-			hal_device_property_strlist_append (pc->device, pc->merge_key, pc->cdata_buf);
+-		} else {
+-			const char *existing_string;
+-			
+-			switch (pc->merge_type) {
+-			case MERGE_TYPE_STRING:
+-				strncpy (buf, pc->cdata_buf, sizeof (buf));
+-				break;
+-				
+-			case MERGE_TYPE_COPY_PROPERTY:
+-				hal_device_property_get_as_string (pc->device, pc->cdata_buf, buf, sizeof (buf));
+-				break;
+-				
+-			default:
+-				HAL_ERROR (("Unknown merge_type=%d='%c'", pc->merge_type, pc->merge_type));
+-				break;
+-			}
+-			
+-			existing_string = hal_device_property_get_string (pc->device, pc->merge_key);
+-			if (existing_string != NULL) {
+-				strncpy (buf2, existing_string, sizeof (buf2));
+-				strncat (buf2, buf, sizeof (buf2) - strlen(buf2));
++			if (pc->curelem == CURELEM_APPEND){
++				hal_device_property_strlist_append (pc->device, pc->merge_key, pc->cdata_buf);
+ 			} else {
+-				strncpy (buf2, buf, sizeof (buf2));
++				hal_device_property_strlist_prepend (pc->device, pc->merge_key, pc->cdata_buf);
+ 			}
+-			hal_device_property_set_string (pc->device, pc->merge_key, buf2);
+-		}
+-	} else if (pc->curelem == CURELEM_PREPEND && pc->match_ok && 
+-		   (hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_STRING ||
+-		    hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_STRLIST ||
+-		    hal_device_property_get_type (pc->device, pc->merge_key) == HAL_PROPERTY_TYPE_INVALID)) {
+-		char buf[256];
+-		char buf2[256];
+-
+-		/* As soon as we are prepending, we have matched the device... */
+-		pc->device_matched = TRUE;
+-
+-		if (pc->merge_type == MERGE_TYPE_STRLIST) {
+-			hal_device_property_strlist_prepend (pc->device, pc->merge_key, pc->cdata_buf);
+ 		} else {
+ 			const char *existing_string;
+ 			
+@@ -1173,8 +1139,34 @@
+ 				break;
+ 				
+ 			case MERGE_TYPE_COPY_PROPERTY:
+-				hal_device_property_get_as_string (pc->device, pc->cdata_buf, buf, sizeof (buf));
++			{
++				char udi_to_merge_from[256];
++				char prop_to_merge[256];
++
++				/* Resolve key paths like 'someudi/foo/bar/baz:prop.name' 
++				 * '@prop.here.is.an.udi:with.prop.name'
++				 */
++				if (!resolve_udiprop_path (pc->cdata_buf,
++							   pc->device->udi,
++							   udi_to_merge_from, sizeof (udi_to_merge_from),
++							   prop_to_merge, sizeof (prop_to_merge))) {
++					HAL_ERROR (("Could not resolve keypath '%s' on udi '%s'", pc->cdata_buf, pc->device->udi));
++				} else {
++					HalDevice *d;
++
++					d = hal_device_store_find (hald_get_gdl (), udi_to_merge_from);
++					if (d == NULL) {
++						d = hal_device_store_find (hald_get_tdl (), udi_to_merge_from);
++					}
++					if (d == NULL) {
++						HAL_ERROR (("Could not find device with udi '%s'", udi_to_merge_from));
++					} else {
++						hal_device_property_get_as_string (d, prop_to_merge, buf, sizeof (buf));
++					}
++				}
++
+ 				break;
++			}
+ 				
+ 			default:
+ 				HAL_ERROR (("Unknown merge_type=%d='%c'", pc->merge_type, pc->merge_type));
+@@ -1183,8 +1175,13 @@
+ 			
+ 			existing_string = hal_device_property_get_string (pc->device, pc->merge_key);
+ 			if (existing_string != NULL) {
+-				strncpy (buf2, buf, sizeof (buf2));
+-				strncat (buf2, existing_string, sizeof (buf2) - strlen(buf2));
++				if (pc->curelem == CURELEM_APPEND){
++					strncpy (buf2, existing_string, sizeof (buf2));
++					strncat (buf2, buf, sizeof (buf2) - strlen(buf2));
++				} else {
++					strncpy (buf2, buf, sizeof (buf2));
++					strncat (buf2, existing_string, sizeof (buf2) - strlen(buf2));
++				}
+ 			} else {
+ 				strncpy (buf2, buf, sizeof (buf2));
+ 			}
diff --git a/sys-apps/hal/files/hal-0.5.7.1-rescan-on-resume.patch b/sys-apps/hal/files/hal-0.5.7.1-rescan-on-resume.patch
new file mode 100644
index 000000000000..e9eeb3142016
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.7.1-rescan-on-resume.patch
@@ -0,0 +1,16 @@
+--- tools/hal-system-power-hibernate	2006-04-26 19:25:40.000000000 -0500
++++ tools/hal-system-power-hibernate	2006-04-26 19:34:00.000000000 -0500
+@@ -53,4 +53,13 @@
+ 		fi
+ 	fi
+ 
++# Refresh devices when resuming from a hibernate
++for type in button battery ac_adapter ; do
++   devices=$(hal-find-by-capability --capability $type)
++   for device in $devices ; do
++      dbus-send --system --print-reply --dest=org.freedesktop.Hal $device \
++                org.freedesktop.Hal.Device.Rescan
++   done
++done
++
+ exit $RET