updated for 4.0.2 release

11 files changed, 152 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 344a7a6f..4eab3bba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-15  Frank Warmerdam  <warmerdam@google.com>
 
+	*  libtiff 4.0.2 released.
+
 	* tools/tif2pdf.c, tools/tifdump.c: avoid unitialized variable
 	warnings with clang.
 
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 5752cc44..418fce23 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -107,7 +107,7 @@ Notes on releasing.
     ftp.remotesensing.org ftp site.
 
       scp tiff-*.tar.gz tiff-*.zip \
-    	 frankw@upload.osgeo.org:/osgeo/download/libtiff
+    	 warmerdam@upload.osgeo.org:/osgeo/download/libtiff
 
 15. Announce to list, tiff@lists.maptools.org
 
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 52cbf447..d32f7156 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20120218
+20120615
diff --git a/VERSION b/VERSION
index 1454f6ed..4d54dadd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.1
+4.0.2
diff --git a/configure b/configure
index 8d1f8d20..0b8a4ec9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for LibTIFF Software 4.0.1.
+# Generated by GNU Autoconf 2.68 for LibTIFF Software 4.0.2.
 #
 # Report bugs to <tiff@lists.maptools.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LibTIFF Software'
 PACKAGE_TARNAME='tiff'
-PACKAGE_VERSION='4.0.1'
-PACKAGE_STRING='LibTIFF Software 4.0.1'
+PACKAGE_VERSION='4.0.2'
+PACKAGE_STRING='LibTIFF Software 4.0.2'
 PACKAGE_BUGREPORT='tiff@lists.maptools.org'
 PACKAGE_URL=''
 
@@ -1379,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LibTIFF Software 4.0.1 to adapt to many kinds of systems.
+\`configure' configures LibTIFF Software 4.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LibTIFF Software 4.0.1:";;
+     short | recursive ) echo "Configuration of LibTIFF Software 4.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1629,7 +1629,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LibTIFF Software configure 4.0.1
+LibTIFF Software configure 4.0.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2351,7 +2351,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LibTIFF Software $as_me 4.0.1, which was
+It was created by LibTIFF Software $as_me 4.0.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3246,7 +3246,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tiff'
- VERSION='4.0.1'
+ VERSION='4.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3312,14 +3312,14 @@ fi
 
 LIBTIFF_MAJOR_VERSION=4
 LIBTIFF_MINOR_VERSION=0
-LIBTIFF_MICRO_VERSION=1
+LIBTIFF_MICRO_VERSION=2
 LIBTIFF_ALPHA_VERSION=
 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
 LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
 
-LIBTIFF_CURRENT=5
-LIBTIFF_REVISION=6
-LIBTIFF_AGE=0
+LIBTIFF_CURRENT=6
+LIBTIFF_REVISION=0
+LIBTIFF_AGE=1
 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
 
 # This is a special hack for OpenBSD and MirOS systems. The dynamic linker
@@ -20446,7 +20446,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LibTIFF Software $as_me 4.0.1, which was
+This file was extended by LibTIFF Software $as_me 4.0.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20512,7 +20512,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LibTIFF Software config.status 4.0.1
+LibTIFF Software config.status 4.0.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b5a7e5ad..1405eb57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl OF THIS SOFTWARE.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.64)
-AC_INIT([LibTIFF Software],[4.0.1],[tiff@lists.maptools.org],[tiff])
+AC_INIT([LibTIFF Software],[4.0.2],[tiff@lists.maptools.org],[tiff])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(m4)
 AC_LANG(C)
@@ -41,7 +41,7 @@ dnl Versioning.
 dnl Don't fill the ALPHA_VERSION field, if not applicable.
 LIBTIFF_MAJOR_VERSION=4
 LIBTIFF_MINOR_VERSION=0
-LIBTIFF_MICRO_VERSION=1
+LIBTIFF_MICRO_VERSION=2
 LIBTIFF_ALPHA_VERSION=
 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
 dnl This will be used with the 'make release' target
@@ -76,9 +76,9 @@ dnl  5. If any interfaces have been added since the last public release, then
 dnl     increment age.
 dnl  6. If any interfaces have been removed since the last public release,
 dnl     then set age to 0.                                
-LIBTIFF_CURRENT=5
-LIBTIFF_REVISION=6
-LIBTIFF_AGE=0
+LIBTIFF_CURRENT=6
+LIBTIFF_REVISION=0
+LIBTIFF_AGE=1
 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
 
 # This is a special hack for OpenBSD and MirOS systems. The dynamic linker
diff --git a/html/Makefile.am b/html/Makefile.am
index 9a0e37e1..8cb6706c 100644
--- a/html/Makefile.am
+++ b/html/Makefile.am
@@ -76,7 +76,9 @@ docfiles = \
 	v3.9.0beta.html \
 	v3.9.1.html \
 	v3.9.2.html \
-	v4.0.0.html
+	v4.0.0.html \
+	v4.0.1.html \
+	v4.0.2.html
 
 dist_doc_DATA = $(docfiles)
 
diff --git a/html/Makefile.in b/html/Makefile.in
index 96cafb92..be2f95e5 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -349,7 +349,9 @@ docfiles = \
 	v3.9.0beta.html \
 	v3.9.1.html \
 	v3.9.2.html \
-	v4.0.0.html
+	v4.0.0.html \
+	v4.0.1.html \
+	v4.0.2.html
 
 dist_doc_DATA = $(docfiles)
 SUBDIRS = images man
diff --git a/html/index.html b/html/index.html
index f5434dfa..aa38485e 100644
--- a/html/index.html
+++ b/html/index.html
@@ -24,7 +24,7 @@
     </tr>
     <tr>
       <th>Latest Stable Release</th>
-      <td><a href="v4.0.1.html">v4.0.1</a></td>
+      <td><a href="v4.0.2.html">v4.0.2</a></td>
     </tr>
     <tr>
       <th>Master Download Site</th>
@@ -117,7 +117,7 @@
   </ul>
   <hr>
   <p>
-    Last updated  $Date: 2012-02-18 21:53:27 $.
+    Last updated  $Date: 2012-06-16 00:19:37 $.
   </p>
 </body>
 </html>
diff --git a/html/v4.0.2.html b/html/v4.0.2.html
new file mode 100644
index 00000000..78d20087
--- /dev/null
+++ b/html/v4.0.2.html
@@ -0,0 +1,118 @@
+<HTML>
+<HEAD>
+<TITLE>
+	Changes in TIFF v4.0.2
+</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=white>
+<FONT FACE="Helvetica, Arial, Sans">
+
+<BASEFONT SIZE=4>
+<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
+<BASEFONT SIZE=3>
+
+<UL>
+<HR SIZE=4 WIDTH=65% ALIGN=left>
+<B>Current Version</B>: v4.0.2<BR>
+<B>Previous Version</B>: <A HREF=v4.0.0.html>v4.0.1</a><BR>
+<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
+ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
+<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
+http://www.remotesensing.org/libtiff</a> 
+<HR SIZE=4 WIDTH=65% ALIGN=left>
+</UL>
+
+<P>
+This document describes the changes made to the software between the
+<I>previous</I> and <I>current</I> versions (see above).  If you don't
+find something listed here, then it was not done in this timeframe, or
+it was not considered important enough to be mentioned.  The following
+information is located here:
+<UL>
+<LI><A HREF="#highlights">Major Changes</A>
+<LI><A HREF="#configure">Changes in the software configuration</A>
+<LI><A HREF="#libtiff">Changes in libtiff</A>
+<LI><A HREF="#tools">Changes in the tools</A>
+<LI><A HREF="#contrib">Changes in the contrib area</A>
+</UL>
+<p> 
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
+
+<UL>
+
+	<li> None
+
+</UL>
+
+
+<P><HR WIDTH=65% ALIGN=left>
+<!--------------------------------------------------------------------------->
+
+<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
+
+<UL>
+
+  <li> None
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
+
+<UL>
+
+  <li> tif_getimage.c: added support for _SEPARATED CMYK images.
+
+  <li> tif_getimage.c: Added support for greyscale + alpha. 
+
+  <li> Added TIFFCreateCustomDirectory() and TIFFCreateEXIFDirectory() functions.
+  <li> tif_print.c: Lots of fixes around printing corrupt or
+    hostile input.
+    
+  <li> Improve handling of corrupt ycbcrsubsampling values. 
+
+  <li> tif_unix.c: use strerror to get meaningful error messages.
+
+  <li> tif_jpeg.c: fix serious bugs in JPEGDecodeRaw().
+
+  <li> tif_jpeg.c:  Fix size overflow (zdi-can-1221,CVE-2012-1173).
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!-------------------------------------------------------------------------->
+	
+<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
+
+<UL>
+
+	<li> tiff2pdf:  Defend against integer overflows while
+	calculating required buffer sizes (CVE-2012-2113).
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
+
+<UL> 
+
+	<li> None
+
+</UL>
+
+Last updated $Date: 2012-06-16 00:19:37 $.
+
+</BODY>
+</HTML>
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index fbdc5a10..38ee9fab 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.1\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
 /*
  * This define can be used in code that requires
  * compilation-related definitions specific to a
@@ -6,4 +6,4 @@
  * version checking should be done based on the
  * string returned by TIFFGetVersion.
  */
-#define TIFFLIB_VERSION 20120218
+#define TIFFLIB_VERSION 20120615