From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 21 Feb 2012 17:08:41 +0000 (+0000)
Subject: - updated to 4.0.1
X-Git-Tag: auto/th/crossmingw32-libtiff-4.0.3-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libtiff.git;a=commitdiff_plain;h=4f0bb7c97ab177ccf874da6cd44243b824e89b1d

- updated to 4.0.1

Changed files:
    crossmingw32-libtiff.spec -> 1.12
    libtiff-sec.patch -> 1.6
---

diff --git a/crossmingw32-libtiff.spec b/crossmingw32-libtiff.spec
index e87d3e9..04468bf 100644
--- a/crossmingw32-libtiff.spec
+++ b/crossmingw32-libtiff.spec
@@ -3,14 +3,13 @@ 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:	4.0.0
+Version:	4.0.1
 Release:	1
 License:	BSD-like
 Group:		Development/Libraries
 Source0:	http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
-# Source0-md5:	456ad12e7c492b275a0d047f2ba89904
+# Source0-md5:	fae149cc9da35c598d8be897826dfc63
 Patch0:		%{realname}-glut.patch
-Patch1:		%{realname}-sec.patch
 URL:		http://www.remotesensing.org/libtiff/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11
@@ -118,7 +117,6 @@ Biblioteka DLL strumieni C++ libtiff dla Windows.
 %prep
 %setup -q -n tiff-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/libtiff-sec.patch b/libtiff-sec.patch
deleted file mode 100644
index a04b17a..0000000
--- a/libtiff-sec.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- tiff-4.0.0/libtiff/tif_dir.c.orig	2011-02-19 17:26:09.000000000 +0100
-+++ tiff-4.0.0/libtiff/tif_dir.c	2011-12-24 10:43:18.779372638 +0100
-@@ -153,6 +153,7 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va
- {
- 	static const char module[] = "_TIFFVSetField";
- 
-+	const TIFFField* fip;
- 	TIFFDirectory* td = &tif->tif_dir;
- 	int status = 1;
- 	uint32 v32, i, v;
-@@ -660,17 +661,19 @@ end:
- 	va_end(ap);
- 	return (status);
- badvalue:
-+	fip = TIFFFieldWithTag(tif, tag);
- 	TIFFErrorExt(tif->tif_clientdata, module,
- 		     "%s: Bad value %u for \"%s\" tag",
- 		     tif->tif_name, v,
--		     TIFFFieldWithTag(tif, tag)->field_name);
-+		     fip ? fip->field_name : "Unknown");
- 	va_end(ap);
- 	return (0);
- badvalue32:
-+	fip = TIFFFieldWithTag(tif, tag);
- 	TIFFErrorExt(tif->tif_clientdata, module,
- 		     "%s: Bad value %u for \"%s\" tag",
- 		     tif->tif_name, v32,
--		     TIFFFieldWithTag(tif, tag)->field_name);
-+		     fip ? fip->field_name : "Unknown");
- 	va_end(ap);
- 	return (0);
- }
---- tiff-4.0.0/libtiff/tif_dirread.c.orig	2011-12-22 00:18:41.000000000 +0100
-+++ tiff-4.0.0/libtiff/tif_dirread.c	2011-12-24 10:39:34.932698478 +0100
-@@ -3897,6 +3897,7 @@ TIFFReadDirectory(TIFF* tif)
- 		 * Attempt to deal with a missing StripByteCounts tag.
- 		 */
- 		if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
-+			const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- 			/*
- 			 * Some manufacturers violate the spec by not giving
- 			 * the size of the strips.  In this case, assume there
-@@ -3912,7 +3913,7 @@ TIFFReadDirectory(TIFF* tif)
- 			TIFFWarningExt(tif->tif_clientdata, module,
- 				"TIFF directory is missing required "
- 				"\"%s\" field, calculating from imagelength",
--				TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+				fip ? fip->field_name : "Unknown");
- 			if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- 			    goto bad;
- 		/*
-@@ -3940,6 +3941,7 @@ TIFFReadDirectory(TIFF* tif)
-                            && _TIFFFillStriles(tif)
- 			   && tif->tif_dir.td_stripoffset[0] != 0
- 			   && BYTECOUNTLOOKSBAD) {
-+			const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- 			/*
- 			 * XXX: Plexus (and others) sometimes give a value of
- 			 * zero for a tag when they don't know what the
-@@ -3948,7 +3950,7 @@ TIFFReadDirectory(TIFF* tif)
- 			 */
- 			TIFFWarningExt(tif->tif_clientdata, module,
- 			    "Bogus \"%s\" field, ignoring and calculating from imagelength",
--			    TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+			    fip ? fip->field_name : "Unknown");
- 			if(EstimateStripByteCounts(tif, dir, dircount) < 0)
- 			    goto bad;
- 
-@@ -3959,6 +3961,7 @@ TIFFReadDirectory(TIFF* tif)
- 			   && tif->tif_dir.td_stripbytecount[0] != tif->tif_dir.td_stripbytecount[1]
- 			   && tif->tif_dir.td_stripbytecount[0] != 0
- 			   && tif->tif_dir.td_stripbytecount[1] != 0 ) {
-+			const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- 			/*
- 			 * XXX: Some vendors fill StripByteCount array with
- 			 * absolutely wrong values (it can be equal to
-@@ -3971,7 +3974,7 @@ TIFFReadDirectory(TIFF* tif)
- 			 */
- 			TIFFWarningExt(tif->tif_clientdata, module,
- 			    "Wrong \"%s\" field, ignoring and calculating from imagelength",
--			    TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+			    fip ? fip->field_name : "Unknown");
- 			if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- 			    goto bad;
- #endif /* !defined(DEFER_STRILE_LOAD) */