diff options
author | Bryan Østergaard <kloeri@gentoo.org> | 2006-11-04 19:41:40 +0000 |
---|---|---|
committer | Bryan Østergaard <kloeri@gentoo.org> | 2006-11-04 19:41:40 +0000 |
commit | 5357f024b44aabce1828c5282e38aa648f0a2f1b (patch) | |
tree | dc97e089ac2a408a54073712ddd700a092af7eb8 /media-gfx | |
parent | www-client/amaya removal (pending 16th October 2006), see #129874 for reference. (diff) | |
download | historical-5357f024b44aabce1828c5282e38aa648f0a2f1b.tar.gz historical-5357f024b44aabce1828c5282e38aa648f0a2f1b.tar.bz2 historical-5357f024b44aabce1828c5282e38aa648f0a2f1b.zip |
Fix overflows, bug 152668.
Package-Manager: portage-2.1.2_rc1-r3
Diffstat (limited to 'media-gfx')
6 files changed, 189 insertions, 5 deletions
diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog index 3fd2a623e148..d3983409e7ba 100644 --- a/media-gfx/graphicsmagick/ChangeLog +++ b/media-gfx/graphicsmagick/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/graphicsmagick # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.39 2006/10/08 00:02:20 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.40 2006/11/04 19:41:40 kloeri Exp $ + +*graphicsmagick-1.1.7-r3 (04 Nov 2006) + + 04 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> + +files/graphicsmagick-1.1.7-dcm.patch, + +files/graphicsmagick-1.1.7-palm.patch, +graphicsmagick-1.1.7-r3.ebuild: + Fix overflows, bug 152668. 08 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> graphicsmagick-1.1.7-r2.ebuild: diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 71228906e051..a15c7c5f5462 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,7 +1,15 @@ +AUX graphicsmagick-1.1.7-dcm.patch 666 RMD160 8270eab6bf69bf4f4d6ae1113ff83a7332988d81 SHA1 4ced17c29fb028946eef89ca7549195ebf241e66 SHA256 e0d959b9ef9cbe835d27e9387555eda67c22065b775a489dcb8a605633df5763 +MD5 e53ff54a19bbe3fd5082cca3aa2042de files/graphicsmagick-1.1.7-dcm.patch 666 +RMD160 8270eab6bf69bf4f4d6ae1113ff83a7332988d81 files/graphicsmagick-1.1.7-dcm.patch 666 +SHA256 e0d959b9ef9cbe835d27e9387555eda67c22065b775a489dcb8a605633df5763 files/graphicsmagick-1.1.7-dcm.patch 666 AUX graphicsmagick-1.1.7-overflow.patch 466 RMD160 63483059931735cc185217f2a232ebd4b6476d7a SHA1 ae474ea3348a7d08c7c1026a34a5cf9f37170305 SHA256 1cfc01739d4911dc31978b35b5b7df46fab5468ec1a5fb3874fba0e202f92a12 MD5 e839cb87efd01d7afa56143043c26be4 files/graphicsmagick-1.1.7-overflow.patch 466 RMD160 63483059931735cc185217f2a232ebd4b6476d7a files/graphicsmagick-1.1.7-overflow.patch 466 SHA256 1cfc01739d4911dc31978b35b5b7df46fab5468ec1a5fb3874fba0e202f92a12 files/graphicsmagick-1.1.7-overflow.patch 466 +AUX graphicsmagick-1.1.7-palm.patch 1459 RMD160 055ce6ca2bb0bbfac276fbb1dade010b89b6d3a3 SHA1 e01c779011c45cb6b733e6de11dc08df78c14a7a SHA256 1b27218ec810f85fd6130afb29f12ba985b2e7a301d4017621df6acff9cee46f +MD5 6863186b423ea6d5415024261f39d36a files/graphicsmagick-1.1.7-palm.patch 1459 +RMD160 055ce6ca2bb0bbfac276fbb1dade010b89b6d3a3 files/graphicsmagick-1.1.7-palm.patch 1459 +SHA256 1b27218ec810f85fd6130afb29f12ba985b2e7a301d4017621df6acff9cee46f files/graphicsmagick-1.1.7-palm.patch 1459 AUX graphicsmagick-libpng.patch 1004 RMD160 8b3e46ed2e4bafd28726fbe3e7e61c77b8dc8653 SHA1 6944c767dd885e6356c29dd21ae717327c42d9a0 SHA256 8227b47ec06d48248ec0023dfe4ccb26b4d8a02777f50dac956d4e3da38a2020 MD5 460b1415a0a309a1815f641c917dbdcb files/graphicsmagick-libpng.patch 1004 RMD160 8b3e46ed2e4bafd28726fbe3e7e61c77b8dc8653 files/graphicsmagick-libpng.patch 1004 @@ -19,14 +27,18 @@ EBUILD graphicsmagick-1.1.7-r2.ebuild 2667 RMD160 266be98d3631da1fdbe5db3127d973 MD5 1988b3b704deee06f19b3bb28b36a1bd graphicsmagick-1.1.7-r2.ebuild 2667 RMD160 266be98d3631da1fdbe5db3127d973a930d2f480 graphicsmagick-1.1.7-r2.ebuild 2667 SHA256 48220691f4ed36fb4a27cf1d7e6baeeb4b37a9e553a7274f46a89eb9fbb11ef2 graphicsmagick-1.1.7-r2.ebuild 2667 +EBUILD graphicsmagick-1.1.7-r3.ebuild 2742 RMD160 e105032c12dbd2cc8e29441b8900bbcde1bca955 SHA1 ef44852f13e8acebab20008b3886944e42534862 SHA256 a0a9ca7c72023548662b74183eb8d49017220076427328a83bcfd7131749ebf3 +MD5 758d20235561033e78ea6ad1f4f5713d graphicsmagick-1.1.7-r3.ebuild 2742 +RMD160 e105032c12dbd2cc8e29441b8900bbcde1bca955 graphicsmagick-1.1.7-r3.ebuild 2742 +SHA256 a0a9ca7c72023548662b74183eb8d49017220076427328a83bcfd7131749ebf3 graphicsmagick-1.1.7-r3.ebuild 2742 EBUILD graphicsmagick-1.1.7.ebuild 2520 RMD160 4a0c0699d44cdd407c58d4b2dc4683a1095e6a90 SHA1 e62dc9c9a63ac0a79ad91f3ca6f9f1024a82790a SHA256 e02a1a115e127af22941ba2081fbbb6aa20d38c766399f9fd170b74c11cd079a MD5 4147eb1bad543a0b36d59c03fd1fc8a2 graphicsmagick-1.1.7.ebuild 2520 RMD160 4a0c0699d44cdd407c58d4b2dc4683a1095e6a90 graphicsmagick-1.1.7.ebuild 2520 SHA256 e02a1a115e127af22941ba2081fbbb6aa20d38c766399f9fd170b74c11cd079a graphicsmagick-1.1.7.ebuild 2520 -MISC ChangeLog 6071 RMD160 ddb74e3164585aad73b4b9564aaf795e1595a2e6 SHA1 d5eabdfbcb97b34294425431fd60642e68a58aa0 SHA256 5a365ec11db4ffa8fcebba92452fa0a062238ea8a57bb5231c064e3e41a6e543 -MD5 3a99e3f1f854b56316141e243c3279fa ChangeLog 6071 -RMD160 ddb74e3164585aad73b4b9564aaf795e1595a2e6 ChangeLog 6071 -SHA256 5a365ec11db4ffa8fcebba92452fa0a062238ea8a57bb5231c064e3e41a6e543 ChangeLog 6071 +MISC ChangeLog 6310 RMD160 00556143695b60a8ab9b09c00d4894731fc1b53e SHA1 900dba3c2c61580ed839059417805728301173de SHA256 8dcb8d1b4b2287aeb29bce45dac83ba38e9ee82d8910f6efb7baafb1d48230f6 +MD5 be17f0ce4527093110a6127dbf977105 ChangeLog 6310 +RMD160 00556143695b60a8ab9b09c00d4894731fc1b53e ChangeLog 6310 +SHA256 8dcb8d1b4b2287aeb29bce45dac83ba38e9ee82d8910f6efb7baafb1d48230f6 ChangeLog 6310 MISC metadata.xml 197 RMD160 45fece5f76f3776dd119fe5b124d815caced375f SHA1 bd1ad5337092280854cc444f6444402bfe9f38ed SHA256 a42685246e78553ec390823695d12279e70c7d4ebdd9d9af36cc5932374c95e9 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197 RMD160 45fece5f76f3776dd119fe5b124d815caced375f metadata.xml 197 @@ -40,3 +52,6 @@ SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/di MD5 21b9a3101ccf785dfe7c6703f62adc3f files/digest-graphicsmagick-1.1.7-r2 268 RMD160 79582430aaa177324cbafb5eaae828cd12d07b74 files/digest-graphicsmagick-1.1.7-r2 268 SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/digest-graphicsmagick-1.1.7-r2 268 +MD5 21b9a3101ccf785dfe7c6703f62adc3f files/digest-graphicsmagick-1.1.7-r3 268 +RMD160 79582430aaa177324cbafb5eaae828cd12d07b74 files/digest-graphicsmagick-1.1.7-r3 268 +SHA256 6065e62de7dbdee3f8edc0812d75cd47131ae835ea21c9680c9a05b306b9c8a2 files/digest-graphicsmagick-1.1.7-r3 268 diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 new file mode 100644 index 000000000000..9a72057947c2 --- /dev/null +++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 @@ -0,0 +1,3 @@ +MD5 f75d830ca623bf10385b3ad62c48437a GraphicsMagick-1.1.7.tar.bz2 4957394 +RMD160 9193ab3b109df6ce4b80cb2c1602c86ca36e3043 GraphicsMagick-1.1.7.tar.bz2 4957394 +SHA256 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc GraphicsMagick-1.1.7.tar.bz2 4957394 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch new file mode 100644 index 000000000000..a9d33d0d0595 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch @@ -0,0 +1,16 @@ +=================================================================== +RCS file: /GraphicsMagick/GraphicsMagick/coders/dcm.c,v +retrieving revision 1.133 +retrieving revision 1.134 +diff -u -p -r1.133 -r1.134 +--- GraphicsMagick/coders/dcm.c 2005/09/23 22:32:22 1.133 ++++ GraphicsMagick/coders/dcm.c 2006/11/02 14:23:28 1.134 +@@ -3022,7 +3022,7 @@ static Image *ReadDCMImage(const ImageIn + /* + Photometric interpretation. + */ +- for (i=0; i < (long) length; i++) ++ for (i=0; i < (long) Min(length, MaxTextExtent-1); i++) + photometric[i]=data[i]; + photometric[i]='\0'; + break; diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch new file mode 100644 index 000000000000..e2ec3a9383a7 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch @@ -0,0 +1,34 @@ +=================================================================== +RCS file: /GraphicsMagick/GraphicsMagick/coders/palm.c,v +retrieving revision 1.62 +retrieving revision 1.62.2.1 +diff -u -p -r1.62 -r1.62.2.1 +--- GraphicsMagick/coders/palm.c 2003/10/11 18:38:35 1.62 ++++ GraphicsMagick/coders/palm.c 2006/11/02 14:24:05 1.62.2.1 +@@ -541,7 +541,7 @@ static Image *ReadPALMImage(const ImageI + image->compression = RLECompression; + for (i = 0; i < (long) bytes_per_row; ) + { +- count = ReadBlobByte(image); ++ count = Min(ReadBlobByte(image), bytes_per_row-i); + byte = ReadBlobByte(image); + memset(one_row + i, (int) byte, count); + i += count; +@@ -579,6 +579,8 @@ static Image *ReadPALMImage(const ImageI + indexes=GetIndexes(image); + if(bits_per_pixel == 16) + { ++ if (image->columns > 2*bytes_per_row) ++ ThrowReaderException(CorruptImageError,CorruptImage,image); + for (x=0; x < (long) image->columns; x++) + { + color16 = (*ptr++ << 8); +@@ -595,6 +597,8 @@ static Image *ReadPALMImage(const ImageI + bit = 8 - bits_per_pixel; + for(x = 0; x < (long) image->columns; x++) + { ++ if (ptr - one_row >= bytes_per_row) ++ ThrowReaderException(CorruptImageError,CorruptImage,image); + index =(IndexPacket) (mask - (((*ptr) & (mask << bit)) >> bit)); + indexes[x] = index; + *q++ = image->colormap[index]; diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r3.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r3.ebuild new file mode 100644 index 000000000000..44a9cd01a11c --- /dev/null +++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.7-r3.ebuild,v 1.1 2006/11/04 19:41:40 kloeri Exp $ + +inherit libtool flag-o-matic perl-app + +MY_PN="GraphicsMagick" +MY_P=${MY_PN}-${PV} + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="http://www.graphicsmagick.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml doc depth16 depth32" + +RDEPEND="app-arch/bzip2 + sys-libs/zlib + X? ( || ( + ( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM ) + virtual/x11 + ) ) + gs? ( virtual/ghostscript ) + jbig? ( media-libs/jbigkit ) + jpeg2k? ( media-libs/jasper ) + jpeg? ( >=media-libs/jpeg-6b ) + lcms? ( >=media-libs/lcms-1.06 ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + tiff? ( >=media-libs/tiff-3.5.5 ) + xml? ( >=dev-libs/libxml2-2.4.10 ) + truetype? ( =media-libs/freetype-2* ) + wmf? ( >=media-libs/libwmf-0.2.5 )" +DEPEND="${RDEPEND} + X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-overflow.patch" + epatch "${FILESDIR}/${PN}-libpng.patch" + epatch "${FILESDIR}/${P}-dcm.patch" + epatch "${FILESDIR}/${P}-palm.patch" + + # Netscape is still used ? More people should have Mozilla + sed -i 's:netscape:mozilla:g' configure +} + +src_compile() { + DEPTH=8 + use depth16 && DEPTH=16 + use depth32 && DEPTH=32 + econf \ + --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ + --enable-shared \ + --with-threads \ + --with-bzlib \ + --without-perl \ + --without-fpx \ + $(use_with X x) \ + $(use_with jbig) \ + $(use_with jpeg2k) \ + $(use_with jpeg) \ + $(use_with lcms) \ + $(use_enable lzw) \ + $(use_with png) \ + $(use_with tiff) \ + $(use_with truetype ttf) \ + $(use_with wmf) \ + $(use_with xml xml) \ + --with-quantum-depth=${DEPTH} \ + || die + + # make PerlMagick using portage tools instead of Makefile to avoid sandbox issues + if use perl ; then + cd PerlMagick + perl-app_src_prep + perl-app_src_compile + cd .. + fi + + emake || die "compile problem" +} + +src_install() { + make DESTDIR="${D}" install || die + + if use perl ; then + cd PerlMagick + perl-module_src_install + cd .. + fi + + dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick + + rm -f "${D}"/usr/share/GraphicsMagick/*.txt + rm -rf "${D}"/usr/share/${MY_P}/www + + if use doc ; then + dohtml -r www/* + fi + + dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config + dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config +} |