daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

[security] imagemagick: updated to 6.2.6 + additional fixes, see

Browse Source 
http://www.securityfocus.com/bid/16093/info
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345238
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345876
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345595

Kudos to Daniel Mueller
This commit is contained in:
Simone Rota 2006-01-28 00:58:54 +00:00
parent 86fb92aabe
commit e297d42c00
4 changed files with 89 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
imagemagick/.footprint
View File

@ -30,6 +30,7 @@ drwxr-xr-x root/root usr/include/Magick++/
-rw-r--r-- root/root usr/include/Magick++/TypeMetric.h
drwxr-xr-x root/root usr/include/magick/
-rw-r--r-- root/root usr/include/magick/ImageMagick.h
-rw-r--r-- root/root usr/include/magick/MagickCore.h
-rw-r--r-- root/root usr/include/magick/PreRvIcccm.h
-rw-r--r-- root/root usr/include/magick/animate.h
-rw-r--r-- root/root usr/include/magick/annotate.h
@ -46,9 +47,7 @@ drwxr-xr-x root/root usr/include/magick/
-rw-r--r-- root/root usr/include/magick/composite.h
-rw-r--r-- root/root usr/include/magick/compress.h
-rw-r--r-- root/root usr/include/magick/configure.h
-rw-r--r-- root/root usr/include/magick/conjure.h
-rw-r--r-- root/root usr/include/magick/constitute.h
-rw-r--r-- root/root usr/include/magick/convert.h
-rw-r--r-- root/root usr/include/magick/decorate.h
-rw-r--r-- root/root usr/include/magick/delegate.h
-rw-r--r-- root/root usr/include/magick/deprecate.h
@ -63,7 +62,6 @@ drwxr-xr-x root/root usr/include/magick/
-rw-r--r-- root/root usr/include/magick/hashmap.h
-rw-r--r-- root/root usr/include/magick/identify.h
-rw-r--r-- root/root usr/include/magick/image.h
-rw-r--r-- root/root usr/include/magick/import.h
-rw-r--r-- root/root usr/include/magick/list.h
-rw-r--r-- root/root usr/include/magick/locale_.h
-rw-r--r-- root/root usr/include/magick/log.h
@ -74,7 +72,6 @@ drwxr-xr-x root/root usr/include/magick/
-rw-r--r-- root/root usr/include/magick/memory_.h
-rw-r--r-- root/root usr/include/magick/methods.h
-rw-r--r-- root/root usr/include/magick/module.h
-rw-r--r-- root/root usr/include/magick/mogrify.h
-rw-r--r-- root/root usr/include/magick/monitor.h
-rw-r--r-- root/root usr/include/magick/montage.h
-rw-r--r-- root/root usr/include/magick/option.h
@ -103,45 +100,58 @@ drwxr-xr-x root/root usr/include/magick/
-rw-r--r-- root/root usr/include/magick/utility.h
-rw-r--r-- root/root usr/include/magick/version.h
-rw-r--r-- root/root usr/include/magick/widget.h
-rw-r--r-- root/root usr/include/magick/xml-tree.h
-rw-r--r-- root/root usr/include/magick/xwindow.h
drwxr-xr-x root/root usr/include/wand/
-rw-r--r-- root/root usr/include/wand/MagickWand.h
-rw-r--r-- root/root usr/include/wand/animate.h
-rw-r--r-- root/root usr/include/wand/compare.h
-rw-r--r-- root/root usr/include/wand/composite.h
-rw-r--r-- root/root usr/include/wand/conjure.h
-rw-r--r-- root/root usr/include/wand/convert.h
-rw-r--r-- root/root usr/include/wand/display.h
-rw-r--r-- root/root usr/include/wand/drawing-wand.h
-rw-r--r-- root/root usr/include/wand/identify.h
-rw-r--r-- root/root usr/include/wand/import.h
-rw-r--r-- root/root usr/include/wand/magick-attribute.h
-rw-r--r-- root/root usr/include/wand/magick-image.h
-rw-r--r-- root/root usr/include/wand/magick-wand.h
-rw-r--r-- root/root usr/include/wand/magick_wand.h
-rw-r--r-- root/root usr/include/wand/mogrify.h
-rw-r--r-- root/root usr/include/wand/montage.h
-rw-r--r-- root/root usr/include/wand/pixel-iterator.h
-rw-r--r-- root/root usr/include/wand/pixel-wand.h
-rw-r--r-- root/root usr/include/wand/wand-config.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.5/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.5/config/
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/colors.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/configure.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/delegates.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/english.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/locale.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/type-ghostscript.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/type-solaris.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/type-windows.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.5/config/type.xml
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.5/modules-Q16/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.5/modules-Q16/coders/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.5/modules-Q16/filters/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.6/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.6/config/
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/colors.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/configure.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/delegates.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/english.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/locale.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/type-ghostscript.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/type-solaris.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/type-windows.xml
-rw-r--r-- root/root usr/lib/ImageMagick-6.2.6/config/type.xml
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.6/modules-Q16/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.6/modules-Q16/coders/
drwxr-xr-x root/root usr/lib/ImageMagick-6.2.6/modules-Q16/filters/
-rw-r--r-- root/root usr/lib/libMagick++.a
-rwxr-xr-x root/root usr/lib/libMagick++.la
lrwxrwxrwx root/root usr/lib/libMagick++.so -> libMagick++.so.9.0.4
lrwxrwxrwx root/root usr/lib/libMagick++.so.9 -> libMagick++.so.9.0.4
-rwxr-xr-x root/root usr/lib/libMagick++.so.9.0.4
lrwxrwxrwx root/root usr/lib/libMagick++.so -> libMagick++.so.10.0.0
lrwxrwxrwx root/root usr/lib/libMagick++.so.10 -> libMagick++.so.10.0.0
-rwxr-xr-x root/root usr/lib/libMagick++.so.10.0.0
-rw-r--r-- root/root usr/lib/libMagick.a
-rwxr-xr-x root/root usr/lib/libMagick.la
lrwxrwxrwx root/root usr/lib/libMagick.so -> libMagick.so.9.0.4
lrwxrwxrwx root/root usr/lib/libMagick.so.9 -> libMagick.so.9.0.4
-rwxr-xr-x root/root usr/lib/libMagick.so.9.0.4
lrwxrwxrwx root/root usr/lib/libMagick.so -> libMagick.so.10.0.0
lrwxrwxrwx root/root usr/lib/libMagick.so.10 -> libMagick.so.10.0.0
-rwxr-xr-x root/root usr/lib/libMagick.so.10.0.0
-rw-r--r-- root/root usr/lib/libWand.a
-rwxr-xr-x root/root usr/lib/libWand.la
lrwxrwxrwx root/root usr/lib/libWand.so -> libWand.so.9.0.4
lrwxrwxrwx root/root usr/lib/libWand.so.9 -> libWand.so.9.0.4
-rwxr-xr-x root/root usr/lib/libWand.so.9.0.4
lrwxrwxrwx root/root usr/lib/libWand.so -> libWand.so.10.0.0
lrwxrwxrwx root/root usr/lib/libWand.so.10 -> libWand.so.10.0.0
-rwxr-xr-x root/root usr/lib/libWand.so.10.0.0
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/site_perl/
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/
@ -177,8 +187,8 @@ drwxr-xr-x root/root usr/man/man1/
drwxr-xr-x root/root usr/man/man3/
-r--r--r-- root/root usr/man/man3/Image::Magick.3pm.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/ImageMagick-6.2.5/
drwxr-xr-x root/root usr/share/ImageMagick-6.2.5/config/
-rw-r--r-- root/root usr/share/ImageMagick-6.2.5/config/coder.xml
-rw-r--r-- root/root usr/share/ImageMagick-6.2.5/config/log.xml
-rw-r--r-- root/root usr/share/ImageMagick-6.2.5/config/magic.xml
drwxr-xr-x root/root usr/share/ImageMagick-6.2.6/
drwxr-xr-x root/root usr/share/ImageMagick-6.2.6/config/
-rw-r--r-- root/root usr/share/ImageMagick-6.2.6/config/coder.xml
-rw-r--r-- root/root usr/share/ImageMagick-6.2.6/config/log.xml
-rw-r--r-- root/root usr/share/ImageMagick-6.2.6/config/magic.xml

3
imagemagick/.md5sum
View File

@ -1 +1,2 @@
0c89ca5bc773ea41f77afb6f4099f7bd ImageMagick-6.2.5-4.tar.bz2
4ff40a92bba825d8cb9447ca454698a0 ImageMagick-6.2.6-0.tar.bz2
543ed5c3a42e6c567488440fc13643d6 imagemagick-6.2.6.patch

6
imagemagick/Pkgfile
View File

@ -5,12 +5,14 @@
# Depends on: freetype ghostscript lcms libungif libxml2
name=imagemagick
version=6.2.5
version=6.2.6
release=2
source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$version-4.tar.bz2)
source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$version-0.tar.bz2
$name-$version.patch)
build () {
cd ImageMagick-$version
patch -p1 < ../$name-$version.patch
./configure --prefix=/usr --enable-shared --enable-lzw --with-perl
make
mkdir -p $PKG/usr/

41
imagemagick/imagemagick-6.2.6.patch Normal file
View File

@ -0,0 +1,41 @@
diff -Nru ImageMagick-6.2.6/magick/blob.c ImageMagick-6.2.6-new/magick/blob.c
--- ImageMagick-6.2.6/magick/blob.c 2006-01-19 00:30:32.000000000 +0100
+++ ImageMagick-6.2.6-new/magick/blob.c 2006-01-26 00:12:21.000000000 +0100
@@ -1927,8 +1927,17 @@
char
format[MaxTextExtent];
+ /* Extract first numeric format specifier */
(void) CopyMagickString(format,p,MaxTextExtent);
+ if (q-p+1 < MaxTextExtent)
+ format[q-p+1]='\0';
+ /* Expand format */
(void) FormatMagickString(p,MaxTextExtent,format,image->scene);
+ /* Copy rest of string verbatim without further expansion */
+ (void) ConcatenateMagickString(filename,
+ image_info->filename+(q-filename)+1,
+ MaxTextExtent);
+
break;
}
}
diff -Nru ImageMagick-6.2.6/magick/image.c ImageMagick-6.2.6-new/magick/image.c
--- ImageMagick-6.2.6/magick/image.c 2006-01-17 17:20:54.000000000 +0100
+++ ImageMagick-6.2.6-new/magick/image.c 2006-01-26 00:12:21.000000000 +0100
@@ -2794,8 +2794,16 @@
char
format[MaxTextExtent];
+ /* Extract first numeric format specifier */
(void) CopyMagickString(format,p,MaxTextExtent);
+ if (q-p+1 < MaxTextExtent)
+ format[q-p+1]='\0';
+ /* Expand format */
(void) FormatMagickString(p,MaxTextExtent,format,image_info->scene);
+ /* Copy rest of string verbatim without further expansion */
+ (void) ConcatenateMagickString(filename,
+ image_info->filename+(q-filename)+1,
+ MaxTextExtent);
break;
}
}