rpms/xscreensaver/devel xscreensaver-5.08-phosphor-segv.patch, NONE, 1.1 xscreensaver.spec, 1.83, 1.84

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21624/devel

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-phosphor-segv.patch 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
- Fix phosphor segv when changing window size (bug 481146)


xscreensaver-5.08-phosphor-segv.patch:

--- NEW FILE xscreensaver-5.08-phosphor-segv.patch ---
--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
@@ -1353,6 +1353,7 @@
 	  if (state->pid)
 	    {
 	      waitpid(state->pid, NULL, 0);
+	      state->pid = 0;
 	      fclose (state->pipe);
 	    }
 	  else
@@ -1436,7 +1437,7 @@
   resize_grid (state);
 
 # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
-  if (state->pid)
+  if (state->pid && state->pipe)
     {
       /* Tell the sub-process that the screen size has changed. */
       struct winsize ws;


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- xscreensaver.spec	30 Dec 2008 01:26:04 -0000	1.83
+++ xscreensaver.spec	22 Jan 2009 14:02:45 -0000	1.84
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -34,6 +34,7 @@
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Patch50:         xscreensaver-5.08-po-recreate.patch
+Patch51:         xscreensaver-5.08-phosphor-segv.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -187,6 +188,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .po
+%patch51 -p1 -b .phosphor
 
 change_option(){
    set +x
@@ -631,6 +633,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
+- Fix phosphor segv when changing window size (bug 481146)
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-4
 - Fix the process of "make update-po -C po", reported by jwz