bump, cleanup, and patch for bug 91584

Package-Manager: portage-2.0.51.19

8 files changed, 82 insertions, 57 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 0c007c339246..e5b63056c8e0 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tiff
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.51 2005/01/05 02:11:53 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.52 2005/05/08 18:20:12 nerdboy Exp $
+
+*tiff-3.7.2 (08 May 2005)
+
+  08 May 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/tiff-3.7.2-buffer_check.patch, -tiff-3.7.0.ebuild,
+  -tiff-3.7.1.ebuild, +tiff-3.7.2.ebuild:
+  bump, cleanup, and patch for bug 91584
 
   04 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> tiff-3.7.1-r1.ebuild:
   Stable ppc-macos.
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 9b01b60cb1b0..30f323dfe0f7 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,26 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9463217ea34d16cb059c2b346d2c3ddc ChangeLog 7464
+MD5 a7a68f5f6a3ddf0a654577ab3acce4d1 ChangeLog 7685
 MD5 085bf925a1dc6f9756f484ac688a92f9 metadata.xml 447
 MD5 9b3a1e0834cc4a7f5507d508a733d065 tiff-3.6.1-r2.ebuild 2191
-MD5 b6ab48113572a77e1b4061fdf767e11d tiff-3.7.0.ebuild 920
 MD5 ab3519ae0f7d0763b8869d9156cdc68c tiff-3.7.1-r1.ebuild 1029
-MD5 7a005661ea512d10cde69ebe7746dad6 tiff-3.7.1.ebuild 832
+MD5 0fd053343288c509753d1cb93e26f53e tiff-3.7.2.ebuild 964
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site 488
 MD5 46287dce0914479f229a719830ab3fb3 files/digest-tiff-3.6.1-r2 378
-MD5 62d9bd4a2f32dd28ab29a94a90b4fdb2 files/digest-tiff-3.7.0 63
 MD5 c20fc7c59038d011ff51cae0d1c2e9cc files/tiff-3.7.0-sharedlibsnamefix.patch 938
 MD5 7fb04eea18fc47d8211f3bfaf71e5491 files/tiff-3.7.0-tiff2ps_float.patch 675
-MD5 0d970257da4fc0fba7ae38016e4655d6 files/digest-tiff-3.7.1 63
-MD5 0d970257da4fc0fba7ae38016e4655d6 files/digest-tiff-3.7.1-r1 63
+MD5 9bd055973e8798d783f0e87f5d6c160d files/digest-tiff-3.7.2 63
 MD5 6a9a255a3b89908c05b1f8bbde260e26 files/tiff-3.7.1-tiffdump.patch 439
+MD5 0d970257da4fc0fba7ae38016e4655d6 files/digest-tiff-3.7.1-r1 63
 MD5 dca7d9db2819ce30468b1a44b7575aaa files/tiff-3.6.1-r1-man.so.patch 364
 MD5 4bffd94510b6a669790656394f2d0302 files/tiff-3.7.1-trans.patch 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB5dNGroRuSHgZdywRAjbzAJ4k9TT6tR71F+gp0b6iQ3pS+q87wQCZATQe
-nM2U6mdZSjPlmCBrDjy3KV8=
-=wkbA
------END PGP SIGNATURE-----
+MD5 f0b2abf65d2e777bb249d460fc54cd87 files/tiff-3.7.2-buffer_check.patch 2093
diff --git a/media-libs/tiff/files/digest-tiff-3.7.0 b/media-libs/tiff/files/digest-tiff-3.7.0
deleted file mode 100644
index 3915c5810214..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 305af467c94d988c17ca6528d8936f27 tiff-3.7.0.tar.gz 1244737
diff --git a/media-libs/tiff/files/digest-tiff-3.7.1 b/media-libs/tiff/files/digest-tiff-3.7.1
deleted file mode 100644
index c6b9f9274e15..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37d222df12eb23691614cd40b7b1f215 tiff-3.7.1.tar.gz 1253810
diff --git a/media-libs/tiff/files/digest-tiff-3.7.2 b/media-libs/tiff/files/digest-tiff-3.7.2
new file mode 100644
index 000000000000..b0f5df157a22
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.7.2
@@ -0,0 +1 @@
+MD5 9d7123bd0dbde2a3853fb758346adb78 tiff-3.7.2.tar.gz 1260598
diff --git a/media-libs/tiff/files/tiff-3.7.2-buffer_check.patch b/media-libs/tiff/files/tiff-3.7.2-buffer_check.patch
new file mode 100644
index 000000000000..2a5fc03b5a7c
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.7.2-buffer_check.patch
@@ -0,0 +1,59 @@
+--- libtiff/tif_dirread.c.orig	2005-05-08 10:28:15.000000000 -0700
++++ libtiff/tif_dirread.c	2005-05-08 10:45:26.000000000 -0700
+@@ -1310,12 +1310,15 @@
+ 		uint16 buf[10];
+ 		uint16* v = buf;
+ 
+-		if (samples > NITEMS(buf))
+-			v = (uint16*) CheckMalloc(tif, samples, sizeof(uint16),
++		if (dir->tdir_count > NITEMS(buf))
++			v = (uint16*) CheckMalloc(tif, dir->tdir_count, sizeof(uint16),
+ 						  "to fetch per-sample values");
+ 		if (v && TIFFFetchShortArray(tif, dir, v)) {
+ 			uint16 i;
+-			for (i = 1; i < samples; i++)
++			int check_count = dir->tdir_count;
++			if( samples < check_count )
++				check_count = samples;
++			for (i = 1; i < check_count; i++)
+ 				if (v[i] != v[0]) {
+ 					TIFFError(tif->tif_name,
+ 		"Cannot handle different per-sample values for field \"%s\"",
+@@ -1347,12 +1350,15 @@
+ 		uint32 buf[10];
+ 		uint32* v = buf;
+ 
+-		if (samples > NITEMS(buf))
+-			v = (uint32*) CheckMalloc(tif, samples, sizeof(uint32),
++		if (dir->tdir_count > NITEMS(buf))
++			v = (uint32*) CheckMalloc(tif, dir->tdir_count, sizeof(uint32),
+ 						  "to fetch per-sample values");
+ 		if (v && TIFFFetchLongArray(tif, dir, v)) {
+ 			uint16 i;
+-			for (i = 1; i < samples; i++)
++			int check_count = dir->tdir_count;
++			if( samples < check_count )
++				check_count = samples;
++			for (i = 1; i < check_count; i++)
+ 				if (v[i] != v[0]) {
+ 					TIFFError(tif->tif_name,
+ 		"Cannot handle different per-sample values for field \"%s\"",
+@@ -1384,12 +1390,15 @@
+ 		double buf[10];
+ 		double* v = buf;
+ 
+-		if (samples > NITEMS(buf))
+-			v = (double*) CheckMalloc(tif, samples, sizeof (double),
++		if (dir->tdir_count > NITEMS(buf))
++			v = (double*) CheckMalloc(tif, dir->tdir_count, sizeof (double),
+ 						  "to fetch per-sample values");
+ 		if (v && TIFFFetchAnyArray(tif, dir, v)) {
+ 			uint16 i;
+-			for (i = 1; i < samples; i++)
++			int check_count = dir->tdir_count;
++			if( samples < check_count )
++				check_count = samples;
++			for (i = 1; i < check_count; i++)
+ 				if (v[i] != v[0]) {
+ 					TIFFError(tif->tif_name,
+ 		"Cannot handle different per-sample values for field \"%s\"",
diff --git a/media-libs/tiff/tiff-3.7.0.ebuild b/media-libs/tiff/tiff-3.7.0.ebuild
deleted file mode 100644
index d53d4088d8a3..000000000000
--- a/media-libs/tiff/tiff-3.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.7.0.ebuild,v 1.7 2005/01/02 14:44:09 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-HOMEPAGE="http://www.libtiff.org/"
-SRC_URI="http://dl.maptools.org/dl/libtiff/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos s390 sparc x86"
-IUSE=""
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${P}-sharedlibsnamefix.patch
-	epatch ${FILESDIR}/${P}-tiff2ps_float.patch
-	epunt_cxx
-}
-
-src_compile() {
-	econf --without-x || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.7.1.ebuild b/media-libs/tiff/tiff-3.7.2.ebuild
index b1f123e2a771..6b4692022773 100644
--- a/media-libs/tiff/tiff-3.7.1.ebuild
+++ b/media-libs/tiff/tiff-3.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.7.1.ebuild,v 1.6 2005/01/02 15:59:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.7.2.ebuild,v 1.1 2005/05/08 18:20:12 nerdboy Exp $
 
 inherit eutils
 
@@ -10,12 +10,18 @@ SRC_URI="http://dl.maptools.org/dl/libtiff/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~mips alpha ~arm ~hppa amd64 ~ia64 ~s390 ~ppc-macos ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc-macos ~ppc64"
 IUSE=""
 
 DEPEND=">=media-libs/jpeg-6b
 	>=sys-libs/zlib-1.1.3-r2"
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-buffer_check.patch || die "buffer_check patch failed"
+}
+
 src_compile() {
 	econf --without-x || die "econf failed"
 	emake || die "emake failed"
@@ -27,5 +33,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Latest tiff with bug #75213 fixes."
+	einfo "Latest tiff with bug #91584 fixes."
 }