[arch-commits] CVS update of extra/system/hal (13 files)
Jan de Groot
jgc at archlinux.org
Wed May 30 07:37:11 UTC 2007
Date: Wednesday, May 30, 2007 @ 03:37:11
Author: jgc
Path: /home/cvs-extra/extra/system/hal
Modified: PKGBUILD (1.41 -> 1.42)
Removed: 10_callout_errors.patch (1.1) 24_dbus_connection_close.patch (1.1)
25_correctly_free_lists.patch (1.1)
26_fix_hald_not_running_coredump.patch (1.1)
27_hal_fix_dbus_error_is_set.patch (1.1)
53_dbus_is_error_set.patch (1.1)
hal-0.5.8.1-shareddbus-noclose.patch (1.1)
hal-0.5.8.1-stat-devicefile-not-mountpoint.patch (1.1)
hal-check-for-error.patch (1.1) hal-crash-winpart.patch (1.1)
hal-fix-assertion.patch (1.1) writespeeds-dontcrash.patch (1.1)
upgpkg: hal 0.5.9-3
Clean up old patches, add dmidecode to depends
--------------------------------------------------+
10_callout_errors.patch | 131 --------------
24_dbus_connection_close.patch | 36 ----
25_correctly_free_lists.patch | 24 --
26_fix_hald_not_running_coredump.patch | 122 -------------
27_hal_fix_dbus_error_is_set.patch | 184 ---------------------
53_dbus_is_error_set.patch | 82 ---------
PKGBUILD | 8
hal-0.5.8.1-shareddbus-noclose.patch | 35 ---
hal-0.5.8.1-stat-devicefile-not-mountpoint.patch | 94 ----------
hal-check-for-error.patch | 11 -
hal-crash-winpart.patch | 13 -
hal-fix-assertion.patch | 18 --
writespeeds-dontcrash.patch | 27 ---
13 files changed, 4 insertions(+), 781 deletions(-)
Index: extra/system/hal/10_callout_errors.patch
diff -u extra/system/hal/10_callout_errors.patch:1.1 extra/system/hal/10_callout_errors.patch:removed
--- extra/system/hal/10_callout_errors.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/10_callout_errors.patch Wed May 30 03:37:10 2007
@@ -1,131 +0,0 @@
-commit 7ca14a9265548dc74cc6b16517d8d3f23e6d4c6c
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Mon Oct 2 18:26:18 2006 +0200
-
- use dbus_error_free instead of LIBHAL_FREE_DBUS_ERROR so errors are correctly
- reported to hald-runner
-
- Various tools use LIBHAL_FREE_DBUS_ERROR, which will print an error to stderror
- when the error is not set. Because the runner uses stderror to get the errors
- from the callout, this confuses it somewhat. Using dbus_error_free instead of
- LIBHAL_FREE_DBUS_ERROR solves this.
-
-diff --git a/tools/hal-storage-closetray.c b/tools/hal-storage-closetray.c
-index 755ccd1..2866afd 100644
---- a/tools/hal-storage-closetray.c
-+++ b/tools/hal-storage-closetray.c
-@@ -107,7 +107,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -115,7 +115,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-eject.c b/tools/hal-storage-eject.c
-index 65248f3..3234be4 100644
---- a/tools/hal-storage-eject.c
-+++ b/tools/hal-storage-eject.c
-@@ -109,7 +109,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -117,7 +117,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c
-index ef8d1a9..9c1348d 100644
---- a/tools/hal-storage-mount.c
-+++ b/tools/hal-storage-mount.c
-@@ -272,7 +272,7 @@ volume_findby (LibHalContext *hal_ctx, c
- dbus_error_init (&error);
- if ((hal_udis = libhal_manager_find_device_string_match (hal_ctx, property,
- value, &num_hal_udis, &error)) == NULL) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- goto out;
- }
- for (i = 0; i < num_hal_udis; i++) {
-@@ -493,7 +493,7 @@ #endif
- dbus_error_init (&error);
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error) ||
- dbus_error_is_set (&error)) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- permission_denied_volume_ignore (device);
- }
-
-@@ -1011,7 +1011,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -1019,7 +1019,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
-index 0b95a35..f6e0bf2 100644
---- a/tools/hal-storage-shared.c
-+++ b/tools/hal-storage-shared.c
-@@ -288,7 +288,7 @@ #endif
- dbus_error_init (&error);
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error) ||
- dbus_error_is_set (&error)) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- permission_denied_volume_ignore (device);
- }
-
-diff --git a/tools/hal-storage-unmount.c b/tools/hal-storage-unmount.c
-index d1239f7..ef7cee9 100644
---- a/tools/hal-storage-unmount.c
-+++ b/tools/hal-storage-unmount.c
-@@ -112,7 +112,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -120,7 +120,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
Index: extra/system/hal/24_dbus_connection_close.patch
diff -u extra/system/hal/24_dbus_connection_close.patch:1.1 extra/system/hal/24_dbus_connection_close.patch:removed
--- extra/system/hal/24_dbus_connection_close.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/24_dbus_connection_close.patch Wed May 30 03:37:10 2007
@@ -1,36 +0,0 @@
-From: Timo Hoenig <thoenig at suse.de>
-Date: Mon, 23 Oct 2006 15:35:17 +0000 (-0400)
-Subject: don't call dbus_connection_close() for some of our tools
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c85e02d58d6503b494bb4c8584a7c44ac6923208
-
-don't call dbus_connection_close() for some of our tools
-
-lshal and hal-device should not call dbus_connection_close() as they do
-not have a private connection to the bus.
-
-This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
-messages. Note: It is safe to apply this patch for HAL when using older
-versions of D-Bus, too.
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -161,7 +161,6 @@ int main(int argc, char **argv)
-
- libhal_ctx_shutdown(hal_ctx, &error);
- libhal_ctx_free(hal_ctx);
-- dbus_connection_close(conn);
- dbus_connection_unref(conn);
- dbus_error_free(&error);
-
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -723,7 +723,6 @@ main (int argc, char *argv[])
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_ctx_free (hal_ctx);
-
-- dbus_connection_close (conn);
- dbus_connection_unref (conn);
-
- if (show_device)
-
Index: extra/system/hal/25_correctly_free_lists.patch
diff -u extra/system/hal/25_correctly_free_lists.patch:1.1 extra/system/hal/25_correctly_free_lists.patch:removed
--- extra/system/hal/25_correctly_free_lists.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/25_correctly_free_lists.patch Wed May 30 03:37:10 2007
@@ -1,24 +0,0 @@
-From: John (J5) Palmieri <johnp at redhat.com>
-Date: Mon, 6 Nov 2006 16:48:55 +0000 (-0500)
-Subject: use g_slist_remove_link instead of g_slist_remove
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=a56a15b90177734c70a8b03d961a7bcabdea2af8
-
-use g_slist_remove_link instead of g_slist_remove
-
-Data would be freed and then g_slist_remove would be called on the
-link which would leave the link in the list, any subsequent iteration
-over the list would cause us to access freed memory.
----
-
---- a/hald/hald_dbus.c
-+++ b/hald/hald_dbus.c
-@@ -3976,7 +3976,7 @@ local_server_message_handler (DBusConnec
- g_free (hih->introspection_xml);
- g_free (hih->udi);
- g_free (hih);
-- helper_interface_handlers = g_slist_remove (helper_interface_handlers, i);
-+ helper_interface_handlers = g_slist_remove_link (helper_interface_handlers, i);
- }
- }
-
-
Index: extra/system/hal/26_fix_hald_not_running_coredump.patch
diff -u extra/system/hal/26_fix_hald_not_running_coredump.patch:1.1 extra/system/hal/26_fix_hald_not_running_coredump.patch:removed
--- extra/system/hal/26_fix_hald_not_running_coredump.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/26_fix_hald_not_running_coredump.patch Wed May 30 03:37:10 2007
@@ -1,122 +0,0 @@
-From: Artem Kachitchkine <artem.kachitchkin at sun.com>
-Date: Thu, 12 Oct 2006 17:03:08 +0000 (-0700)
-Subject: do not let tools coredump if HAL is not running
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c2053bf825cd9d81949d63ad83790a68310bb808
-
-do not let tools coredump if HAL is not running
-
-Make HAL tools actually fail with a useful message
-in case HAL not running on a system.
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -136,12 +136,16 @@ int main(int argc, char **argv)
- return 2;
- }
-
-- // fprintf(stderr, "connected to: %s\n", dbus_bus_get_unique_name(conn));
-+ /* fprintf(stderr, "connected to: %s\n", dbus_bus_get_unique_name(conn)); */
- if (!(hal_ctx = libhal_ctx_new())) return 3;
- if (!libhal_ctx_set_dbus_connection(hal_ctx, conn)) return 4;
- if (!libhal_ctx_init(hal_ctx, &error)) {
-- fprintf(stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 5;
- }
-
---- a/tools/hal_find_by_capability.c
-+++ b/tools/hal_find_by_capability.c
-@@ -147,8 +147,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_find_by_property.c
-+++ b/tools/hal_find_by_property.c
-@@ -154,8 +154,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_get_property.c
-+++ b/tools/hal_get_property.c
-@@ -163,8 +163,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_set_property.c
-+++ b/tools/hal_set_property.c
-@@ -230,8 +230,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -682,11 +682,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n",
-- error.name, error.message);
-- fprintf (stderr, "Could not initialise connection to hald. \n "
-- "Normally this mean the HAL daemon (hald) is not running or not ready.\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
-
Index: extra/system/hal/27_hal_fix_dbus_error_is_set.patch
diff -u extra/system/hal/27_hal_fix_dbus_error_is_set.patch:1.1 extra/system/hal/27_hal_fix_dbus_error_is_set.patch:removed
--- extra/system/hal/27_hal_fix_dbus_error_is_set.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/27_hal_fix_dbus_error_is_set.patch Wed May 30 03:37:10 2007
@@ -1,184 +0,0 @@
-diff --git a/libhal/libhal.c b/libhal/libhal.c
-index e88ca3d..49ac5c4 100644
---- a/libhal/libhal.c
-+++ b/libhal/libhal.c
-@@ -1457,7 +1457,7 @@ libhal_device_set_property_helper (LibHa
- 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;
- }
-@@ -1650,7 +1650,7 @@ libhal_device_property_strlist_append (L
- 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;
- }
-@@ -1703,7 +1703,7 @@ libhal_device_property_strlist_prepend (
- 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;
- }
-@@ -1756,7 +1756,7 @@ libhal_device_property_strlist_remove_in
- 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;
- }
-@@ -1808,7 +1808,7 @@ libhal_device_property_strlist_remove (L
- 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;
- }
-@@ -1867,7 +1867,7 @@ libhal_device_lock (LibHalContext *ctx,
- 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) {
-@@ -1928,7 +1928,7 @@ libhal_device_unlock (LibHalContext *ctx
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1983,7 +1983,7 @@ libhal_new_device (LibHalContext *ctx, D
- 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;
- }
-@@ -2066,7 +2066,7 @@ libhal_device_commit_to_gdl (LibHalConte
- 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;
- }
-@@ -2122,7 +2122,7 @@ libhal_remove_device (LibHalContext *ctx
- 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;
- }
-@@ -2314,7 +2314,7 @@ libhal_merge_properties (LibHalContext *
- 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;
- }
-@@ -2604,7 +2604,7 @@ libhal_device_add_capability (LibHalCont
- 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;
- }
-@@ -2744,7 +2744,7 @@ libhal_device_property_watch_all (LibHal
- "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;
-@@ -2778,7 +2778,7 @@ libhal_device_add_property_watch (LibHal
- "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;
-@@ -2808,7 +2808,7 @@ libhal_device_remove_property_watch (Lib
- "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 @@ libhal_device_rescan (LibHalContext *ctx
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3283,7 +3283,7 @@ libhal_device_reprobe (LibHalContext *ct
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3354,7 +3354,7 @@ dbus_bool_t libhal_device_emit_condition
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3420,7 +3420,7 @@ libhal_device_addon_is_ready (LibHalCont
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3491,7 +3491,7 @@ libhal_device_claim_interface (LibHalCon
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
Index: extra/system/hal/53_dbus_is_error_set.patch
diff -u extra/system/hal/53_dbus_is_error_set.patch:1.1 extra/system/hal/53_dbus_is_error_set.patch:removed
--- extra/system/hal/53_dbus_is_error_set.patch:1.1 Tue Feb 6 18:43:40 2007
+++ extra/system/hal/53_dbus_is_error_set.patch Wed May 30 03:37:10 2007
@@ -1,82 +0,0 @@
-From: Danny Kukawka <danny.kukawka at web.de>
-Date: Fri, 13 Oct 2006 09:46:03 +0000 (+0200)
-Subject: replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=0a9965e4aa4ffc2f382d7fe1286937308439fd1f
-
-replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
-
-Replaced _again_ usage of macro LIBHAL_FREE_DBUS_ERROR with
-dbus_error_free().
-
-NOTE: If you use dbus_error_is_set() to check if the error is set,
- you should not use LIBHAL_FREE_DBUS_ERROR to free the error.
- Better use dbus_error_free() directly in this case to avoid
- double call of dbus_error_is_set().
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -142,7 +142,7 @@ int main(int argc, char **argv)
- if (!libhal_ctx_init(hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- }
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/hal_find_by_property.c
-+++ b/tools/hal_find_by_property.c
-@@ -156,7 +156,7 @@ main (int argc, char *argv[])
- if (!libhal_ctx_init (hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- }
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
-@@ -168,7 +168,7 @@ main (int argc, char *argv[])
-
- if (dbus_error_is_set (&error)) {
- fprintf (stderr, "error: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- return 1;
- }
-
---- a/tools/hal_get_property.c
-+++ b/tools/hal_get_property.c
-@@ -165,7 +165,7 @@ main (int argc, char *argv[])
- if (!libhal_ctx_init (hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- }
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/hal_set_property.c
-+++ b/tools/hal_set_property.c
-@@ -232,7 +232,7 @@ main (int argc, char *argv[])
- if (!libhal_ctx_init (hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- }
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -684,7 +684,7 @@ main (int argc, char *argv[])
- if (!libhal_ctx_init (hal_ctx, &error)) {
- if (dbus_error_is_set(&error)) {
- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- }
- fprintf (stderr, "Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
-
-
Index: extra/system/hal/PKGBUILD
diff -u extra/system/hal/PKGBUILD:1.41 extra/system/hal/PKGBUILD:1.42
--- extra/system/hal/PKGBUILD:1.41 Tue May 1 17:56:44 2007
+++ extra/system/hal/PKGBUILD Wed May 30 03:37:10 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.41 2007/05/01 21:56:44 jgc Exp $
+# $Id: PKGBUILD,v 1.42 2007/05/30 07:37:10 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
# Contributor: Link Dupont <link at subpop.net>
pkgname=hal
pkgver=0.5.9
-pkgrel=2
+pkgrel=3
pkgdesc="Hardware Abstraction Layer"
arch=(i686 x86_64)
license=('GPL' 'custom')
url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.73' 'libusb' 'udev>=089' 'filesystem>=0.7.1-5' 'hal-info>=0.20070402' 'eject' 'libsmbios>=0.13.6')
+depends=('dbus-glib>=0.73' 'libusb' 'udev>=089' 'filesystem>=0.7.1-5' 'hal-info>=0.20070402' 'eject' 'libsmbios>=0.13.6' 'dmidecode')
makedepends=('pkgconfig')
-options=('nolibtool')
+options=('!libtool')
install=hal.install
source=(http://people.freedesktop.org/~david/dist/${pkgname}-${pkgver}.tar.gz
hal
Index: extra/system/hal/hal-0.5.8.1-shareddbus-noclose.patch
diff -u extra/system/hal/hal-0.5.8.1-shareddbus-noclose.patch:1.1 extra/system/hal/hal-0.5.8.1-shareddbus-noclose.patch:removed
--- extra/system/hal/hal-0.5.8.1-shareddbus-noclose.patch:1.1 Sun Feb 4 12:56:52 2007
+++ extra/system/hal/hal-0.5.8.1-shareddbus-noclose.patch Wed May 30 03:37:10 2007
@@ -1,35 +0,0 @@
-From: Timo Hoenig <thoenig at suse.de>
-Date: Mon, 23 Oct 2006 15:35:17 +0000 (-0400)
-Subject: don't call dbus_connection_close() for some of our tools
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c85e02d58d6503b494bb4c8584a7c44ac6923208
-
-don't call dbus_connection_close() for some of our tools
-
-lshal and hal-device should not call dbus_connection_close() as they do
-not have a private connection to the bus.
-
-This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
-messages. Note: It is safe to apply this patch for HAL when using older
-versions of D-Bus, too.
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -161,7 +161,6 @@ int main(int argc, char **argv)
-
- libhal_ctx_shutdown(hal_ctx, &error);
- libhal_ctx_free(hal_ctx);
-- dbus_connection_close(conn);
- dbus_connection_unref(conn);
- dbus_error_free(&error);
-
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -723,7 +723,6 @@ main (int argc, char *argv[])
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_ctx_free (hal_ctx);
-
-- dbus_connection_close (conn);
- dbus_connection_unref (conn);
-
- if (show_device)
Index: extra/system/hal/hal-0.5.8.1-stat-devicefile-not-mountpoint.patch
diff -u extra/system/hal/hal-0.5.8.1-stat-devicefile-not-mountpoint.patch:1.1 extra/system/hal/hal-0.5.8.1-stat-devicefile-not-mountpoint.patch:removed
--- extra/system/hal/hal-0.5.8.1-stat-devicefile-not-mountpoint.patch:1.1 Wed Sep 27 17:27:05 2006
+++ extra/system/hal/hal-0.5.8.1-stat-devicefile-not-mountpoint.patch Wed May 30 03:37:10 2007
@@ -1,94 +0,0 @@
-From: David Zeuthen <davidz at redhat.com>
-Date: Mon, 25 Sep 2006 03:21:28 +0000 (-0400)
-Subject: stat special device file, not the mount point
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=2ea340399bf8cf3d2bb6bd1b5c4ecbc2042e93d4
-
-stat special device file, not the mount point
-
-This is required to make FUSE mounts work for e.g. the ntfs-fuse
-driver. Also remove the list used for autofs, no longer needed as we
-don't use the .created-by-hal file anymore.
----
-
---- a/hald/linux/blockdev.c
-+++ b/hald/linux/blockdev.c
-@@ -168,7 +168,6 @@ blockdev_refresh_mount_state (HalDevice
- dev_t devt = makedev(0, 0);
- GSList *volumes = NULL;
- GSList *volume;
-- GSList *autofs_mounts = NULL;
-
- /* open /proc/mounts */
- g_snprintf (buf, sizeof (buf), "%s/mounts", get_hal_proc_path ());
-@@ -189,6 +188,8 @@ blockdev_refresh_mount_state (HalDevice
- while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
- struct stat statbuf;
-
-+ /*HAL_INFO ((" * /proc/mounts contain dev %s - type %s", mnt.mnt_fsname, mnt.mnt_type));*/
-+
- /* If this is a nfs mount (fstype == 'nfs') ignore the mount. Reason:
- * 1. we don't list nfs devices in HAL
- * 2. more problematic: stat on mountpoints with 'stale nfs handle' never come
-@@ -197,35 +198,14 @@ blockdev_refresh_mount_state (HalDevice
- if (strcmp(mnt.mnt_type, "nfs") == 0)
- continue;
-
-- /* If this is an autofs mount (fstype == 'autofs')
-- * store the mount in a list for later use.
-- * On mounts managed by autofs accessing files below the mount
-- * point cause the mount point to be remounted after an
-- * unmount. We keep the list so we do not check for
-- * the .created-by-hal file on mounts under autofs mount points
-- */
-- if (strcmp(mnt.mnt_type, "autofs") == 0) {
-- char *mnt_dir;
--
-- if (mnt.mnt_dir[strlen (mnt.mnt_dir) - 1] != '/')
-- mnt_dir = g_strdup_printf ("%s/", mnt.mnt_dir);
-- else
-- mnt_dir = g_strdup (mnt.mnt_dir);
--
-- autofs_mounts = g_slist_append (autofs_mounts,
-- mnt_dir);
--
--
-+ /* get major:minor of special device file */
-+ if (stat (mnt.mnt_fsname, &statbuf) != 0)
- continue;
-- }
-
-- /* check the underlying device of the mount point */
-- if (stat (mnt.mnt_dir, &statbuf) != 0)
-- continue;
-- if (major(statbuf.st_dev) == 0)
-+ if (major (statbuf.st_rdev) == 0)
- continue;
-
-- /*HAL_INFO (("* found mounts dev %s (%i:%i)", mnt.mnt_fsname, major(statbuf.st_dev), minor(statbuf.st_dev)));*/
-+ /*HAL_INFO (("* found mounts dev %s (%i:%i)", mnt.mnt_fsname, major (statbuf.st_rdev), minor (statbuf.st_rdev)));*/
- /* match against all hal volumes */
- for (volume = volumes; volume != NULL; volume = g_slist_next (volume)) {
- HalDevice *dev;
-@@ -235,10 +215,10 @@ blockdev_refresh_mount_state (HalDevice
- if (major == 0)
- continue;
- minor = hal_device_property_get_int (dev, "block.minor");
-- devt = makedev(major, minor);
-+ devt = makedev (major, minor);
- /*HAL_INFO ((" match %s (%i:%i)", hal_device_get_udi (dev), major, minor));*/
-
-- if (statbuf.st_dev == devt) {
-+ if (statbuf.st_rdev == devt) {
- /* found entry for this device in /proc/mounts */
- device_property_atomic_update_begin ();
- hal_device_property_set_bool (dev, "volume.is_mounted", TRUE);
-@@ -255,9 +235,6 @@ blockdev_refresh_mount_state (HalDevice
- }
- }
-
-- g_slist_foreach (autofs_mounts, (GFunc) g_free, NULL);
-- g_slist_free (autofs_mounts);
--
- /* all remaining volumes are not mounted */
- for (volume = volumes; volume != NULL; volume = g_slist_next (volume)) {
- HalDevice *dev;
Index: extra/system/hal/hal-check-for-error.patch
diff -u extra/system/hal/hal-check-for-error.patch:1.1 extra/system/hal/hal-check-for-error.patch:removed
--- extra/system/hal/hal-check-for-error.patch:1.1 Wed Sep 27 17:27:05 2006
+++ extra/system/hal/hal-check-for-error.patch Wed May 30 03:37:10 2007
@@ -1,11 +0,0 @@
---- hal-0.5.8.1/libhal/libhal.c.orig 2006-09-27 20:35:03.000000000 +0200
-+++ hal-0.5.8.1/libhal/libhal.c 2006-09-27 20:35:35.000000000 +0200
-@@ -1457,7 +1457,7 @@ libhal_device_set_property_helper (LibHa
- 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;
- }
Index: extra/system/hal/hal-crash-winpart.patch
diff -u extra/system/hal/hal-crash-winpart.patch:1.1 extra/system/hal/hal-crash-winpart.patch:removed
--- extra/system/hal/hal-crash-winpart.patch:1.1 Sat Oct 7 05:54:46 2006
+++ extra/system/hal/hal-crash-winpart.patch Wed May 30 03:37:10 2007
@@ -1,13 +0,0 @@
---- hal-0.5.8.1/partutil/partutil.c 2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1/partutil/partutil.c 2006-10-07 11:31:51.000000000 +0200
-@@ -584,8 +584,8 @@
- }
-
- //HAL_INFO (("pe = %p", pe));
--
-- p->entries = g_slist_append (p->entries, pe);
-+ if( pe != NULL)
-+ p->entries = g_slist_append (p->entries, pe);
- }
-
- out:
Index: extra/system/hal/hal-fix-assertion.patch
diff -u extra/system/hal/hal-fix-assertion.patch:1.1 extra/system/hal/hal-fix-assertion.patch:removed
--- extra/system/hal/hal-fix-assertion.patch:1.1 Wed Sep 27 17:27:05 2006
+++ extra/system/hal/hal-fix-assertion.patch Wed May 30 03:37:10 2007
@@ -1,18 +0,0 @@
-diff --git a/doc/api/.gitignore b/doc/api/.gitignore
-diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
-diff --git a/doc/api/hal-docs.xml b/doc/api/hal-docs.xml
-diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
-index 7a51bfb..741a52e 100644
---- a/hald/hald_dbus.c
-+++ b/hald/hald_dbus.c
-@@ -2902,7 +2902,8 @@ device_is_executing_method (HalDevice *d
-
- ret = FALSE;
-
-- if (g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
-+ if (udi_to_method_queue != NULL &&
-+ g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
-
- if (queue != NULL) {
- MethodInvocation *mi;
-diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
Index: extra/system/hal/writespeeds-dontcrash.patch
diff -u extra/system/hal/writespeeds-dontcrash.patch:1.1 extra/system/hal/writespeeds-dontcrash.patch:removed
--- extra/system/hal/writespeeds-dontcrash.patch:1.1 Wed Sep 27 17:27:05 2006
+++ extra/system/hal/writespeeds-dontcrash.patch Wed May 30 03:37:10 2007
@@ -1,27 +0,0 @@
-From: David Zeuthen <davidz at redhat.com>
-Date: Tue, 26 Sep 2006 19:50:51 +0000 (-0400)
-Subject: don't crash on cd drives without write capabilities
-X-Git-Tag: HAL_0_2
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c127f54ee1a91743989ccdbe93025740fe9cec73
-
-don't crash on cd drives without write capabilities
-
-This fix needs to be forward-ported to master. Probably we shouldn't
-be looking for write speeds unless the drive can write. This fix
-will do it for the 0.5.8 series though.
----
-
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -254,8 +254,10 @@ main (int argc, char *argv[])
- free (write_speeds);
- }
- } else {
-+ gchar *wspeeds[1] = {NULL};
- libhal_changeset_set_property_int (cs, "storage.cdrom.write_speed", 0);
-- libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", NULL);
-+ libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds",
-+ (const char **) wspeeds);
- }
- }
-
More information about the arch-commits
mailing list