Author: ghibo
Date: Fri Feb 9 16:13:56 2007
New Revision: 118474
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8-libpath.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8.tar.bz2
(contents, props changed)
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-CVE-2006-5456.patch
Removed:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.9-4-libpath.diff.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.6-textfontsize.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-2.tar.bz2
Modified:
packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec
Log:
- Release: 6.2.9-8.
- Removed Patch10 (no longer needed).
- Rebuilt Patch19.
- Merged Patch21 from Stew Benetict (security fix for CVE-2006-5456).
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8-libpath.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8-libpath.patch
Fri Feb 9 16:13:56 2007
@@ -0,0 +1,22 @@
+--- ImageMagick-6.2.9/PerlMagick/Makefile.am.libpath 2006-09-19
16:53:54.000000000 +0200
++++ ImageMagick-6.2.9/PerlMagick/Makefile.am 2007-02-09 13:32:03.000000000
+0100
+@@ -47,7 +47,7 @@
+ install-exec-perl: $(PERLMAKEFILE)
+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
+
+-all-perl: $(PERLMAKEFILE)
++all-perl: $(PERLMAKEFILE) magick/libMagick.la
+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
+
+ uninstall-exec-perl: $(PERLMAKEFILE)
+--- ImageMagick-6.2.9/configure.ac.libpath 2007-02-09 13:30:42.000000000
+0100
++++ ImageMagick-6.2.9/configure.ac 2007-02-09 13:30:42.000000000 +0100
+@@ -2595,7 +2595,7 @@
+ # Determine path to pick up Magick library from for use with building
PerlMagick
+ MAGICKLIBDIR="${LIB_DIR}"
+ MAGICKLIB="-L${MAGICKLIBDIR} -lMagick"
+-if test $with_perl_static = 'yes'
++if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'
+ then
+ # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
+ libtool_objdir=$objdir
Added: packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8.tar.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-CVE-2006-5456.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-CVE-2006-5456.patch
Fri Feb 9 16:13:56 2007
@@ -0,0 +1,40 @@
+--- ImageMagick-6.2.9/coders/palm.c.cve-2006-5456 2006-01-07
22:41:08.000000000 -0700
++++ ImageMagick-6.2.9/coders/palm.c 2006-10-27 14:45:46.000000000 -0600
+@@ -398,7 +398,7 @@ static Image *ReadPALMImage(const ImageI
+ image->compression=RLECompression;
+ for (i=0; i < (long) bytes_per_row; )
+ {
+- count=ReadBlobByte(image);
++ count = Min(ReadBlobByte(image), bytes_per_row-i);
+ byte=ReadBlobByte(image);
+ (void) ResetMagickMemory(one_row+i,(int) byte,count);
+ i+=count;
+@@ -431,6 +431,8 @@ static Image *ReadPALMImage(const ImageI
+ indexes=GetIndexes(image);
+ if (bits_per_pixel == 16)
+ {
++ if (image->columns > 2*bytes_per_row)
++ ThrowReaderException(CorruptImageError,"CorruptImage");
+ for (x=0; x < (long) image->columns; x++)
+ {
+ color16=(*ptr++ << 8);
+@@ -447,6 +449,8 @@ static Image *ReadPALMImage(const ImageI
+ bit=8-bits_per_pixel;
+ for (x=0; x < (long) image->columns; x++)
+ {
++ if (ptr - one_row >= bytes_per_row)
++ ThrowReaderException(CorruptImageError,"CorruptImage");
+ index=(IndexPacket) (mask-(((*ptr) & (mask << bit)) >> bit));
+ indexes[x]=index;
+ *q++=image->colormap[index];
+--- ImageMagick-6.2.9/coders/dcm.c.cve-2006-5456 2006-01-21
10:54:06.000000000 -0700
++++ ImageMagick-6.2.9/coders/dcm.c 2006-10-27 14:40:31.000000000 -0600
+@@ -2950,7 +2950,7 @@ static Image *ReadDCMImage(const ImageIn
+ /*
+ Photometric interpretation.
+ */
+- for (i=0; i < (long) length; i++)
++ for (i=0; i < (long) Min(length, MaxTextExtent-1); i++)
+ photometric[i]=(char) data[i];
+ photometric[i]='\0';
+ break;
Modified: packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec
==============================================================================
--- packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec (original)
+++ packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec Fri Feb 9
16:13:56 2007
@@ -13,7 +13,7 @@
%define major 10.4.0
%define libname %mklibname Magick %{major}
%define fversion 6.2.9
-%define rev 2
+%define rev 8
%define rel 1
%define qlev Q16
@@ -53,11 +53,11 @@
Patch4: ImageMagick-6.0.1-includedir.patch.bz2
Patch7: ImageMagick-6.1.7-type-urw.patch.bz2
Patch8: ImageMagick-6.2.7-libname.patch.bz2
-Patch10: ImageMagick-6.2.6-textfontsize.patch.bz2
Patch17: ImageMagick-6.2.7-fpxdeps.patch.bz2
Patch18: ImageMagick-6.1.7-windows-fontdir.patch.bz2
-Patch19: ImageMagick-6.1.9-4-libpath.diff.bz2
+Patch19: ImageMagick-6.2.9-8-libpath.patch
Patch20: ImageMagick-6.2.5-fix-montageimages-test.patch.bz2
+Patch21: ImageMagick-6.2.9-CVE-2006-5456.patch
Requires: %{libname} = %{version}
Requires: ghostscript
@@ -184,11 +184,11 @@
%patch4 -p1 -b .include
%patch7 -p1 -b .urw
%patch8 -p1 -b .libname
-%patch10 -p1 -b .text
%patch17 -p1 -b .fpx
%patch18 -p1 -b .windows
%patch19 -p1 -b .libpath
%patch20 -p1 -b .ppc
+%patch21 -p1 -b .cve-2006-5456
%__libtoolize --copy --force
aclocal-1.8
@@ -250,8 +250,10 @@
if [ -f PerlMagick/t/x/write.t ]; then
mv PerlMagick/t/x/write.t PerlMagick/t/x/write.t.disabled
fi
-dlname=`grep "^dlname" Magick++/lib/.libs/libMagick++.la | cut -d\' -f2`
-LD_PRELOAD="$PWD/Magick++/lib/.libs/$dlname" VERBOSE="1" make check
+#dlname=`grep "^dlname" Magick++/lib/.libs/libMagick++.la | cut -d\' -f2`
+#LD_PRELOAD="$PWD/Magick++/lib/.libs/$dlname" VERBOSE="1" make check
+
+make check
%install
rm -rf %{buildroot}
@@ -349,3 +351,4 @@
#doc www/ images/ index.html
# gw maybe we should the doc location in configure instead
%doc %_datadir/doc/%name-doc-%fversion/
+
