summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/hal/ChangeLog7
-rw-r--r--sys-apps/hal/files/hal-0.5.7.1-dbus-close.patch24
2 files changed, 30 insertions, 1 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 2960eb3b8676..1dccef77a77d 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.95 2006/08/16 03:36:55 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.96 2006/08/16 05:45:01 steev Exp $
+
+ 16 Aug 2006; Steev Klimaszewski <steev@gentoo.org>
+ +files/hal-0.5.7.1-dbus-close.patch:
+ And add the missing patch, closes bug #144075, thanks to Courtney Oliver for
+ reporting.
*hal-0.5.7.1 (16 Aug 2006)
diff --git a/sys-apps/hal/files/hal-0.5.7.1-dbus-close.patch b/sys-apps/hal/files/hal-0.5.7.1-dbus-close.patch
new file mode 100644
index 000000000000..d7dabac69c8b
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.7.1-dbus-close.patch
@@ -0,0 +1,24 @@
+diff -ruN hal-0.5.7.1.orig/tools/hal-device.c hal-0.5.7.1/tools/hal-device.c
+--- hal-0.5.7.1.orig/tools/hal-device.c 2006-07-28 16:07:56.000000000 -0500
++++ hal-0.5.7.1/tools/hal-device.c 2006-07-28 16:08:36.000000000 -0500
+@@ -155,7 +155,7 @@
+
+ libhal_ctx_shutdown(hal_ctx, &error);
+ libhal_ctx_free(hal_ctx);
+- dbus_connection_disconnect(conn);
++ dbus_connection_close(conn);
+ dbus_connection_unref(conn);
+ dbus_error_free(&error);
+
+diff -ruN hal-0.5.7.1.orig/tools/lshal.c hal-0.5.7.1/tools/lshal.c
+--- hal-0.5.7.1.orig/tools/lshal.c 2006-07-28 16:07:56.000000000 -0500
++++ hal-0.5.7.1/tools/lshal.c 2006-07-28 16:08:52.000000000 -0500
+@@ -701,7 +701,7 @@
+ libhal_ctx_shutdown (hal_ctx, &error);
+ libhal_ctx_free (hal_ctx);
+
+- dbus_connection_disconnect (conn);
++ dbus_connection_close (conn);
+ dbus_connection_unref (conn);
+
+ if (show_device)