Pullup ticket #2416 - requested by obache

Security update for GraphicsMagick

Apply patch to update the package to version 1.1.14:

Significant changes associated with GraphicsMagick 1.1.14:
  Bugs Fixed:
    o Noise generation was not working correctly for anything but a Q8
      build.
    o Poisson noise generator was extremely slow.  Now it is reasonably
      fast.
    o PDF reader now computes bounding box for rotated PDFs correctly.
  Security Fixes:
    o Cineon reader: Fixed crash with broken file from Sami Liedes.
    o PICT reader: Fixed crash with broken files from Sami Liedes.
    o XCF reader: Fixed crash with broken files from Sami Liedes.
  Security Issue Not Fixed:
    o JP2/JPC reader: Several JPEG-2000 files from Sami Liedes broken
      collection cause crashes in Jasper. This is not GraphicsMagick's
      fault.

Significant changes associated with GraphicsMagick 1.1.13:
  Bugs Fixed:
    o Documentation is now installed according to the conventions
      established by the configure script.  This results in documentation
      being installed under /usr/local/share/doc/GraphicsMagick by default.
    o HWB colorspace now works correctly.
    o Composition with CopyOpacity now produces an image with
      transparency (as expected).
    o Composition now preserves the canvas colorspace.
    o Composition with a displacement map (-displace) no longer leaks an
      image.
    o Alpha composition now works as expected when both pixels involved
      include transparency.
    o -gamma multiple channel syntax now works as documented.
    o Now compiles with Visual C++ 2008.

3 files changed, 154 insertions, 154 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 025e5a19075..a5a05817989 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7.2.1 2008/05/09 11:21:26 rtr Exp $
+# $NetBSD: Makefile,v 1.7.2.2 2008/06/08 12:25:43 tron Exp $
 #
 
-DISTNAME=	GraphicsMagick-1.1.12
+DISTNAME=	GraphicsMagick-1.1.14
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index 5d52430124f..1c734e1aab1 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2.4.1 2008/05/09 11:21:27 rtr Exp $
+@comment $NetBSD: PLIST,v 1.2.4.2 2008/06/08 12:25:43 tron Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -85,159 +85,159 @@ man/man1/GraphicsMagickWand-config.1
 man/man1/gm.1
 man/man4/miff.4
 man/man5/quantize.5
-share/${PKGNAME}/Copyright.txt
 share/${PKGNAME}/config/log.mgk
 share/${PKGNAME}/config/magic.mgk
 share/${PKGNAME}/config/modules.mgk
-share/${PKGNAME}/images/ball.png
-share/${PKGNAME}/images/corbis.png
-share/${PKGNAME}/images/examples.jpg
-share/${PKGNAME}/images/gm-125x80t.png
-share/${PKGNAME}/images/gm-188x120t.png
-share/${PKGNAME}/images/gm-282x180t.png
-share/${PKGNAME}/images/home.png
-share/${PKGNAME}/images/mail.png
-share/${PKGNAME}/images/pdfsages.png
-share/${PKGNAME}/images/pngnow.png
-share/${PKGNAME}/images/right_triangle.png
-share/${PKGNAME}/images/right_triangle_option.png
-share/${PKGNAME}/index.html
-share/${PKGNAME}/www/AUTHORS.html
-share/${PKGNAME}/www/Changelog.html
-share/${PKGNAME}/www/Copyright.html
-share/${PKGNAME}/www/FAQ.html
-share/${PKGNAME}/www/GraphicsMagick.html
-share/${PKGNAME}/www/INSTALL-unix.html
-share/${PKGNAME}/www/INSTALL-windows.html
-share/${PKGNAME}/www/ImageMagickObject.html
-share/${PKGNAME}/www/Magick++/Blob.html
-share/${PKGNAME}/www/Magick++/Cache.fig
-share/${PKGNAME}/www/Magick++/Cache.png
-share/${PKGNAME}/www/Magick++/Cache.svg
-share/${PKGNAME}/www/Magick++/ChangeLog.html
-share/${PKGNAME}/www/Magick++/CoderInfo.html
-share/${PKGNAME}/www/Magick++/Color.html
-share/${PKGNAME}/www/Magick++/Documentation.html
-share/${PKGNAME}/www/Magick++/Drawable.html
-share/${PKGNAME}/www/Magick++/Drawable_example_1.png
-share/${PKGNAME}/www/Magick++/Enumerations.html
-share/${PKGNAME}/www/Magick++/Exception.html
-share/${PKGNAME}/www/Magick++/FormatCharacters.html
-share/${PKGNAME}/www/Magick++/Future.html
-share/${PKGNAME}/www/Magick++/Geometry.html
-share/${PKGNAME}/www/Magick++/Image.fig
-share/${PKGNAME}/www/Magick++/Image.html
-share/${PKGNAME}/www/Magick++/Image.png
-share/${PKGNAME}/www/Magick++/ImageDesign.html
-share/${PKGNAME}/www/Magick++/ImageMagick.png
-share/${PKGNAME}/www/Magick++/Install.html
-share/${PKGNAME}/www/Magick++/Magick++.png
-share/${PKGNAME}/www/Magick++/Montage.html
-share/${PKGNAME}/www/Magick++/NEWS.html
-share/${PKGNAME}/www/Magick++/PixelPacket.html
-share/${PKGNAME}/www/Magick++/Pixels.html
-share/${PKGNAME}/www/Magick++/README.txt
-share/${PKGNAME}/www/Magick++/STL.html
-share/${PKGNAME}/www/Magick++/TypeMetric.html
-share/${PKGNAME}/www/Magick++/gm-188x120t.png
-share/${PKGNAME}/www/Magick++/index.html
-share/${PKGNAME}/www/Magick++/montage-sample-framed.jpg
-share/${PKGNAME}/www/Magick++/right_triangle.png
-share/${PKGNAME}/www/Magick++/thumbnail-anatomy-framed.fig
-share/${PKGNAME}/www/Magick++/thumbnail-anatomy-framed.jpg
-share/${PKGNAME}/www/Magick++/thumbnail-anatomy-plain.fig
-share/${PKGNAME}/www/Magick++/thumbnail-anatomy-plain.jpg
-share/${PKGNAME}/www/Magick++/thumbnail-sample-framed.jpg
-share/${PKGNAME}/www/Magick++/thumbnail-sample-plain.jpg
-share/${PKGNAME}/www/NEWS.html
-share/${PKGNAME}/www/README.html
-share/${PKGNAME}/www/animate.html
-share/${PKGNAME}/www/api.html
-share/${PKGNAME}/www/api/animate.html
-share/${PKGNAME}/www/api/annotate.html
-share/${PKGNAME}/www/api/attribute.html
-share/${PKGNAME}/www/api/blob.html
-share/${PKGNAME}/www/api/cache.html
-share/${PKGNAME}/www/api/cache_view.html
-share/${PKGNAME}/www/api/color.html
-share/${PKGNAME}/www/api/composite.html
-share/${PKGNAME}/www/api/constitute.html
-share/${PKGNAME}/www/api/decorate.html
-share/${PKGNAME}/www/api/deprecate.html
-share/${PKGNAME}/www/api/display.html
-share/${PKGNAME}/www/api/draw.html
-share/${PKGNAME}/www/api/effect.html
-share/${PKGNAME}/www/api/enhance.html
-share/${PKGNAME}/www/api/error.html
-share/${PKGNAME}/www/api/fx.html
-share/${PKGNAME}/www/api/image.html
-share/${PKGNAME}/www/api/list.html
-share/${PKGNAME}/www/api/magick.html
-share/${PKGNAME}/www/api/memory.html
-share/${PKGNAME}/www/api/monitor.html
-share/${PKGNAME}/www/api/montage.html
-share/${PKGNAME}/www/api/paint.html
-share/${PKGNAME}/www/api/profile.html
-share/${PKGNAME}/www/api/quantize.html
-share/${PKGNAME}/www/api/registry.html
-share/${PKGNAME}/www/api/render.html
-share/${PKGNAME}/www/api/resize.html
-share/${PKGNAME}/www/api/resource.html
-share/${PKGNAME}/www/api/segment.html
-share/${PKGNAME}/www/api/shear.html
-share/${PKGNAME}/www/api/signature.html
-share/${PKGNAME}/www/api/stream.html
-share/${PKGNAME}/www/api/transform.html
-share/${PKGNAME}/www/api/types.html
-share/${PKGNAME}/www/api/widget.html
-share/${PKGNAME}/www/body.html
-share/${PKGNAME}/www/books.html
-share/${PKGNAME}/www/color.html
-share/${PKGNAME}/www/composite.html
-share/${PKGNAME}/www/conjure.html
-share/${PKGNAME}/www/contribute.html
-share/${PKGNAME}/www/convert.html
-share/${PKGNAME}/www/cvs.html
-share/${PKGNAME}/www/development.html
-share/${PKGNAME}/www/display.html
-share/${PKGNAME}/www/download.html
-share/${PKGNAME}/www/formats.html
-share/${PKGNAME}/www/gm.html
-share/${PKGNAME}/www/header.html
-share/${PKGNAME}/www/identify.html
-share/${PKGNAME}/www/import.html
-share/${PKGNAME}/www/index.html
-share/${PKGNAME}/www/install.html
-share/${PKGNAME}/www/links.html
-share/${PKGNAME}/www/magick.css
-share/${PKGNAME}/www/miff.html
-share/${PKGNAME}/www/mission.html
-share/${PKGNAME}/www/mogrify.html
-share/${PKGNAME}/www/montage.html
-share/${PKGNAME}/www/perl.html
-share/${PKGNAME}/www/programming.html
-share/${PKGNAME}/www/quantize.html
-share/${PKGNAME}/www/smile.c
-share/${PKGNAME}/www/tools.html
-share/${PKGNAME}/www/utilities.html
-share/${PKGNAME}/www/windows.html
-@dirrm include/GraphicsMagick/Magick++
-@dirrm include/GraphicsMagick/magick
-@dirrm include/GraphicsMagick/wand
-@dirrm include/GraphicsMagick
-@dirrm lib/${PKGNAME}/config
+share/doc/GraphicsMagick/Copyright.txt
+share/doc/GraphicsMagick/images/ball.png
+share/doc/GraphicsMagick/images/corbis.png
+share/doc/GraphicsMagick/images/examples.jpg
+share/doc/GraphicsMagick/images/gm-125x80t.png
+share/doc/GraphicsMagick/images/gm-188x120t.png
+share/doc/GraphicsMagick/images/gm-282x180t.png
+share/doc/GraphicsMagick/images/home.png
+share/doc/GraphicsMagick/images/mail.png
+share/doc/GraphicsMagick/images/pdfsages.png
+share/doc/GraphicsMagick/images/pngnow.png
+share/doc/GraphicsMagick/images/right_triangle.png
+share/doc/GraphicsMagick/images/right_triangle_option.png
+share/doc/GraphicsMagick/index.html
+share/doc/GraphicsMagick/www/AUTHORS.html
+share/doc/GraphicsMagick/www/Changelog.html
+share/doc/GraphicsMagick/www/Copyright.html
+share/doc/GraphicsMagick/www/FAQ.html
+share/doc/GraphicsMagick/www/GraphicsMagick.html
+share/doc/GraphicsMagick/www/INSTALL-unix.html
+share/doc/GraphicsMagick/www/INSTALL-windows.html
+share/doc/GraphicsMagick/www/ImageMagickObject.html
+share/doc/GraphicsMagick/www/Magick++/Blob.html
+share/doc/GraphicsMagick/www/Magick++/Cache.fig
+share/doc/GraphicsMagick/www/Magick++/Cache.png
+share/doc/GraphicsMagick/www/Magick++/Cache.svg
+share/doc/GraphicsMagick/www/Magick++/ChangeLog.html
+share/doc/GraphicsMagick/www/Magick++/CoderInfo.html
+share/doc/GraphicsMagick/www/Magick++/Color.html
+share/doc/GraphicsMagick/www/Magick++/Documentation.html
+share/doc/GraphicsMagick/www/Magick++/Drawable.html
+share/doc/GraphicsMagick/www/Magick++/Drawable_example_1.png
+share/doc/GraphicsMagick/www/Magick++/Enumerations.html
+share/doc/GraphicsMagick/www/Magick++/Exception.html
+share/doc/GraphicsMagick/www/Magick++/FormatCharacters.html
+share/doc/GraphicsMagick/www/Magick++/Future.html
+share/doc/GraphicsMagick/www/Magick++/Geometry.html
+share/doc/GraphicsMagick/www/Magick++/Image.fig
+share/doc/GraphicsMagick/www/Magick++/Image.html
+share/doc/GraphicsMagick/www/Magick++/Image.png
+share/doc/GraphicsMagick/www/Magick++/ImageDesign.html
+share/doc/GraphicsMagick/www/Magick++/ImageMagick.png
+share/doc/GraphicsMagick/www/Magick++/Install.html
+share/doc/GraphicsMagick/www/Magick++/Magick++.png
+share/doc/GraphicsMagick/www/Magick++/Montage.html
+share/doc/GraphicsMagick/www/Magick++/NEWS.html
+share/doc/GraphicsMagick/www/Magick++/PixelPacket.html
+share/doc/GraphicsMagick/www/Magick++/Pixels.html
+share/doc/GraphicsMagick/www/Magick++/README.txt
+share/doc/GraphicsMagick/www/Magick++/STL.html
+share/doc/GraphicsMagick/www/Magick++/TypeMetric.html
+share/doc/GraphicsMagick/www/Magick++/gm-188x120t.png
+share/doc/GraphicsMagick/www/Magick++/index.html
+share/doc/GraphicsMagick/www/Magick++/montage-sample-framed.jpg
+share/doc/GraphicsMagick/www/Magick++/right_triangle.png
+share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.fig
+share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.jpg
+share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.fig
+share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.jpg
+share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-framed.jpg
+share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-plain.jpg
+share/doc/GraphicsMagick/www/NEWS.html
+share/doc/GraphicsMagick/www/README.html
+share/doc/GraphicsMagick/www/animate.html
+share/doc/GraphicsMagick/www/api.html
+share/doc/GraphicsMagick/www/api/animate.html
+share/doc/GraphicsMagick/www/api/annotate.html
+share/doc/GraphicsMagick/www/api/attribute.html
+share/doc/GraphicsMagick/www/api/blob.html
+share/doc/GraphicsMagick/www/api/cache.html
+share/doc/GraphicsMagick/www/api/cache_view.html
+share/doc/GraphicsMagick/www/api/color.html
+share/doc/GraphicsMagick/www/api/composite.html
+share/doc/GraphicsMagick/www/api/constitute.html
+share/doc/GraphicsMagick/www/api/decorate.html
+share/doc/GraphicsMagick/www/api/deprecate.html
+share/doc/GraphicsMagick/www/api/display.html
+share/doc/GraphicsMagick/www/api/draw.html
+share/doc/GraphicsMagick/www/api/effect.html
+share/doc/GraphicsMagick/www/api/enhance.html
+share/doc/GraphicsMagick/www/api/error.html
+share/doc/GraphicsMagick/www/api/fx.html
+share/doc/GraphicsMagick/www/api/image.html
+share/doc/GraphicsMagick/www/api/list.html
+share/doc/GraphicsMagick/www/api/magick.html
+share/doc/GraphicsMagick/www/api/memory.html
+share/doc/GraphicsMagick/www/api/monitor.html
+share/doc/GraphicsMagick/www/api/montage.html
+share/doc/GraphicsMagick/www/api/paint.html
+share/doc/GraphicsMagick/www/api/profile.html
+share/doc/GraphicsMagick/www/api/quantize.html
+share/doc/GraphicsMagick/www/api/registry.html
+share/doc/GraphicsMagick/www/api/render.html
+share/doc/GraphicsMagick/www/api/resize.html
+share/doc/GraphicsMagick/www/api/resource.html
+share/doc/GraphicsMagick/www/api/segment.html
+share/doc/GraphicsMagick/www/api/shear.html
+share/doc/GraphicsMagick/www/api/signature.html
+share/doc/GraphicsMagick/www/api/stream.html
+share/doc/GraphicsMagick/www/api/transform.html
+share/doc/GraphicsMagick/www/api/types.html
+share/doc/GraphicsMagick/www/api/widget.html
+share/doc/GraphicsMagick/www/body.html
+share/doc/GraphicsMagick/www/books.html
+share/doc/GraphicsMagick/www/color.html
+share/doc/GraphicsMagick/www/composite.html
+share/doc/GraphicsMagick/www/conjure.html
+share/doc/GraphicsMagick/www/contribute.html
+share/doc/GraphicsMagick/www/convert.html
+share/doc/GraphicsMagick/www/cvs.html
+share/doc/GraphicsMagick/www/development.html
+share/doc/GraphicsMagick/www/display.html
+share/doc/GraphicsMagick/www/download.html
+share/doc/GraphicsMagick/www/formats.html
+share/doc/GraphicsMagick/www/gm.html
+share/doc/GraphicsMagick/www/header.html
+share/doc/GraphicsMagick/www/identify.html
+share/doc/GraphicsMagick/www/import.html
+share/doc/GraphicsMagick/www/index.html
+share/doc/GraphicsMagick/www/install.html
+share/doc/GraphicsMagick/www/links.html
+share/doc/GraphicsMagick/www/magick.css
+share/doc/GraphicsMagick/www/miff.html
+share/doc/GraphicsMagick/www/mission.html
+share/doc/GraphicsMagick/www/mogrify.html
+share/doc/GraphicsMagick/www/montage.html
+share/doc/GraphicsMagick/www/perl.html
+share/doc/GraphicsMagick/www/programming.html
+share/doc/GraphicsMagick/www/quantize.html
+share/doc/GraphicsMagick/www/smile.c
+share/doc/GraphicsMagick/www/tools.html
+share/doc/GraphicsMagick/www/utilities.html
+share/doc/GraphicsMagick/www/windows.html
+@dirrm share/doc/GraphicsMagick/www/api
+@dirrm share/doc/GraphicsMagick/www/Magick++
+@dirrm share/doc/GraphicsMagick/www
+@dirrm share/doc/GraphicsMagick/images
+@dirrm share/doc/GraphicsMagick
+@dirrm share/${PKGNAME}/config
+@dirrm share/${PKGNAME}
+@exec ${MKDIR} %D/share/GraphicsMagick
+@dirrm share/GraphicsMagick
 @exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8/filters
 @dirrm lib/${PKGNAME}/modules-Q8/filters
 @exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8/coders
 @dirrm lib/${PKGNAME}/modules-Q8/coders
-@exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8
 @dirrm lib/${PKGNAME}/modules-Q8
+@dirrm lib/${PKGNAME}/config
 @dirrm lib/${PKGNAME}
-@dirrm share/${PKGNAME}/www/Magick++
-@dirrm share/${PKGNAME}/www/api
-@dirrm share/${PKGNAME}/www
-@dirrm share/${PKGNAME}/images
-@dirrm share/${PKGNAME}/config
-@dirrm share/${PKGNAME}
-@exec ${MKDIR} %D/share/GraphicsMagick
-@dirrm share/GraphicsMagick
+@dirrm include/GraphicsMagick/wand
+@dirrm include/GraphicsMagick/magick
+@dirrm include/GraphicsMagick/Magick++
+@dirrm include/GraphicsMagick
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index b1a1e53bc4f..6075f5fff20 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4.2.1 2008/05/09 11:21:27 rtr Exp $
+$NetBSD: distinfo,v 1.4.2.2 2008/06/08 12:25:43 tron Exp $
 
-SHA1 (GraphicsMagick-1.1.12.tar.bz2) = bd551d6a06e0f5c4965d12448e3e584ffa22c266
-RMD160 (GraphicsMagick-1.1.12.tar.bz2) = 9f944187c3409c65f8e4721bf10169ce31d1229d
-Size (GraphicsMagick-1.1.12.tar.bz2) = 5034822 bytes
+SHA1 (GraphicsMagick-1.1.14.tar.bz2) = e2cdbac9e10640886ddeb298b4a0c455f024db26
+RMD160 (GraphicsMagick-1.1.14.tar.bz2) = 97429c8132691285faf06674d3677ff03979acaf
+Size (GraphicsMagick-1.1.14.tar.bz2) = 5060409 bytes