Version bump, fixed security bug #105717

Package-Manager: portage-2.0.53_rc6

6 files changed, 253 insertions, 20 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index dcac1282cefc..2c16d08a2ff7 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.158 2005/08/25 16:07:16 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.159 2005/10/19 23:10:55 sekretarz Exp $
+
+*imagemagick-6.2.5.2 (19 Oct 2005)
+*imagemagick-6.2.4.2-r1 (19 Oct 2005)
+
+  19 Oct 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.4.2-r1.ebuild, +imagemagick-6.2.5.2.ebuild:
+  Version bump, fixed security bug #105717
 
 *imagemagick-6.2.4.2 (25 Aug 2005)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 6b185ae63473..73f5cfe75657 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,34 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f83f94636e500cc9b4e38e637e19eeaa imagemagick-6.2.4.2.ebuild 2678
-MD5 c065399950638c0256aab63246c0f238 imagemagick-6.2.1.5.ebuild 2592
-MD5 6ddba8488efcce8504bb7c7143f55345 imagemagick-6.2.2.3.ebuild 2582
-MD5 4c6b5a9b2f6836174c4cd4834f76b67e imagemagick-6.2.1.5-r1.ebuild 2617
-MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
-MD5 3dce9cbb137138524f39515905101a35 imagemagick-6.2.2.0.ebuild 2584
-MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
-MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
-MD5 e217021f88f2b1597d5946f36f4f7ec3 imagemagick-6.2.2.0-r1.ebuild 2609
-MD5 14f87dc26f34faed9eb5ea005eee2a7c ChangeLog 23165
-MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
-MD5 44276ac94f4ce41654185285a85dd336 imagemagick-6.2.2.3-r1.ebuild 2658
-MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
+MD5 a3e2ece3926fedcfe1784b3cbb7fc3ff ChangeLog 23400
 MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
 MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-imagemagick-6.2.0.4 72
 MD5 3463dd071a5d891ab69d1797c256df76 files/digest-imagemagick-6.2.0.6 72
 MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5 73
-MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
-MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3 73
-MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2 73
 MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5-r1 73
+MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
 MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0-r1 73
+MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3 73
 MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3-r1 73
+MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2 73
+MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2-r1 73
+MD5 36bddbdde99d4acb74564afdbbfcabae files/digest-imagemagick-6.2.5.2 73
+MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
 MD5 0ec169e44bbf685be7f25684344ff9a6 files/imagemagick-perlmagick.patch 1193
+MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
+MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
+MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
+MD5 4c6b5a9b2f6836174c4cd4834f76b67e imagemagick-6.2.1.5-r1.ebuild 2617
+MD5 c065399950638c0256aab63246c0f238 imagemagick-6.2.1.5.ebuild 2592
+MD5 e217021f88f2b1597d5946f36f4f7ec3 imagemagick-6.2.2.0-r1.ebuild 2609
+MD5 3dce9cbb137138524f39515905101a35 imagemagick-6.2.2.0.ebuild 2584
+MD5 44276ac94f4ce41654185285a85dd336 imagemagick-6.2.2.3-r1.ebuild 2658
+MD5 6ddba8488efcce8504bb7c7143f55345 imagemagick-6.2.2.3.ebuild 2582
+MD5 2bc67ba98dfbab47368cda1b83dccd00 imagemagick-6.2.4.2-r1.ebuild 2717
+MD5 f83f94636e500cc9b4e38e637e19eeaa imagemagick-6.2.4.2.ebuild 2678
+MD5 cc6c155e7a58cc1d780b805d3f4fdab1 imagemagick-6.2.5.2.ebuild 2714
+MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDDgapZ/iYVBmujdURAm5DAKCGcZKSkP9gxL18ZO8sWswL1tCjbACg1aGo
-Ce+skf/91LT8C1WP1G/yFoM=
-=ulkR
+iD8DBQFDVtNvZ/iYVBmujdURAmO8AJ9r+k9u6mS+ojVDkOBI88koMqdAjACfeAaS
+RezrK+w+DVrK12HYX1k5KXU=
+=M0BN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.4.2-r1 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.4.2-r1
new file mode 100644
index 000000000000..cdfa2b9a4c6f
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.4.2-r1
@@ -0,0 +1 @@
+MD5 04f8e77b1ee6b6dd36f092a3477d5fda ImageMagick-6.2.4-2.tar.bz2 4837173
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.2 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.2
new file mode 100644
index 000000000000..8bb662214098
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.2
@@ -0,0 +1 @@
+MD5 7f73904356c9f5192e6643188b576a48 ImageMagick-6.2.5-2.tar.bz2 4990475
diff --git a/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild
new file mode 100644
index 000000000000..55e1ee64060c
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild,v 1.1 2005/10/19 23:10:55 sekretarz Exp $
+
+inherit libtool flag-o-matic eutils perl-module
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
+
+DEPEND=">=sys-apps/sed-4
+	app-arch/bzip2
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	cups?   ( virtual/ghostscript )
+	lcms? ( >=media-libs/lcms-1.06 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	perl? ( >=dev-lang/perl-5.8.6-r6
+			!=dev-lang/perl-5.8.7 )
+	!dev-perl/perlmagick
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+
+RDEPEND="${DEPEND}
+		>=sys-devel/libtool-1.5.2-r6"
+pkg_setup() {
+		ewarn "Please, remember that dev-perl/perlmagick is now"
+		ewarn "part of media-gfx/imagemagick"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	chmod +x config.sub
+	epatch ${FILESDIR}/imagemagick-perlmagick.patch
+}
+
+src_compile() {
+	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--enable-shared \
+		--enable-lzw \
+		--without-hdf \
+		--with-threads \
+		--with-bzlib \
+		--with-modules \
+		--with-zlib \
+		--without-perl \
+		$(use_with X x) \
+		$(use_with wmf) \
+		$(use_with fpx) \
+		$(use_with jbig) \
+		$(use_with tiff) \
+		$(use_with lcms) \
+		$(use_with xml2 xml) \
+		$(use_with jpeg jp2) \
+		$(use_with jpeg jpeg) \
+		$(use_with mpeg mpeg2) \
+		$(use_with cups gslib) \
+		$(use_with graphviz dot) \
+		$(use_with truetype ttf) || die "econf failed"
+
+	emake || die "compile problem"
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install
+
+	if use perl ; then
+		cd ${S}/PerlMagick
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_install
+		cd ${S}
+	fi
+
+	if use doc; then
+	    dohtml -r www/*
+	    dodoc LICENSE NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
+	fi
+
+	#bug 69705
+	rm -f ${D}/usr/$(get_libdir)/libltdl*
+
+	#bug 73464 and 78740
+	rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
+
+	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
+	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
+}
diff --git a/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild b/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild
new file mode 100644
index 000000000000..19631294c5f4
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild,v 1.1 2005/10/19 23:10:55 sekretarz Exp $
+
+inherit libtool flag-o-matic eutils perl-module
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
+
+DEPEND=">=sys-apps/sed-4
+	app-arch/bzip2
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	cups?   ( virtual/ghostscript )
+	lcms? ( >=media-libs/lcms-1.06 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	perl? ( >=dev-lang/perl-5.8.6-r6
+			!=dev-lang/perl-5.8.7 )
+	!dev-perl/perlmagick
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+
+RDEPEND="${DEPEND}
+		>=sys-devel/libtool-1.5.2-r6"
+pkg_setup() {
+		ewarn "Please, remember that dev-perl/perlmagick is now"
+		ewarn "part of media-gfx/imagemagick"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	chmod +x config.sub
+	epatch ${FILESDIR}/imagemagick-perlmagick.patch
+}
+
+src_compile() {
+	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--enable-shared \
+		--enable-lzw \
+		--without-hdf \
+		--with-threads \
+		--with-bzlib \
+		--with-modules \
+		--with-zlib \
+		--without-perl \
+		$(use_with X x) \
+		$(use_with wmf) \
+		$(use_with fpx) \
+		$(use_with jbig) \
+		$(use_with tiff) \
+		$(use_with lcms) \
+		$(use_with xml2 xml) \
+		$(use_with jpeg jp2) \
+		$(use_with jpeg jpeg) \
+		$(use_with mpeg mpeg2) \
+		$(use_with cups gslib) \
+		$(use_with graphviz dot) \
+		$(use_with truetype ttf) || die "econf failed"
+
+	emake || die "compile problem"
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install
+
+	if use perl ; then
+		cd ${S}/PerlMagick
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_install
+		cd ${S}
+	fi
+
+	if use doc; then
+	    dohtml -r www/*
+	    dodoc LICENSE NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
+	fi
+
+	#bug 69705
+	rm -f ${D}/usr/$(get_libdir)/libltdl*
+
+	#bug 73464 and 78740
+	rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
+
+	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
+	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
+}