https://github.com/libsdl-org/libtiff/commit/b60cc865088979923cc8e5f2124b034f68cae776
From b60cc865088979923cc8e5f2124b034f68cae776 Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <[EMAIL REDACTED]>
Date: Fri, 11 Jun 2010 22:02:12 +0000
Subject: [PATCH] * libtiff 3.9.3 released.
---
ChangeLog | 2 +
RELEASE-DATE | 2 +-
VERSION | 2 +-
build/Makefile.in | 2 +-
configure | 22 ++---
configure.ac | 4 +-
contrib/dbs/xtiff/Makefile.in | 2 +-
html/Makefile.in | 2 +-
html/index.html | 4 +-
html/v3.9.3.html | 160 ++++++++++++++++++++++++++++++++++
libtiff/tiffvers.h | 11 +--
11 files changed, 184 insertions(+), 29 deletions(-)
create mode 100644 html/v3.9.3.html
diff --git a/ChangeLog b/ChangeLog
index fec736cd..7d4bb50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2010-06-11 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+ * libtiff 3.9.3 released.
+
* tools/tiffcp.c (tiffcp): Applied Tom Lane's patch to reject
YCbCr subsampled data since tiffcp currently doesn't support it.
http://bugzilla.maptools.org/show_bug.cgi?id=2097
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 1f15bfe5..9e5fb1cf 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20091104
+20100611
diff --git a/VERSION b/VERSION
index 2009c7df..820476af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.9.2
+3.9.3
diff --git a/build/Makefile.in b/build/Makefile.in
index 51a63113..1adca1f9 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.1.2.14 2010-06-11 20:31:21 bfriesen Exp $
+# $Id: Makefile.in,v 1.1.2.15 2010-06-11 22:02:15 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/configure b/configure
index 520e4817..48f008f0 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.65 for LibTIFF Software 3.9.2.
+# Generated by GNU Autoconf 2.65 for LibTIFF Software 3.9.3.
#
# Report bugs to <tiff@lists.maptools.org>.
#
@@ -562,8 +562,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LibTIFF Software'
PACKAGE_TARNAME='tiff'
-PACKAGE_VERSION='3.9.2'
-PACKAGE_STRING='LibTIFF Software 3.9.2'
+PACKAGE_VERSION='3.9.3'
+PACKAGE_STRING='LibTIFF Software 3.9.3'
PACKAGE_BUGREPORT='tiff@lists.maptools.org'
PACKAGE_URL=''
@@ -1355,7 +1355,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 3.9.2 to adapt to many kinds of systems.
+\`configure' configures LibTIFF Software 3.9.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LibTIFF Software 3.9.2:";;
+ short | recursive ) echo "Configuration of LibTIFF Software 3.9.3:";;
esac
cat <<\_ACEOF
@@ -1588,7 +1588,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LibTIFF Software configure 3.9.2
+LibTIFF Software configure 3.9.3
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2312,7 +2312,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 3.9.2, which was
+It was created by LibTIFF Software $as_me 3.9.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3239,7 +3239,7 @@ fi
# Define the identity of the package.
PACKAGE='tiff'
- VERSION='3.9.2'
+ VERSION='3.9.3'
cat >>confdefs.h <<_ACEOF
@@ -3305,7 +3305,7 @@ fi
LIBTIFF_MAJOR_VERSION=3
LIBTIFF_MINOR_VERSION=9
-LIBTIFF_MICRO_VERSION=2
+LIBTIFF_MICRO_VERSION=3
LIBTIFF_ALPHA_VERSION=
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
@@ -19267,7 +19267,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 3.9.2, which was
+This file was extended by LibTIFF Software $as_me 3.9.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19333,7 +19333,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 3.9.2
+LibTIFF Software config.status 3.9.3
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index fdc13975..5cafabbd 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],[3.9.2],[tiff@lists.maptools.org],[tiff])
+AC_INIT([LibTIFF Software],[3.9.3],[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=3
LIBTIFF_MINOR_VERSION=9
-LIBTIFF_MICRO_VERSION=2
+LIBTIFF_MICRO_VERSION=3
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
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index 6be16b3e..c0357f4a 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.36.2.14 2010-06-11 20:31:22 bfriesen Exp $
+# $Id: Makefile.in,v 1.36.2.15 2010-06-11 22:02:15 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/Makefile.in b/html/Makefile.in
index 439fc42f..bdde77e0 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.49.2.14 2010-06-11 20:31:22 bfriesen Exp $
+# $Id: Makefile.in,v 1.49.2.15 2010-06-11 22:02:15 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/index.html b/html/index.html
index bb0e1616..dfa68961 100644
--- a/html/index.html
+++ b/html/index.html
@@ -24,7 +24,7 @@ <h1>LibTIFF - TIFF Library and Utilities</h1>
</tr>
<tr>
<th>Latest Stable Release</th>
- <td><a href="v3.9.2.html">v3.9.2</a></td>
+ <td><a href="v3.9.3.html">v3.9.3</a></td>
</tr>
<tr>
<th>Master Download Site</th>
@@ -117,7 +117,7 @@ <h1>LibTIFF - TIFF Library and Utilities</h1>
</ul>
<hr>
<p>
- Last updated $Date: 2009-11-04 17:28:46 $.
+ Last updated $Date: 2010-06-11 22:02:15 $.
</p>
</body>
</html>
diff --git a/html/v3.9.3.html b/html/v3.9.3.html
new file mode 100644
index 00000000..122f07fd
--- /dev/null
+++ b/html/v3.9.3.html
@@ -0,0 +1,160 @@
+<HTML>
+<HEAD>
+<TITLE>
+ Changes in TIFF v3.9.3
+</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=white>
+<FONT FACE="Helvetica, Arial, Sans">
+<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>: v3.9.3<BR>
+<B>Previous Version</B>: <A HREF=v3.9.2.html>v3.9.2</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="#hightlights">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> Fixes for CVE-2010-1411.
+
+ <li> Various reported bug fixes.
+
+</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> libtool is updated to version 2.2.10.
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
+
+<UL>
+ <li> Fix a couple of issues that trigger failures in some
+ cases when using TIFFReadScanline() with JPEG compressed
+ subsampled ycbcr images.
+ http://bugzilla.maptools.org/show_bug.cgi?id=1936
+
+ <li> Ensure tile and scanline sizes are reset when moving to
+ new directories.
+ http://bugzilla.maptools.org/show_bug.cgi?id=1936
+
+ <li> Do not generate a JPEGTables tag when creating the JPEG
+ TIFF as is is not required in order to prevent it from being
+ unused and filled with invalid data. (Leave it to be
+ generated by later activity.)
+ http://bugzilla.maptools.org/show_bug.cgi?id=2135
+
+ <li> Don't return error on badly-terminated MMR strips.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2029
+
+ <li> Have TIFFTAG_REFERENCEBLACKWHITE always print 6 floats
+ instead of 2*SamplesPerPixel.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2186
+
+ <li> Ensure that JPEG quality is always set in
+ JPEGPreEncode(), not just when we want to output local tables.
+ Otherwise the quality used during compression may not be right
+ and might not match the tables in the tables tag. This bug
+ only occurs when seeking between directories in the midst of
+ writing blocks. http://trac.osgeo.org/gdal/ticket/3539
+
+ <li> OJPEG: Report an error and avoid a crash if the input
+ file is so broken that the strip offsets are not defined.
+
+ <li> Eliminate FAX3 decoder buffer overrun possibility
+ (CVE-2010-1411).
+
+ <li> Restore ReferenceBlackWhite as a non-custom field. This
+ avoids a multi-thread reentrancy problem as well as fixing
+ output of wrong tag value due to redundant definitions for the
+ same tag in the tiffFieldInfo[] array. Resolves
+ http://bugzilla.maptools.org/show_bug.cgi?id=2185
+
+</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: Write the JPEG SOI headers into the TIFF strip
+ data rather than skipping them. This fixes the ability to view in
+ Acrobat Reader, Evince, and Ghostscript.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2135
+
+ <li> ppm2tiff: While case for parsing comment line
+ requires extra parenthesis to work as expected. Reported by
+ Thomas Sinclair.
+
+ <li> tiffcp: add a new option -x to force merged tiff
+ file PAGENUMBER value in sequence for users who care the page
+ sequence, this will also prevent tiff2pdf from creating pdf file from
+ the merged tiff file with wrong page sequence.
+
+ <li> tiffcp: Applied Tom Lane's patch to reject YCbCr
+ subsampled data since tiffcp currently doesn't support it.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2097
+
+</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: 2010-06-11 22:02:15 $.
+
+</BODY>
+</HTML>
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index cf08e8d2..ce293e7a 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.3\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,11 +6,4 @@
* version checking should be done based on the
* string returned by TIFFGetVersion.
*/
-#define TIFFLIB_VERSION 20091104
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 8
- * fill-column: 78
- * End:
- */
+#define TIFFLIB_VERSION 20100611