Date: Sat, 5 Mar 2005 17:56:18 +0100 From: "Arjan van Leeuwen" <avleeuwen@piwebs.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/78454: Update graphics/ImageMagick to 6.2.0-5 Message-ID: <1110041778.0@winston.piwebs.com> Resent-Message-ID: <200503051700.j25H0Zsp057529@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78454
>Category: ports
>Synopsis: Update graphics/ImageMagick to 6.2.0-5
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 05 17:00:34 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Arjan van Leeuwen
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 6.0-CURRENT #6: Wed Mar 2 19:10:07 CET 2005
root@winston.piwebs.com:/usr/obj/usr/src/sys/WINSTONULE
>Description:
This patch updates ImageMagick to version 6.2.0-5. This also
- fixes a security vulnerability [1]
- change logic in WITH_WMF/WITHOUT_WMF because of dependencies on X11 and ImageMagick modules [2]
The library version of ImageMagick has been bumped to .8; I'll submit another PR with updates for ports that depend on ImageMagick.
[1] Reported by Simon L. Nielsen <simon@freebsd.org>. See http://vuxml.freebsd.org/713c3913-8c2b-11d9-b58c-0001020eed82.html.
[2] Reported by Joan Picanyol i Puig <lists-freebsd@biaix.org>
>How-To-Repeat:
>Fix:
--- ImageMagick.diff begins here ---
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile Thu Feb 17 16:52:16 2005
+++ ImageMagick/Makefile Sat Mar 5 13:17:01 2005
@@ -6,9 +6,10 @@
#
PORTNAME= ImageMagick
-PORTVERSION= 6.1.9.4
+PORTVERSION= 6.2.0.5
CATEGORIES= graphics perl5
MASTER_SITES= ftp://ftp.nluug.nl/pub/ImageMagick/ \
+ http://people.fruitsalad.org/avleeuwen/distfiles/imagemagick/ \
${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
@@ -146,8 +147,17 @@
.endif
# WMF (Windows Meta File) images
-.if !defined(WITHOUT_IMAGEMAGICK_WMF)
+.if defined(WITH_IMAGEMAGICK_WMF)
+.if !defined(WITH_IMAGEMAGICK_MODULES)
+IGNORE= WMF support requires WITH_IMAGEMAGICK_MODULES
+.else
+.if defined(WITHOUT_X11)
+IGNORE= WMF support requires X11 libraries, please unset WITHOUT_X11
+.else
LIB_DEPENDS+= wmf.2:${PORTSDIR}/graphics/libwmf
+CONFIGURE_ARGS+= --with-wmf=yes
+.endif
+.endif
.else
CONFIGURE_ARGS+= --without-wmf
.endif
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo Thu Feb 17 16:39:00 2005
+++ ImageMagick/distinfo Sat Mar 5 12:48:02 2005
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.1.9-4.tar.bz2) = 9b2da5cfc898b6ab6015eaa96703b39c
-SIZE (ImageMagick-6.1.9-4.tar.bz2) = 4617422
+MD5 (ImageMagick-6.2.0-5.tar.bz2) = 3c6be31c122ead8c747d1eeb6f12b5f1
+SIZE (ImageMagick-6.2.0-5.tar.bz2) = 4642284
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist Fri Feb 18 01:31:50 2005
+++ ImageMagick/pkg-plist Sat Mar 5 14:40:31 2005
@@ -32,7 +32,7 @@
include/magick/attribute.h
include/magick/blob.h
include/magick/cache.h
-include/magick/cache_view.h
+include/magick/cache-view.h
include/magick/client.h
include/magick/coder.h
include/magick/color.h
@@ -64,7 +64,7 @@
include/magick/log.h
include/magick/magic.h
include/magick/magick.h
-include/magick/magick_config.h
+include/magick/magick-config.h
include/magick/memory_.h
include/magick/methods.h
include/magick/module.h
@@ -76,7 +76,7 @@
include/magick/pixel.h
include/magick/profile.h
include/magick/quantize.h
-include/magick/random.h
+include/magick/random_.h
include/magick/registry.h
include/magick/resize.h
include/magick/resource_.h
@@ -84,6 +84,7 @@
include/magick/semaphore.h
include/magick/shear.h
include/magick/signature.h
+include/magick/splay-tree.h
include/magick/stream.h
include/magick/string_.h
include/magick/timer.h
@@ -94,10 +95,11 @@
include/magick/version.h
include/magick/widget.h
include/magick/xwindow.h
-include/wand/drawing_wand.h
+include/wand/drawing-wand.h
include/wand/magick_wand.h
-include/wand/pixel_iterator.h
-include/wand/pixel_wand.h
+include/wand/magick-wand.h
+include/wand/pixel-iterator.h
+include/wand/pixel-wand.h
lib/ImageMagick/config/colors.xml
lib/ImageMagick/config/configure.xml
lib/ImageMagick/config/delegates.xml
@@ -305,13 +307,13 @@
%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/filters/analyze.so
lib/libMagick++.a
lib/libMagick++.so
-lib/libMagick++.so.7
+lib/libMagick++.so.8
lib/libMagick.a
lib/libMagick.so
-lib/libMagick.so.7
+lib/libMagick.so.8
lib/libWand.a
lib/libWand.so
-lib/libWand.so.7
+lib/libWand.so.8
libdata/pkgconfig/ImageMagick++.pc
libdata/pkgconfig/ImageMagick.pc
libdata/pkgconfig/Wand.pc
@@ -408,17 +410,17 @@
%%PORTDOCS%%share/doc/ImageMagick/www/api/attribute.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/blob.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/cache-view.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/color.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/colorspace.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/compare.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/composite.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/drawing-wand.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/deprecate.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/display.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/drawing_wand.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/enhance.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/exception.html
@@ -426,13 +428,13 @@
%%PORTDOCS%%share/doc/ImageMagick/www/api/image.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/list.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/magick.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/magick_wand.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/magick-wand.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/memory.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/paint.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_iterator.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_wand.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel-iterator.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel-wand.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/profile.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html
%%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html
--- ImageMagick.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1110041778.0>