From cd7b9eb77202c9fb3b65c771816916dc82ab331b Mon Sep 17 00:00:00 2001 From: bernd Date: Mon, 6 Feb 2006 22:10:24 +0000 Subject: [PATCH] Security update to ImageMagick/p5-PerlMagick 6.2.6-1. (CVE-2006-0082) More info: http://studio.imagemagick.org/pipermail/magick-users/2006-January/017083.html from jakemsr@, ok steven@ --- graphics/ImageMagick/Makefile | 14 +++++++------- graphics/ImageMagick/distinfo | 8 ++++---- graphics/ImageMagick/patches/patch-configure_ac | 14 +++++++------- graphics/p5-PerlMagick/Makefile | 4 ++-- graphics/p5-PerlMagick/distinfo | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 92257095169..06b7e666156 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.89 2006/01/28 19:56:16 bernd Exp $ +# $OpenBSD: Makefile,v 1.90 2006/02/06 22:10:24 bernd Exp $ COMMENT= "image processing tools" VER= 6.2.6 -DASHVER= 0 +DASHVER= 1 DISTNAME= ImageMagick-${VER}-${DASHVER} -PKGNAME= ImageMagick-${VER}.${DASHVER}p0 -SHARED_LIBS= Magick++ 10.0 \ - Magick 10.0 \ - Wand 10.0 +PKGNAME= ImageMagick-${VER}.${DASHVER} +SHARED_LIBS= Magick++ 10.1 \ + Magick 10.1 \ + Wand 10.1 CATEGORIES= graphics MAINTAINER= Bernd Ahlers @@ -35,7 +35,7 @@ LIB_DEPENDS= bz2.10::archivers/bzip2 \ RUN_DEPENDS= :netpbm-*:graphics/netpbm BUILD_DEPENDS= :netpbm-*:graphics/netpbm -REGRESS_DEPENDS= ::graphics/p5-PerlMagick +REGRESS_DEPENDS= :p5-PerlMagick-${VER}.${DASHVER}:graphics/p5-PerlMagick USE_LIBTOOL= Yes SEPARATE_BUILD= concurrent diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 5261ed788e1..25c51d67942 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,4 +1,4 @@ -MD5 (ImageMagick-6.2.6-0.tar.gz) = 7e43d2a0ef3798596f49b04a39d27d58 -RMD160 (ImageMagick-6.2.6-0.tar.gz) = 0837bdd378a1c7a5a8133478adc1614fbaa06dd1 -SHA1 (ImageMagick-6.2.6-0.tar.gz) = c7e59c728b72192b4297af66fc780ebbde0509c2 -SIZE (ImageMagick-6.2.6-0.tar.gz) = 6374497 +MD5 (ImageMagick-6.2.6-1.tar.gz) = 7fade1360a407345ed614f39d42a5f9c +RMD160 (ImageMagick-6.2.6-1.tar.gz) = 9ea56a32785714428c0fcf5425cbc4f028fd2bca +SHA1 (ImageMagick-6.2.6-1.tar.gz) = 0b0c74df99d10bb150b4f5c8b4130d7b2939b95c +SIZE (ImageMagick-6.2.6-1.tar.gz) = 6390721 diff --git a/graphics/ImageMagick/patches/patch-configure_ac b/graphics/ImageMagick/patches/patch-configure_ac index 3aaadfbde11..4a258e95b20 100644 --- a/graphics/ImageMagick/patches/patch-configure_ac +++ b/graphics/ImageMagick/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.2 2006/01/27 17:40:05 bernd Exp $ ---- configure.ac.orig Thu Jan 5 11:02:55 2006 -+++ configure.ac Mon Jan 23 12:38:27 2006 -@@ -351,9 +351,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with +$OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $ +--- configure.ac.orig Fri Jan 27 02:20:07 2006 ++++ configure.ac Fri Feb 3 13:45:01 2006 +@@ -352,9 +352,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' @@ -14,7 +14,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/01/27 17:40:05 bernd Exp $ AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no') if test "$with_ltdl" != 'no' ; then -@@ -1984,7 +1984,7 @@ AC_SUBST(PERLMAINCC) +@@ -1996,7 +1996,7 @@ AC_SUBST(PERLMAINCC) # # Subdirectory under lib to place ImageMagick lib files @@ -23,7 +23,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/01/27 17:40:05 bernd Exp $ AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed) # Path to ImageMagick bin directory -@@ -2047,7 +2047,7 @@ AC_SUBST(MagickFilterModulesPath) +@@ -2059,7 +2059,7 @@ AC_SUBST(MagickFilterModulesPath) # # Path to ImageMagick document files @@ -32,7 +32,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/01/27 17:40:05 bernd Exp $ MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}" MagickDocumentPathDefine="${MagickDocumentPath}/" if test "$native_win32_build" = 'yes' -@@ -2059,7 +2059,7 @@ AC_SUBST(MagickDocumentPath) +@@ -2071,7 +2071,7 @@ AC_SUBST(MagickDocumentPath) # # Path to ImageMagick share files diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index feb4c58c36a..a9bb3944bc5 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2006/01/27 17:40:05 bernd Exp $ +# $OpenBSD: Makefile,v 1.12 2006/02/06 22:10:24 bernd Exp $ SHARED_ONLY= Yes COMMENT= "object-oriented Perl interface to ImageMagick" VER= 6.2.6 -DASHVER= 0 +DASHVER= 1 DISTNAME= ImageMagick-${VER}-${DASHVER} PKGNAME= p5-PerlMagick-${VER}.${DASHVER} CATEGORIES= graphics devel diff --git a/graphics/p5-PerlMagick/distinfo b/graphics/p5-PerlMagick/distinfo index 5261ed788e1..25c51d67942 100644 --- a/graphics/p5-PerlMagick/distinfo +++ b/graphics/p5-PerlMagick/distinfo @@ -1,4 +1,4 @@ -MD5 (ImageMagick-6.2.6-0.tar.gz) = 7e43d2a0ef3798596f49b04a39d27d58 -RMD160 (ImageMagick-6.2.6-0.tar.gz) = 0837bdd378a1c7a5a8133478adc1614fbaa06dd1 -SHA1 (ImageMagick-6.2.6-0.tar.gz) = c7e59c728b72192b4297af66fc780ebbde0509c2 -SIZE (ImageMagick-6.2.6-0.tar.gz) = 6374497 +MD5 (ImageMagick-6.2.6-1.tar.gz) = 7fade1360a407345ed614f39d42a5f9c +RMD160 (ImageMagick-6.2.6-1.tar.gz) = 9ea56a32785714428c0fcf5425cbc4f028fd2bca +SHA1 (ImageMagick-6.2.6-1.tar.gz) = 0b0c74df99d10bb150b4f5c8b4130d7b2939b95c +SIZE (ImageMagick-6.2.6-1.tar.gz) = 6390721