punt vulnerable

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

4 files changed, 13 insertions, 157 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index b73feb50fb1f..a8418f1e7b80 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.74 2012/03/08 12:47:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.75 2012/03/08 12:48:08 ssuominen Exp $
+
+  08 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -optipng-0.6.5.ebuild,
+  -files/optipng-0.6.5-libpng-1.4.8.patch:
+  old
 
   08 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> optipng-0.7.ebuild:
   ppc/ppc64 stable wrt #355739
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 958523bde44f..bd5e824bf46c 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX optipng-0.6.5-libpng-1.4.8.patch 3257 RMD160 6b4cb26e1c96d1074b3ce4eb8a8f2d9d524267a6 SHA1 eae46c43ef1bbf9a25839273327cebdbcf7cb7fb SHA256 48306de1267095caa239fac5ed37925c894d9e64fa2a251bc2fd016e6f964f9b
-DIST optipng-0.6.5.tar.gz 1534271 RMD160 2b67ce48cba37e5c77ef13bdc285b37e919e2b01 SHA1 91525748a0bbd9bbfa8355529da7c17a408173e5 SHA256 2998e203941cdb95eb97587a44b02b3b765e85a7d62fe2df076b0123a7ba5b44
 DIST optipng-0.7.tar.gz 1607303 RMD160 5a4ef72c786ac28a44d6f0e5335c65484767c461 SHA1 68122f8cdd279312a4d4cde53a48286ded680f06 SHA256 bc069bb69bbac8ac4eac86cf9d54b5f5138f48c29c4196cec587b6589c628e7b
-EBUILD optipng-0.6.5.ebuild 1543 RMD160 a1eba759e9e36279c6efb62109947722623f39e4 SHA1 dad120e5b8c6bae9d6fea5d9582abcab60bcbd6d SHA256 ba956b2f5f2f1508be39193d35c718636d59ca9d49d946383fbe9f512e8b7cf7
 EBUILD optipng-0.7.ebuild 1171 RMD160 9d9466ab77de1f1cb7762ed848c9348304093305 SHA1 06932e56db66c81a27037f738ca3c964ce7ebc0d SHA256 60dd80fdf39e98748cd3b3e29f3ac6130583539340c0ef2f2b21f4379866f03d
-MISC ChangeLog 9552 RMD160 5b75b24ae922bd644742b055744b847d435a0cc2 SHA1 7be1d6a2d3be1cb07d05cc390d259f19ac4012b0 SHA256 859944e2620700432c95977d041b74e84fd7cbb2c6570d6c30ee99e1c4da9ba6
+MISC ChangeLog 9679 RMD160 d3ab2c9ed8b58445d6cd08e41e1c492307c4f7f9 SHA1 4e128cda3bc14ff92a86998a6db6d59b620c413d SHA256 515fb2a474a8f25c6ea996db293475a1573345d12da936cc12363157aa86f69f
 MISC metadata.xml 330 RMD160 6639d32103db63ef2e510a3da75741fb368adabc SHA1 bb99d2162efb387f827f55d41c62242b44abeb52 SHA256 7ee69b202d4997694342d75efe34c5324118ab575dace4a445e16c59ef3d8052
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPWKn+AAoJEEdUh39IaPFNOWgIAJViu4TxdtoJOr+GY72GHMA7
-CGz14OdUSukBuNJeU3IGJu54dqZ13qiZHT2sUSNLL6hnxNDZPDQa3U8tjSUOyCeq
-aAlh4J691ZKgYrlAlivPnMUqyaCb+/63SlzZehHZ50kMgHSOWw3d0jX0IrZQZdL+
-n6wivZuPgKk1Vb1SKTBMWATZMj1bP2nkql7Qe9uXV8R62VA6mKfGxr3FcwuTKV+q
-JPw+3GKkEMQX16sXMksTgwZVWh4zkNqSwNmd1QWTTOeffeZs3qYFReXMMEUDoMda
-y3vEwMao8bt1O5wf3+91YSFHzcAJaVEpkDSXMIfVuFZHyhykyKGFRcfxzVMb7XI=
-=YWy1
+iQEcBAEBAgAGBQJPWKo8AAoJEEdUh39IaPFNBs0H/041y56No+Rj/ssQ7NRt1MrF
+jQvgC20xqZzn8lVNs/kEELEESwNpoPpZE2KMuDgPio5UHt/TugE2iSozWwBINRjB
+jTAZ7XW6I1h+aW8y0YyottF6HsEh3o5QFzj2H0nSwra52HD7Y1zY5g5lqlJpygFB
+mDikOjju+Ny5acRk8nDLT+4h5qIRO+ejs/xEeR0ZAGaF1PAeLHwV/yKanG94S940
+j9Wyb4SjuF2brkD5mRGRi+eDYvUKWfyXRCpt8gaDCWI1pYpBx/HCmpJQ4HdnmucD
+DVnryAWsfiGj1dE1dI7fX3AO0/jy/tHCmjDDXW4F9D7RfYHIwRUbg3+D/LWEWHE=
+=0tAQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch b/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch
deleted file mode 100644
index 0714f685b6f5..000000000000
--- a/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From d84fd1880aae22a2a92ca759a3f9e07f2f7b6bee Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 2 Aug 2011 17:01:51 +0200
-Subject: [PATCH] Fix compilation against libpng 1.4.8
-
----
- src/opngoptim.c |    2 +-
- src/opngreduc.c |   16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/opngoptim.c b/src/opngoptim.c
-index 16f7acd..ead0c6e 100644
---- a/src/opngoptim.c
-+++ b/src/opngoptim.c
-@@ -19,10 +19,10 @@
- #include "proginfo.h"
- 
- #include "cbitset.h"
--#include "cexcept.h"
- #include "opngreduc.h"
- #include "osys.h"
- #include "png.h"
-+#include "cexcept.h"
- #include "pngx.h"
- #include "pngxtern.h"
- #include "zlib.h"
-diff --git a/src/opngreduc.c b/src/opngreduc.c
-index e4d5c98..5ef0b60 100644
---- a/src/opngreduc.c
-+++ b/src/opngreduc.c
-@@ -366,8 +366,8 @@ opng_get_alpha_row(png_structp png_ptr, png_infop info_ptr,
-    channels = (png_ptr->usr_channels > 0) ?
-       png_ptr->usr_channels : info_ptr->channels;
-    sample_ptr = row;
--   if (!(png_ptr->transformations & PNG_FILLER) ||
--        (png_ptr->flags & PNG_FLAG_FILLER_AFTER))
-+   if (!(png_ptr->transformations & OPNG_FILLER) ||
-+        (png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
-       sample_ptr += channels - 1;  /* alpha sample is the last in RGBA tuple */
-    for (i = 0; i < width; ++i, sample_ptr += channels, ++alpha_row)
-       *alpha_row = *sample_ptr;
-@@ -416,8 +416,8 @@ opng_analyze_bits(png_structp png_ptr, png_infop info_ptr,
-       reductions &= ~OPNG_REDUCE_STRIP_ALPHA;
- 
-    offset_color = offset_alpha = 0;
--   if ((png_ptr->transformations & PNG_FILLER) &&
--       !(png_ptr->flags & PNG_FLAG_FILLER_AFTER))
-+   if ((png_ptr->transformations & OPNG_FILLER) &&
-+       !(png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
-       offset_color = byte_depth;
-    else
-       offset_alpha = (channels - 1) * byte_depth;
-@@ -565,7 +565,7 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
-    /* See which reductions may be performed. */
-    reductions = opng_analyze_bits(png_ptr, info_ptr, reductions);
-    /* Strip the filler even if it is not an alpha channel. */
--   if (png_ptr->transformations & PNG_FILLER)
-+   if (png_ptr->transformations & OPNG_FILLER)
-       reductions |= OPNG_REDUCE_STRIP_ALPHA;
-    if (reductions == OPNG_REDUCE_NONE)
-       return OPNG_REDUCE_NONE;  /* nothing can be reduced */
-@@ -606,8 +606,8 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
-    dest_sample_size = dest_channels * dest_byte_depth;
-    dest_pixel_depth = dest_channels * dest_bit_depth;
- 
--   if (!(png_ptr->transformations & PNG_FILLER) ||
--       (png_ptr->flags & PNG_FLAG_FILLER_AFTER))
-+   if (!(png_ptr->transformations & OPNG_FILLER) ||
-+       (png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
-       src_offset_alpha = (src_channels - 1) * src_byte_depth;
-    else
-       src_offset_alpha = 0;
-@@ -748,7 +748,7 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
-    png_ptr->pixel_depth = info_ptr->pixel_depth = (png_byte)dest_pixel_depth;
-    if (reductions & OPNG_REDUCE_STRIP_ALPHA)
-    {
--      png_ptr->transformations &= ~PNG_FILLER;
-+      png_ptr->transformations &= ~OPNG_FILLER;
-       if (png_ptr->usr_channels > 0)
-          --png_ptr->usr_channels;
-    }
--- 
-1.7.6
-
diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild
deleted file mode 100644
index 81389d58f6eb..000000000000
--- a/media-gfx/optipng/optipng-0.6.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.5 2011/10/10 17:25:15 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.4:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/^C/s: -O2.*: $(GENTOO_CFLAGS) -Wall:' \
-		-e '/^LD/s: -s$: $(GENTOO_LDFLAGS):' \
-		src/scripts/gcc.mak.in \
-		lib/pngxtern/scripts/gcc.mak.in \
-		|| die "sed failed"
-
-	# FIXME
-	if has_version "<media-libs/libpng-1.5:0"; then
-		cp lib/libpng/pngpriv.h src/ || die
-		rm -rf lib/{libpng,zlib}
-		epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch
-	else
-		ewarn "Using internal copy of libpng, see bug 355739"
-		rm -rf lib/zlib
-	fi
-}
-
-src_configure() {
-	./configure \
-		$(has_version "<media-libs/libpng-1.5:0" && echo -with-system-libpng) \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake \
-		-C src \
-		-f scripts/gcc.mak \
-		CC="$(tc-getCC)" \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin src/optipng || die "dobin failed"
-	dodoc README.txt doc/*.txt || die
-	dohtml doc/*.html || die
-	doman man/optipng.1 || die
-}