diff options
| -rw-r--r-- | media-gfx/optipng/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/optipng/Manifest | 14 | ||||
| -rw-r--r-- | media-gfx/optipng/files/digest-optipng-0.4.8-r1 | 1 | ||||
| -rw-r--r-- | media-gfx/optipng/files/optipng-zlib-security.diff | 32 | ||||
| -rw-r--r-- | media-gfx/optipng/optipng-0.4.8-r1.ebuild | 34 |
5 files changed, 83 insertions, 6 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog index 5be085cb21ca..b14519ef0507 100644 --- a/media-gfx/optipng/ChangeLog +++ b/media-gfx/optipng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/optipng # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.20 2005/07/13 19:27:29 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.21 2005/10/07 16:36:00 taviso Exp $ + +*optipng-0.4.8-r1 (07 Oct 2005) + + 07 Oct 2005; Tavis Ormandy <taviso@gentoo.org> + +files/optipng-zlib-security.diff, +optipng-0.4.8-r1.ebuild: + fix #108404, mark stable on x86 13 Jul 2005; Simon Stelling <blubb@gentoo.org> optipng-0.4.8.ebuild: added ~amd64 keyword diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest index 0c2c0cb3f4af..e3166bc414a0 100644 --- a/media-gfx/optipng/Manifest +++ b/media-gfx/optipng/Manifest @@ -1,10 +1,14 @@ -MD5 d20d0b93908789e200955723dd481038 ChangeLog 2580 -MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400 +MD5 dd864ad339a9202895aa4b82379d9549 optipng-0.4.8-r1.ebuild 928 +MD5 7cc8617198f52a77dd90f65948f5fdde .optipng-0.4.8.ebuild.swp 12288 +MD5 24e4516150c74ca051b37bc100498e46 optipng-0.4.8.ebuild 931 MD5 86d23c83773f704f2e0716a2bc035cdc optipng-0.4.5.ebuild 2587 +MD5 d20d0b93908789e200955723dd481038 ChangeLog 2580 MD5 c7fc1e1bf37885691cf1d6733401eb03 optipng-0.4.7.ebuild 922 -MD5 24e4516150c74ca051b37bc100498e46 optipng-0.4.8.ebuild 931 +MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400 +MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8-r1 65 MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65 MD5 6bb7aeb92d547a0979d3bc3ee21b9319 files/digest-optipng-0.4.7 65 -MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271 -MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423 MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8 65 +MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423 +MD5 ee642ac85110cd1a39ac0f53a753289e files/optipng-zlib-security.diff 1455 +MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271 diff --git a/media-gfx/optipng/files/digest-optipng-0.4.8-r1 b/media-gfx/optipng/files/digest-optipng-0.4.8-r1 new file mode 100644 index 000000000000..88f6d9476884 --- /dev/null +++ b/media-gfx/optipng/files/digest-optipng-0.4.8-r1 @@ -0,0 +1 @@ +MD5 0f3648f06a389d7bbb1e6bf309581b6a optipng-0.4.8.tar.gz 666570 diff --git a/media-gfx/optipng/files/optipng-zlib-security.diff b/media-gfx/optipng/files/optipng-zlib-security.diff new file mode 100644 index 000000000000..157ae8927af0 --- /dev/null +++ b/media-gfx/optipng/files/optipng-zlib-security.diff @@ -0,0 +1,32 @@ +diff -ru optipng-0.4.8.orig/lib/zlib/inftrees.c optipng-0.4.8/lib/zlib/inftrees.c +--- optipng-0.4.8.orig/lib/zlib/inftrees.c 2004-09-15 15:30:06.000000000 +0100 ++++ optipng-0.4.8/lib/zlib/inftrees.c 2005-10-07 17:13:03.069420200 +0100 +@@ -134,7 +134,7 @@ + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } +- if (left > 0 && (type == CODES || (codes - count[0] != 1))) ++ if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ +diff -ru optipng-0.4.8.orig/lib/zlib/inftrees.h optipng-0.4.8/lib/zlib/inftrees.h +--- optipng-0.4.8.orig/lib/zlib/inftrees.h 2003-08-10 23:15:50.000000000 +0100 ++++ optipng-0.4.8/lib/zlib/inftrees.h 2005-10-07 17:13:49.953292768 +0100 +@@ -36,12 +36,12 @@ + */ + + /* Maximum size of dynamic tree. The maximum found in a long but non- +- exhaustive search was 1004 code structures (850 for length/literals +- and 154 for distances, the latter actually the result of an ++ exhaustive search was 1444 code structures (852 for length/literals ++ and 592 for distances, the latter actually the result of an + exhaustive search). The true maximum is not known, but the value + below is more than safe. */ +-#define ENOUGH 1440 +-#define MAXD 154 ++#define ENOUGH 2048 ++#define MAXD 592 + + /* Type of code to build for inftable() */ + typedef enum { diff --git a/media-gfx/optipng/optipng-0.4.8-r1.ebuild b/media-gfx/optipng/optipng-0.4.8-r1.ebuild new file mode 100644 index 000000000000..682b48e8f3b4 --- /dev/null +++ b/media-gfx/optipng/optipng-0.4.8-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8-r1.ebuild,v 1.1 2005/10/07 16:36:00 taviso Exp $ + +inherit eutils + +DESCRIPTION="Find the optimal compression settings for your png files" +SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz" +HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/" + +LICENSE="as-is" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc x86" +IUSE="" + +DEPEND="virtual/libc" + +src_unpack() { + unpack ${A} + sed -i -e 's!-O2!${CFLAGS}!' scripts/gcc.mak + epatch ${FILESDIR}/optipng-zlib-security.diff +} + +src_compile() { + emake -C ${S}/src -f ${S}/src/scripts/gcc.mak optipng \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die +} + +src_install() { + dobin ${S}/src/optipng + dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,TODO,USAGE} + dohtml ${S}/doc/index.html +} |