From 89d08bdd7dadc0b3ad9eb1e54c52dc83da04eb7d Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 23 Apr 2011 04:41:54 +0000
Subject: [PATCH 1/1] - updated to 3.9.5

Changed files:
    crossmingw32-libtiff.spec -> 1.9
    libtiff-sec.patch -> 1.4
---
 crossmingw32-libtiff.spec |  4 ++--
 libtiff-sec.patch         | 32 --------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/crossmingw32-libtiff.spec b/crossmingw32-libtiff.spec
index e54574f..42d3f03 100644
--- a/crossmingw32-libtiff.spec
+++ b/crossmingw32-libtiff.spec
@@ -2,12 +2,12 @@ Summary:	Library for handling TIFF files - cross MinGW32 version
 Summary(pl.UTF-8):	Biblioteka do manipulacji plikami w formacie TIFF - wersja skrośna MinGW32
 %define		realname   libtiff
 Name:		crossmingw32-%{realname}
-Version:	3.9.4
+Version:	3.9.5
 Release:	1
 License:	BSD-like
 Group:		Development/Libraries
 Source0:	ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-# Source0-md5:	2006c1bdd12644dbf02956955175afd6
+# Source0-md5:	8fc7ce3b4e1d0cc8a319336967815084
 Patch0:		%{realname}-sec.patch
 Patch1:		%{realname}-glut.patch
 Patch2:		%{realname}-CVE-2009-2285.patch
diff --git a/libtiff-sec.patch b/libtiff-sec.patch
index 7eebb74..eff9b68 100644
--- a/libtiff-sec.patch
+++ b/libtiff-sec.patch
@@ -30,26 +30,6 @@
  	va_end(ap);
  	return (0);
  }
---- tiff-3.9.1/libtiff/tif_dirinfo.c.orig	2008-04-11 01:05:55.000000000 +0200
-+++ tiff-3.9.1/libtiff/tif_dirinfo.c	2009-08-31 17:48:30.568606747 +0200
-@@ -807,8 +807,6 @@ _TIFFFieldWithTag(TIFF* tif, ttag_t tag)
- 		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag",
- 			     "Internal error, unknown tag 0x%x",
- 			     (unsigned int) tag);
--		assert(fip != NULL);
--		/*NOTREACHED*/
- 	}
- 	return (fip);
- }
-@@ -821,8 +819,6 @@ _TIFFFieldWithName(TIFF* tif, const char
- 	if (!fip) {
- 		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName",
- 			     "Internal error, unknown tag %s", field_name);
--		assert(fip != NULL);
--		/*NOTREACHED*/
- 	}
- 	return (fip);
- }
 --- tiff-3.9.1/libtiff/tif_dirread.c.orig	2009-01-01 01:10:43.000000000 +0100
 +++ tiff-3.9.1/libtiff/tif_dirread.c	2009-08-31 18:38:28.060606747 +0200
 @@ -190,6 +190,11 @@ TIFFReadDirectory(TIFF* tif)
@@ -229,15 +209,3 @@
  			goto bad;
                  }
              *pl = v[0];
-@@ -1788,9 +1809,10 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDi
- 
-             for (i = 1; i < check_count; i++)
-                 if (v[i] != v[0]) {
-+			const TIFFFieldInfo *fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- 			TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 		"Cannot handle different per-sample values for field \"%s\"",
--			_TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+			fip ? fip->field_name : "Unknown");
- 			goto bad;
-                 }
-             *pl = v[0];
-- 
2.43.0