update to 6.3.3-6

This fixes security vulnerabilities in the DCM and XWD read functions,
see CVE-2007-1797.
For other changes, see the ChangeLog file.

4 files changed, 27 insertions, 28 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 31d26dda7f3..ca929862304 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2007/03/17 22:01:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.74 2007/04/18 22:44:22 drochner Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.3.2
-IM_MINOR_VER=		9
+IM_MAJOR_VER=		6.3.3
+IM_MINOR_VER=		6
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index b8f61d2eb2f..c55e668138f 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2007/02/06 14:52:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.55 2007/04/18 22:44:22 drochner Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -264,7 +264,6 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html
-share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.php
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 69ca8786d57..27ab079e0ba 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.88 2007/03/17 22:01:54 adam Exp $
+$NetBSD: distinfo,v 1.89 2007/04/18 22:44:22 drochner Exp $
 
-SHA1 (ImageMagick-6.3.2-9.tar.bz2) = 8021a03c5823d0ea2c72758fd730aa9a0139cfdf
-RMD160 (ImageMagick-6.3.2-9.tar.bz2) = 7eb9967881f28d06ac72a465ccaf9c1cb29ac1f0
-Size (ImageMagick-6.3.2-9.tar.bz2) = 5555232 bytes
-SHA1 (patch-aa) = 6c9fd018d4072a9f309f4d290078e90951d6515d
+SHA1 (ImageMagick-6.3.3-6.tar.bz2) = 61aed9286d22d79bda75b65428791455cc191369
+RMD160 (ImageMagick-6.3.3-6.tar.bz2) = 0b8cadc428ac3aff36d8e356943310d7e643888f
+Size (ImageMagick-6.3.3-6.tar.bz2) = 5625824 bytes
+SHA1 (patch-aa) = 63ea984409733fd6e35b0a305b96760b3aae36e7
 SHA1 (patch-ab) = 87cbd40e9ae64bbe160e1dbebd0ec50e7e62b311
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 239bd73e949..8a49283b806 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,41 +1,41 @@
-$NetBSD: patch-aa,v 1.42 2007/02/15 08:05:52 adam Exp $
+$NetBSD: patch-aa,v 1.43 2007/04/18 22:44:22 drochner Exp $
 
---- configure.orig	2007-02-10 21:49:48.000000000 +0100
+--- configure.orig	2007-03-31 22:30:48.000000000 +0200
 +++ configure
-@@ -19001,9 +19001,6 @@ fi
+@@ -18984,9 +18984,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
 -if test "$libtool_build_shared_libs" != 'no' ; then
--  with_ltdl='yes'
+-    with_ltdl='yes'
 -fi
  
   if test "$with_ltdl" != 'no'; then
    WITH_LTDL_TRUE=
-@@ -34663,7 +34660,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -34622,7 +34619,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasFONTCONFIG 1
  _ACEOF
  
--  if test "$with_modules" == 'no' ; then
-+  if test "$with_modules" = 'no' ; then
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
      CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
-   fi
+     fi
  fi
-@@ -36781,7 +36778,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -36794,7 +36791,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasGVC 1
  _ACEOF
  
--  if test "$with_modules" == 'no' ; then
-+  if test "$with_modules" = 'no' ; then
-     CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
-   fi
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
+     fi
  fi
-@@ -37326,7 +37323,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -37337,7 +37334,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasRSVG 1
  _ACEOF
  
--  if test "$with_modules" == 'no' ; then
-+  if test "$with_modules" = 'no' ; then
-     CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
-   fi
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
+     fi
  fi