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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-01 23:00:58 +0000 (Wed, 01 Feb 2006)
New Revision: 541

Added:
   packages/unstable/hal/debian/patches/04_hald-no-patch.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
Start correctly when PATH is not set

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-02-01 22:53:22 UTC (rev 540)
+++ packages/unstable/hal/debian/changelog	2006-02-01 23:00:58 UTC (rev 541)
@@ -11,8 +11,10 @@
   * debian/patches/03_storage_sigio.patch
     + Added. Switch EjectButton detection to SG_IO interface. Solves some
     problems with scsi cdrom drives (from hal CVS)
+  * debian/patches/04_hald-no-patch.patch 
+    + Added. Also start correctly when PATH is not set (Closes: #345391)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed,  1 Feb 2006 23:52:18 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed,  1 Feb 2006 23:59:58 +0100
 
 hal (0.5.6-1) experimental; urgency=low
 

Added: packages/unstable/hal/debian/patches/04_hald-no-patch.patch
===================================================================
--- packages/unstable/hal/debian/patches/04_hald-no-patch.patch	2006-02-01 22:53:22 UTC (rev 540)
+++ packages/unstable/hal/debian/patches/04_hald-no-patch.patch	2006-02-01 23:00:58 UTC (rev 541)
@@ -0,0 +1,27 @@
+diff -ruN hal-0.5.6-old/hald/hald.c hal-0.5.6/hald/hald.c
+--- hal-0.5.6-old/hald/hald.c	2006-02-01 23:56:06.000000000 +0100
++++ hal-0.5.6/hald/hald.c	2006-02-01 23:56:18.000000000 +0100
+@@ -382,13 +382,18 @@
+ 	 * run-hald.sh and friends)
+ 	 */
+ 	path = getenv ("PATH");
+-	g_strlcpy (newpath, path, sizeof (newpath));
+ 	if (path != NULL) {
++		g_strlcpy (newpath, path, sizeof (newpath));
+ 		g_strlcat (newpath, ":", sizeof (newpath));
+-		g_strlcat (newpath, PACKAGE_LIBEXEC_DIR, sizeof (newpath));
+-		g_strlcat (newpath, ":", sizeof (newpath));
+-		g_strlcat (newpath, PACKAGE_SCRIPT_DIR, sizeof (newpath));
+-	}
++	} else {
++		/* No PATH was set */
++		newpath[0] = '\0';
++	} 
++
++	g_strlcat (newpath, PACKAGE_LIBEXEC_DIR, sizeof (newpath));
++	g_strlcat (newpath, ":", sizeof (newpath));
++	g_strlcat (newpath, PACKAGE_SCRIPT_DIR, sizeof (newpath));
++
+ 	setenv ("PATH", newpath, TRUE);
+ 
+ 	while (1) {