Merge embargo branch

libtiff.spec

@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Name: libtiff
 Version: 3.6.1
-Release: 6
+Release: 7
 License: distributable
 Group: System Environment/Libraries
 Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz
@@ -13,6 +13,9 @@ Patch4: libtiff-v3.6.1-64bit.patch
 Patch5: libtiff-v3.5.7-largefile.patch
 Patch6: libtiff-v3.6.1-makeflags.patch
 Patch7: libtiff-v3.6.1-hylafax.patch
+Patch8: libtiff-v3.6.1-alt-bound.patch
+Patch9: libtiff-v3.6.1-chris-bound.patch
+Patch10: libtiff-v3.6.1-alt-bound2.patch
 URL: http://www.libtiff.org/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: zlib-devel zlib libjpeg-devel libjpeg
@@ -52,6 +55,9 @@ install the libtiff package.
 %patch5 -p1 -b .largefile
 %patch6 -p1 -b .makeflags
 %patch7 -p1 -b .hylafax
+%patch8 -p1 -b .alt-bound
+%patch9 -p1 -b .chris-bound
+%patch10 -p1 -b .alt-bound2
 find . -type d -name CVS | xargs -r rm -frv
 
 %build
@@ -109,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 14 2004 Matthias Clasen <mclasen@redhat.com> 3.6.1-7
+- fix some integer and buffer overflows (#134853, #134848)
+
 * Tue Oct 12 2004 Matthias Clasen <mclasen@redhat.com> 3.6.1-6
 - fix http://bugzilla.remotesensing.org/show_bug.cgi?id=483