[Pkg-utopia-commits] r616 - in packages/experimental/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-19 22:39:36 +0000 (Sun, 19 Feb 2006)
New Revision: 616

Added:
   packages/experimental/hal/debian/patches/03_hald_runnerpath.patch
Modified:
   packages/experimental/hal/debian/changelog
Log:
* debian/patches/03_hald_runnerpath.patch 
  + Added. Give programs run by the runner a save PATH
* debian/patches/04_hald_scripts.patch
  + Added. Fix various bugs in the hal scripts

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2006-02-19 20:22:54 UTC (rev 615)
+++ packages/experimental/hal/debian/changelog	2006-02-19 22:39:36 UTC (rev 616)
@@ -18,8 +18,12 @@
     + Add small utility script to run hald from the debian dir.
   * debian/patches/storage-policy-debian.patch
     + Removed. Obsolete
+  * debian/patches/03_hald_runnerpath.patch 
+    + Added. Give programs run by the runner a save PATH
+  * debian/patches/04_hald_scripts.patch
+    + Added. Fix various bugs in the hal scripts
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:38:05 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Feb 2006 23:37:37 +0100
 
 hal (0.5.6-4) unstable; urgency=high
 

Added: packages/experimental/hal/debian/patches/03_hald_runnerpath.patch
===================================================================
--- packages/experimental/hal/debian/patches/03_hald_runnerpath.patch	2006-02-19 20:22:54 UTC (rev 615)
+++ packages/experimental/hal/debian/patches/03_hald_runnerpath.patch	2006-02-19 22:39:36 UTC (rev 616)
@@ -0,0 +1,66 @@
+Index: hald-runner/main.c
+===================================================================
+RCS file: /cvs/hal/hal/hald-runner/main.c,v
+retrieving revision 1.3
+diff -u -r1.3 main.c
+--- hald-runner/main.c	23 Jan 2006 14:54:48 -0000	1.3
++++ hald-runner/main.c	19 Feb 2006 21:35:26 -0000
+@@ -47,13 +47,15 @@
+ 	if (!dbus_message_iter_next(iter) || dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+ 		goto malformed;
+ 	dbus_message_iter_recurse(iter, &sub_iter);
+-	r->environment = get_string_array(&sub_iter);
++	/* Add default path for the programs we start */
++	tmpstr = g_strdup_printf("PATH=/sbin:/usr/sbin:/bin:/usr/bin:%s", getenv("PATH"));
++	r->environment = get_string_array(&sub_iter, tmpstr);
+ 
+ 	/* Then argv */
+ 	if (!dbus_message_iter_next(iter) || dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY) 
+ 		goto malformed;
+ 	dbus_message_iter_recurse(iter, &sub_iter);
+-	r->argv = get_string_array(&sub_iter);
++	r->argv = get_string_array(&sub_iter, NULL);
+ 
+ 	return TRUE;
+ 
+Index: hald-runner/utils.c
+===================================================================
+RCS file: /cvs/hal/hal/hald-runner/utils.c,v
+retrieving revision 1.2
+diff -u -r1.2 utils.c
+--- hald-runner/utils.c	23 Jan 2006 14:54:48 -0000	1.2
++++ hald-runner/utils.c	19 Feb 2006 21:35:26 -0000
+@@ -31,7 +31,7 @@
+ #include "utils.h"
+ 
+ char **
+-get_string_array(DBusMessageIter *iter)
++get_string_array(DBusMessageIter *iter, char *extra)
+ {
+ 	GArray *array;
+ 	char **result;
+@@ -45,6 +45,8 @@
+ 		g_array_append_vals(array, &t, 1);
+ 		dbus_message_iter_next(iter);
+ 	}
++	if (extra != NULL) 
++		g_array_append_vals(array, &extra, 1);
+ 	result = (char **) array->data;
+ 	g_array_free(array, FALSE);
+ 	return result;
+Index: hald-runner/utils.h
+===================================================================
+RCS file: /cvs/hal/hal/hald-runner/utils.h,v
+retrieving revision 1.1
+diff -u -r1.1 utils.h
+--- hald-runner/utils.h	21 Jan 2006 02:45:27 -0000	1.1
++++ hald-runner/utils.h	19 Feb 2006 21:35:26 -0000
+@@ -28,7 +28,7 @@
+ #define DBUS_API_SUBJECT_TO_CHANGE 
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+-char **get_string_array(DBusMessageIter *iter);
++char **get_string_array(DBusMessageIter *iter, gchar *extra);
+ char **get_string_array_from_fd(int fd);
+ void free_string_array(char **array);
+