rpms/xscreensaver/FC-5 xscreensaver-4.24-clean-up-the-zombies.patch, NONE, 1.1 xscreensaver.spec, 1.75, 1.76

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv600

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-4.24-clean-up-the-zombies.patch 
Log Message:
- add patch from jwz to reap zombie processes (bug 185833)


xscreensaver-4.24-clean-up-the-zombies.patch:
 grabclient.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-4.24-clean-up-the-zombies.patch ---
--- xscreensaver-4.24/utils/grabclient.c	1 Mar 2006 11:35:52 -0000	1.17
+++ xscreensaver-4.24/utils/grabclient.c	20 Mar 2006 01:35:43 -0000
@@ -302,6 +302,7 @@
   FILE *read_pipe;
   FILE *write_pipe;
   XtInputId pipe_id;
+  pid_t pid;
 } grabclient_data;
 
 
@@ -350,7 +351,8 @@
                    (XtPointer) (XtInputReadMask | XtInputExceptMask),
                    finalize_cb, (XtPointer) data);
 
-  switch ((int) (forked = fork ()))
+  forked = fork ();
+  switch ((int) forked)
     {
     case -1:
       sprintf (buf, "%s: couldn't fork", progname);
@@ -379,6 +381,7 @@
     default:					/* parent */
       fclose (data->write_pipe);
       data->write_pipe = 0;
+      data->pid = forked;
       break;
     }
 }
@@ -405,6 +408,14 @@
   if (name) free (name);
 
   fclose (data->read_pipe);
+
+  if (data->pid)	/* reap zombies */
+    {
+      int status;
+      waitpid (data->pid, &status, 0);
+      data->pid = 0;
+    }
+
   memset (data, 0, sizeof (*data));
   free (data);
 }




Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-5/xscreensaver.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xscreensaver.spec	11 Feb 2006 06:35:09 -0000	1.75
+++ xscreensaver.spec	24 Mar 2006 22:39:10 -0000	1.76
@@ -6,7 +6,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release: 	1.1
+Release: 	2
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -29,6 +29,7 @@
 Patch17:	xscreensaver-4.23-default-text.patch
 Patch18:	xscreensaver-4.23-modularX-addoption.patch
 Patch19:	xscreensaver-4.23-remove-gccwarn-pointer.patch
+Patch20:	xscreensaver-4.24-clean-up-the-zombies.patch
 
 Buildroot:	%{_tmppath}/%{name}-root
 
@@ -105,6 +106,7 @@
 %patch17 -p1 -b .default-text
 %patch18 -p1 -b .modularX-addoption
 %patch19 -p1 -b .remove-gccwarn-pointer
+%patch20 -p1 -b .clean-up-the-zombies
 
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
@@ -245,6 +247,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Mar 24 2006 Ray Strode <rstrode at redhat.com> - 1:4.24-2
+- add patch from jwz to reap zombie processes (bug 185833)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.24-1.1
 - bump again for double-long bug on ppc(64)