[libtiff/f13/master] Update to libtiff 3.9.5

[Tom Lane]

commit ce710b09ac36afdd41c6e8c6994eaecb26a6c816
Author: Tom Lane <tgl at redhat.com>
Date:   Tue Apr 12 23:00:08 2011 -0400

    Update to libtiff 3.9.5

 .gitignore                     |    2 +-
 libtiff-3samples.patch         |   21 -----------
 libtiff-CVE-2011-0192.patch    |   27 ---------------
 libtiff-CVE-2011-1167.patch    |   53 -----------------------------
 libtiff-acversion.patch        |   16 ---------
 libtiff-checkbytecount.patch   |   48 --------------------------
 libtiff-getimage-64bit.patch   |   48 --------------------------
 libtiff-gif2tiff-overrun.patch |   22 ------------
 libtiff-mantypo.patch          |   17 ---------
 libtiff-scanlinesize.patch     |   72 ----------------------------------------
 libtiff-subsampling.patch      |   51 ----------------------------
 libtiff-tiffdump.patch         |   35 -------------------
 libtiff-unknown-fix.patch      |   47 --------------------------
 libtiff-ycbcr-clamp.patch      |   35 -------------------
 libtiff.spec                   |   36 ++++----------------
 sources                        |    2 +-
 16 files changed, 9 insertions(+), 523 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37e1552..9d99bf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-tiff-3.9.4.tar.gz
+/tiff-3.9.5.tar.gz
diff --git a/libtiff.spec b/libtiff.spec
index ac246a6..8aa25a2 100644
--- a/libtiff.spec
+++ b/libtiff.spec
@@ -1,26 +1,13 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
-Version: 3.9.4
-Release: 4%{?dist}
+Version: 3.9.5
+Release: 1%{?dist}
 
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
 
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-Patch1: libtiff-acversion.patch
-Patch2: libtiff-mantypo.patch
-Patch3: libtiff-scanlinesize.patch
-Patch4: libtiff-getimage-64bit.patch
-Patch5: libtiff-ycbcr-clamp.patch
-Patch6: libtiff-3samples.patch
-Patch7: libtiff-subsampling.patch
-Patch8: libtiff-unknown-fix.patch
-Patch9: libtiff-checkbytecount.patch
-Patch10: libtiff-tiffdump.patch
-Patch11: libtiff-CVE-2011-0192.patch
-Patch12: libtiff-CVE-2011-1167.patch
-Patch13: libtiff-gif2tiff-overrun.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel libjpeg-devel
@@ -73,20 +60,6 @@ image files using the libtiff library.
 %prep
 %setup -q -n tiff-%{version}
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-
 # Use build system's libtool.m4, not the one in the package.
 rm -f libtool.m4
 
@@ -197,6 +170,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 12 2011 Tom Lane <tgl at redhat.com> 3.9.5-1
+- Update to libtiff 3.9.5, incorporating all our previous patches plus other
+  fixes, notably the fix for CVE-2009-5022
+Related: #695885
+
 * Mon Mar 21 2011 Tom Lane <tgl at redhat.com> 3.9.4-4
 - Fix incorrect fix for CVE-2011-0192
 Resolves: #684007
diff --git a/sources b/sources
index a73728b..04027f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2006c1bdd12644dbf02956955175afd6  tiff-3.9.4.tar.gz
+8fc7ce3b4e1d0cc8a319336967815084  tiff-3.9.5.tar.gz