rpms/libfm/devel libfm-0.1.11-path-removal-sanity-check.patch, NONE, 1.1 libfm.spec, 1.11, 1.12

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/libfm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24883/devel

Modified Files:
	libfm.spec 
Added Files:
	libfm-0.1.11-path-removal-sanity-check.patch 
Log Message:
* Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-6
- Fix crash of gnome-terminal wrapper with certain path settings
  (bug 596598, 597270)


libfm-0.1.11-path-removal-sanity-check.patch:
 gnome-terminal-wrapper.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE libfm-0.1.11-path-removal-sanity-check.patch ---
diff --git a/src/gnome-terminal-wrapper.c b/src/gnome-terminal-wrapper.c
index 44134bb..45629ee 100644
--- a/src/gnome-terminal-wrapper.c
+++ b/src/gnome-terminal-wrapper.c
@@ -78,9 +78,14 @@ int main(int argc, char** argv)
     }
     /* Remove /usr/lib/libfm from PATH */
     path = g_getenv("PATH");
-    sep = strchr(path, ':');
-    path = sep + 1;
-    g_setenv("PATH", path, TRUE);
+	/* Sanity check here... */
+    sep = NULL;
+    if (path) sep = strchr(path, ':');
+    if (sep) path = sep + 1;
+    if (sep && path && *path) 
+		g_setenv("PATH", path, TRUE);
+    else
+		g_unsetenv("PATH");
 
     if((argc < 2) && terminal) /* only execute the temrinal emulator */
     {


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libfm.spec	25 May 2010 14:32:10 -0000	1.11
+++ libfm.spec	28 May 2010 17:51:49 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           libfm
 Version:        0.1.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -22,6 +22,9 @@ Patch0:         libfm-0.1.9-pref-apps.pa
 Patch2:         libfm-0.1.11-gterm-argc.patch
 # Issue in sorting by name in ja_JP.UTF-8, upstream bug 3002788
 Patch3:         libfm-0.1.11-sort-by-name-in-japanese.patch
+# Patches need discussing with the upstream
+# gnome-terminal wrapper crashes with certain path setting
+Patch4:         libfm-0.1.11-path-removal-sanity-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -87,6 +90,7 @@ developing applications that use %{name}
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .gterm_segv
 %patch3 -p1 -b .sort_in_jp
+%patch4 -p1 -b .gterm_path
 
 # translation update
 cp -p libfm-po-files/*.po po/
@@ -196,6 +200,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-6
+- Fix crash of gnome-terminal wrapper with certain path settings
+  (bug 596598, 597270)
+
 * Tue May 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-5
 - Translation update from git
 - Fix an issue in sorting by name in ja_JP.UTF-8 (upstream bug 3002788)
@@ -209,7 +217,7 @@ update-mime-database %{_datadir}/mime &>
   and treak sys_lib_dlsearch_path_spec instead for rpath issue on x86_64
 
 * Fri May  7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-2
-- Fix wrapper of gnome-terminal when libfm.conf doesn't exist or so
+- Fix crash of wrapper of gnome-terminal when libfm.conf doesn't exist or so
   (bug 589730)
 
 * Thu Apr 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-1