--- a/components/imagemagick/Makefile Mon Oct 03 17:14:29 2016 -0700
+++ b/components/imagemagick/Makefile Wed Sep 28 19:43:56 2016 +0200
@@ -29,12 +29,12 @@
COMPONENT_NAME= ImageMagick
COMPONENT_VERSION= 6.9.5
COMPONENT_MAJOR_VERSION= $(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
-COMPONENT_SUBVERSION= 0
+COMPONENT_SUBVERSION= 10
HUMAN_VERSION= $(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
COMPONENT_PROJECT_URL= http://www.imagemagick.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:4b84a3236d24278966140bb5d641c45d3dab47244db79b51e5066518c5cf65c4
+ sha256:468419fea538ba1dcd2dc69334e8981cf41417f9a9938973884dccaedc403b39
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/download/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/imagemagick
@@ -83,6 +83,7 @@
CONFIGURE_OPTIONS+= --disable-static
CONFIGURE_OPTIONS+= --without-gvc
CONFIGURE_OPTIONS+= --disable-openmp
+CONFIGURE_OPTIONS+= --without-openjp2 # tests do not pass
# Using option 'with-fontconfig=no' so that the fonts/fonts path specified in
# configuration file 'type-ghostscript.xml' is being used.
CONFIGURE_OPTIONS+= --with-fontconfig=no
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/imagemagick/TESTING Wed Sep 28 19:43:56 2016 +0200
@@ -0,0 +1,37 @@
+cd /var/tmp
+
+convert -list font | wc -l # ~ 200 lines of output
+
+convert -size 170x100 xc:black \
+ -fill white -draw 'circle 50,50 13,50' \
+ -draw 'circle 120,50 157,50' \
+ -draw 'rectangle 50,13 120,87' \
+ -fill black -draw 'circle 50,50 25,50' \
+ -draw 'circle 120,50 145,50' \
+ -draw 'rectangle 50,25 120,75' \
+ -fill white -draw 'circle 60,50 40,50' \
+ -draw 'circle 110,50 130,50' \
+ -draw 'rectangle 60,30 110,70' \
+ -gaussian 1x1 +matte logo_mask.png
+
+convert logo_mask.png -background red -alpha shape \
+ -font Times-Roman -pointsize 36 -fill white -stroke black \
+ -gravity Center -annotate 0 "Ant" \
+ logo.png
+
+convert logo.png -alpha extract -blur 0x6 -shade 110x30 -normalize \
+ logo.png -compose Overlay -composite \
+ logo.png -alpha on -compose Dst_In -composite \
+ logo_3D.png
+
+convert logo_3D.png \( +clone -background navy -shadow 80x4+6+6 \) \
+ +swap -background none -layers merge +repage logo_3D_shadowed.png
+
+convert logo_3D_shadowed.png \
+ \( +clone +repage -alpha off -fx 'rand()' -shade 120x30 \
+ -fill grey70 -colorize 60 \
+ -fill lavender -tint 100 \) \
+ +swap -composite logo_3D_bg.jpg
+
+# Now compare logo_3D_bg.jpg to the image at
+# http://www.imagemagick.org/Usage/advanced/#3d-logos
--- a/components/imagemagick/patches/CVE-2016-6491.patch Mon Oct 03 17:14:29 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-This patch comes from upstream:
-https://github.com/ImageMagick/ImageMagick/commit/dd84447b63a71fa8c3f47071b09454efc667767b
-It can be removed once we upgrade to a release that has the fix, presumably
-version 6.9.5-4 or later.
-
---- ImageMagick-6.9.5/magick/property.c.orig 2016-06-26 17:40:19.000000000 -0700
-+++ ImageMagick-6.9.5/magick/property.c 2016-07-29 05:56:23.858967297 -0700
-@@ -638,6 +638,11 @@
- if ((count & 0x01) == 0)
- (void) ReadPropertyByte(&info,&length);
- count=(ssize_t) ReadPropertyMSBLong(&info,&length);
-+ if ((count < 0) || ((size_t) count > length))
-+ {
-+ length=0;
-+ continue;
-+ }
- if ((*name != '\0') && (*name != '#'))
- if ((resource == (char *) NULL) || (LocaleCompare(name,resource) != 0))
- {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/imagemagick/patches/tiff.patch Wed Sep 28 19:43:56 2016 +0200
@@ -0,0 +1,26 @@
+This is workaround until fix for 24750280 is delivered to build machine.
+
+Not suitable for upstream.
+
+--- ImageMagick-6.9.5/coders/tiff.c.old 2016-09-28 07:57:25.320767505 -0700
++++ ImageMagick-6.9.5/coders/tiff.c 2016-09-28 07:57:27.957254880 -0700
+@@ -84,6 +84,19 @@
+ #include "magick/thread_.h"
+ #include "magick/token.h"
+ #include "magick/utility.h"
++
++#if !defined(__sparcv9)
++# if !defined(__amd64)
++# include "tiffconf.h"
++# undef TIFF_INT64_T
++# define TIFF_INT64_T signed long long
++# undef TIFF_UINT64_T
++# define TIFF_UINT64_T unsigned long long
++# undef TIFF_SSIZE_T
++# define TIFF_SSIZE_T signed int
++# endif
++#endif
++
+ #if defined(MAGICKCORE_TIFF_DELEGATE)
+ # if defined(MAGICKCORE_HAVE_TIFFCONF_H)
+ # include "tiffconf.h"
--- a/components/imagemagick/test/results-32.master Mon Oct 03 17:14:29 2016 -0700
+++ b/components/imagemagick/test/results-32.master Wed Sep 28 19:43:56 2016 +0200
@@ -29,9 +29,9 @@
PASS: tests/validate-compare.tap 1
PASS: tests/validate-composite.tap 1
PASS: tests/validate-convert.tap 1
-FAIL: tests/validate-formats-disk.tap 1
-FAIL: tests/validate-formats-map.tap 1
-FAIL: tests/validate-formats-memory.tap 1
+PASS: tests/validate-formats-disk.tap 1
+PASS: tests/validate-formats-map.tap 1
+PASS: tests/validate-formats-memory.tap 1
PASS: tests/validate-identify.tap 1
PASS: tests/validate-import.tap 1
PASS: tests/validate-montage.tap 1
@@ -75,9 +75,9 @@
PASS: Magick++/demo/demos.tap 23
PASS: Magick++/demo/demos.tap 24
# TOTAL: 76
-# PASS: 73
+# PASS: 76
# SKIP: 0
# XFAIL: 0
-# FAIL: 3
+# FAIL: 0
# XPASS: 0
# ERROR: 0
--- a/components/imagemagick/test/results-64.master Mon Oct 03 17:14:29 2016 -0700
+++ b/components/imagemagick/test/results-64.master Wed Sep 28 19:43:56 2016 +0200
@@ -29,7 +29,7 @@
PASS: tests/validate-compare.tap 1
PASS: tests/validate-composite.tap 1
PASS: tests/validate-convert.tap 1
-FAIL: tests/validate-formats-disk.tap 1
+PASS: tests/validate-formats-disk.tap 1
PASS: tests/validate-formats-map.tap 1
PASS: tests/validate-formats-memory.tap 1
PASS: tests/validate-identify.tap 1
@@ -75,9 +75,9 @@
PASS: Magick++/demo/demos.tap 23
PASS: Magick++/demo/demos.tap 24
# TOTAL: 76
-# PASS: 75
+# PASS: 76
# SKIP: 0
# XFAIL: 0
-# FAIL: 1
+# FAIL: 0
# XPASS: 0
# ERROR: 0