rpms/xscreensaver/F-12 xscreensaver-5.10-noseguy-segv-with-nofont.patch, NONE, 1.1 xscreensaver.spec, 1.101, 1.102

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-noseguy-segv-with-nofont.patch 
Log Message:
* Wed Feb  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-5
- Fix crash on noseguy when X resource is no longer available (bug 560614)


xscreensaver-5.10-noseguy-segv-with-nofont.patch:
 noseguy.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-5.10-noseguy-segv-with-nofont.patch ---
--- xscreensaver-5.10/hacks/noseguy.c.debug	2009-08-06 12:43:56.000000000 +0900
+++ xscreensaver-5.10/hacks/noseguy.c	2010-02-03 01:27:25.000000000 +0900
@@ -602,8 +602,11 @@
   if (!fontname || !*fontname)
     fprintf (stderr, "%s: no font specified.\n", progname);
   st->font = XLoadQueryFont(st->dpy, fontname);
-  if (!st->font)
+  if (!st->font){
     fprintf (stderr, "%s: could not load font %s.\n", progname, fontname);
+    fprintf (stderr, "%s: exiting...\n", progname);
+    exit(1);
+  }
 
   fg = get_pixel_resource (st->dpy, cmap, "foreground", "Foreground");
   bg = get_pixel_resource (st->dpy, cmap, "background", "Background");


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- xscreensaver.spec	10 Dec 2009 18:16:34 -0000	1.101
+++ xscreensaver.spec	2 Feb 2010 16:38:50 -0000	1.102
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -47,10 +47,12 @@ Patch1:          xscreensaver-5.00b5-san
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 #
-#
-# Not sent to upstream yet, must do later
+# Patches already sent to upstream:
 Patch30:         xscreensaver-5.10-substrate-bz545847.patch
 Patch31:         xscreensaver-5.10-apple2-initialization.patch
+# Not sent to upstream yet, must do later
+# bug 560614
+Patch32:         xscreensaver-5.10-noseguy-segv-with-nofont.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -207,6 +209,7 @@ This package contains some test programs
 %patch21 -p1 -b .nonet
 %patch30 -p1 -b .subst
 %patch31 -p1 -b .apple
+%patch32 -p1 -b .noseguy
 
 change_option(){
    set +x
@@ -676,6 +679,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Feb  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-5
+- Fix crash on noseguy when X resource is no longer available (bug 560614)
+
 * Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
 - Fix initialization process on apple2, hopefully fix bug 540790??