Give proper error message on displays without the SHAPE extension. Bz #1071429.

Fix printf format security issue.  Bz #1037404.

xpenguins-2.2-format-security.patch

@@ -0,0 +1,11 @@
+--- src/xpenguins_theme.c~	2001-10-02 00:36:12.000000000 +0200
++++ src/xpenguins_theme.c	2013-12-03 12:54:49.000000000 +0100
+@@ -608,7 +608,7 @@
+ 	    xpm_file_name = word;
+ 	  }
+ 	  else {
+-	    snprintf(file_base, MAX_STRING_LENGTH, word);
++	    snprintf(file_base, MAX_STRING_LENGTH, "%s", word);
+ 	    xpm_file_name = file_name;
+ 	  }
+ 	  if (current->image) {

xpenguins-2.2-no-SHAPE.patch

@@ -0,0 +1,23 @@
+--- src/toon_init.cshape	2001-06-24 18:28:17.000000000 +0200
++++ src/toon_init.c	2014-03-16 13:44:18.000000000 +0100
+@@ -29,6 +29,8 @@
+ Display *
+ ToonOpenDisplay(char *display_name)
+ {
++  int event_base, error_base;
++
+   toon_display=XOpenDisplay(display_name);
+   if (toon_display == NULL) {
+     if (display_name == NULL && getenv("DISPLAY") == NULL)
+@@ -39,6 +41,11 @@
+ 	      TOON_MESSAGE_LENGTH);
+     return(NULL);
+   }
++  if (!XShapeQueryExtension(toon_display, &event_base, &error_base)) {
++    strncpy(toon_error_message, _("Display doesn't support the SHAPE extension"),
++	    TOON_MESSAGE_LENGTH);
++    return(NULL);
++  }
+   ToonInit(toon_display);
+   return toon_display;
+ }

xpenguins.spec

@@ -1,6 +1,6 @@
 Name: xpenguins
 Version: 2.2
-Release: 7
+Release: 9%{?dist}
 Summary: Cute little penguins that walk along the tops of your windows
 Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster
 
@@ -9,6 +9,14 @@ License: GPLv2+
 URL: http://xpenguins.seul.org/
 
 Source: http://xpenguins.seul.org/%name-%version.tar.gz
+# Mailed upstreams developer with this patch, but it is unclear if
+# there ever will be a new release.  This is a rather inactive
+# project.
+Patch0: xpenguins-2.2-format-security.patch
+# If run on a display without the SHAPE extension, xpenguins will
+# crash.  This patch causes it to exit more gracefully.  Sent
+# upstreams, in case there ever will be a new release.
+Patch1: xpenguins-2.2-no-SHAPE.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: ImageMagick
@@ -25,7 +33,7 @@ XPenguins animates a friendly family of penguins in your root window.
 They drop in from the top of the screen, walk along the tops of your
 windows, up the side of your windows, levitate, skateboard, and do
 other similarly exciting things.  XPenguins is now themeable so if
-you're bored of penguins, try something else.  The themes that come
+you are bored of penguins, try something else.  The themes that come
 with this package are "Penguins", "Classic Penguins", "Big Penguins",
 "Turtles" and "Bill".
 
@@ -41,6 +49,8 @@ Penguins" (klassiska pingviner), "Big Penguins" (stora pingviner),
 
 %prep
 %setup -q
+%patch0 -b .format
+%patch1 -b .shape
 
 %build
 %configure
@@ -88,6 +98,12 @@ gtk-update-icon-cache %icontop &>/dev/null || :
 %icondir/%name.png
 
 %changelog
+* Sun Mar 16 2014 Göran Uddeborg <goeran@uddeborg.se> - 2.2-9
+- Give proper error message on displays without the SHAPE extension. Bz #1071429.
+
+* Tue Dec 03 2013 Göran Uddeborg <goeran@uddeborg.se> - 2.2-8
+- Fix printf format security issue.  Bz #1037404.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild