From 765fee82c1937ebefae221c764b441bd13c9b26b Mon Sep 17 00:00:00 2001
From: Andreas Thienemann <ixs@fedoraproject.org>
Date: Sat, 28 Jul 2007 18:24:57 +0000
Subject: [PATCH] - Update to new maintainance release 1.1.8

---
 .cvsignore                               |  2 +-
 GraphicsMagick-1.1.8-MagickSpawnVP.patch | 11 +++++++
 GraphicsMagick-palm.patch                | 41 ------------------------
 GraphicsMagick.spec                      | 11 ++++---
 sources                                  |  2 +-
 5 files changed, 20 insertions(+), 47 deletions(-)
 create mode 100644 GraphicsMagick-1.1.8-MagickSpawnVP.patch
 delete mode 100644 GraphicsMagick-palm.patch

diff --git a/.cvsignore b/.cvsignore
index d6c587f..14348bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GraphicsMagick-1.1.7.tar.bz2
+GraphicsMagick-1.1.8.tar.bz2
diff --git a/GraphicsMagick-1.1.8-MagickSpawnVP.patch b/GraphicsMagick-1.1.8-MagickSpawnVP.patch
new file mode 100644
index 0000000..c669491
--- /dev/null
+++ b/GraphicsMagick-1.1.8-MagickSpawnVP.patch
@@ -0,0 +1,11 @@
+--- GraphicsMagick-1.1.8/magick/delegate.c.orig	2007-07-28 19:54:58.000000000 +0200
++++ GraphicsMagick-1.1.8/magick/delegate.c	2007-07-28 19:53:34.000000000 +0200
+@@ -753,7 +753,7 @@ MagickExport unsigned int InvokePostscri
+         int arg_count;
+         char **arg_array;
+         arg_array = StringToArgv(command,&arg_count);
+-        return MagickSpawnVP(arg_array[1],arg_array+1);
++        return MagickSpawnVP(0, arg_array[1],arg_array+1);
+       }
+ #else
+       return(SystemCommand(verbose,command));
diff --git a/GraphicsMagick-palm.patch b/GraphicsMagick-palm.patch
deleted file mode 100644
index d435e74..0000000
--- a/GraphicsMagick-palm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- graphicsmagick-1.1.7.orig/coders/dcm.c
-+++ graphicsmagick-1.1.7/coders/dcm.c
-@@ -3022,7 +3022,7 @@
-             /*
-               Photometric interpretation.
-             */
--            for (i=0; i < (long) length; i++)
-+            for (i=0; i < (long) Min(length, MaxTextExtent-1); i++)
-               photometric[i]=data[i];
-             photometric[i]='\0';
-             break;
---- graphicsmagick-1.1.7.orig/coders/palm.c
-+++ graphicsmagick-1.1.7/coders/palm.c
-@@ -541,7 +541,8 @@
-         image->compression = RLECompression;
-         for (i = 0; i < (long) bytes_per_row; )
-           {
-           count = ReadBlobByte(image);
-+          count = Min(count, bytes_per_row-i);
-           byte = ReadBlobByte(image);
-           memset(one_row + i, (int) byte, count);
-           i += count;
-@@ -579,6 +579,8 @@
-     indexes=GetIndexes(image);
-     if(bits_per_pixel == 16)
-       {
-+      if (image->columns > 2*bytes_per_row)
-+        ThrowReaderException(CorruptImageError,CorruptImage,image);
-       for (x=0; x < (long) image->columns; x++)
-         {
-         color16 = (*ptr++ << 8);
-@@ -595,6 +597,8 @@
-       bit = 8 - bits_per_pixel;
-       for(x = 0; x < (long) image->columns; x++)
-         {
-+	if (ptr - one_row >= bytes_per_row)
-+          ThrowReaderException(CorruptImageError,CorruptImage,image);
-         index =(IndexPacket) (mask - (((*ptr) & (mask << bit)) >> bit));
-         indexes[x] = index;
-         *q++ = image->colormap[index];
-
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 2f91273..45deb9f 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -1,12 +1,12 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.7
-Release: 7%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
-Patch1: GraphicsMagick-palm.patch
+Patch1: GraphicsMagick-1.1.8-MagickSpawnVP.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,7 +88,7 @@ however.
 %prep
 %setup -q
 %patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .palm
+%patch1 -p 1 -b .spawn
 # Regenerating configure script
 autoconf
 
@@ -228,6 +228,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 28 2007 Andreas Thienemann <andreas@bawue.net> - 1.1.8-1
+- Update to new maintainance release 1.1.8
+
 * Wed Mar 07 2007 Andreas Thienemann <andreas@bawue.net> - 1.1.7-7
 - Fix potential CVE-2007-0770 issue.
 - Added perl-devel BuildReq
diff --git a/sources b/sources
index 745848e..4427b72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f75d830ca623bf10385b3ad62c48437a  GraphicsMagick-1.1.7.tar.bz2
+0a673c0d5b3b8152c2c69e9fbbb7c1d9  GraphicsMagick-1.1.8.tar.bz2