rpms/xscreensaver/F-10 xscreensaver-5.08-phosphor-segv.patch, NONE, 1.1 xscreensaver-5.08-po-recreate.patch, NONE, 1.1 xscreensaver.spec, 1.78, 1.79

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.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;

xscreensaver-5.08-po-recreate.patch:

--- NEW FILE xscreensaver-5.08-po-recreate.patch ---
--- xscreensaver-5.08/aclocal.m4.po	2002-05-11 10:44:33.000000000 +0900
+++ xscreensaver-5.08/aclocal.m4	2008-12-30 04:33:01.000000000 +0900
@@ -252,7 +252,10 @@
 
     AC_OUTPUT_COMMANDS(
       [case "$CONFIG_FILES" in *po/Makefile.in*)
+         rm -f po/stamp-it po/stamp-it.tmp
+         > po/stamp-it.tmp
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+        mv po/stamp-it.tmp po/stamp-it
       esac])
 
     dnl These rules are solely for the distribution goal.  While doing this
--- xscreensaver-5.08/po/Makefile.in.in.po	2007-11-11 09:44:42.000000000 +0900
+++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 04:47:58.000000000 +0900
@@ -190,7 +190,7 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
 	export INTLTOOL_EXTRACT ; \
 	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
@@ -274,6 +274,7 @@
 
 distclean: clean
 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
+	rm -f stamp-it
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -282,8 +283,8 @@
 
 depend:
 # fuck off.  love, jwz.
-#distdepend: generate_potfiles_in update-po $(DISTFILES)
-distdepend::
+distdepend: generate_potfiles_in update-po $(DISTFILES)
+#distdepend::
 
 
 # jwz: Generates po/POTFILES.in by examining the source tree:
@@ -292,6 +293,8 @@
 generate_potfiles_in:
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
+	 echo "sleeping 3 seconds..." ;\
+	 sleep 3; \
 	 ( cd $(top_srcdir);			\
 	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
@@ -362,16 +365,22 @@
 	    && (sed -e '/^#/d' 						\
 		    -e "s/^\[.*\] +//" 					\
 		    -e '/^[ 	]*$$/d' 				\
-		    -e "s at .*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		    -e "s at .*@	$$posrcprefix& \\\\@" < $@.in	\
 		| sed -e '$$s/\\$$//') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
+Makefile: stamp-it
+	@if test ! -f $@; then \
+		rm -f stamp-it; \
+		$(MAKE) stamp-it; \
+	fi
+
 # Please to be fucking the hell off.   This breaks "make distdepend". -jwz
-#Makefile: Makefile.in.in ../config.status POTFILES
-#	cd .. \
-#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-#	       $(SHELL) ./config.status
+stamp-it: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xscreensaver.spec	28 Dec 2008 15:24:14 -0000	1.78
+++ xscreensaver.spec	22 Jan 2009 14:02:44 -0000	1.79
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -33,6 +33,8 @@
 %endif
 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}
@@ -185,6 +187,8 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch50 -p1 -b .po
+%patch51 -p1 -b .phosphor
 
 change_option(){
    set +x
@@ -308,7 +312,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-# autoconf
+autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -629,6 +633,12 @@
 %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
+
 * Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
 - Update to 5.08
 - All non Fedora-specific patches went upstream