Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump ImageMagick to 6.9.9-20 to resolve CVEs #530

Closed
wants to merge 1 commit into from
Closed

Bump ImageMagick to 6.9.9-20 to resolve CVEs #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions graphics/ImageMagick/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xm
CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml
CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml

SUBST_CLASSES+= pkgcfg
SUBST_FILES.pkgcfg= ${PKGCONFIG_OVERRIDE} Magick++/bin/Magick++-config.in
SUBST_FILES.pkgcfg+= magick/Magick-config.in magick/MagickCore-config.in
SUBST_FILES.pkgcfg+= wand/MagickWand-config.in wand/Wand-config.in
SUBST_MESSAGE.pkgcfg= Fixing pkg-config requirements.
SUBST_SED.pkgcfg= -e 's|MagickCore-config |MagickCore-config6 |g'
SUBST_SED.pkgcfg+= -e 's|Wand-config|Wand-config6|g'
SUBST_SED.pkgcfg+= -e 's|s MagickWand|s MagickWand-6.Q16|g'
SUBST_SED.pkgcfg+= -e 's|s: MagickWand|s: MagickWand-6.Q16|g'
SUBST_SED.pkgcfg+= -e 's|s MagickCore|s MagickCore-6.Q16|g'
SUBST_SED.pkgcfg+= -e 's|s: MagickCore|s: MagickCore-6.Q16|g'
SUBST_SED.pkgcfg+= -e 's|Magick++-config|Magick++-config6|g'
SUBST_SED.pkgcfg+= -e 's|Magick-config |Magick-config6 |g'
SUBST_SED.pkgcfg+= -e 's|s Magick++|s Magick++-6.Q16|g'
SUBST_SED.pkgcfg+= -e 's|@PKG_CONFIG@|${PREFIX}/bin/pkg-config|g'
SUBST_STAGE.pkgcfg= pre-configure

SUBST_CLASSES+= fix-cfg
SUBST_STAGE.fix-cfg= pre-configure
SUBST_MESSAGE.fix-cfg= Fixing configure.xml.
Expand All @@ -71,6 +88,13 @@ SUBST_MESSAGE.fix-etc= Handle configuration files.
SUBST_FILES.fix-etc= Makefile.in
SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,'

SUBST_CLASSES+= fix-tools
SUBST_STAGE.fix-tools= pre-install
SUBST_MESSAGE.fix-tools=Unwrapping tools path in delegate paths.
SUBST_FILES.fix-tools= config/delegates.xml
SUBST_SED.fix-tools= -e 's,${TOOLS_DIR},,g'


.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
Expand Down
4 changes: 2 additions & 2 deletions graphics/ImageMagick/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# used by graphics/p5-PerlMagick/Makefile

IM_MAJOR_VER= 6.9.1
IM_MINOR_VER= 7
IM_MAJOR_VER= 6.9.9
IM_MINOR_VER= 20
IM_MAJOR_LIB_VER= 6

.if (${IM_MINOR_VER} != NONE)
Expand Down
30 changes: 22 additions & 8 deletions graphics/ImageMagick/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ include/ImageMagick-6/Magick++/STL.h
include/ImageMagick-6/Magick++/TypeMetric.h
include/ImageMagick-6/magick/ImageMagick.h
include/ImageMagick-6/magick/MagickCore.h
include/ImageMagick-6/magick/PreRvIcccm.h
include/ImageMagick-6/magick/accelerate.h
include/ImageMagick-6/magick/animate.h
include/ImageMagick-6/magick/annotate.h
include/ImageMagick-6/magick/api.h
Expand Down Expand Up @@ -151,7 +149,6 @@ include/ImageMagick-6/wand/pixel-iterator.h
include/ImageMagick-6/wand/pixel-wand.h
include/ImageMagick-6/wand/stream.h
include/ImageMagick-6/wand/wand-view.h
lib/ImageMagick-6.9.1/config-Q16/configure.xml
lib/libMagick++-6.Q16.la
lib/libMagickCore-6.Q16.la
lib/libMagickWand-6.Q16.la
Expand Down Expand Up @@ -1126,7 +1123,6 @@ share/doc/ImageMagick-6/www/conjure.html
share/doc/ImageMagick-6/www/connected-components.html
share/doc/ImageMagick-6/www/contact.html
share/doc/ImageMagick-6/www/convert.html
share/doc/ImageMagick-6/www/css/bootstrap.min.css
share/doc/ImageMagick-6/www/css/magick.css
share/doc/ImageMagick-6/www/display.html
share/doc/ImageMagick-6/www/distribute-pixel-cache.html
Expand All @@ -1145,14 +1141,12 @@ share/doc/ImageMagick-6/www/import.html
share/doc/ImageMagick-6/www/index.html
share/doc/ImageMagick-6/www/install-source.html
share/doc/ImageMagick-6/www/jp2.html
share/doc/ImageMagick-6/www/js/bootstrap.min.js
share/doc/ImageMagick-6/www/license.html
share/doc/ImageMagick-6/www/links.html
share/doc/ImageMagick-6/www/magick++.html
share/doc/ImageMagick-6/www/magick-core.html
share/doc/ImageMagick-6/www/magick-vector-graphics.html
share/doc/ImageMagick-6/www/magick-wand.html
share/doc/ImageMagick-6/www/magick.css
share/doc/ImageMagick-6/www/miff.html
share/doc/ImageMagick-6/www/mogrify.html
share/doc/ImageMagick-6/www/montage.html
Expand Down Expand Up @@ -1188,9 +1182,7 @@ share/doc/ImageMagick-6/www/source/type-windows.xml
share/doc/ImageMagick-6/www/source/type.xml
share/doc/ImageMagick-6/www/source/wand.c
share/doc/ImageMagick-6/www/stream.html
share/doc/ImageMagick-6/www/subversion.html
share/doc/ImageMagick-6/www/support.html
share/doc/ImageMagick-6/www/t-shirt.html
share/doc/ImageMagick-6/www/wand.png
share/doc/ImageMagick-6/www/webp.html
share/examples/ImageMagick/coder.xml
Expand All @@ -1206,3 +1198,25 @@ share/examples/ImageMagick/type-dejavu.xml
share/examples/ImageMagick/type-ghostscript.xml
share/examples/ImageMagick/type-windows.xml
share/examples/ImageMagick/type.xml
lib/ImageMagick-6.9.9/config-Q16/configure.xml
share/doc/ImageMagick-6/images/annotate.png
share/doc/ImageMagick-6/images/atop.gif
share/doc/ImageMagick-6/images/donate.png
share/doc/ImageMagick-6/images/networkredux.png
share/doc/ImageMagick-6/images/over.gif
share/doc/ImageMagick-6/images/transloadit.png
share/doc/ImageMagick-6/www/api/Image++.html
share/doc/ImageMagick-6/www/api/magick++-classes.html
share/doc/ImageMagick-6/www/css/README.txt
share/doc/ImageMagick-6/www/develop.html
share/doc/ImageMagick-6/www/gradient.html
share/doc/ImageMagick-6/www/js/magick.js
share/doc/ImageMagick-6/www/js/README.txt
share/doc/ImageMagick-6/www/magick-script.html
share/doc/ImageMagick-6/www/magick.html
share/doc/ImageMagick-6/www/Magick++/Image++.html
share/doc/ImageMagick-6/www/mirror.html
share/doc/ImageMagick-6/www/opencl.html
share/doc/ImageMagick-6/www/security-policy.html
share/examples/ImageMagick/type-apple.xml
share/examples/ImageMagick/type-urw-base35.xml
8 changes: 4 additions & 4 deletions graphics/ImageMagick/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.135 2015/11/03 21:33:51 agc Exp $

SHA1 (ImageMagick-6.9.1-7.tar.xz) = d58a448e6026cb2ecc2cc5804e35d6bc09924081
RMD160 (ImageMagick-6.9.1-7.tar.xz) = 79d903b831d72dce50712dfc2632260b263a94b5
SHA512 (ImageMagick-6.9.1-7.tar.xz) = 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434
Size (ImageMagick-6.9.1-7.tar.xz) = 8284892 bytes
SHA1 (ImageMagick-6.9.9-20.tar.xz) = 551b9684a0ec02b8993f59ed127cd13d976516a6
RMD160 (ImageMagick-6.9.9-20.tar.xz) = f52fe28e5988d08083428d1a21fae8921f9526b0
SHA512 (ImageMagick-6.9.9-20.tar.xz) = 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
Size (ImageMagick-6.9.9-20.tar.xz) = 8994128 bytes
SHA1 (patch-magick_property.c) = bffd5d465bb000d83de76ba81c3913e003b26299
17 changes: 0 additions & 17 deletions graphics/ImageMagick/patches/patch-magick_property.c
View file
Open in desktop

This file was deleted.