From fb018c268516388e595aa614484c144c633395b8 Mon Sep 17 00:00:00 2001 From: snj Date: Mon, 21 Feb 2005 17:26:20 +0000 Subject: Pullup ticket 301 - requested by Lubomir Sedlacik security fix for ImageMagick and p5-PerlMagick Revisions pulled up: - pkgsrc/graphics/ImageMagick/Makefile 1.123,1.125 - pkgsrc/graphics/ImageMagick/Makefile.common 1.25-1.27 - pkgsrc/graphics/ImageMagick/options.mk 1.1 - pkgsrc/graphics/ImageMagick/PLIST 1.28-1.29 - pkgsrc/graphics/ImageMagick/distinfo 1.35-1.37 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.27 - pkgsrc/graphics/p5-PerlMagick/Makefile 1.38 Module Name: pkgsrc Committed By: tv Date: Fri Dec 24 23:42:49 UTC 2004 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Added Files: pkgsrc/graphics/ImageMagick: options.mk Log Message: Allow building without X11 support with "PKG_OPTIONS.ImageMagick=-x11". Idea inspired by post to tech-pkg from . --- Module Name: pkgsrc Committed By: adam Date: Wed Jan 5 09:25:18 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa Log Message: Changes 6.1.7: * ReadPALMImage() now produces a proper RGB image * Added the -shadow option to simulate an image shadow * Fix file leak in ImageToBlob() method --- Module Name: pkgsrc Committed By: adam Date: Fri Jan 14 12:41:07 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo Log Message: Changes 6.1.8-6: * Bug fixes and improvements --- Module Name: pkgsrc Committed By: drochner Date: Tue Jan 18 11:22:10 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common distinfo pkgsrc/graphics/p5-PerlMagick: Makefile Log Message: update to 6.1.8-8, fixes a security problem, see http://www.idefense.com/application/poi/display?id=184&type=vulnerabilities --- graphics/ImageMagick/Makefile | 10 ++-------- graphics/ImageMagick/Makefile.common | 6 +++--- graphics/ImageMagick/PLIST | 6 ++++-- graphics/ImageMagick/distinfo | 8 ++++---- graphics/ImageMagick/options.mk | 18 ++++++++++++++++++ graphics/ImageMagick/patches/patch-aa | 6 +++--- graphics/p5-PerlMagick/Makefile | 3 +-- 7 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 graphics/ImageMagick/options.mk diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index e6d1a142230..bb086544c08 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2004/10/10 11:20:08 kristerw Exp $ +# $NetBSD: Makefile,v 1.122.2.1 2005/02/21 17:26:20 snj Exp $ .include "Makefile.common" @@ -8,15 +8,11 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.simplesystems.org/ImageMagick/ COMMENT= Package for display and interactive manipulation of images -BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0 -DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec - CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_LANGUAGES= c c++ @@ -29,7 +25,7 @@ GCC_REQD+= 2.95.3 PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER} PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER} -.include "../../mk/bsd.prefs.mk" +.include "options.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) GCC_REQD+= 3.0 @@ -44,10 +40,8 @@ CFLAGS= -O CONFIGURE_ARGS+= --without-perl .include "../../archivers/bzip2/buildlink3.mk" -.include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" -.include "../../graphics/libwmf/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index 1576b4b70fc..21dcc20c955 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.24 2004/12/05 09:42:11 adam Exp $ +# $NetBSD: Makefile.common,v 1.24.2.1 2005/02/21 17:26:20 snj Exp $ -IM_MAJOR_VER= 6.1.6 -IM_MINOR_VER= 0 +IM_MAJOR_VER= 6.1.8 +IM_MINOR_VER= 8 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} .if (${IM_MINOR_VER} != NONE) diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index 8ec811b8112..d0671595e7b 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2004/11/29 09:05:46 adam Exp $ +@comment $NetBSD: PLIST,v 1.27.2.1 2005/02/21 17:26:20 snj Exp $ bin/Magick++-config bin/Magick-config bin/Wand-config @@ -27,6 +27,7 @@ include/Magick++/STL.h include/Magick++/TypeMetric.h include/magick/ImageMagick.h include/magick/PreRvIcccm.h +include/magick/animate.h include/magick/annotate.h include/magick/api.h include/magick/attribute.h @@ -47,6 +48,7 @@ include/magick/convert.h include/magick/decorate.h include/magick/delegate.h include/magick/deprecate.h +include/magick/display.h include/magick/draw.h include/magick/effect.h include/magick/enhance.h @@ -72,6 +74,7 @@ include/magick/monitor.h include/magick/montage.h include/magick/option.h include/magick/paint.h +include/magick/pixel.h include/magick/profile.h include/magick/quantize.h include/magick/random.h @@ -91,7 +94,6 @@ include/magick/type.h include/magick/utility.h include/magick/version.h include/magick/widget.h -include/magick/xwindow.h include/wand/drawing_wand.h include/wand/magick_wand.h include/wand/pixel_iterator.h diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 57171005460..e154803ec9b 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.34 2004/12/05 09:42:11 adam Exp $ +$NetBSD: distinfo,v 1.34.2.1 2005/02/21 17:26:20 snj Exp $ -SHA1 (ImageMagick-6.1.6-0.tar.bz2) = 14b19fd3c752699a205997c647395c7c6bfe43b3 -Size (ImageMagick-6.1.6-0.tar.bz2) = 4558525 bytes -SHA1 (patch-aa) = 207bea9bece866ea773ebaddc7cd35d3c857b59f +SHA1 (ImageMagick-6.1.8-8.tar.bz2) = 7ad63e1268440135dc5c0bea3dd14a931680ae0a +Size (ImageMagick-6.1.8-8.tar.bz2) = 4561964 bytes +SHA1 (patch-aa) = 8fc26a7c88c58c5324d9935b768b53932fa4c9f0 diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk new file mode 100644 index 00000000000..2bd0ea91979 --- /dev/null +++ b/graphics/ImageMagick/options.mk @@ -0,0 +1,18 @@ +# $NetBSD: options.mk,v 1.1.2.2 2005/02/21 17:26:20 snj Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick +PKG_DEFAULT_OPTIONS= x11 +PKG_SUPPORTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mx11) +BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0 +DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec +USE_X11= YES + +.include "../../graphics/jasper/buildlink3.mk" +.include "../../graphics/libwmf/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-x +.endif diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 28ac69917fa..d996a990d90 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.26 2004/12/05 09:42:11 adam Exp $ +$NetBSD: patch-aa,v 1.26.2.1 2005/02/21 17:26:20 snj Exp $ ---- configure.orig 2004-12-03 23:31:05.000000000 +0000 +--- configure.orig 2004-12-27 21:45:13.000000000 +0000 +++ configure -@@ -25576,9 +25576,6 @@ fi +@@ -25563,9 +25563,6 @@ fi # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index 88450245081..4a422d5ec64 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2004/12/20 11:31:04 grant Exp $ +# $NetBSD: Makefile,v 1.37.2.1 2005/02/21 17:26:20 snj Exp $ .include "../../graphics/ImageMagick/Makefile.common" PKGNAME= p5-PerlMagick-${DISTVERSION} -PKGREVISION= 2 SVR4_PKGNAME= p5pma -- cgit v1.2.3