From 7d8abb33bbb18adc0cd0475096e09ab1e64efdcf Mon Sep 17 00:00:00 2001 From: snj Date: Thu, 12 May 2005 22:08:24 +0000 Subject: Pullup ticket 491 - requested by Lubomir Sedlacik security update for ImageMagick Revisions pulled up: - pkgsrc/graphics/ImageMagick/Makefile.common 1.35, 1.36, 1.37, 1.38, 1.39 - pkgsrc/graphics/ImageMagick/PLIST 1.32, 1.33, 1.34, 1.35, 1.36 - pkgsrc/graphics/ImageMagick/distinfo 1.44, 1.45, 1.46, 1.47, 1.48 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.29 - pkgsrc/graphics/ImageMagick/buildlink3.mk 1.8 Module Name: pkgsrc Committed By: adam Date: Tue Mar 22 15:10:39 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo Log Message: Changes 6.2.0-8: * Bug fixes ---- Module Name: pkgsrc Committed By: adam Date: Tue Mar 29 14:31:52 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa Log Message: Changes 6.2.1-0: * Bug fixes, clean ups, and improvements ---- Module Name: pkgsrc Committed By: adam Date: Wed Apr 13 08:10:18 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo Log Message: Changes 6.2.1-3: * Bug fixes ---- Module Name: pkgsrc Committed By: adam Date: Tue Apr 19 15:43:13 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo Log Message: Changes 6.2.1.6: * Bug fixes? ---- Module Name: pkgsrc Committed By: adam Date: Tue Apr 26 08:08:01 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo Log Message: Changes 6.2.2.0: * Bug-fixes ---- Module Name: pkgsrc Committed By: salo Date: Wed May 11 13:22:15 UTC 2005 Modified Files: pkgsrc/graphics/ImageMagick: buildlink3.mk Log Message: Bump BUILDLINK_RECOMMENDED after latest update with security fixes. --- graphics/ImageMagick/Makefile.common | 6 +-- graphics/ImageMagick/PLIST | 95 ++++++++++++++++------------------- graphics/ImageMagick/buildlink3.mk | 4 +- graphics/ImageMagick/distinfo | 10 ++-- graphics/ImageMagick/patches/patch-aa | 6 +-- 5 files changed, 56 insertions(+), 65 deletions(-) diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index 08b5ef91030..97efa4559e5 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.34 2005/03/03 15:33:22 drochner Exp $ +# $NetBSD: Makefile.common,v 1.34.2.1 2005/05/12 22:08:24 snj Exp $ -IM_MAJOR_VER= 6.2.0 -IM_MINOR_VER= 4 +IM_MAJOR_VER= 6.2.2 +IM_MINOR_VER= 0 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} .if (${IM_MINOR_VER} != NONE) diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index 97a347441b5..c69c72ebb01 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2005/02/27 12:37:30 adam Exp $ +@comment $NetBSD: PLIST,v 1.31.2.1 2005/05/12 22:08:24 snj Exp $ bin/Magick++-config bin/Magick-config bin/Wand-config @@ -86,6 +86,7 @@ include/magick/semaphore.h include/magick/shear.h include/magick/signature.h include/magick/splay-tree.h +include/magick/statistic.h include/magick/stream.h include/magick/string_.h include/magick/timer.h @@ -132,47 +133,40 @@ man/man1/identify.1 man/man1/import.1 man/man1/mogrify.1 man/man1/montage.1 -man/man4/miff.4 -man/man5/quantize.5 share/ImageMagick-${IM_MAJOR_VER}/ChangeLog share/ImageMagick-${IM_MAJOR_VER}/LICENSE share/ImageMagick-${IM_MAJOR_VER}/NEWS share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml share/ImageMagick-${IM_MAJOR_VER}/config/log.xml share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml -share/ImageMagick-${IM_MAJOR_VER}/images/ImageMagick.jpg -share/ImageMagick-${IM_MAJOR_VER}/images/background.gif +share/ImageMagick-${IM_MAJOR_VER}/images/background.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/button.gif +share/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg share/ImageMagick-${IM_MAJOR_VER}/images/devlib.gif -share/ImageMagick-${IM_MAJOR_VER}/images/dogwaffle.png +share/ImageMagick-${IM_MAJOR_VER}/images/difference.png +share/ImageMagick-${IM_MAJOR_VER}/images/donate.png share/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/frame.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/fuzzy-magick.png +share/ImageMagick-${IM_MAJOR_VER}/images/georeviews.gif share/ImageMagick-${IM_MAJOR_VER}/images/granite.png -share/ImageMagick-${IM_MAJOR_VER}/images/logo.png -share/ImageMagick-${IM_MAJOR_VER}/images/magick-icon.png -share/ImageMagick-${IM_MAJOR_VER}/images/magick.png -share/ImageMagick-${IM_MAJOR_VER}/images/networkeleven.png -share/ImageMagick-${IM_MAJOR_VER}/images/pair.png -share/ImageMagick-${IM_MAJOR_VER}/images/promote.png -share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle.png -share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle_option.png +share/ImageMagick-${IM_MAJOR_VER}/images/label.gif +share/ImageMagick-${IM_MAJOR_VER}/images/logo.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/montage.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/reconstruct.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/red-ball.png +share/ImageMagick-${IM_MAJOR_VER}/images/red-circle.png +share/ImageMagick-${IM_MAJOR_VER}/images/right.gif +share/ImageMagick-${IM_MAJOR_VER}/images/rose-over.png +share/ImageMagick-${IM_MAJOR_VER}/images/rose.jpg share/ImageMagick-${IM_MAJOR_VER}/images/rose.png -share/ImageMagick-${IM_MAJOR_VER}/images/screen.png -share/ImageMagick-${IM_MAJOR_VER}/images/script.gif -share/ImageMagick-${IM_MAJOR_VER}/images/sprite.png -share/ImageMagick-${IM_MAJOR_VER}/images/star.gif -share/ImageMagick-${IM_MAJOR_VER}/images/top.gif +share/ImageMagick-${IM_MAJOR_VER}/images/script.png +share/ImageMagick-${IM_MAJOR_VER}/images/smile.gif +share/ImageMagick-${IM_MAJOR_VER}/images/sponsor.jpg +share/ImageMagick-${IM_MAJOR_VER}/images/sprite.jpg share/ImageMagick-${IM_MAJOR_VER}/images/travelsur.gif -share/ImageMagick-${IM_MAJOR_VER}/images/twi.png +share/ImageMagick-${IM_MAJOR_VER}/images/white-highlight.png share/ImageMagick-${IM_MAJOR_VER}/index.html -share/ImageMagick-${IM_MAJOR_VER}/www/Authors.html -share/ImageMagick-${IM_MAJOR_VER}/www/Changelog.html -share/ImageMagick-${IM_MAJOR_VER}/www/Copyright.html -share/ImageMagick-${IM_MAJOR_VER}/www/FAQ.html -share/ImageMagick-${IM_MAJOR_VER}/www/ImageMagick.html -share/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html -share/ImageMagick-${IM_MAJOR_VER}/www/Install-mac.html -share/ImageMagick-${IM_MAJOR_VER}/www/Install-unix.html -share/ImageMagick-${IM_MAJOR_VER}/www/Install-vms.html -share/ImageMagick-${IM_MAJOR_VER}/www/Install-windows.html share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.fig share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.png @@ -211,17 +205,14 @@ share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.fig share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.jpg share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-framed.jpg share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-plain.jpg -share/ImageMagick-${IM_MAJOR_VER}/www/News.html -share/ImageMagick-${IM_MAJOR_VER}/www/Notice.html -share/ImageMagick-${IM_MAJOR_VER}/www/QuickStart.html -share/ImageMagick-${IM_MAJOR_VER}/www/README.html +share/ImageMagick-${IM_MAJOR_VER}/www/advanced-unix-installation.html +share/ImageMagick-${IM_MAJOR_VER}/www/advanced-windows-installation.html share/ImageMagick-${IM_MAJOR_VER}/www/animate.html share/ImageMagick-${IM_MAJOR_VER}/www/api.html share/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html share/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html share/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html share/ImageMagick-${IM_MAJOR_VER}/www/api/color.html share/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html @@ -229,7 +220,6 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html share/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html share/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html share/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/display.html share/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html share/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html @@ -257,39 +247,40 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/shear.html share/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html share/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html share/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/types.html share/ImageMagick-${IM_MAJOR_VER}/www/api/version.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/widget.html -share/ImageMagick-${IM_MAJOR_VER}/www/apis.html -share/ImageMagick-${IM_MAJOR_VER}/www/cd.html +share/ImageMagick-${IM_MAJOR_VER}/www/binary-releases.html +share/ImageMagick-${IM_MAJOR_VER}/www/changelog.html share/ImageMagick-${IM_MAJOR_VER}/www/color.html +share/ImageMagick-${IM_MAJOR_VER}/www/command-line-options.html +share/ImageMagick-${IM_MAJOR_VER}/www/command-line-processing.html +share/ImageMagick-${IM_MAJOR_VER}/www/command-line-tools.html share/ImageMagick-${IM_MAJOR_VER}/www/compare.html share/ImageMagick-${IM_MAJOR_VER}/www/composite.html share/ImageMagick-${IM_MAJOR_VER}/www/conjure.html +share/ImageMagick-${IM_MAJOR_VER}/www/contact.html share/ImageMagick-${IM_MAJOR_VER}/www/convert.html share/ImageMagick-${IM_MAJOR_VER}/www/cvs.html share/ImageMagick-${IM_MAJOR_VER}/www/display.html share/ImageMagick-${IM_MAJOR_VER}/www/download.html +share/ImageMagick-${IM_MAJOR_VER}/www/examples.html share/ImageMagick-${IM_MAJOR_VER}/www/formats.html -share/ImageMagick-${IM_MAJOR_VER}/www/help.html share/ImageMagick-${IM_MAJOR_VER}/www/identify.html share/ImageMagick-${IM_MAJOR_VER}/www/import.html -share/ImageMagick-${IM_MAJOR_VER}/www/index.html -share/ImageMagick-${IM_MAJOR_VER}/www/install.html -share/ImageMagick-${IM_MAJOR_VER}/www/magick-list.html +share/ImageMagick-${IM_MAJOR_VER}/www/install-source.html +share/ImageMagick-${IM_MAJOR_VER}/www/license.html +share/ImageMagick-${IM_MAJOR_VER}/www/links.html +share/ImageMagick-${IM_MAJOR_VER}/www/magick-core.html +share/ImageMagick-${IM_MAJOR_VER}/www/magick-wand.html share/ImageMagick-${IM_MAJOR_VER}/www/magick.css +share/ImageMagick-${IM_MAJOR_VER}/www/mailing-list.html share/ImageMagick-${IM_MAJOR_VER}/www/miff.html share/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html share/ImageMagick-${IM_MAJOR_VER}/www/montage.html -share/ImageMagick-${IM_MAJOR_VER}/www/new.html -share/ImageMagick-${IM_MAJOR_VER}/www/objectives.html -share/ImageMagick-${IM_MAJOR_VER}/www/perl.html +share/ImageMagick-${IM_MAJOR_VER}/www/perl-magick.html share/ImageMagick-${IM_MAJOR_VER}/www/quantize.html -share/ImageMagick-${IM_MAJOR_VER}/www/smile.c -share/ImageMagick-${IM_MAJOR_VER}/www/sponsor.html -share/ImageMagick-${IM_MAJOR_VER}/www/tools.html -share/ImageMagick-${IM_MAJOR_VER}/www/topics.html -share/ImageMagick-${IM_MAJOR_VER}/www/windows.html +share/ImageMagick-${IM_MAJOR_VER}/www/resources.html +share/ImageMagick-${IM_MAJOR_VER}/www/search.html +share/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html @dirrm share/ImageMagick-${IM_MAJOR_VER}/www/api @dirrm share/ImageMagick-${IM_MAJOR_VER}/www/Magick++ @dirrm share/ImageMagick-${IM_MAJOR_VER}/www diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index 89bfa4aad5e..23fc55932d4 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/12/28 23:18:20 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.7.2.1 2005/05/12 22:08:25 snj Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= ImageMagick .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 -BUILDLINK_RECOMMENDED.ImageMagick+= ImageMagick>=6.1.6.0nb1 +BUILDLINK_RECOMMENDED.ImageMagick+= ImageMagick>=6.2.2.0 BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick .endif # IMAGEMAGICK_BUILDLINK3_MK diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 71bd0683db3..a341ba918db 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.43 2005/03/03 15:33:22 drochner Exp $ +$NetBSD: distinfo,v 1.43.2.1 2005/05/12 22:08:25 snj Exp $ -SHA1 (ImageMagick-6.2.0-4.tar.bz2) = 41983dc87f828406557d1d53e03544bd17a0f7a9 -RMD160 (ImageMagick-6.2.0-4.tar.bz2) = 274e20574c230fd3b557ab3a39143f34f917a1d9 -Size (ImageMagick-6.2.0-4.tar.bz2) = 4642489 bytes -SHA1 (patch-aa) = 41824024eed1178ed16a55d7dcc490454cc062f9 +SHA1 (ImageMagick-6.2.2-0.tar.bz2) = cca429b9d1ba30983ef8e451d119b7d4921eaa15 +RMD160 (ImageMagick-6.2.2-0.tar.bz2) = efeb373c27dd6c38295c17e30dd44127025a886c +Size (ImageMagick-6.2.2-0.tar.bz2) = 4717977 bytes +SHA1 (patch-aa) = 41171c5c07b3e8d476d8279b3019040a4331b5bf diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 7ff92759136..33d9ffe4855 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.28 2005/02/27 12:37:30 adam Exp $ +$NetBSD: patch-aa,v 1.28.2.1 2005/05/12 22:08:25 snj Exp $ ---- configure.orig 2005-02-25 19:38:46.000000000 +0000 +--- configure.orig 2005-03-29 02:36:44.000000000 +0000 +++ configure -@@ -25816,9 +25816,6 @@ fi +@@ -25818,9 +25818,6 @@ fi # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' -- cgit v1.2.3