Update the memory corruption fix some more #194864 by Peter Henriksson.

Package-Manager: portage-2.1.3.11

5 files changed, 75 insertions, 21 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index c21e344c6f05..2877d584fc00 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.152 2007/10/06 14:05:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.153 2007/10/06 22:57:41 vapier Exp $
+
+*libpng-1.2.21-r2 (06 Oct 2007)
+
+  06 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  files/libpng-1.2.21-off-by-one.patch, +libpng-1.2.21-r2.ebuild:
+  Update the memory corruption fix some more #194864 by Peter Henriksson.
 
 *libpng-1.2.21-r1 (06 Oct 2007)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index eb6f4a9bf161..153200357061 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -9,10 +9,10 @@ AUX libpng-1.2.18-gray.patch 691 RMD160 284d6fb5e8f2e05b4f7f4e8ea3b49975a31b8bde
 MD5 1a4237870c6f4bab93ada5e9228084dd files/libpng-1.2.18-gray.patch 691
 RMD160 284d6fb5e8f2e05b4f7f4e8ea3b49975a31b8bde files/libpng-1.2.18-gray.patch 691
 SHA256 1e32ef256e8823863488df366fd47ee419e2bf49369236652b66bf0bfdb7940b files/libpng-1.2.18-gray.patch 691
-AUX libpng-1.2.21-off-by-one.patch 539 RMD160 270a51efe8f24b52e7ff5b6229275ff8860df23b SHA1 dc26b57e8db082e70a90224623c13d76a2dcbdf8 SHA256 4f6dec71c8a4876751c828447257bd098dbde3062efe53041598331eba0ebd59
-MD5 9d37fd784e22189b3b1e2b705168a7c2 files/libpng-1.2.21-off-by-one.patch 539
-RMD160 270a51efe8f24b52e7ff5b6229275ff8860df23b files/libpng-1.2.21-off-by-one.patch 539
-SHA256 4f6dec71c8a4876751c828447257bd098dbde3062efe53041598331eba0ebd59 files/libpng-1.2.21-off-by-one.patch 539
+AUX libpng-1.2.21-off-by-one.patch 571 RMD160 dacd779d27941e4833fab0536b6624a8bd93947c SHA1 68e69a2652ec6b954dc454cc530cd0df0ea4681d SHA256 9229cb9fc740f2c3acfae0926f56089faad167e48538a1504568bbc4fb1d9fa2
+MD5 d44b8d96d51792365d1b7a844c4ffc17 files/libpng-1.2.21-off-by-one.patch 571
+RMD160 dacd779d27941e4833fab0536b6624a8bd93947c files/libpng-1.2.21-off-by-one.patch 571
+SHA256 9229cb9fc740f2c3acfae0926f56089faad167e48538a1504568bbc4fb1d9fa2 files/libpng-1.2.21-off-by-one.patch 571
 DIST libpng-1.2.18.tar.bz2 623690 RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e SHA1 42156e45fa999b242dc63c261e9253ce0dd810ab SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
 DIST libpng-1.2.20.tar.bz2 613683 RMD160 0934f9f304756e011c4f0d73ad95506e8663ccee SHA1 3fc27faf224ea31a43771c214f2f903ea2e98b0d SHA256 f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2
 DIST libpng-1.2.21.tar.bz2 614352 RMD160 2738cb7cebe19184a0ffefe31c49e570b0791049 SHA1 b626caff87100c6c86979a120fcb938c6d513163 SHA256 3b4f186e5dd1e683178d58d45db16f4fd9203f6518037ff28b4505ec35246953
@@ -25,14 +25,14 @@ EBUILD libpng-1.2.20.ebuild 1173 RMD160 f442f50fba84a8bb9c66cff28993a6ea23d57c39
 MD5 880ee5ae3fc83c448650d54a628bdcc5 libpng-1.2.20.ebuild 1173
 RMD160 f442f50fba84a8bb9c66cff28993a6ea23d57c39 libpng-1.2.20.ebuild 1173
 SHA256 16ed0daf0f821f3b52f9ac3d1beafc7fb6698ce28f7fb3dc17945d10a0178f40 libpng-1.2.20.ebuild 1173
-EBUILD libpng-1.2.21-r1.ebuild 1228 RMD160 dd74d94c7292c455b051c1e56fb556fc0ad3a8da SHA1 385153bc9336f7203945911053b61d8be4683bae SHA256 e9e062aee941cd99f6432c197f324a76c0b5f121c06b21d779bbfdf502a5d83f
-MD5 a68f00d03914ff9ec8f56200ffad4ca1 libpng-1.2.21-r1.ebuild 1228
-RMD160 dd74d94c7292c455b051c1e56fb556fc0ad3a8da libpng-1.2.21-r1.ebuild 1228
-SHA256 e9e062aee941cd99f6432c197f324a76c0b5f121c06b21d779bbfdf502a5d83f libpng-1.2.21-r1.ebuild 1228
-MISC ChangeLog 21432 RMD160 f2d779e8a61da0a1e49d68bb0822be14eb9c5399 SHA1 f16cf73aa5a69b7b25c8f59324e6756d82e313ac SHA256 0695f4dedb398ba838096a928ac735cb6005e9701e9054c0e66dcad11b34939e
-MD5 99cd3ead2717de428c27ab48d8d2e75a ChangeLog 21432
-RMD160 f2d779e8a61da0a1e49d68bb0822be14eb9c5399 ChangeLog 21432
-SHA256 0695f4dedb398ba838096a928ac735cb6005e9701e9054c0e66dcad11b34939e ChangeLog 21432
+EBUILD libpng-1.2.21-r2.ebuild 1228 RMD160 040bd9641760b58532390d28039106ae31359937 SHA1 499308aafc63d9289512af0c8e8a32b27293f3c2 SHA256 23124d16a360756261532ed4202d7e101bd4a1c430744f75d539d10b2ef9bab2
+MD5 e47fe81cc7daf1981f4efa2664b5ca68 libpng-1.2.21-r2.ebuild 1228
+RMD160 040bd9641760b58532390d28039106ae31359937 libpng-1.2.21-r2.ebuild 1228
+SHA256 23124d16a360756261532ed4202d7e101bd4a1c430744f75d539d10b2ef9bab2 libpng-1.2.21-r2.ebuild 1228
+MISC ChangeLog 21656 RMD160 e733fb80ccc17e0d96060845874146fe3134d7be SHA1 9a9e06e5433da3fd4f4b9d7d65ce16b7098b7bdc SHA256 c216fa8ce471f5adb7fcce17a0fbb9432d4caf136e20de809b92b02e4ff615b4
+MD5 0672e24f1c40b767d253f550dfae3d97 ChangeLog 21656
+RMD160 e733fb80ccc17e0d96060845874146fe3134d7be ChangeLog 21656
+SHA256 c216fa8ce471f5adb7fcce17a0fbb9432d4caf136e20de809b92b02e4ff615b4 ChangeLog 21656
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -43,13 +43,13 @@ SHA256 7cb4175e8e91ab1c8015c29cc27be6e6f0d11dc99c7b997d0a737fad9ef07d24 files/di
 MD5 73195f73f30e13f269ca7255eceb41b7 files/digest-libpng-1.2.20 476
 RMD160 107e0523878ad488fa70d43e0c607c67d33a62c4 files/digest-libpng-1.2.20 476
 SHA256 def7713b4a6c38691aa93786ab0136adf9ba050ee9379da8c2c3ec1f550a6a53 files/digest-libpng-1.2.20 476
-MD5 2c7b9c142a18a0c4b1ab6be5cd07edbf files/digest-libpng-1.2.21-r1 476
-RMD160 64e88b320e13f3a981bb868dca10063c54223d3c files/digest-libpng-1.2.21-r1 476
-SHA256 f1b9960cc389be1a1288b5e523548929346f3598dce885ee60543f16ab6e8c5a files/digest-libpng-1.2.21-r1 476
+MD5 2c7b9c142a18a0c4b1ab6be5cd07edbf files/digest-libpng-1.2.21-r2 476
+RMD160 64e88b320e13f3a981bb868dca10063c54223d3c files/digest-libpng-1.2.21-r2 476
+SHA256 f1b9960cc389be1a1288b5e523548929346f3598dce885ee60543f16ab6e8c5a files/digest-libpng-1.2.21-r2 476
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHB5YYp/wUKkr7RBoRApxZAJ9WUetqTL2BaPDExD1lrtTXxDTN4wCglXCN
-REGb4pWfWxbU24wGm8fZxMk=
-=p9rr
+iD8DBQFHCBLrp/wUKkr7RBoRAjEQAJwIIo602bFnewTjDOhghtzr9G2IyQCg49RD
+7oIhzGr4LdUNnVcLJh/VDMg=
+=0a0J
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/digest-libpng-1.2.21-r2 b/media-libs/libpng/files/digest-libpng-1.2.21-r2
new file mode 100644
index 000000000000..5ef3058d09bf
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.21-r2
@@ -0,0 +1,6 @@
+MD5 b0cda5e10e8165e5f151e674e1a67983 libpng-1.2.21.tar.bz2 614352
+RMD160 2738cb7cebe19184a0ffefe31c49e570b0791049 libpng-1.2.21.tar.bz2 614352
+SHA256 3b4f186e5dd1e683178d58d45db16f4fd9203f6518037ff28b4505ec35246953 libpng-1.2.21.tar.bz2 614352
+MD5 1518ec4b873f2c61a7d32ad867b67b17 libpng-manual.txt 128284
+RMD160 f019974f931327e6d9d332d306e07dce71ff031b libpng-manual.txt 128284
+SHA256 0cc3a25643024807672e5df255332cb63c902cea333246f4a5ab48c682c3297a libpng-manual.txt 128284
diff --git a/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch b/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch
index 2a10e1b20e1d..39a9534c24c4 100644
--- a/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch
+++ b/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch
@@ -2,12 +2,13 @@ http://bugs.gentoo.org/194864
 http://sourceforge.net/mailarchive/forum.php?thread_name=47067C84.7010205%40playstation.sony.com&forum_name=png-mng-implement
 --- pngset.c
 +++ pngset.c
-@@ -690,7 +690,7 @@
+@@ -690,7 +690,8 @@
        png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
        return;
     }
 -   png_strncpy(new_iccp_name, name, png_strlen(new_iccp_name)+1);
-+   png_strncpy(new_iccp_name, name, png_strlen(new_iccp_name));
++   png_strncpy(new_iccp_name, name, png_strlen(name));
++   new_iccp_name[png_strlen(name)+1]=0;
     new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
     if (new_iccp_profile == NULL)
     {
diff --git a/media-libs/libpng/libpng-1.2.21-r2.ebuild b/media-libs/libpng/libpng-1.2.21-r2.ebuild
new file mode 100644
index 000000000000..ebf1bb0f369d
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.21-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.21-r2.ebuild,v 1.1 2007/10/06 22:57:41 vapier Exp $
+
+inherit libtool multilib eutils flag-o-matic
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2
+	doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="sys-libs/zlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use doc && cp "${WORKDIR}"/${PN}-manual.txt .
+	epatch "${FILESDIR}"/1.2.7-gentoo.diff
+	epatch "${FILESDIR}"/${P}-off-by-one.patch #194864
+
+	# So we get sane .so versioning on FreeBSD
+	elibtoolize
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
+	use doc && dodoc libpng-manual.txt
+}
+
+pkg_postinst() {
+	# the libpng authors really screwed around between 1.2.1 and 1.2.3
+	if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1
+	fi
+}