[Pkg-xfce-commits] r5147 - in goodies/branches/experimental/xfce4-genmon-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-23 15:29:11 +0000 (Wed, 23 Mar 2011)
New Revision: 5147

Removed:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch
Modified:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
Log:
02_close-unused-pipes as well.

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:27:01 UTC (rev 5146)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:29:11 UTC (rev 5147)
@@ -15,6 +15,7 @@
     - add ${misc:Depends} to dependencies.
   * debian/patches:
     - 01_no-zombies dropped, included upstream.
+    - 02_close-unused-pipes as well.
     - 03_link-with-libxfcegui4 added, link against libxfcegui4 now that it's
       not provided by xfce4-panel.
   * debian/rules:

Deleted: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch	2011-03-23 15:27:01 UTC (rev 5146)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch	2011-03-23 15:29:11 UTC (rev 5147)
@@ -1,36 +0,0 @@
-Description: close unused pipes to prevent freezing the UI
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=4036
-Author: Steve Tyler <stephent98 at hotmail.com>
---- xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c	2007-11-23 07:32:40.000000000 -0800
-+++ xfce4-genmon-plugin-3.2.new2/panel-plugin/cmdspawn.c	2008-04-28 21:18:28.000000000 -0700
-@@ -184,6 +184,7 @@
-             return (-1);
-         case 0:
-             /* Redirect stdout/stderr to associated pipe's write-ends */
-+            close(0); /* stdin is not used in child */
-             for (i = 0; i < OUT_ERR; i++) {
-                 j = i + 1; // stdout/stderr file descriptor
-                 close (j);
-@@ -199,6 +200,9 @@
-         exit (-1);
-     }
- 
-+    for (i = 0; i < OUT_ERR; i++)
-+        close (aaiPipe[i][WR]); /* close write end of pipes in parent */
-+
-     /* Wait for child completion */
-     if (wait == 1)
-     {
-@@ -231,10 +235,9 @@
-     }
- 
-     End:
--    /* Close created pipes */
-+    /* Close read end of pipes */
-     for (i = 0; i < OUT_ERR; i++)
--        for (j = 0; j < RD_WR; j++)
--            close (aaiPipe[i][j]);
-+        close (aaiPipe[i][RD]);
- 
-     return (-fError);
- }// Spawn()

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:27:01 UTC (rev 5146)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:29:11 UTC (rev 5147)
@@ -1,2 +1 @@
-02_close-unused-pipes.patch
 03_link-with-libxfcegui4.patch