From e510e9a769fe8f8caa2175164d571886cff1aae3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 9 Mar 2015 07:58:43 -0500
Subject: [PATCH] 1.3.21

---
 .gitignore                                |  1 +
 GraphicsMagick-1.3.20-CVE-2014-1947.patch | 25 -----------------------
 GraphicsMagick.spec                       | 14 ++++++-------
 sources                                   |  2 +-
 4 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 GraphicsMagick-1.3.20-CVE-2014-1947.patch

diff --git a/.gitignore b/.gitignore
index d9bb688..b24b744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /GraphicsMagick-1.3.20.tar.xz
+/GraphicsMagick-1.3.21.tar.xz
diff --git a/GraphicsMagick-1.3.20-CVE-2014-1947.patch b/GraphicsMagick-1.3.20-CVE-2014-1947.patch
deleted file mode 100644
index da4e021..0000000
--- a/GraphicsMagick-1.3.20-CVE-2014-1947.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up GraphicsMagick-1.3.20/coders/psd.c.CVE-2014-1947 GraphicsMagick-1.3.20/coders/psd.c
---- GraphicsMagick-1.3.20/coders/psd.c.CVE-2014-1947	2014-08-16 15:33:23.000000000 -0500
-+++ GraphicsMagick-1.3.20/coders/psd.c	2014-08-20 07:30:08.767862041 -0500
-@@ -1719,8 +1719,7 @@ static unsigned int WritePSDImage(const
-     i;
- 
-   unsigned char
--    *pixels,
--    layer_name[4];
-+    *pixels;
- 
-   unsigned int
-     packet_size,
-@@ -1944,8 +1943,9 @@ static unsigned int WritePSDImage(const
-             (void) WriteBlob(image, 3, &layer_name[1]);
-           */ 
-         } else {
--          (void) sprintf((char *) layer_name, "L%02d", layer_count++ );
--          WritePascalString( image, (char*)layer_name, 4 );
-+          char layer_name[MaxTextExtent];
-+          (void) sprintf(layer_name, "L%02d", layer_count++ );
-+          WritePascalString( image, layer_name, 4 );
-         }
-         tmp_image = tmp_image->next;
-       };
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 02e2141..d15bc56 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -32,8 +32,8 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.20
-Release: 5%{?dist}
+Version: 1.3.21
+Release: 1%{?dist}
 
 License: MIT
 Group: Applications/Multimedia
@@ -46,8 +46,6 @@ Patch1: GraphicsMagick-1.3.16-multilib.patch
 
 ## upstreamable patches
 Patch50: GraphicsMagick-1.3.14-perl_linkage.patch
-# https://bugzilla.redhat.com/1064098
-Patch51: GraphicsMagick-1.3.20-CVE-2014-1947.patch
 
 ## upstream patches
 
@@ -158,7 +156,6 @@ however.
 
 %patch1 -p1 -b .multilib
 %patch50 -p1 -b .perl_linkage
-%patch51 -p1 -b .CVE-2014-1947
 
 for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do
     iconv -f iso-8859-2 -t utf8 < $f > $f.utf8
@@ -250,7 +247,7 @@ EOF
 
 
 %check
-make check ||:
+make %{?_smp_mflags} check ||:
 # multilib hack only supports 32/64 bits for now
 %ifarch %{multilib_archs}
 %if ! (%{__isa_bits} == 32 || %{__isa_bits} == 64)
@@ -297,7 +294,7 @@ rm -rf %{buildroot}
 %postun c++ -p /sbin/ldconfig
 
 %files c++
-%{_libdir}/libGraphicsMagick++%{?libQ}.so.3*
+%{_libdir}/libGraphicsMagick++%{?libQ}.so.11*
 
 %files c++-devel
 %{_bindir}/GraphicsMagick++-config
@@ -313,6 +310,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 09 2015 Rex Dieter <rdieter@fedoraproject.org> 1.3.21-1
+- 1.3.21
+
 * Wed Feb 18 2015 Orion Poplawski <orion@cora.nwra.com> - 1.3.20-5
 - Rebuild for gcc 5 C++11
 
diff --git a/sources b/sources
index 08d7599..99d6b4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bb456e3466026ada6f12cc53c9776dc  GraphicsMagick-1.3.20.tar.xz
+f86fe89ea413720a3b04c59c8d5271a2  GraphicsMagick-1.3.21.tar.xz