bumped and added patches for bugs #75423 and #75316

6 files changed, 83 insertions, 18 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 2fd6d43699ed..edff145eb45b 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.42 2005/01/02 15:59:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.43 2005/01/02 23:01:09 nerdboy Exp $
+
+*tiff-3.7.1-r1 (02 Jan 2005)
+
+  02 Jan 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/tiff-3.7.1-tiffdump.patch, +files/tiff-3.7.1-trans.patch,
+  +tiff-3.7.1-r1.ebuild:
+  bumped and added patches for bugs #75423 and #75316 (all ~)
 
   02 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> tiff-3.7.1.ebuild:
   Stable on alpha, bug 75213.
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 6fc3a2d59135..c2f8831b1257 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b6ab48113572a77e1b4061fdf767e11d tiff-3.7.0.ebuild 920
-MD5 f774c48304b0608d77e100ff5105d3ca ChangeLog 6420
-MD5 9b3a1e0834cc4a7f5507d508a733d065 tiff-3.6.1-r2.ebuild 2191
+MD5 4a3fde770cae9b727a3cddbcd74781b3 ChangeLog 6654
 MD5 085bf925a1dc6f9756f484ac688a92f9 metadata.xml 447
+MD5 9b3a1e0834cc4a7f5507d508a733d065 tiff-3.6.1-r2.ebuild 2191
+MD5 b6ab48113572a77e1b4061fdf767e11d tiff-3.7.0.ebuild 920
 MD5 7a005661ea512d10cde69ebe7746dad6 tiff-3.7.1.ebuild 832
-MD5 7fb04eea18fc47d8211f3bfaf71e5491 files/tiff-3.7.0-tiff2ps_float.patch 675
-MD5 0d970257da4fc0fba7ae38016e4655d6 files/digest-tiff-3.7.1 63
+MD5 f7753dc855b6f1504a6f5620ebd6b72c tiff-3.7.1-r1.ebuild 1040
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site 488
-MD5 dca7d9db2819ce30468b1a44b7575aaa files/tiff-3.6.1-r1-man.so.patch 364
+MD5 46287dce0914479f229a719830ab3fb3 files/digest-tiff-3.6.1-r2 378
 MD5 c20fc7c59038d011ff51cae0d1c2e9cc files/tiff-3.7.0-sharedlibsnamefix.patch 938
+MD5 7fb04eea18fc47d8211f3bfaf71e5491 files/tiff-3.7.0-tiff2ps_float.patch 675
 MD5 62d9bd4a2f32dd28ab29a94a90b4fdb2 files/digest-tiff-3.7.0 63
-MD5 46287dce0914479f229a719830ab3fb3 files/digest-tiff-3.6.1-r2 378
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB2BpjugEuf3OQ0akRAmnqAKCRkY0Nd71JlZpQuqVDxCMRfAo2lACeOZph
-55fiHVLcshiuYIOB7eG4saI=
-=W6qG
------END PGP SIGNATURE-----
+MD5 0d970257da4fc0fba7ae38016e4655d6 files/digest-tiff-3.7.1 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
diff --git a/media-libs/tiff/files/digest-tiff-3.7.1-r1 b/media-libs/tiff/files/digest-tiff-3.7.1-r1
new file mode 100644
index 000000000000..c6b9f9274e15
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.7.1-r1
@@ -0,0 +1 @@
+MD5 37d222df12eb23691614cd40b7b1f215 tiff-3.7.1.tar.gz 1253810
diff --git a/media-libs/tiff/files/tiff-3.7.1-tiffdump.patch b/media-libs/tiff/files/tiff-3.7.1-tiffdump.patch
new file mode 100644
index 000000000000..fc55c5d37916
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.7.1-tiffdump.patch
@@ -0,0 +1,14 @@
+--- tiff-3.7.1/tools/tiffdump.c.orig	2004-09-03 12:16:01 +0400
++++ tiff-3.7.1/tools/tiffdump.c	2004-12-22 01:57:51 +0300
+@@ -307,6 +307,11 @@ ReadDirectory(int fd, unsigned ix, off_t
+ 			continue;
+ 		}
+ 		space = dp->tdir_count * datawidth[dp->tdir_type];
++		if (space <= 0) {
++			printf(">\n");
++			Error("Invalid count for tag %u", dp->tdir_tag);
++			continue;
++		}
+ 		if (space <= 4) {
+ 			switch (dp->tdir_type) {
+ 			case TIFF_FLOAT:
diff --git a/media-libs/tiff/files/tiff-3.7.1-trans.patch b/media-libs/tiff/files/tiff-3.7.1-trans.patch
new file mode 100644
index 000000000000..563ac3476eda
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.7.1-trans.patch
@@ -0,0 +1,11 @@
+--- libtiff/tif_getimage.c.orig	2005-01-02 12:17:24.733622762 -0800
++++ libtiff/tif_getimage.c	2005-01-02 12:17:29.010612325 -0800
+@@ -247,7 +247,7 @@
+     TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &img->samplesperpixel);
+     TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
+ 	&extrasamples, &sampleinfo);
+-    if (extrasamples > 1)
++    if (extrasamples >= 1)
+     {
+ 	switch (sampleinfo[0]) {
+ 	case EXTRASAMPLE_UNSPECIFIED:	/* Workaround for some images without */
diff --git a/media-libs/tiff/tiff-3.7.1-r1.ebuild b/media-libs/tiff/tiff-3.7.1-r1.ebuild
new file mode 100644
index 000000000000..f27bdd68537f
--- /dev/null
+++ b/media-libs/tiff/tiff-3.7.1-r1.ebuild
@@ -0,0 +1,38 @@
+# 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-r1.ebuild,v 1.1 2005/01/02 23:01:09 nerdboy 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="~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}-trans.patch || die "transparency patch failed"
+	epatch ${FILESDIR}/${P}-tiffdump.patch || die "tiffdump patch failed"
+}
+
+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
+}
+
+pkg_postinst() {
+	einfo "Latest tiff with bug #75423 and #75316 fixes."
+}