From 14bfeab84d46a988a0d721cfb9f0436c8e6eb74f Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 30 Dec 2011 12:11:10 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- media-libs/tiff/ChangeLog | 6 +- media-libs/tiff/Manifest | 19 ++-- .../tiff/files/tiff-3.9.2-CVE-2009-2347.patch | 89 ------------------- media-libs/tiff/tiff-4.0.0_beta7.ebuild | 60 ------------- 4 files changed, 13 insertions(+), 161 deletions(-) delete mode 100644 media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch delete mode 100644 media-libs/tiff/tiff-4.0.0_beta7.ebuild diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog index 4e48cd5b1cdf..eb96f88fd7c9 100644 --- a/media-libs/tiff/ChangeLog +++ b/media-libs/tiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/tiff # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.177 2011/12/30 12:10:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.178 2011/12/30 12:11:10 ssuominen Exp $ + + 30 Dec 2011; Samuli Suominen + -files/tiff-3.9.2-CVE-2009-2347.patch, -tiff-4.0.0_beta7.ebuild: + old *tiff-4.0.0 (30 Dec 2011) diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 30d57d0e8f15..fd56f8c72b6a 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,24 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX tiff-3.9.2-CVE-2009-2347.patch 2571 RMD160 142c305b3a1cd9c0f27b482ced15104e82f43a19 SHA1 04c0bb3f6bcfa27e89f00f97c843b2f9d5220ce8 SHA256 27839133f0ddd51b7c5f53e85b7985f68284ab0da4ba589e629fe085be62074b DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33 DIST tiff-4.0.0.tar.gz 2008075 RMD160 82b27f00b48c74970faac6a4bb4a8a49a199e3b1 SHA1 85d85520fea40fc9291995a60e3d40cf980b5522 SHA256 9f4c0b2a8446a259db431c6401342bcb2c1be4a604e77a532d109c8448619288 -DIST tiff-4.0.0beta7.tar.gz 2004539 RMD160 2bdac755802112ba93a534baeb50c08c42e5677d SHA1 91686943ebb7a0e1b162ba61f5abf9598109a391 SHA256 7b622db9e62a14464b0ae27e5eed4e2e893d7aab889c778e56ac28df069c3ded EBUILD tiff-3.9.5-r1.ebuild 1325 RMD160 e66673e83d6c35b1c5a3f748c09e16455a03cf48 SHA1 870a50821cf8af8cb7edaf47489055ab6c93ee42 SHA256 1216172ce9de0ac68618dd5d998548c2850af50315b039480d85a417c15e045d EBUILD tiff-3.9.5.ebuild 1535 RMD160 c1721defb89f93aaa216abf22abad474f9ba4240 SHA1 9acb6a00732c81ae7a8d04ffc7bc639e07247c77 SHA256 07ef04430a12fd8e7cc17bb36437d8fd35aefba712d8c210bb77f7443392a621 EBUILD tiff-4.0.0.ebuild 1370 RMD160 9d34686c672dac661f31a3a13981b9733900c878 SHA1 999bdd74306d209a5b88980b91867391d9cd98a2 SHA256 ffc1ae9fb004db7cb602ea7e6925c229eb552f2e0e8b7a98bab0ff32b56e2abb -EBUILD tiff-4.0.0_beta7.ebuild 1729 RMD160 a135ed8b20aec1a678f815710dd604f6e18d12a8 SHA1 796cabbaa70a96c263b3fefdd2daf11b8825959c SHA256 ce50c0c1a7163f798c3d8c47f72e96ffa6bbe496ad0abd152b39ee1d4e8c42d5 -MISC ChangeLog 24775 RMD160 8f458b0200d5402d24d43b77780b26182db3d33c SHA1 dde30b7a46f95bb7557097fa1cb7c52f32ff514c SHA256 6cab9e40a52a38b27f9e40c5b6742e1c8ce8a9af306be5eb780c5d9426c5d043 +MISC ChangeLog 24903 RMD160 214b44a6f59401b1e39c7d689b6d9cdc9ad06bfc SHA1 6b1a0b53eb80c4c7bafb5022188f238e0580a419 SHA256 a46455806da4cf0934fed2e69bc10d46b8a0bbf7382b3173c98c04731e04b1b9 MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO/anDAAoJEEdUh39IaPFNoNAIAJW6VLFjc3tYmVGMZB/K6opo -BvQUABcGxqRkDdsXU6IrMgBDwwsWd/b5fdUF7WTjQER7NwU2JaKjLdDrGCeD6p37 -gY2PxllXHXXaChrqPdhr+oRqNz+LC5Lmww9vCjB4M3nE9mF5dLZij2F3n6vDoTfa -xak6oOwhEyVa0FzDhbw5prRlg2q+dl1/3AgsMSnnG16H+nh0d8GDza/d2ZlsoCzO -cOPiLw3lcJ9e6+g62ut5o1vVOzxoQ2c6EVz4hfl/KllbKcMH/POIsM2NGVeTpYuo -tzbLSYcPo8xMLvcsXV5ZS3X+k2qmuzBZ3FYFSd22RQp+wZ5JhauDM+B6qsdSQ5w= -=aHCh +iQEcBAEBAgAGBQJO/aoDAAoJEEdUh39IaPFNHegH/iHWmfF8wQosbt6zusdDTlre +JCuCXiU0ses3VP5SaptuY4VmhONNeB78UYN3HF2iaYY3k52+aSxA4adbLJa+1gD5 +sPBslQGPrGPqaLF6jP1TW0qDHsZ6vzre2m3/7ypKqa9zHYv/IIMJE0ZoALU+df3P +QTCAqesGfXdrxY5zUyuSmjdS07taS6hEatGUILw5lyOwU+ow41ngzlYviYn+pwUd +N/RZPdyBXy24tWcCUD1rrvf5aPxVnEoUhNaqVDvevZHXZXJNJcNvmggd3EUuJjdB +ekwhHqMdpdhK65kqxfLcAVPYoqzaTckyJBWWn+0o6WG0cz8Ci1MtW3H6NiJVWDU= +=eK4I -----END PGP SIGNATURE----- diff --git a/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch b/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch deleted file mode 100644 index 8d30334da380..000000000000 --- a/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch +++ /dev/null @@ -1,89 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=307001 -http://bugzilla.maptools.org/show_bug.cgi?id=2079 - ---- tools/tiff2rgba.c -+++ tools/tiff2rgba.c -@@ -125,6 +125,17 @@ - return (0); - } - -+static tsize_t -+multiply(tsize_t m1, tsize_t m2) -+{ -+ tsize_t prod = m1 * m2; -+ -+ if (m1 && prod / m1 != m2) -+ prod = 0; /* overflow */ -+ -+ return prod; -+} -+ - static int - cvt_by_tile( TIFF *in, TIFF *out ) - -@@ -134,6 +145,7 @@ - uint32 tile_width, tile_height; - uint32 row, col; - uint32 *wrk_line; -+ tsize_t raster_size; - int ok = 1; - - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); -@@ -151,7 +163,14 @@ - /* - * Allocate tile buffer - */ -- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32)); -+ raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32)); -+ if (!raster_size) { -+ TIFFError(TIFFFileName(in), -+ "Can't allocate buffer for raster of size %lux%lu", -+ (unsigned long) tile_width, (unsigned long) tile_height); -+ return (0); -+ } -+ raster = (uint32*)_TIFFmalloc(raster_size); - if (raster == 0) { - TIFFError(TIFFFileName(in), "No space for raster buffer"); - return (0); -@@ -159,7 +178,7 @@ - - /* - * Allocate a scanline buffer for swapping during the vertical -- * mirroring pass. -+ * mirroring pass. (Request can't overflow given prior checks.) - */ - wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32)); - if (!wrk_line) { -@@ -236,6 +255,7 @@ - uint32 width, height; /* image width & height */ - uint32 row; - uint32 *wrk_line; -+ tsize_t raster_size; - int ok = 1; - - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); -@@ -251,7 +271,14 @@ - /* - * Allocate strip buffer - */ -- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32)); -+ raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32)); -+ if (!raster_size) { -+ TIFFError(TIFFFileName(in), -+ "Can't allocate buffer for raster of size %lux%lu", -+ (unsigned long) width, (unsigned long) rowsperstrip); -+ return (0); -+ } -+ raster = (uint32*)_TIFFmalloc(raster_size); - if (raster == 0) { - TIFFError(TIFFFileName(in), "No space for raster buffer"); - return (0); -@@ -259,7 +286,7 @@ - - /* - * Allocate a scanline buffer for swapping during the vertical -- * mirroring pass. -+ * mirroring pass. (Request can't overflow given prior checks.) - */ - wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32)); - if (!wrk_line) { diff --git a/media-libs/tiff/tiff-4.0.0_beta7.ebuild b/media-libs/tiff/tiff-4.0.0_beta7.ebuild deleted file mode 100644 index 2e26f6a70054..000000000000 --- a/media-libs/tiff/tiff-4.0.0_beta7.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta7.ebuild,v 1.3 2011/04/27 18:01:28 grobian Exp $ - -EAPI=3 -inherit eutils libtool - -MY_P=${P/_} - -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/${MY_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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="+cxx jbig jpeg static-libs zlib" - -RDEPEND="jpeg? ( virtual/jpeg ) - jbig? ( media-libs/jbigkit ) - zlib? ( sys-libs/zlib )" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.9.2-CVE-2009-2347.patch - elibtoolize -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(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 - - use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' + -} - -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 -} -- 2.26.2