Version bump due security bug #152672

Package-Manager: portage-2.1.2_pre2-r7

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index a56f894c07b3ee73a7f6693129e4b6181f7d7bdd..81dc578b2169a2ebbe5955225f02ec83088af041 100644 (file)
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # 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.202 2006/10/15 13:08:12 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.203 2006/11/16 21:02:12 sekretarz Exp $
+
+*imagemagick-6.3.0.5 (16 Nov 2006)
+
+  16 Nov 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/imagemagick-6.3.0.5-docs.patch, +imagemagick-6.3.0.5.ebuild:
+  Version bump due security bug #152672
 
   15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   imagemagick-6.2.9.5.ebuild:

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c1d451d52b69d18492c01565e1990424dc62c3a8..997b75bf7d7169c5c7aa160936222e8f847667b3 100644 (file)
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -5,11 +5,16 @@ AUX imagemagick-6.2.5.4-docs.patch 1025 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f2
 MD5 a2ea32f35ad5cd39b86e963c6af87076 files/imagemagick-6.2.5.4-docs.patch 1025
 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 files/imagemagick-6.2.5.4-docs.patch 1025
 SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2 files/imagemagick-6.2.5.4-docs.patch 1025
+AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 SHA1 4a8c1122849a2362786cc3cbf165e57a123ade4c SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5
+MD5 e43f5cda62b2eda3e6a257b806b2386d files/imagemagick-6.3.0.5-docs.patch 528
+RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 files/imagemagick-6.3.0.5-docs.patch 528
+SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5 files/imagemagick-6.3.0.5-docs.patch 528
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 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
@@ -18,10 +23,14 @@ EBUILD imagemagick-6.2.9.5.ebuild 2811 RMD160 3ffba54601307d002f2256ba64fcce114b
 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
-MISC ChangeLog 30374 RMD160 ef41a14901404db95887875855762a5e5bc05ba8 SHA1 b26ab6f4af811f602df30302d59f221eb318358c SHA256 dd7f11bfa9683ddb6c0244e5acbaeb02571fa02313c9c6e972d545183ca1b560
-MD5 443e078f31a8efcb5b4fe72744f4aebb ChangeLog 30374
-RMD160 ef41a14901404db95887875855762a5e5bc05ba8 ChangeLog 30374
-SHA256 dd7f11bfa9683ddb6c0244e5acbaeb02571fa02313c9c6e972d545183ca1b560 ChangeLog 30374
+EBUILD imagemagick-6.3.0.5.ebuild 2803 RMD160 c6bca675676996b40610b849cf0c98e63cd8ed25 SHA1 5072b05479f5632df116ad82f7e3a0e9308e115e SHA256 dc9f6decc177e60e0c335c21f487f484a77b238b93bb302200e276c22b8d0856
+MD5 0cf6b145f5d8d223b44b67b542581fc8 imagemagick-6.3.0.5.ebuild 2803
+RMD160 c6bca675676996b40610b849cf0c98e63cd8ed25 imagemagick-6.3.0.5.ebuild 2803
+SHA256 dc9f6decc177e60e0c335c21f487f484a77b238b93bb302200e276c22b8d0856 imagemagick-6.3.0.5.ebuild 2803
+MISC ChangeLog 30578 RMD160 bb3ec4f11bb5271942500ce2bc43b0336edcac53 SHA1 b813a92c9dad5ae714cdd6a11aaa7c55f7c55a36 SHA256 a3a4f298606001ee29f396825e0ff4cdd5e8f154e14955fea58bbe1436a41634
+MD5 fffd49f311e2c2152bc1908b9cd80a23 ChangeLog 30578
+RMD160 bb3ec4f11bb5271942500ce2bc43b0336edcac53 ChangeLog 30578
+SHA256 a3a4f298606001ee29f396825e0ff4cdd5e8f154e14955fea58bbe1436a41634 ChangeLog 30578
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -32,10 +41,13 @@ SHA256 629523b989b4d82c8858bedb4416832ec397618e345609225dac7ac65587a319 files/di
 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)
 
-iD8DBQFFRyFbamhnQswr0vIRAtyYAJ4hKseGIvY5I0lkD0Ibbid22C3/dgCfRBuj
-VJ84j4GHLbnm6aYjwa3O00g=
-=SEus
+iD8DBQFFXPDkub4+zaPCR/oRAvFWAJ97lHlXWwvBfaLa0XxH9t6k9l7wOQCghAw9
+svjmaxLVVXpWNMCKdR1Ylg4=
+=zHns
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5 b/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5
new file mode 100644 (file)
index 0000000..5b5c1d2
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5
@@ -0,0 +1,3 @@
+MD5 1c60e1c1600da054f4f10bece3f4ffe7 ImageMagick-6.3.0-5.tar.bz2 5384739
+RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e ImageMagick-6.3.0-5.tar.bz2 5384739
+SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30 ImageMagick-6.3.0-5.tar.bz2 5384739

diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-docs.patch
new file mode 100644 (file)
index 0000000..35cf26a
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-docs.patch
@@ -0,0 +1,16 @@
+--- configure.orig     2006-11-13 20:22:26.000000000 +0100
++++ configure  2006-11-16 00:23:41.000000000 +0100
+@@ -43559,8 +43559,12 @@
+ 
+ #
+ # Path to ImageMagick document files
++if test "x${PF}" = "x" ; then
+ MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
++else
++MagickDocumentSubdir="${PF}"
++fi
++MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html"
+ MagickDocumentPathDefine="${MagickDocumentPath}/"
+ if test "$native_win32_build" = 'yes'
+ then

diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
new file mode 100644 (file)
index 0000000..c4cce59
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
@@ -0,0 +1,103 @@
+# 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.3.0.5.ebuild,v 1.1 2006/11/16 21:02:12 sekretarz 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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${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
+       einfo ${S}
+       epatch "${FILESDIR}"/${PN}-6.3.0.5-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
+
+}