From 640f8afb592cba272a43e1b9b2dffc48211c1eab Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 16 Mar 2005 16:10:35 +0000
Subject: [PATCH] Update to 6.2.0

---
 .cvsignore                      |  1 +
 ImageMagick-6.2.0-hp2xx.patch   | 21 +++++++++++++++++++++
 ImageMagick-6.2.0-lprhack.patch | 11 +++++++++++
 ImageMagick.spec                | 33 +++++++++++++++------------------
 sources                         |  2 +-
 5 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 ImageMagick-6.2.0-hp2xx.patch
 create mode 100644 ImageMagick-6.2.0-lprhack.patch

diff --git a/.cvsignore b/.cvsignore
index 6beecf8..0b3754f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 ImageMagick-6.0.7-1.tar.bz2
+ImageMagick-6.2.0-7.tar.gz
diff --git a/ImageMagick-6.2.0-hp2xx.patch b/ImageMagick-6.2.0-hp2xx.patch
new file mode 100644
index 0000000..4b667ce
--- /dev/null
+++ b/ImageMagick-6.2.0-hp2xx.patch
@@ -0,0 +1,21 @@
+--- ImageMagick-6.2.0/config/delegates.xml.in.hp2xx	2005-03-16 09:31:42.843768000 -0500
++++ ImageMagick-6.2.0/config/delegates.xml.in	2005-03-16 09:33:16.544971000 -0500
+@@ -70,8 +70,16 @@
+   <delegate decode="gs-mono" stealth="True" command='"@PSDelegate@" -q -dBATCH -dSAFER -dMaxBitmap=500000000 -dNOPAUSE -dAlignToPixels=0 "-sDEVICE=@GSMonoDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-g%s" "-r%s" %s "-sOutputFile=%s" "-f%s" "-f%s"' />
+   <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i"
+     mv -f `basename "%o"` "%o"' />
+-  <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i"
+-    mv -f `basename "%o"` "%o"' />
++  <delegate decode="hpgl" command='if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then
++    @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i"
++    mv -f `basename "%o"` "%o
++  else
++    echo "You need to install hp2xx (which is not part of Red Hat Linux) to use"
++    echo "HPGL files with ImageMagick."
++    echo "Current hp2xx RPM packages for Red Hat Linux can be found at"
++    echo "http://rhcontrib.bero.org/search.php in the Applications/Multimedia section."
++    exit 1
++  fi' />
+   <delegate decode="htm" command='"@HTMLDecodeDelegate@" -U -o "%o" "%i"' />
+   <delegate decode="html" command='"@HTMLDecodeDelegate@" -U -o "%o" "%i"' />
+   <delegate decode="https" command='"@WWWDecodeDelegateDefault@" -q -O "%o" "https:%i"' />
diff --git a/ImageMagick-6.2.0-lprhack.patch b/ImageMagick-6.2.0-lprhack.patch
new file mode 100644
index 0000000..2a6dda8
--- /dev/null
+++ b/ImageMagick-6.2.0-lprhack.patch
@@ -0,0 +1,11 @@
+--- ImageMagick-6.2.0/config/delegates.xml.in.lprhack	2005-03-16 09:27:05.564324000 -0500
++++ ImageMagick-6.2.0/config/delegates.xml.in	2005-03-16 09:28:31.015788000 -0500
+@@ -89,7 +89,7 @@
+     "@ConvertDelegate@" -concatenate "%o*.png" "%o"' />
+   <delegate decode="ps" encode="eps" mode="bi" command='"@PSDelegate@" -q -dBATCH -dSAFER -dMaxBitmap=500000000 -dNOPAUSE -dAlignToPixels=0 -sDEVICE="@GSEPSDevice@" -sOutputFile="%o" -f"%i"' />
+   <delegate decode="ps" encode="pdf" mode="bi" command='"@PSDelegate@" -q -dBATCH -dSAFER -dMaxBitmap=500000000 -dNOPAUSE -dAlignToPixels=0 -sDEVICE="@GSPDFDevice@" -sOutputFile="%o" -f"%i"' />
+-  <delegate decode="ps" encode="print" mode="encode" command='"@PrintDelegate@" "%i"' />
++  <delegate decode="ps" encode="print" mode="encode" command='lpr "%i"' />
+   <delegate decode="pxl" command='"@PCLDelegate@" -dBATCH -dSAFER -dNOPAUSE -dAlignToPixels=0 -sDEVICE=pdfwrite -sOutputFile="%o" "%i"' />
+   <delegate decode="rad" command='"@RADDecodeDelegate@" -g 1.0 "%i" "%o"' />
+   <delegate decode="rgba" encode="rle" mode="encode" command='"@MogrifyDelegate@" -flip -size %wx%h "rgba:%i"
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 505546c..0ac9ff3 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,7 +1,7 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.0.7
-%define Patchlevel 1
+%define VER 6.2.0
+%define Patchlevel 7
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""
@@ -9,22 +9,18 @@ Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 7
+Release: 1
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
-Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2
+Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.gz
 %else
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.gz
 %endif
 Source1: magick_small.png
-Patch2: ImageMagick-5.3.6-nonroot.patch
-Patch3: ImageMagick-5.3.7-config.patch
-Patch4: ImageMagick-6.0.6-hp2xx.patch
-Patch5: ImageMagick-5.4.7-localdoc.patch
-Patch6: ImageMagick-5.5.7-stdin.patch
-Patch7: ImageMagick-5.5.7-automake.patch
-Patch8: ImageMagick-6.0.7-vsnprintf.patch
+Patch1: ImageMagick-6.2.0-lprhack.patch
+Patch2: ImageMagick-6.2.0-hp2xx.patch
+Patch3: ImageMagick-6.0.7-vsnprint.patch
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -108,13 +104,9 @@ however.
 
 %prep
 %setup -q -n %{name}-%{VER}
-#%patch2 -p1 -b .nonroot
-#%patch3 -p1 -b .config
-%patch4 -p1 -b .hp2xx
-%patch5 -p1 -b .ImageMagick
-# KH: %patch6 -p1 -b .stdin
-#%patch7 -p1 -b .amake
-%patch8 -p1 -b .vsnprintf
+%patch1 -p1 -b .lpr
+%patch2 -p1 -b .hp2xx
+%patch3 -p1 -b .vsnprintf
 
 %build
 libtoolize --copy --force
@@ -262,6 +254,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}
 #%{_libdir}/perl*/site_perl/*/*/Image
 
 %changelog
+* Wed Mar 16 2005  <mclasen@redhat.com> - 6.2.0.7-1
+- Update to 6.2.0 to fix a number of security issues:
+  #145112 (CAN-2005-05), #151265 (CAN-2005-0397)
+- Drop a lot of upstreamed patches
+
 * Wed Mar  2 2005 Matthias Clasen <mclasen@redhat.com> 6.0.7.1-7
 - rebuild with gcc4
 - remove an extraneous vsnprintf prototype which causes
diff --git a/sources b/sources
index 9661f4c..12be960 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c9f5bd9afa95b747480040abd456784  ImageMagick-6.0.7-1.tar.bz2
+d051b66a3492df599719dce0e1278cb8  ImageMagick-6.2.0-7.tar.gz