[pkgsrc/pkgsrc-2008Q1]: pkgsrc/graphics/GraphicsMagick pullup ticket #2366 - ...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f03300c7b7b0
branches:  pkgsrc-2008Q1
changeset: 540321:f03300c7b7b0
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Fri May 09 11:21:26 2008 +0000

description:
pullup ticket #2366 - requested by obache
GraphicsMagick: security & bug fixes

revisions pulled up:
- pkgsrc/graphics/GraphicsMagick/Makefile
- pkgsrc/graphics/GraphicsMagick/PLIST
- pkgsrc/graphics/GraphicsMagick/buildlink3.mk
- pkgsrc/graphics/GraphicsMagick/distinfo

   Module Name: pkgsrc
   Committed By:        obache
   Date:                Tue Apr 29 04:56:24 UTC 2008

   Modified Files:
        pkgsrc/graphics/GraphicsMagick: Makefile PLIST buildlink3.mk distinfo

   Log Message:
   Update GraphicsMagick to 1.1.12.

   Significant changes associated with GraphicsMagick 1.1.12 (released April 28, 2008)

    Security Fixes:

      o Do not access X11 or invoke convenience or stealth delegate
        programs based on the file extension. In particular, these file
        extensions are rejected for consideration as a format specifier:
        'autotrace', 'browse', 'dcraw', 'edit', 'gs-color',
        'gs-color+alpha', 'gs-gray', 'gs-mono', 'launch', 'mpeg-encode',
        'print', 'scan', 'show', 'win', 'xc', and 'x'.

    Bugs Fixed:

      o magick/effect.c: Should now compile for ARM CPU.

      o TIFF: Don't request Kodak private tags since these cause some
        versions of libtiff to misbehave.

      o When performing string expansion of image attribute identifiers, skip
        those which require access to image pixels if image pixels are not
        present.

      o CropImageToHBITMAP(), ImageToHBITMAP(): Fix leak of bitmap handle.

diffstat:

 graphics/GraphicsMagick/Makefile      |  7 +++++--
 graphics/GraphicsMagick/PLIST         |  3 +--
 graphics/GraphicsMagick/buildlink3.mk |  4 +++-
 graphics/GraphicsMagick/distinfo      |  8 ++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r c8c447f75fba -r f03300c7b7b0 graphics/GraphicsMagick/Makefile
--- a/graphics/GraphicsMagick/Makefile  Fri May 09 10:21:41 2008 +0000
+++ b/graphics/GraphicsMagick/Makefile  Fri May 09 11:21:26 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/02/24 02:58:40 obache Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2008/05/09 11:21:26 rtr Exp $
 #
 
-DISTNAME=      GraphicsMagick-1.1.11
+DISTNAME=      GraphicsMagick-1.1.12
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
                ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
@@ -38,7 +38,10 @@
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c8c447f75fba -r f03300c7b7b0 graphics/GraphicsMagick/PLIST
--- a/graphics/GraphicsMagick/PLIST     Fri May 09 10:21:41 2008 +0000
+++ b/graphics/GraphicsMagick/PLIST     Fri May 09 11:21:26 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/10/14 12:25:15 obache Exp $
+@comment $NetBSD: PLIST,v 1.2.4.1 2008/05/09 11:21:27 rtr Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -191,7 +191,6 @@
 share/${PKGNAME}/www/api/types.html
 share/${PKGNAME}/www/api/widget.html
 share/${PKGNAME}/www/body.html
-share/${PKGNAME}/www/body.html.rej
 share/${PKGNAME}/www/books.html
 share/${PKGNAME}/www/color.html
 share/${PKGNAME}/www/composite.html
diff -r c8c447f75fba -r f03300c7b7b0 graphics/GraphicsMagick/buildlink3.mk
--- a/graphics/GraphicsMagick/buildlink3.mk     Fri May 09 10:21:41 2008 +0000
+++ b/graphics/GraphicsMagick/buildlink3.mk     Fri May 09 11:21:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/02/06 18:05:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5.10.1 2008/05/09 11:21:27 rtr Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GRAPHICSMAGICK_BUILDLINK3_MK:= ${GRAPHICSMAGICK_BUILDLINK3_MK}+
@@ -28,7 +28,9 @@
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff -r c8c447f75fba -r f03300c7b7b0 graphics/GraphicsMagick/distinfo
--- a/graphics/GraphicsMagick/distinfo  Fri May 09 10:21:41 2008 +0000
+++ b/graphics/GraphicsMagick/distinfo  Fri May 09 11:21:26 2008 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/02/24 02:58:40 obache Exp $
+$NetBSD: distinfo,v 1.4.2.1 2008/05/09 11:21:27 rtr Exp $
 
-SHA1 (GraphicsMagick-1.1.11.tar.bz2) = 05f295b08ac07182b38a0284acfc023b0d84d091
-RMD160 (GraphicsMagick-1.1.11.tar.bz2) = 0a737af87d6ae78324cdafcb7f3e886dee285689
-Size (GraphicsMagick-1.1.11.tar.bz2) = 5019414 bytes
+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