Version bump. Upstream libpng-1.4 compatibility

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

diff --git a/media-plugins/gst-plugins-libpng/ChangeLog b/media-plugins/gst-plugins-libpng/ChangeLog
index fbd0da5ff18f989a4e9a4a6a8ccdbcf333e4655c..8c214ccc89a7e5ba7fb2a4b02ba97a8bb660f793 100644 (file)
--- a/media-plugins/gst-plugins-libpng/ChangeLog
+++ b/media-plugins/gst-plugins-libpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-libpng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/ChangeLog,v 1.125 2010/03/24 20:06:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/ChangeLog,v 1.126 2010/04/05 04:38:01 leio Exp $
+
+*gst-plugins-libpng-0.10.21 (05 Apr 2010)
+
+  05 Apr 2010; Mart Raudsepp <leio@gentoo.org>
+  -files/gst-plugins-good-0.10.15-CVE-2009-1932.patch,
+  -gst-plugins-libpng-0.10.14-r1.ebuild, +gst-plugins-libpng-0.10.21.ebuild:
+  Version bump. Upstream libpng-1.4 compatibility
 
   24 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   gst-plugins-libpng-0.10.17.ebuild:

diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 8f8d466e6771ad4f8dc59bd59f156762a16bb20e..18dbfa0bb4c87c7f3d381e292212cffd4d52bcfd 100644 (file)
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gst-plugins-good-0.10.15-CVE-2009-1932.patch 2520 RMD160 7f0290630f1c0cfcee4e0edb8934d8596bd8728b SHA1 0281f3117ab6adbb64b739f585b183f008f02b73 SHA256 cd3e52355e26e784de82c12d888194d490da213eac4baeeee4914fdf78b718d4
-DIST gst-plugins-good-0.10.14.tar.bz2 2228076 RMD160 7832c2087c2a5d6c354f5a931dcc49f24c547ee9 SHA1 49dbcfcbbab9bd6a1e54d9e548184016c20f3aba SHA256 12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
 DIST gst-plugins-good-0.10.16.tar.bz2 2573811 RMD160 51f6dfc95932ae3a25d017257a3587e3081ad163 SHA1 655a22ea3f4f4dc0f9f200af7c85b4b725d960e7 SHA256 64bd5177913b8ccaa1502e88a255adb3e6024202ba8983e6a956061e57fe1640
 DIST gst-plugins-good-0.10.17.tar.bz2 2671700 RMD160 770a5a091751ea362600c2824cc860dc3f8830b3 SHA1 fb0b9054ee7d1674a7c2bcc2fccf5331d8e9b80c SHA256 4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6
-EBUILD gst-plugins-libpng-0.10.14-r1.ebuild 619 RMD160 9684929a84abbf78c00e2abe03941f3de58811a7 SHA1 aed3d968ddf14d13a50eeb1091c107a71c1d4d30 SHA256 1bc00a21c8ba3db5fc84271685c0f0a578fd484d494200637076474607c62693
+DIST gst-plugins-good-0.10.21.tar.bz2 2675836 RMD160 71cfebe965409ffc6d6d3a5b08e3923fc966fffa SHA1 ed619824f5ca4592bfe2b2f6df9d53f08bf5f360 SHA256 24445a1cf56302ab4ad5f56055d5c3d81c704b8f9f6875fe78a25d4f72716d22
 EBUILD gst-plugins-libpng-0.10.16.ebuild 491 RMD160 79fac1a7b4bc038c654024d13eafcb6d1d459800 SHA1 84b25265fc184b8dd1b4c098893b82dcc1010baf SHA256 57c1bb625398dcfe58583cd144f9a913f01fff51ec5d493313fc703c23752db4
 EBUILD gst-plugins-libpng-0.10.17.ebuild 678 RMD160 2d7e3d8e43176fc540bcde11cd122982d0016ac8 SHA1 a2c06cee2bda1be721dd0169b78ff25989e4442d SHA256 0c0d708693e1365749b5bc0e84dc6079d9809c45dd1376dae0c6089a52399a5d
-MISC ChangeLog 16110 RMD160 bbb668381ff5d1ed5bb76595667c9fa46f89a803 SHA1 75bcc966332d15264b495a4b39bc9440e703ef20 SHA256 e032bf0bfe12f7209d9df68d173679a2460b5ec07fed0f1cdf49ce46b74eda89
+EBUILD gst-plugins-libpng-0.10.21.ebuild 516 RMD160 7af75415981de608e20dc82897fbf4ac1b5de68b SHA1 40298a89b091c46eb92f47ef7ecbf3be55e7abf5 SHA256 f9d115f4be186cf8d6328c721a63a993b472b2bb63e0326d4c09f8547988fad4
+MISC ChangeLog 16382 RMD160 9b75e5ecc85cb4c95293c4592ddcbc952f6884a8 SHA1 db6e4caada4770641834b5ce66e190afd0e4fe47 SHA256 2f9fbcd50f3df1401cc01ae37e5a059c19f95ddf6e615f69261bed5e0696e19d
 MISC metadata.xml 383 RMD160 a286eed5e8c37a213d4d293fea41f92d280f9a5e SHA1 1a34500ecfaf50353be4ed81b890bd5543bb6d6b SHA256 87f0529f83ba3b353eb7b55d827463f4cba05d5620e557ed250a51c697dd9110
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuqcMsACgkQNQqtfCuFneOddwCfRifoLmOC+luLrgrwT2Usxzh8
-WzMAnRm2h560h9myEfrMYA8WiEKSAOH4
-=OWpK
------END PGP SIGNATURE-----

diff --git a/media-plugins/gst-plugins-libpng/files/gst-plugins-good-0.10.15-CVE-2009-1932.patch b/media-plugins/gst-plugins-libpng/files/gst-plugins-good-0.10.15-CVE-2009-1932.patch
deleted file mode 100644 (file)
index e07289b..0000000
--- a/media-plugins/gst-plugins-libpng/files/gst-plugins-good-0.10.15-CVE-2009-1932.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d9544bcc44adcef769cbdf7f6453e140058a3adc Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <thaytan@noraisin.net>
-Date: Wed, 27 May 2009 16:06:34 +0000
-Subject: pngdec: Avoid possible overflow in calculations
-
-A malformed (or simply huge) PNG file can lead to integer overflow in
-calculating the size of the output buffer, leading to crashes or buffer
-overflows later. Fixes SA35205 security advisory.
----
-diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
-index 524b468..dde459d 100644
---- a/ext/libpng/gstpngdec.c
-+++ b/ext/libpng/gstpngdec.c
-@@ -201,7 +201,14 @@ user_info_callback (png_structp png_ptr, png_infop info)
- 
-   /* Allocate output buffer */
-   pngdec->rowbytes = png_get_rowbytes (pngdec->png, pngdec->info);
--  buffer_size = pngdec->height * GST_ROUND_UP_4 (pngdec->rowbytes);
-+  if (pngdec->rowbytes > (G_MAXUINT32 - 3)
-+      || pngdec->height > G_MAXUINT32 / pngdec->rowbytes) {
-+    ret = GST_FLOW_ERROR;
-+    goto beach;
-+  }
-+  pngdec->rowbytes = GST_ROUND_UP_4 (pngdec->rowbytes);
-+  buffer_size = pngdec->height * pngdec->rowbytes;
-+
-   ret =
-       gst_pad_alloc_buffer_and_set_caps (pngdec->srcpad, GST_BUFFER_OFFSET_NONE,
-       buffer_size, GST_PAD_CAPS (pngdec->srcpad), &buffer);
-@@ -228,7 +235,7 @@ user_endrow_callback (png_structp png_ptr, png_bytep new_row,
-   /* If buffer_out doesn't exist, it means buffer_alloc failed, which 
-    * will already have set the return code */
-   if (GST_IS_BUFFER (pngdec->buffer_out)) {
--    size_t offset = row_num * GST_ROUND_UP_4 (pngdec->rowbytes);
-+    size_t offset = row_num * pngdec->rowbytes;
- 
-     GST_LOG ("got row %u, copying in buffer %p at offset %" G_GSIZE_FORMAT,
-         (guint) row_num, pngdec->buffer_out, offset);
-@@ -496,7 +503,12 @@ gst_pngdec_task (GstPad * pad)
- 
-   /* Allocate output buffer */
-   rowbytes = png_get_rowbytes (pngdec->png, pngdec->info);
--  buffer_size = pngdec->height * GST_ROUND_UP_4 (rowbytes);
-+  if (rowbytes > (G_MAXUINT32 - 3) || pngdec->height > G_MAXUINT32 / rowbytes) {
-+    ret = GST_FLOW_ERROR;
-+    goto pause;
-+  }
-+  rowbytes = GST_ROUND_UP_4 (rowbytes);
-+  buffer_size = pngdec->height * rowbytes;
-   ret =
-       gst_pad_alloc_buffer_and_set_caps (pngdec->srcpad, GST_BUFFER_OFFSET_NONE,
-       buffer_size, GST_PAD_CAPS (pngdec->srcpad), &buffer);
-@@ -509,7 +521,7 @@ gst_pngdec_task (GstPad * pad)
- 
-   for (i = 0; i < pngdec->height; i++) {
-     rows[i] = inp;
--    inp += GST_ROUND_UP_4 (rowbytes);
-+    inp += rowbytes;
-   }
- 
-   /* Read the actual picture */
---
-cgit v0.8.2

diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.14-r1.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.14-r1.ebuild
deleted file mode 100644 (file)
index 221d299..0000000
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.14-r1.ebuild,v 1.8 2009/08/21 13:21:06 leio Exp $
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2
-       >=media-libs/gstreamer-0.10.22
-       >=media-libs/gst-plugins-base-0.10.22"
-
-src_unpack ()
-{
-       gst-plugins-good_src_unpack
-
-       cd "${S}"
-       epatch "${FILESDIR}/gst-plugins-good-0.10.15-CVE-2009-1932.patch"
-}

diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.21.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.21.ebuild
new file mode 100644 (file)
index 0000000..f35ba1d
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.21.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.21.ebuild,v 1.1 2010/04/05 04:38:01 leio Exp $
+
+inherit gst-plugins-good
+
+DESCRIPTION="GStreamer encoder/decoder for PNG images"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.2
+       >=media-libs/gstreamer-0.10.27
+       >=media-libs/gst-plugins-base-0.10.27"
+DEPEND="${RDEPEND}"