Security clean up, bug #164182

Package-Manager: portage-2.1.2-r5

6 files changed, 10 insertions, 246 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 2d56a988b430..e18b4c2325e5 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.210 2006/11/24 18:01:41 kloeri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.211 2007/02/07 20:23:57 sekretarz Exp $
+
+  07 Feb 2007; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.2.9.5.ebuild, -imagemagick-6.2.9.5-r1.ebuild:
+  Security clean up, bug #164182
 
   24 Nov 2006; Bryan Østergaard <kloeri@gentoo.org>
   imagemagick-6.3.0.5.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3bd908842c26..7fabebdf4d6b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX imagemagick-6.2.5.4-docs.patch 1025 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 SHA1 4f674ebc4554f7edc6c938f14360dc8a50881141 SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2
 MD5 a2ea32f35ad5cd39b86e963c6af87076 files/imagemagick-6.2.5.4-docs.patch 1025
 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 files/imagemagick-6.2.5.4-docs.patch 1025
@@ -13,41 +10,19 @@ AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0
 MD5 d4ff8f64c60d78f04bac78748164f3fb files/imagemagick-perl.patch 1864
 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 files/imagemagick-perl.patch 1864
 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad files/imagemagick-perl.patch 1864
-DIST ImageMagick-6.2.9-5.tar.bz2 5378476 RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 SHA1 209337da8021b23d85440913f276ac99ff958b5d SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05
 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30
-EBUILD imagemagick-6.2.9.5-r1.ebuild 2787 RMD160 e640e84d8fa01467b117e42275e4eae293d51793 SHA1 e28246a4edefaefa56f95b00a5a55fd664cfb4b0 SHA256 de553662c420bfa3c0aaa5f28862b7445b947e755bc5489464dedd79e9f9c77f
-MD5 d87e3a8ab2a9f15f5c1dbb8390c98d5a imagemagick-6.2.9.5-r1.ebuild 2787
-RMD160 e640e84d8fa01467b117e42275e4eae293d51793 imagemagick-6.2.9.5-r1.ebuild 2787
-SHA256 de553662c420bfa3c0aaa5f28862b7445b947e755bc5489464dedd79e9f9c77f imagemagick-6.2.9.5-r1.ebuild 2787
-EBUILD imagemagick-6.2.9.5.ebuild 2811 RMD160 3ffba54601307d002f2256ba64fcce114b013757 SHA1 6fac5c0e19713340a9bf3c75770d3e4f09bae555 SHA256 8cf465d85fa19125d77bd61cb08c40f542af8a26ff8381e76095a8a475f07ffc
-MD5 383ef52b50c0667a9b4dff1641209bb3 imagemagick-6.2.9.5.ebuild 2811
-RMD160 3ffba54601307d002f2256ba64fcce114b013757 imagemagick-6.2.9.5.ebuild 2811
-SHA256 8cf465d85fa19125d77bd61cb08c40f542af8a26ff8381e76095a8a475f07ffc imagemagick-6.2.9.5.ebuild 2811
 EBUILD imagemagick-6.3.0.5.ebuild 2790 RMD160 34fdf108d6db82e2675848bf6ea9a6b034b16323 SHA1 426a5ff1408d39307be52b4625dd72828b0fd22e SHA256 c280ac5e4bb30ab1f4915f5ff4c0a63a8e5af4ac1096b22d8bebd95427ad198a
 MD5 5693f5056df919df786b3ef79d07d1a1 imagemagick-6.3.0.5.ebuild 2790
 RMD160 34fdf108d6db82e2675848bf6ea9a6b034b16323 imagemagick-6.3.0.5.ebuild 2790
 SHA256 c280ac5e4bb30ab1f4915f5ff4c0a63a8e5af4ac1096b22d8bebd95427ad198a imagemagick-6.3.0.5.ebuild 2790
-MISC ChangeLog 31406 RMD160 31d9b23f8350fe884dfded9d6da8b772320b47cc SHA1 8893a5c2c04b0bd8e933c7c0af4a0e64c08bd3fa SHA256 193f8b375c5c5b3d3f6197eab1952cacdbde1857f8c33e960935eb74a1e6a610
-MD5 5541d4c6cf51f5a52e649779b5942d32 ChangeLog 31406
-RMD160 31d9b23f8350fe884dfded9d6da8b772320b47cc ChangeLog 31406
-SHA256 193f8b375c5c5b3d3f6197eab1952cacdbde1857f8c33e960935eb74a1e6a610 ChangeLog 31406
+MISC ChangeLog 31560 RMD160 3d84c390788baa0d0bb6fefc3750cd015d14fec4 SHA1 d3b1385bfb35269cc5207b2526f72c720f8eb1bd SHA256 95c2af0233745de8d5c4c87e90e6bafa9dabc65d5d25f7413f2809175a829c5e
+MD5 031d7e04f342d1b50270865f01bd5e6a ChangeLog 31560
+RMD160 3d84c390788baa0d0bb6fefc3750cd015d14fec4 ChangeLog 31560
+SHA256 95c2af0233745de8d5c4c87e90e6bafa9dabc65d5d25f7413f2809175a829c5e ChangeLog 31560
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3 metadata.xml 224
-MD5 cee80301208cab77996ca62352b9189d files/digest-imagemagick-6.2.9.5 265
-RMD160 ac4d6f121492e7e41e22c8b08a95fd8b54d0c250 files/digest-imagemagick-6.2.9.5 265
-SHA256 629523b989b4d82c8858bedb4416832ec397618e345609225dac7ac65587a319 files/digest-imagemagick-6.2.9.5 265
-MD5 cee80301208cab77996ca62352b9189d files/digest-imagemagick-6.2.9.5-r1 265
-RMD160 ac4d6f121492e7e41e22c8b08a95fd8b54d0c250 files/digest-imagemagick-6.2.9.5-r1 265
-SHA256 629523b989b4d82c8858bedb4416832ec397618e345609225dac7ac65587a319 files/digest-imagemagick-6.2.9.5-r1 265
 MD5 0d12f992e50e9939892f4d4681d0b4a5 files/digest-imagemagick-6.3.0.5 265
 RMD160 3b12a2962e36cf4831ec9bc578749a2a8d76fc64 files/digest-imagemagick-6.3.0.5 265
 SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/digest-imagemagick-6.3.0.5 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFai/MamhnQswr0vIRAuOEAKCSEEci0OcVB95iVT+jsL8b76gRfACghIo6
-pp/OB5QA7FSgDt7DSTV96Xo=
-=9cL5
------END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5
deleted file mode 100644
index 945ff71d74a2..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c927f9afcac089e47a166b5c4476a8d8 ImageMagick-6.2.9-5.tar.bz2 5378476
-RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 ImageMagick-6.2.9-5.tar.bz2 5378476
-SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05 ImageMagick-6.2.9-5.tar.bz2 5378476
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1
deleted file mode 100644
index 945ff71d74a2..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c927f9afcac089e47a166b5c4476a8d8 ImageMagick-6.2.9-5.tar.bz2 5378476
-RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 ImageMagick-6.2.9-5.tar.bz2 5378476
-SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05 ImageMagick-6.2.9-5.tar.bz2 5378476
diff --git a/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild
deleted file mode 100644
index b640e55854fd..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild,v 1.2 2006/09/22 13:51:19 mcummings Exp $
-
-inherit eutils multilib perl-app
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}
-MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-
-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 ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff truetype X wmf xml zlib"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	media-fonts/corefonts
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	gs? ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
-	png? ( media-libs/libpng )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml? ( >=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 )
-	jpeg2k? ( media-libs/jasper )
-	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
-	!dev-perl/perlmagick
-	!sys-apps/compare
-	graphviz? ( media-gfx/graphviz )
-	fpx? ( media-libs/libfpx )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/libtool-1.5.2-r6
-	X? ( x11-proto/xextproto )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod +x config.sub
-	epatch "${FILESDIR}"/${PN}-6.2.5.4-docs.patch
-	epatch "${FILESDIR}"/imagemagick-perl.patch
-}
-
-src_compile() {
-	econf \
-		--with-threads \
-		--with-modules \
-		$(use_with perl) \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		--with-windows-font-dir=/usr/share/fonts/corefonts \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with bzip2 bzlib) \
-		$(use_with fpx) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with mpeg mpeg2) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die "compile problem"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config
-
-	# dont need these files with runtime plugins
-	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
-
-	! use doc && rm -r "${D}"/usr/share/doc/${PF}/html
-	dodoc NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild b/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild
deleted file mode 100644
index ac698dbbf0d4..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild,v 1.10 2006/10/31 09:26:45 vapier Exp $
-
-inherit eutils perl-app multilib
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}
-MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-
-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 ~ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff truetype X wmf xml zlib"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	media-fonts/corefonts
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	gs? ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
-	png? ( media-libs/libpng )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml? ( >=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 )
-	jpeg2k? ( media-libs/jasper )
-	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
-	!dev-perl/perlmagick
-	!sys-apps/compare
-	graphviz? ( media-gfx/graphviz )
-	fpx? ( media-libs/libfpx )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/libtool-1.5.2-r6
-	X? ( x11-proto/xextproto )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod +x config.sub
-	epatch "${FILESDIR}"/${PN}-6.2.5.4-docs.patch
-}
-
-src_compile() {
-	econf \
-		--with-threads \
-		--with-modules \
-		--without-perl \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		--with-windows-font-dir=/usr/share/fonts/corefonts \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with bzip2 bzlib) \
-		$(use_with fpx) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with mpeg mpeg2) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die "compile problem"
-
-	if use perl ; then
-		cd PerlMagick
-		perl-app_src_prep
-		perl-app_src_compile
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config
-
-	# dont need these files with runtime plugins
-	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
-
-	! use doc && rm -r "${D}"/usr/share/doc/${PF}/html
-	dodoc NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
-
-	if use perl ; then
-		cd PerlMagick
-		perl-module_src_install
-	fi
-}