diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-19 06:28:15 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-19 06:28:15 +0000 |
commit | 0d490f15714499fc7c2ad3648690f5a74cbec0d7 (patch) | |
tree | 9c99c0f16de809002921b3913485e2a0919d0346 /media-libs/tiff | |
parent | Fix exchange of nawk to gawk (diff) | |
download | gentoo-2-0d490f15714499fc7c2ad3648690f5a74cbec0d7.tar.gz gentoo-2-0d490f15714499fc7c2ad3648690f5a74cbec0d7.tar.bz2 gentoo-2-0d490f15714499fc7c2ad3648690f5a74cbec0d7.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/tiff')
-rw-r--r-- | media-libs/tiff/Manifest | 14 | ||||
-rw-r--r-- | media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch | 21 | ||||
-rw-r--r-- | media-libs/tiff/files/tiff-3.9.2-CVE-2010-1411.patch | 35 | ||||
-rw-r--r-- | media-libs/tiff/tiff-3.9.2-r1.ebuild | 54 |
4 files changed, 0 insertions, 124 deletions
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 18b41cb9187c..fe21d5c83a10 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,21 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX tiff-3.8.2-CVE-2009-2285.patch 717 RMD160 6fca42b138383626becf1221ec8550935621f60b SHA1 f2daf5306efb6f0908f0046765a10bf30b2642c2 SHA256 bbe28b7dbc6f24619ad851a53d39149100069af6a5d1578b0cd9ade48d7b127b AUX tiff-3.9.2-CVE-2009-2347.patch 2571 RMD160 142c305b3a1cd9c0f27b482ced15104e82f43a19 SHA1 04c0bb3f6bcfa27e89f00f97c843b2f9d5220ce8 SHA256 27839133f0ddd51b7c5f53e85b7985f68284ab0da4ba589e629fe085be62074b -AUX tiff-3.9.2-CVE-2010-1411.patch 898 RMD160 8b503834cdf4ade56b990152da4431cda36fe8d1 SHA1 e03812e4f19d22a0e4222a5d0f8d84be71949e18 SHA256 dd7a7e612df083ab2dd3980a1067a3af53c1f71781df7e9f3794d01698d36383 -DIST tiff-3.9.2.tar.gz 1419742 RMD160 22716e0bcee93a654a704900f3e19f41600f3d18 SHA1 5c054d31e350e53102221b7760c3700cf70b4327 SHA256 3cd566c19291ea3379115dd0d2ebcdefb6a7cf0511cc33e733ec3a500e10da69 DIST tiff-3.9.4.tar.gz 1436968 RMD160 3e0a74b6294297c16fb983ad68056a1dfbbdb1de SHA1 a4e32d55afbbcabd0391a9c89995e8e8a19961de SHA256 67b76d075fb74f7cb32e7e4b217701674755fe6cee0f463b259a753fce691da6 DIST tiff-4.0.0beta6.tar.gz 1968829 RMD160 deab0908742a309f1b2954f1d1b5e2aaaa3180d0 SHA1 20aabb4d92bd5980a382e8ca53a2e010c7580976 SHA256 de016175742bcdd0cd6f326dd2e7bbc7154437d7bb09976ad4789016065061e6 -EBUILD tiff-3.9.2-r1.ebuild 1648 RMD160 d26f8618325e3d43289ba5bf119a6fe31de15035 SHA1 db42b78488f778674f48025cb6221f918c6bc8ed SHA256 0f203bb139cf38ee043f5f6a3ef7632802d0c097e57dfcdc388a64fb2e9b3e80 EBUILD tiff-3.9.4.ebuild 1522 RMD160 00cea6cddb31f548ef90d222ff21c0228f039b31 SHA1 d672548ac7d64660de5ec180c3c7ef965217c1ee SHA256 eb4f36844e44d35d0f0bc8ed9df12fb4fd9132aaa9e979327d79c0f1a697b1d4 EBUILD tiff-4.0.0_beta6.ebuild 1642 RMD160 63b88215a222718efe6a61a7d0c181dc8a6dfbd7 SHA1 fe6495402135a1af43a01029792e163cdc1a3d92 SHA256 89d42095c57293868147881f1ccbb66395f1866a4b5d16707f0f377bab6a3ec2 MISC ChangeLog 22067 RMD160 8fd584e361bb9934a2e4a1514e8a7dc230a023d7 SHA1 313e7b5286e03e916cc0a3e64daf9012071af1f1 SHA256 e0b1fe716dc4be19317a3e80722a6589777b07010773cfff7a65c8b0288ccb8f MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxDpX8ACgkQcsIHjyDViGSi8QCdH+beFbrGvkvea9E5nKv5NlMo -mUcAn3woySK7T543A2PSJb9z2nbTBXGd -=nDco ------END PGP SIGNATURE----- diff --git a/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch b/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch deleted file mode 100644 index 6cca90184d9f..000000000000 --- a/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libtiff/tif_lzw.c -+++ libtiff/tif_lzw.c -@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); -@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); - diff --git a/media-libs/tiff/files/tiff-3.9.2-CVE-2010-1411.patch b/media-libs/tiff/files/tiff-3.9.2-CVE-2010-1411.patch deleted file mode 100644 index 7de456578c76..000000000000 --- a/media-libs/tiff/files/tiff-3.9.2-CVE-2010-1411.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- libtiff/tif_fax3.c.orig 2010-05-13 19:36:08.995479161 +0200 -+++ libtiff/tif_fax3.c 2010-05-13 19:48:04.215467428 +0200 -@@ -42,6 +42,7 @@ - #define G3CODES - #include "t4.h" - #include <stdio.h> -+#include <stdint.h> - - /* - * Compression+decompression state blocks are -@@ -493,9 +494,21 @@ - td->td_compression == COMPRESSION_CCITTFAX4 - ); - -- nruns = needsRefLine ? 2*TIFFroundup(rowpixels,32) : rowpixels; -+ uint64_t val64 = rowpixels; -+ if (needsRefLine) -+ { -+ val64 = 2*TIFFroundup(rowpixels,32); -+ if (val64 > 0xffffffff) -+ return (0); -+ } -+ nruns = (val64 &0xffffffff); - nruns += 3; -- dsp->runs = (uint32*) _TIFFCheckMalloc(tif, 2*nruns, sizeof (uint32), -+ -+ val64 = 2*nruns+3; -+ if (val64 > 0xffffffff) -+ return (0); -+ -+ dsp->runs = (uint32*) _TIFFCheckMalloc(tif, (val64 & 0xffffffff), sizeof (uint32), - "for Group 3/4 run arrays"); - if (dsp->runs == NULL) - return (0); - diff --git a/media-libs/tiff/tiff-3.9.2-r1.ebuild b/media-libs/tiff/tiff-3.9.2-r1.ebuild deleted file mode 100644 index eb238e22ad11..000000000000 --- a/media-libs/tiff/tiff-3.9.2-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.2-r1.ebuild,v 1.8 2010/07/18 21:18:15 nerdboy Exp $ - -EAPI=2 -inherit eutils libtool - -DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images" -HOMEPAGE="http://www.remotesensing.org/libtiff/" -SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="jpeg jbig +cxx zlib" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b:0 ) - jbig? ( media-libs/jbigkit ) - zlib? ( sys-libs/zlib )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.8.2-CVE-2009-2285.patch \ - "${FILESDIR}"/${P}-CVE-2009-2347.patch \ - "${FILESDIR}"/${P}-CVE-2010-1411.patch - elibtoolize -} - -src_configure() { - use prefix || EPREFIX= - econf \ - --disable-dependency-tracking \ - $(use_enable cxx) \ - $(use_enable zlib) \ - $(use_enable jpeg) \ - $(use_enable jbig) \ - --without-x \ - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog README TODO -} - -pkg_postinst() { - if use jbig; then - echo - elog "JBIG support is intended for Hylafax fax compression, so we" - elog "really need more feedback in other areas (most testing has" - elog "been done with fax). Be sure to recompile anything linked" - elog "against tiff if you rebuild it with jbig support." - echo - fi -} |