Patch from upstream for correcting the length written to uncompressed iTXt chunks. This caused "export to .png" with comments in media-gfx/gimp to produce corrupted files as noticed by lu_zero and jlec.

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 186 insertions, 5 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 70a46a1d2aac..41dd491e04e0 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.393 2013/04/12 14:42:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.394 2013/04/14 09:28:28 ssuominen Exp $
+
+*libpng-1.6.1-r1 (14 Apr 2013)
+
+  14 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.6.1-r1.ebuild,
+  +files/libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch,
+  +files/libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch,
+  +files/libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch:
+  Patch from upstream for correcting the length written to uncompressed iTXt
+  chunks. This caused "export to .png" with comments in media-gfx/gimp to
+  produce corrupted files as noticed by lu_zero and jlec.
 
   12 Apr 2013; Jeroen Roovers <jer@gentoo.org> libpng-1.5.15.ebuild:
   Stable for HPPA (bug #462314).
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 21ba55c4e353..49166a90ed9b 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch 1613 SHA256 021836d31eccf5d12816463af72340b88a342285de0b7964ac016d8b276eabb5 SHA512 fe80ddd24c4a5beeb8f50916e9fdc435cf2f5fa48a4cb7decaad4d39bff81b54484817d23cae8e7381d6a1ef19dd6788b1474b3922173aa79cf40c6b20c2f5a6 WHIRLPOOL 3b0d14897eb488d894ebf4066cdb81f62b43d9e96c859dd698bd2f426bf3f4d7f0898e752e5b9e54bc418e25c9728b9fabc40f6953aa678f6ab8ea251b3f4d79
+AUX libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch 1045 SHA256 44bb557f32a1836cc240d40f38edebf952573eb9e86d14b5773174816ff6b390 SHA512 7aa39096dc3c0136da0d9fede69f44fe90453c32d051f66b09b1358e6b70b5d76bf3a1d66de2e480e9ab078e7b28e87f08e3f60052ab61b132d8b6735f5a73a9 WHIRLPOOL bb496289719758aded9af59eeac8221bded7e80631a310f734bb6a9b9b4cf24202e36cda11f848274dacb62dcf401a6765567ddf6d94c1a81efe6609e9919f53
+AUX libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch 755 SHA256 2817160dea49bff3bf2983f534a7d39095bb4554c58f8badf7bbaf611a197323 SHA512 fdeb5ae8f86df592aad56f607dc359e07e9923c6a9bd5275c0859600e574f5363db85ed5632a7ef98425e9faa5661c6a76b13ea760270c4b28291ce4f5283d8d WHIRLPOOL 6d1f014df0b0e2c5ecf0141e6e864e3225d70ef2e457241e9b5a986a02c62f0b9a49b10a82deb50a898c9006544d498fd2620d614f7b2d4c8206de2a8cc6abbf
 DIST libpng-1.2.50.tar.xz 539152 SHA256 4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7 SHA512 a6699d75722e359a90a959369abe612e6e73e76c7c80231d99546c94bb71e92bcda0bd6e157f124176d96341dca2f61e2394689449160745a85e8b4bbe66b227 WHIRLPOOL 90a42f1d209e75dbd14014c843d37f754119cb6b95a07f5195ee63ea18ba8022132f8aaa6e91accf142dc64c66fbb764794fc57f2544581d561b7efa2de05a1f
 DIST libpng-1.5.13-apng.patch.gz 9254 SHA256 fd1189b5978725e840ff9521f2ed18d3e68e97913270e4593ca3619ee11f33a2 SHA512 116e5ddaa4b925ad53f845ed2ae139e001cf96dc677c8693477af7b6a347e85090d57b146a4b9f02f3d8554ed7b6d806d24ab43abf3d915c378014ba3a615db6 WHIRLPOOL 89a60a08e489540755c7a4f91574067a1958d7534ad9a28dd202c044b12d5bc856dfa61632f741cbb5ec8871914f09f6982c1c94c6b41e2c17cf94b50745b095
 DIST libpng-1.5.13.tar.xz 705912 SHA256 b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee SHA512 ef0b324e2687b1d9d8a632f93d0a7997d2d8031b2211cc426f517ffa9543950ef8575bb19bf380d454ff9a9a5106be154e6df59e5d33407773e124eed9e4bb41 WHIRLPOOL 315c46e710eb8e7775ee4796ad5f4d95178b993e770859d0016ad591c46d356ce20a998f0febe8864b632009cb8dd57f454d2adafdd5edb68b06233609982c02
@@ -15,13 +18,18 @@ EBUILD libpng-1.5.13-r1.ebuild 1376 SHA256 3b529b117f6f8d5d3e91d30b3c1cb7a87c0f2
 EBUILD libpng-1.5.14.ebuild 1410 SHA256 1103413acb9a6b87da4cb6a863e100e1ae227b8caeacceca18cfc1785601654c SHA512 d5bba685c1b4f91830e4c1e3033a1ab52e57def516e15061eadfff73b67c79b8bc13d685579f439645eb262135cd6cbd3ecb48d14d49f198289cd3503c9faf5e WHIRLPOOL 7f2b737fb0e467c02ac4215d4680ef0ed09394cf560ad1b8d29ff48bcbe7e6cb614e4791db0d69d080a4db5c606a393a32dea6e7ec9fa1cb95ae596d7d418622
 EBUILD libpng-1.5.15-r15.ebuild 1520 SHA256 1d950911fd4e1259d43acef8f605ccb9c327e3b31a0eab9012e6a02573132b5d SHA512 afe53bd14f021ff4bc4dd508eaf8d8c37496c449fdf039ab8a0c082b879ebeb7603bbebebc210b5c7c5b1ea9963ce59a6abf05eba1f646860dc1bf30222d8a95 WHIRLPOOL 09f736256de720422882542c1aeb0300aba66416085443da4b405803e3ca8efa6c666dd93357cc57c9f3efa0b3ea7dc2de14656409d43b18002ded84848f86ac
 EBUILD libpng-1.5.15.ebuild 1417 SHA256 e535e7077a7d65db701e3f7de14adf4e61915d3491800f35440d7950ebf6e324 SHA512 3ab34ae06f5853059fd5c73311270d83a95e5ba608e2f422482f9b417604db8e72ea9f20357544762fe81502876e82ba2c30f8e702760ca42696a7d1d97ec951 WHIRLPOOL 69dd2e8211cff475c0f07158f7320c75e0714233c28cc1616b889072fe5bae64a4d23ec88722d3a5ec16d22b62984c5d427fe1d1a222aa7df635f06dd61bc51a
+EBUILD libpng-1.6.1-r1.ebuild 1918 SHA256 d3ed9f57a6cbb6d3987a9bd7fd72a901ec2d1295475adabb6f88a4e1b639f4ad SHA512 a1533dad036b17e014f57d9fb1926230d60a9454b757715c92babc158e3d366efc4cbca8622cf47dd4942a3bc2ecde62bfae55413cc8d8eba565882bd976112a WHIRLPOOL 27519f79fc2f3278c9ee282d5152fc4b2beb0d42ae9b620d074170e044ded7d2b3c916ff9a6f1c8a4ab8201a5280b9f89a064c5a29c5a8f7f6e87bde6dfba0a9
 EBUILD libpng-1.6.1.ebuild 1687 SHA256 dc81ae4b0e98b9187fff738ec09d2681ca196fa615b66bff3a3300bae69964c6 SHA512 baed22f4d375595f99c41de68234f0e88ab3ca986b4c302a9974c0f1f5d9eec57319317164e10d882cf904e61b2ddf6101293cb3bad0cd01dea6df06602aa23b WHIRLPOOL a35559cebf028031a86640d7e75fd65ad30679a415bc4ebaa41a836760ca7a72990afd6f86ab132e5e93a1f43b2d4a6eeabe0236d4c00cd5f3dab23a6e291340
-MISC ChangeLog 51849 SHA256 0c1950297e1c15c9827028ab36da751c7ed0fd16eee14396ca0d9cbf31f48ebb SHA512 24a2827745fda11a14f9c382559e6de082cfe0c75de856e709670c77485d848794f94c4210ca67ec64e72ccb13fdbaeb2f8a94338fd9d193e5600a0433bbb928 WHIRLPOOL 9664b81154dc5d3f68f90ec28c364cbb1e992ede81a56331d82d5e2b636d5f2f9787c667aac51f84909e4668aab2a485dca8b33570fb341fdbfb6eae98f68c5a
+MISC ChangeLog 52395 SHA256 7b99bf83a47d2260401956ba3824d0a8cefc301e5e21426c0053c00dcd70f901 SHA512 e3ee6297f3e9067ac11529f67cc52a8084b1414c016d97041bc1147d83a8673771edbf25f621d1ccc72240ea333c909f33c1c7f0e6b416748ca979a116d352b4 WHIRLPOOL 19e3e1d50084b2e4da473aabc82e03782edc845cc64e6e9f1d4601ef2bd654f856d23bff9227c70adcd2e12d8f703bb8e7214afea0443702b54f398c351d8c97
 MISC metadata.xml 247 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 SHA512 f87239088300fd36fad8c64309774ec33c6ee0d0b2c8a43b8bfdd4a53223c4e3ad8bfe31f8e7ccfc12af7ab81cf54d2440070e26ad2ddf774be0b40f9218f05f WHIRLPOOL fd606eed56c413ebfb17ef83fcd32540f0a871febeb21e7f17b77d687d6556f75103f0036a3be2ca0251071e5cfaf0ec9d71b1c2a8c087f68ea50f15bef87eba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFoHXMACgkQVWmRsqeSphPj3gCfXBs5BQjhLG2/Oxf+2wm20hwy
-ftIAnRjTgoDwR3XjswFN/5U0y24bp7xX
-=x8a/
+iQEcBAEBCAAGBQJRanakAAoJEEdUh39IaPFNhpIH/iBSVqs0yI6hm3FzFVvaciHG
+CPSrOtFaJGhCjO3qGYulTCeWhVz6MfytnyN1tPqBAXxs88EVtC8SubERajsXdu+6
+C09HgDggzzfeFqSGWfD+3nBkT2Vhufj24uMjiP1jSCXWeL4d8TqHAJWenkMQL0ZG
+CQdeg5YmiWg2WdVBvRa1PmIUuU8+uLECcScMIHCXcN/63SF6FaRCG5/WTGJf58Yj
+CTQ+fVG10EMPvbWeLNeQ3NeCT61D31+Y/tujDi2a0N9zhE3LmH619hAM/JRUYK2x
+mbhGV4CFTvXg4IkdJQZjaUv2ZQ9Ns3xSHPZLSgfvZIK5zsuMo3fpEQMXNXOkzzI=
+=ZZ2I
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch b/media-libs/libpng/files/libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch
new file mode 100644
index 000000000000..37f9d50189e3
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch
@@ -0,0 +1,47 @@
+From 9bb775fc8cbde98fca150992efe227937b9278ff Mon Sep 17 00:00:00 2001
+From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
+Date: Sat, 13 Apr 2013 14:19:25 -0500
+Subject: [PATCH 1/5] [libpng16] Corrected length written to uncompressed iTXt
+ chunks (Samuli Suominen).
+
+---
+ ANNOUNCE   | 1 +
+ CHANGES    | 1 +
+ pngwutil.c | 6 +++---
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/pngwutil.c b/pngwutil.c
+index 8c49cfd..8f66937 100644
+--- a/pngwutil.c
++++ b/pngwutil.c
+@@ -1,7 +1,7 @@
+ 
+ /* pngwutil.c - utilities to write a PNG file
+  *
+- * Last changed in libpng 1.6.0 [February 14, 2013]
++ * Last changed in libpng 1.6.2 [(PENDING RELEASE)]
+  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+@@ -1738,16 +1738,16 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
+    {
+       if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)
+          png_error(png_ptr, png_ptr->zstream.msg);
++      png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
+    }
+ 
+    else
+    {
+       if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
+          png_error(png_ptr, "iTXt: uncompressed text too long");
++      png_write_chunk_header(png_ptr, png_iTXt, strlen(text) + prefix_len);
+    }
+ 
+-   png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
+-
+    png_write_chunk_data(png_ptr, new_key, key_len);
+ 
+    png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
+-- 
+1.8.1.5
+
diff --git a/media-libs/libpng/files/libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch b/media-libs/libpng/files/libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch
new file mode 100644
index 000000000000..761b7f91f5fa
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch
@@ -0,0 +1,32 @@
+From 70eb0720a04aa71eec6e97b568c8dd129d92c331 Mon Sep 17 00:00:00 2001
+From: John Bowler <jbowler@acm.org>
+Date: Sat, 13 Apr 2013 16:52:09 -0500
+Subject: [PATCH 2/5] [libpng16] Fixed previous bugfix to work on 64-bit
+ platforms.
+
+---
+ pngwutil.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/pngwutil.c b/pngwutil.c
+index 8f66937..755ccef 100644
+--- a/pngwutil.c
++++ b/pngwutil.c
+@@ -1745,9 +1745,13 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
+    {
+       if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
+          png_error(png_ptr, "iTXt: uncompressed text too long");
+-      png_write_chunk_header(png_ptr, png_iTXt, strlen(text) + prefix_len);
++
++      /* So the string will fit in a chunk: */
++      comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;
+    }
+ 
++   png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
++
+    png_write_chunk_data(png_ptr, new_key, key_len);
+ 
+    png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
+-- 
+1.8.1.5
+
diff --git a/media-libs/libpng/files/libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch b/media-libs/libpng/files/libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch
new file mode 100644
index 000000000000..199c1be7f444
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch
@@ -0,0 +1,25 @@
+From 5ec05b3d7cec24c73c68bad4608a4ce15da0423f Mon Sep 17 00:00:00 2001
+From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
+Date: Sat, 13 Apr 2013 20:01:09 -0500
+Subject: [PATCH 3/5] [libpng16] Removed extra recently-inserted line from
+ pngwutil.c
+
+---
+ pngwutil.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pngwutil.c b/pngwutil.c
+index 755ccef..f481683 100644
+--- a/pngwutil.c
++++ b/pngwutil.c
+@@ -1738,7 +1738,6 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
+    {
+       if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)
+          png_error(png_ptr, png_ptr->zstream.msg);
+-      png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
+    }
+ 
+    else
+-- 
+1.8.1.5
+
diff --git a/media-libs/libpng/libpng-1.6.1-r1.ebuild b/media-libs/libpng/libpng-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..0682fb1dcfe2
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.1-r1.ebuild,v 1.1 2013/04/14 09:28:28 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-Corrected-length-written-to-uncompressed-iT.patch \
+		"${FILESDIR}"/${P}-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch \
+		"${FILESDIR}"/${P}-Removed-extra-recently-inserted-line-from-p.patch
+
+	if use apng; then
+		epatch "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-arm-neon=$(usex neon on off)
+}
+
+src_install() {
+	default
+	# Even prune_libtool --all fails to remove libpng.la dead symlink wrt #436996
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	preserve_old_lib /usr/$(get_libdir)/libpng15$(get_libname 15)
+}
+
+pkg_postinst() {
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng15$(get_libname 15)
+}