[Pkg-utopia-commits] r1221 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2007-01-15 14:37:57 +0100 (Mon, 15 Jan 2007)
New Revision: 1221

Added:
   packages/unstable/hal/debian/patches/28_runner_64bit_values.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/28_runner_64bit_values.patch
  - Added. Ensure 64 bit values are correctly aligned before passing them to
  dbus (Closes: #404937)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2007-01-13 16:08:10 UTC (rev 1220)
+++ packages/unstable/hal/debian/changelog	2007-01-15 13:37:57 UTC (rev 1221)
@@ -13,8 +13,13 @@
   * debian/control:
     + Updated to use my debian.org mail address
 
- -- Sebastian Dröge <slomo at debian.org>  Mon,  8 Jan 2007 02:10:08 +0100
+  [ Sjoerd Simons ]
+  * debian/patches/28_runner_64bit_values.patch
+    - Added. Ensure 64 bit values are correctly aligned before passing them to
+    dbus (Closes: #404937)
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 15 Jan 2007 14:28:45 +0100
+
 hal (0.5.8.1-4) unstable; urgency=low
 
   [ Michael Biebl ]

Added: packages/unstable/hal/debian/patches/28_runner_64bit_values.patch
===================================================================
--- packages/unstable/hal/debian/patches/28_runner_64bit_values.patch	2007-01-13 16:08:10 UTC (rev 1220)
+++ packages/unstable/hal/debian/patches/28_runner_64bit_values.patch	2007-01-15 13:37:57 UTC (rev 1221)
@@ -0,0 +1,48 @@
+diff --git a/hald-runner/main.c b/hald-runner/main.c
+index 3b170b3..3842cb8 100644
+--- a/hald-runner/main.c
++++ b/hald-runner/main.c
+@@ -128,9 +128,10 @@ handle_start(DBusConnection *con, DBusMessage *msg)
+ 		goto malformed;
+ 
+ 	if (run_request_run(r, con, NULL, &pid)) {
++		gint64 ppid = pid;
+ 		reply = dbus_message_new_method_return(msg);
+ 		dbus_message_append_args (reply, 
+-					  DBUS_TYPE_INT64, &pid,
++					  DBUS_TYPE_INT64, &ppid,
+ 					  DBUS_TYPE_INVALID);
+ 					  
+ 	} else {
+diff --git a/hald-runner/runner.c b/hald-runner/runner.c
+index 57a2a80..8cbc777 100644
+--- a/hald-runner/runner.c
++++ b/hald-runner/runner.c
+@@ -175,11 +175,12 @@ out:
+ 	/* emit a signal that this PID exited */
+ 	if(rd->con != NULL && rd->emit_pid_exited) {
+ 		DBusMessage *signal;
++		gint64 ppid = rd->pid;
+ 		signal = dbus_message_new_signal ("/org/freedesktop/HalRunner",
+ 						  "org.freedesktop.HalRunner",
+ 						  "StartedProcessExited");
+ 		dbus_message_append_args (signal, 
+-					  DBUS_TYPE_INT64, &(rd->pid),
++					  DBUS_TYPE_INT64, &(ppid),
+ 					  DBUS_TYPE_INVALID);
+ 		dbus_connection_send(rd->con, signal, NULL);
+ 	}
+diff --git a/hald/hald_runner.c b/hald/hald_runner.c
+index 41fa987..4233549 100644
+--- a/hald/hald_runner.c
++++ b/hald/hald_runner.c
+@@ -576,6 +576,9 @@ hald_runner_run_method(HalDevice *device,
+                                               msg, &call, INT_MAX))
+     DIE (("No memory"));
+ 
++  if (call == NULL)
++    DIE (("Not connected to the runner"));
++
+   hd = g_new0 (HelperData, 1);
+   hd->d = device;
+   hd->cb = cb;