Upstream patch for inconsistent typecasts with libpng14 and above wrt security #428718

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 212 insertions, 20 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 034d19b2d030..17aa30631aeb 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.98 2012/06/24 20:15:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.99 2012/08/02 15:13:59 ssuominen Exp $
+
+*graphicsmagick-1.3.16-r1 (02 Aug 2012)
+
+  02 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +graphicsmagick-1.3.16-r1.ebuild,
+  +files/graphicsmagick-1.3.16-libpng14.patch:
+  Upstream patch for inconsistent typecasts with libpng14 and above wrt
+  security #428718
 
   24 Jun 2012; Tim Harder <radhermit@gentoo.org> graphicsmagick-1.3.16.ebuild:
   Drop perl-5.16 build fix since it was applied upstream.
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 55f424b43933..5053cced9001 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX graphicsmagick-1.3.13-lzma_configure.patch 794 RMD160 321dab775528a20ac8750fff5ad8203108f95309 SHA1 d9f6ae3c0b60f70f26adc13d4ab731df3233ea44 SHA256 691e066009ca5826c377ca45269afdbeba175cfad3336ce2d2d073d07b54737f
-DIST GraphicsMagick-1.3.13.tar.xz 4899208 RMD160 ff8170a15ce1a2f4441273704bbefe9f45e3950d SHA1 b85b21785bb072fd795f7fc6ac902cffae4e96e6 SHA256 45e3a676309b25837f34ae78a9f46573af260e38f4ba4960f16b70b8e1968f22
-DIST GraphicsMagick-1.3.14.tar.xz 4879292 RMD160 b8d973d60af70e48ff02689ebb8efb115fd36807 SHA1 307fb59e60685721c365da4c2f593523743ca599 SHA256 8a17891e54d2ffbb5c976922b9293eff258cdb66f74e4886f7c4ae10b7ac84cc
-DIST GraphicsMagick-1.3.15.tar.xz 4921024 RMD160 38d82616acffae4749ee701377fa882438b751bb SHA1 d5df4000d5531fad3ede9e008f9c8dc2d085d546 SHA256 47fc508e596f3ff35f0e94f7844f52c19124446e5626e5081064f81cc39715e8
-DIST GraphicsMagick-1.3.16.tar.xz 5550004 RMD160 e49176d76f4228a9388a73fc55f31bef68a1d747 SHA1 3949030b101d66811242a0d30abc9965481ed035 SHA256 df8ca4d79c0071662cdf125d08581a2c55910f9c5c3e2b885dd05271559dd4b0
-EBUILD graphicsmagick-1.3.13.ebuild 3101 RMD160 4f0038e8d452f95c61a621230e8e8b05f1ee8cc0 SHA1 5b49b063518cc48117ba2e4ee2a027fbdf482cf9 SHA256 662eb525e865e3fdead9203f9017f2a48983d34509eea31e843d447084a68e80
-EBUILD graphicsmagick-1.3.14.ebuild 3131 RMD160 7a8c4b1a94ce3d5ad6bfd6049880f92c4cd0c231 SHA1 b563273253b864c961b5ca11fc6ff83a07663699 SHA256 430c039f9107e60c8a37cdf57991d7fb287ddd140955e4c84c81f9a72c8864be
-EBUILD graphicsmagick-1.3.15.ebuild 3250 RMD160 94365d6d4186c52b00fa29e0a46e7eaf67a4af0d SHA1 2f8f1c9f77c605ea72dd4af0189ecfba21eaf1ee SHA256 957af2dfc7367628a1f9d716fd9783420159dfbc5fce24fb2b93cdff0ba950ef
-EBUILD graphicsmagick-1.3.16.ebuild 3083 RMD160 a7b6cef0669c5057384ab96173c767c945c1dfb8 SHA1 70fd0309c10b36c8b726fc35c55d539d69c7d97b SHA256 a83f54a2303cb9c34b0061ae8c5edebae136fb5c195b2145c8939af5af0d811e
-MISC ChangeLog 10267 RMD160 73474e29c6b7d2cd5814815e76fe1fddbbb0f191 SHA1 262cd16d8b189149ab360ba4f49521cf56bf380f SHA256 4c85388982493b52344f8890ebbe8fc6ee6d9e011ace3cc380fd0f8ce357a498
-MISC metadata.xml 948 RMD160 777ea220f961149cf9da9f4d0150c613df0ca92b SHA1 cf14a02282804546e796d61d143b0add1c086cfd SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6
+AUX graphicsmagick-1.3.13-lzma_configure.patch 794 SHA256 691e066009ca5826c377ca45269afdbeba175cfad3336ce2d2d073d07b54737f SHA512 acb7b820cb038be3f39db3c4e02011c4819db0ffe0ca8f5c612c3f91e32c1f0762140c243dc8b4de11e3cab5f084b604419c42712919bfae00e94767d18421ee WHIRLPOOL 14841466284b5a1246674858eab200a69cbdc5c856b1c81e7addcf22d79c799a019a9de1d1b8a78e10a8875015ce1ca8b9fd244a42e87108b697d8c7db4a0d10
+AUX graphicsmagick-1.3.16-libpng14.patch 2540 SHA256 1c0db66018035a13fbfa2d61d3a71534350e52809e67888f07113663b82bf4c6 SHA512 aab31f92a3b41b60e42afd8d222c16a64d1a602e66b8f61efbadddc09a95aa32d9a5a20f535c784ffd58978da7b5f9580c85ee061e49b043e9dff8fb7a015379 WHIRLPOOL ce849fe5293714ea227c9620165431df97b7a3c51a94f8259617ccbddafa6dfb5268f30416258abaff1a5cd54b27aaf01c2b57b0d816c660d2aaab16946387fc
+DIST GraphicsMagick-1.3.13.tar.xz 4899208 SHA256 45e3a676309b25837f34ae78a9f46573af260e38f4ba4960f16b70b8e1968f22 SHA512 81eabf02a52194e0ce1e5fc57993b29f36fad91893725f240872b6f76888d4ec994d1eadc082f56cf06292a39fe53888c7674c6448e60dcabafc3822e5c5a109 WHIRLPOOL fd985266705e237cb6ddabe2e8d7bf9414455be01cbf77271a4b68dc1a15150481752b52a5a2cc2a5c6f8aa88c3d8ceeb6db73a5253339a0749ed61ddadbc50d
+DIST GraphicsMagick-1.3.14.tar.xz 4879292 SHA256 8a17891e54d2ffbb5c976922b9293eff258cdb66f74e4886f7c4ae10b7ac84cc SHA512 057b7185dc73449e370eabe23694e873e45f005ea471d1f1c9570aafa83be2627733403f984ca55d0bb4f96bd88e8013b49f2b47b8549fb7d281a93ea550415f WHIRLPOOL f112bc60ab164be4f70639b2ff97ecee9d8a76c4dfc9cde0edea4edd4298c711282d644c022b2fe1b3a03a839bb2e5f20c3c80070e177896c65ea5ac197b206d
+DIST GraphicsMagick-1.3.15.tar.xz 4921024 SHA256 47fc508e596f3ff35f0e94f7844f52c19124446e5626e5081064f81cc39715e8 SHA512 362a36db967429c222aade4641799fb9ba00174d400b7587af1003f9b87a608f03237f8602d25035c7baabd79688c9b1d76d9750c6fbafffe3ce298ba39e289f WHIRLPOOL d704de1138b49afa160e6514026a218f1aac7cc9ae46bfa530028d7d8eeda23aaabeed22945c1d846143890baf79838185c8f149586769b123c93755842deaf4
+DIST GraphicsMagick-1.3.16.tar.xz 5550004 SHA256 df8ca4d79c0071662cdf125d08581a2c55910f9c5c3e2b885dd05271559dd4b0 SHA512 24f94cbfa5e92897973a51ce5ee231733483ab04b271432999a2485a2e4355c5b3bcd8017dbfd1fcdd3e4798750caba28e8e67cf533f367ac3f5f03867f620bc WHIRLPOOL 49b33ce9ffb438bd4a1445973e8f7a7724c1d6588dd6adefbe68a7ca4ed8c500e3a44695e0bc0a2744c8cb2ee714cb5aa5f0b6d2d90da1d252c2536dc39879be
+EBUILD graphicsmagick-1.3.13.ebuild 3101 SHA256 662eb525e865e3fdead9203f9017f2a48983d34509eea31e843d447084a68e80 SHA512 f045789b682dc2daa1156f7d0cb298f6101dc18688091bb9b3fb964d90ae84d0f025f2ec019dae93250a3e3cc8f6b13944c452c01efcd589610583a3e656ca5f WHIRLPOOL 93a5f8b7ab7bdace75d05813c6a0492ba2c973c5b9db7b3e223a260ad29dff3e47c29226772d0a189619b1b4c44eda8bd3c9d885a2e5efc6346cee7a45daa0d1
+EBUILD graphicsmagick-1.3.14.ebuild 3131 SHA256 430c039f9107e60c8a37cdf57991d7fb287ddd140955e4c84c81f9a72c8864be SHA512 bde44487e7b72a9317559a8f005e9343fee9a9fea7ef8c476895426f8b3430743c2a8894f5c832fd8b90dbb953602aa0b29582fdaf55a465a46642bfecb24068 WHIRLPOOL e041cc0f4910e7ae00f9fa37156e00877385410e06bec846ded6afeda66ba387ab091a1a6e1bb8611857da4eb278b70e05b579f3f8c5d7363af844a1d4ac0ed7
+EBUILD graphicsmagick-1.3.15.ebuild 3250 SHA256 957af2dfc7367628a1f9d716fd9783420159dfbc5fce24fb2b93cdff0ba950ef SHA512 4e8979a90ddd7393152703bfbeeb190a1845813b0834d2cea47026dd3ad6b961d317984a48032633bf8676bf6afc012edbc10215a525780fcbafe1f43ef3d829 WHIRLPOOL d72cdc0a54abed3abf02a6b67b99cb763a0a8453b5ec7538431599c61410e05d53e94f37c2767e7fb0fa6b6dfd1eb901011986ef3b02cb0a8a75469b043d9318
+EBUILD graphicsmagick-1.3.16-r1.ebuild 3147 SHA256 a890d77a1274bfbe1b075380d0b19fd3fb88605bb4e93f89fcfe5238dbd09605 SHA512 a00370319a08677fbf554313333696e9fd99766c3688c1339029a9d79d0cfe6e0e7f64657b0797cb205c7bf4e4a47c349d5813e474b73d8c06266eba4b4c6f27 WHIRLPOOL 2dc03eece8edffc01466a985336e42d02f8f29e0b88908a355d95934ad28568d81f6947d63a89ade5c66816a8f7d1f467cc8b18340beb7bf36b994da23c5bb0e
+EBUILD graphicsmagick-1.3.16.ebuild 3083 SHA256 a83f54a2303cb9c34b0061ae8c5edebae136fb5c195b2145c8939af5af0d811e SHA512 070bd36a2d12e4faa916a7b33d187367fa4f0fd6494eb78e5c1147b5eeb2d71474c92bf2d6c45ae9e61fdfc707028c799117806061a7967e56955a9f0952f4c0 WHIRLPOOL 0350fd5b0bede9171c0911e67723e1278f4882c24d8d83122f8acf21ae2c5cde02f5f44a9769c6a05523920a1d19ee3c1bd0095fe9b95730a0ae174aa9782516
+MISC ChangeLog 10537 SHA256 a34c98bf369f63838816c1abf4463fe217af4496cb22d322b383f238c72d956c SHA512 45bc39bb34e9c9d38e7cbf45bd61f69148c7be4751eb5f3ec50010bdf9dedd8fd3567e80ab2d3163469d2076a6677542fd936af24ccf728544c80407ffc48aa1 WHIRLPOOL 1b56f1b6a0e2a943bef43d62ab86bf4b69d38edc085ab5410b7bb7d5234894bc18f8aa0a8a06fda1d83d163e227e93db1ede5bbdefe0563a67db00583e1cc19f
+MISC metadata.xml 948 SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6 SHA512 bd1485172b469c218f688d3352c5a00f16f651a3aedbc1db786aa524b6e7c1c237cce556a17d223c29ccff870601691ae7a0f54d01005c3541a3c67526ae65ee WHIRLPOOL 7f33793cca1f96fb4d65c8d1da2ea14901ed6614ff99655bad14e71963ecd0f3fdb6c216e8df301a6e462d04e3461031f0874e58b2b94d9271f659df902285dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP53V9AAoJEEqz6FtPBkyjF0gH/0cixrKFVMM4LWpfBv/btTZn
-nXyCFHkLfRBEPBTK7PT2pP0SMNVj/2exgFLdmOk+VSeyVuMzJbKgl/+s3ZRGnBWE
-k5slk0z0uwht+iLQyhujh8rH545bAwLi6GJ6jpVM5CbkrmNRb64AUV1YK9vzUx1l
-iTGVn/5DXsTd7Ur2t3rY0iXXtEX4GkmKGwWVvlNvN43ejaEAleqfzYTpc20eeQOC
-y2jYynPc6JUG6rDMDvYkUK33srCA+7VKcHzj8EZF8+qWjKtHAQqEypEdVVXIwlTa
-toroT55erKRfZvcpaeIqHLmV8jntnw04A8snPJernFwPX29zkijwidlv5kuFXB0=
-=JdVs
+iQEcBAEBAgAGBQJQGpkGAAoJEEdUh39IaPFNMJkH/intF+K65Ao0H+XGgKw4jcdK
+Ai6triaKL9KML+3KGIaRWzXPFlMb0oLLEOAyYr5VZ0H2q2faeYH4MyReZDk1JUWS
+jz1dBt3xPrEl3kOHh6wrWgy6eu+fRNbpBnN1Q2X0SvF5/Id001l883TZBhdQ3S1q
+ZQzaod3Mli9k49cmy000CAKJLcIX8GB3f4fxS3nVmrdCHGvspPSMxaTlm/AR4m3L
+cIFdJEIG4pY0kVbcNL07M2oNAxzSnMol6dpEUxT3Mqz2cC3ClPtFjhaIO3UNkcRe
+SfUcP/fvPzpRgXkMoTFvSU3PdOvrxSMq/Fr+lEZZI62q7CWQWkuMWsQ0Z+e6EyQ=
+=A1qj
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
new file mode 100644
index 000000000000..bacf70e9ec24
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
@@ -0,0 +1,65 @@
+
+# HG changeset patch
+# User Glenn Randers-Pehrson <glennrp@simple...>
+# Date 1343491548 18000
+# Node ID d6e469d02cd260b6531e86a8a6c8a5a2b9ff51cb
+# Parent  fe9e2eb655ce8b85abfd9b88d20a8a1648ad71e7
+coders/png.c: Some typecasts were inconsistent with libpng-1.4 and later.
+
+diff -r fe9e2eb655ce -r d6e469d02cd2 coders/png.c
+--- a/coders/png.c	Thu Jul 26 20:24:26 2012 -0500
++++ b/coders/png.c	Sat Jul 28 11:05:48 2012 -0500
+@@ -1360,7 +1360,11 @@
+ }
+ 
+ #ifdef PNG_USER_MEM_SUPPORTED
+-static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
++#if PNG_LIBPNG_VER >= 14000
++static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
++#else
++static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
++#endif
+ {
+   (void) png_ptr;
+   return MagickAllocateMemory(png_voidp,(size_t) size);
+@@ -6169,12 +6173,22 @@
+       (void) printf("writing raw profile: type=%.1024s, length=%lu\n",
+                     profile_type, (unsigned long)length);
+     }
+-  text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
++#if PNG_LIBPNG_VER >= 14000
++  text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
++#else
++  text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
++#endif
+   description_length=strlen((const char *) profile_description);
+   allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
+                                   + description_length);
+-  text[0].text=(png_charp) png_malloc(ping,allocated_length);
+-  text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
++#if PNG_LIBPNG_VER >= 14000
++   text[0].text=(png_charp) png_malloc(ping,
++      (png_alloc_size_t) allocated_length);
++   text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
++#else
++   text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
++   text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
++#endif
+   text[0].key[0]='\0';
+   (void) strcat(text[0].key, "Raw profile type ");
+   (void) strncat(text[0].key, (const char *) profile_type, 61);
+@@ -7620,7 +7634,12 @@
+ 
+       if (*attribute->key == '[')
+         continue;
+-      text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
++#if PNG_LIBPNG_VER >= 14000
++            text=(png_textp) png_malloc(ping,
++                 (png_alloc_size_t) sizeof(png_text));
++#else
++            text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
++#endif
+       text[0].key=attribute->key;
+       text[0].text=attribute->value;
+       text[0].text_length=strlen(attribute->value);
+
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.16-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.16-r1.ebuild
new file mode 100644
index 000000000000..89c3bfe857ed
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.16-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.16-r1.ebuild,v 1.1 2012/08/02 15:13:59 ssuominen Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype wmf X zlib"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0 )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+}
+
+src_configure() {
+	local depth=8
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--${openmp}-openmp \
+		--enable-largefile \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug ccmalloc) \
+		$(use_enable debug prof) \
+		$(use_enable debug gcov) \
+		$(use_enable imagemagick magick-compat) \
+		$(use_with threads) \
+		--without-included-ltdl \
+		$(use_with modules) \
+		--with-quantum-depth=${depth} \
+		--without-frozenpaths \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		$(use_with bzip2 bzlib) \
+		$(use_with postscript dps) \
+		$(use_with fpx) \
+		--without-gslib \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lzma) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		--with-fontpath="${EPREFIX}"/usr/share/fonts \
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
+		$(use_with svg xml) \
+		$(use_with zlib) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake
+	use perl && emake perl-build
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use perl; then
+		emake -C PerlMagick DESTDIR="${D}" install
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}