* base-specs/gvfs.spec: Add patch5 to fix bugzilla bug #581711.
authorjyu_mit
Tue, 12 May 2009 10:19:04 +0000
changeset 15753 aa88a8898869
parent 15752 e361b48a8acf
child 15754 0ac47ad96ba0
* base-specs/gvfs.spec: Add patch5 to fix bugzilla bug #581711. * patches/gvfs-05-tmp-dir.diff: Added.
ChangeLog
base-specs/gvfs.spec
patches/gvfs-05-tmp-dir.diff
--- a/ChangeLog	Tue May 12 10:04:53 2009 +0000
+++ b/ChangeLog	Tue May 12 10:19:04 2009 +0000
@@ -1,3 +1,8 @@
+2009-05-12  Jerry Yu <[email protected]>
+
+	* base-specs/gvfs.spec: Add patch5 to fix bugzilla bug #581711.
+	* patches/gvfs-05-tmp-dir.diff: Added.
+
 2009-05-12  Elaine Xiong  <[email protected]>
 	
 	* base-specs/pidgin.spec:
--- a/base-specs/gvfs.spec	Tue May 12 10:04:53 2009 +0000
+++ b/base-specs/gvfs.spec	Tue May 12 10:19:04 2009 +0000
@@ -29,6 +29,8 @@
 Patch3:	      gvfs-03-debug-crash.diff
 #owner:gheet date:2009-04-16 type:bug doo:7996
 Patch4:	      gvfs-04-smb-browse-anon.diff
+#owner:jyu_mit date:2009-05-12 type:bug bugzilla:581711
+Patch5:       gvfs-05-tmp-dir.diff
 
 %prep
 %setup -q
@@ -36,6 +38,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %ifos linux
@@ -67,6 +70,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Feb May 12 2009 - [email protected]
+- Added patch5.
 * Thu Apr 16 2009 - [email protected]
 - added gvfs-04-smb-browse-anon.diff to allow anonymous login by default.
   doo#7996.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gvfs-05-tmp-dir.diff	Tue May 12 10:19:04 2009 +0000
@@ -0,0 +1,19 @@
+--- gvfs-1.2.2/daemon/gvfsdaemon.c.orig	2009-05-12 11:31:04.492541412 +0800
++++ gvfs-1.2.2/daemon/gvfsdaemon.c	2009-05-12 11:36:34.445483149 +0800
+@@ -463,8 +463,15 @@
+   NewConnectionData *data = memory;
+   
+   /* Remove the socket and dir after connected */
+-  if (data->socket_dir) 
++  if (data->socket_dir) {
++    gchar *address1 = g_strdup_printf ("%s/socket1", data->socket_dir);
++    gchar *address2 = g_strdup_printf ("%s/socket2", data->socket_dir);
++    unlink(address1);
++    unlink(address2);
+     rmdir (data->socket_dir);
++    g_free (address1);
++    g_free (address2);
++  }
+ 
+   if (data->io_watch)
+     g_source_remove (data->io_watch);