Permalink
Browse files

Update ImageMagick to 6.7.9-0

- Update IM per security notice [USN-1544-1]

- Leave IM lib version as 6.7.7 to satisfy RMagick IM version
  verification check

IM BVTs passed, RMagick satisfied, IM commands print version 6.7.9

Change-Id: Ie53ce8073385341fe61da4827e22338250047e8e
  • Loading branch information...
1 parent f0b06f2 commit 3de180264e86ddc7d9b2a31ffbbd238ce48924f6 @mariash mariash committed Aug 23, 2012
Showing with 33 additions and 6 deletions.
  1. +4 −4 config/blobs.yml
  2. +3 −2 packages/imagemagick/packaging
  3. +26 −0 src/imagemagick/im-lib-version-677-for-rmagick.patch
View
8 config/blobs.yml
@@ -535,10 +535,10 @@ imagemagick/ghostscript-fonts-std-8.11.tar.gz:
object_id: eyJvaWQiOiI0ZTRlNzhiY2EyMWUxMjEyMDRlNGU4NmVlMTUxYmMwNGZlOGVh%0AYjY4MzZhNiIsInNpZyI6ImZuNGprNlVMck9oUlpjU2FoWDZ5dmlwaHFYVT0i%0AfQ==%0A
sha: 2a7198e8178b2e7dba87cb5794da515200b568f5
size: 3752871
-imagemagick/ImageMagick-6.7.7-7.tar.gz:
- object_id: eyJvaWQiOiI0ZTRlNzhiY2EyMWUxMjIwMDRlNGU4ZWM2NDdhNTQwNGZlOGVh%0AYmRkZjRmMSIsInNpZyI6IjRVMzBEdHVsNHFFYWwxMG9GWU1mT08vc0JiVT0i%0AfQ==%0A
- sha: 6d77d114f3c90c178b573fd59e316f471572e37a
- size: 12839949
+imagemagick/ImageMagick-6.7.9-0.tar.gz:
+ object_id: eyJvaWQiOiI0ZTRlNzhiY2E0MWUxMjEwMDRlNGU3ZDUxNzYxOGYwNTAzNjlk%0ANmJhYzdhYSIsInNpZyI6IkVmQ2NFRmd6V21PTVBLLy9sWUZURHZnQ1pzOD0i%0AfQ==%0A
+ sha: 5de140894458d331fd93fa41867c2731924c0c07
+ size: 13070869
imagemagick/jpegsrc.v8d.tar.gz:
object_id: eyJvaWQiOiI0ZTRlNzhiY2E0MWUxMjIyMDRlNGU5ODYzZDA3NjMwNGZlOGVh%0AYzRiZTY5NCIsInNpZyI6InRXZmZDenVDQkpQcjkxcG9MeGFkV0ptT0VnQT0i%0AfQ==%0A
sha: f080b2fffc7581f7d19b968092ba9ebc234556ff
View
5 packages/imagemagick/packaging
@@ -80,10 +80,11 @@ tar zxf imagemagick/ghostscript-fonts-std-8.11.tar.gz
mkdir -p ${BOSH_INSTALL_TARGET}/share/ghostscript/fonts
mv -f fonts/* ${BOSH_INSTALL_TARGET}/share/ghostscript/fonts
-tar zxf imagemagick/ImageMagick-6.7.7-7.tar.gz
+tar zxf imagemagick/ImageMagick-6.7.9-0.tar.gz
(
- cd ImageMagick-6.7.7-7
+ cd ImageMagick-6.7.9-0
+ patch -p1 < ../imagemagick/im-lib-version-677-for-rmagick.patch
export CPPFLAGS=-I${BOSH_INSTALL_TARGET}/include
export LDFLAGS=-L${BOSH_INSTALL_TARGET}/lib
./configure --prefix=${BOSH_INSTALL_TARGET} --disable-static --with-modules --without-perl --without-magick-plus-plus --with-quantum-depth=8 --with-gs-font-dir=${BOSH_INSTALL_TARGET}/share/ghostscript/fonts
View
26 src/imagemagick/im-lib-version-677-for-rmagick.patch
@@ -0,0 +1,26 @@
+diff --git a/magick/version.h b/magick/version.h
+index f189553..e921f5f 100644
+--- a/magick/version.h
++++ b/magick/version.h
+@@ -28,7 +28,7 @@ extern "C" {
+ #define MagickPackageName "ImageMagick"
+ #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
+ #define MagickSVNRevision "8971"
+-#define MagickLibVersion 0x679
++#define MagickLibVersion 0x677
+ #define MagickLibVersionText "6.7.9"
+ #define MagickLibVersionNumber 5,0,0
+ #define MagickLibAddendum "-0"
+diff --git a/version.sh b/version.sh
+index 6c4d7ba..5630ea7 100644
+--- a/version.sh
++++ b/version.sh
+@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
+ # PACKAGE_NAME (e.g. "1.0.0").
+ PACKAGE_VERSION='6.7.9'
+ PACKAGE_PERL_VERSION='6.79'
+-PACKAGE_LIB_VERSION="0x679"
++PACKAGE_LIB_VERSION="0x677"
+ PACKAGE_RELEASE="0"
+ PACKAGE_LIB_VERSION_NUMBER="6,7,9,${PACKAGE_RELEASE}"
+ PACKAGE_RELEASE_DATE=`date +%F`

0 comments on commit 3de1802

Please sign in to comment.