Changes 4.0.3:

MAJOR CHANGES:
None
CHANGES IN THE SOFTWARE CONFIGURATION:
Updated to use Automake 1.12.4. Avoids security problem with 'make distcheck' (CVE-2012-3386).
CHANGES IN LIBTIFF:
Various memory buffer access fixes.
Fix handling when writing RGBA jpeg compressed imagery (http://trac.osgeo.org/gdal/ticket/4732).
Fix to work properly with IJG JPEG 7+.
New functions TIFFFieldTag(), TIFFFieldName(), TIFFFieldDataType(), TIFFFieldPassCount(), TIFFFieldReadCount(), TIFFFieldWriteCount() to use as external accessors for the opaque type TIFFField.
Fix bug rewriting image tiles in a compressed file (http://trac.osgeo.org/gdal/ticket/4771).
Add TIFF/FX tag support in libtiff.
CHANGES IN THE TOOLS:
tiff2pdf: Fail when TIFFSetDirectory() fails. This prevents core dumps or perhaps even arbitrary code execution when processing a corrupt input file (CVE-2012-3401).
tiff2pdf: Fix two places where t2p_error didn't get set after a malloc failure. No crash risk AFAICS, but the program might not report exit code 1 as desired.
CHANGES IN THE CONTRIB AREA:
None

5 files changed, 25 insertions, 28 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index efbc88fe335..f251aadab95 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2012/07/19 21:41:45 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2012/10/01 18:11:29 adam Exp $
 
-DISTNAME=	tiff-4.0.2
-PKGREVISION=	1
+DISTNAME=	tiff-4.0.3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
@@ -9,6 +8,7 @@ MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.remotesensing.org/libtiff/
 COMMENT=	Library and tools for reading and writing TIFF data files
+LICENSE=	mit
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -17,7 +17,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-rpath
 CONFIGURE_ARGS+=	--enable-cxx
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index 086ceff1bf8..8c41c08685d 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2012/06/20 21:07:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/10/01 18:11:29 adam Exp $
 bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
@@ -59,6 +59,12 @@ man/man1/tiffsv.1
 man/man3/TIFFClose.3
 man/man3/TIFFDataWidth.3
 man/man3/TIFFError.3
+man/man3/TIFFFieldDataType.3
+man/man3/TIFFFieldName.3
+man/man3/TIFFFieldPassCount.3
+man/man3/TIFFFieldReadCount.3
+man/man3/TIFFFieldTag.3
+man/man3/TIFFFieldWriteCount.3
 man/man3/TIFFFlush.3
 man/man3/TIFFGetField.3
 man/man3/TIFFOpen.3
@@ -131,6 +137,12 @@ share/doc/tiff/html/libtiff.html
 share/doc/tiff/html/man/TIFFClose.3tiff.html
 share/doc/tiff/html/man/TIFFDataWidth.3tiff.html
 share/doc/tiff/html/man/TIFFError.3tiff.html
+share/doc/tiff/html/man/TIFFFieldDataType.3tiff.html
+share/doc/tiff/html/man/TIFFFieldName.3tiff.html
+share/doc/tiff/html/man/TIFFFieldPassCount.3tiff.html
+share/doc/tiff/html/man/TIFFFieldReadCount.3tiff.html
+share/doc/tiff/html/man/TIFFFieldTag.3tiff.html
+share/doc/tiff/html/man/TIFFFieldWriteCount.3tiff.html
 share/doc/tiff/html/man/TIFFFlush.3tiff.html
 share/doc/tiff/html/man/TIFFGetField.3tiff.html
 share/doc/tiff/html/man/TIFFOpen.3tiff.html
@@ -165,6 +177,7 @@ share/doc/tiff/html/man/TIFFsize.3tiff.html
 share/doc/tiff/html/man/TIFFstrip.3tiff.html
 share/doc/tiff/html/man/TIFFswab.3tiff.html
 share/doc/tiff/html/man/TIFFtile.3tiff.html
+share/doc/tiff/html/man/bmp2tiff.1.html
 share/doc/tiff/html/man/fax2ps.1.html
 share/doc/tiff/html/man/fax2tiff.1.html
 share/doc/tiff/html/man/gif2tiff.1.html
@@ -232,4 +245,4 @@ share/doc/tiff/html/v3.9.1.html
 share/doc/tiff/html/v3.9.2.html
 share/doc/tiff/html/v4.0.0.html
 share/doc/tiff/html/v4.0.1.html
-share/doc/tiff/html/v${PKGVERSION}.html
+share/doc/tiff/html/v4.0.2.html
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 13abffb3b86..26ebe626b99 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.57 2012/07/19 21:41:45 wiz Exp $
+$NetBSD: distinfo,v 1.58 2012/10/01 18:11:30 adam Exp $
 
-SHA1 (tiff-4.0.2.tar.gz) = d84b7b33a6cfb3d15ca386c8c16b05047f8b5352
-RMD160 (tiff-4.0.2.tar.gz) = 520c5a6d17d1b0c3957e3889b66eadce0accf53f
-Size (tiff-4.0.2.tar.gz) = 2022814 bytes
-SHA1 (patch-configure) = 0e86c6d69783333c03d6241e1824f68602f3c732
-SHA1 (patch-tools_tiff2pdf.c) = bb2099fce1907e27ff646cf5f33ff3d275e5515a
+SHA1 (tiff-4.0.3.tar.gz) = 652e97b78f1444237a82cbcfe014310e776eb6f0
+RMD160 (tiff-4.0.3.tar.gz) = eacd725fb3c299682c1c2e508049d98acd170f31
+Size (tiff-4.0.3.tar.gz) = 2051630 bytes
+SHA1 (patch-configure) = 1fb9ef790a59ac9c1396dd8e962c75946e2c998a
diff --git a/graphics/tiff/patches/patch-configure b/graphics/tiff/patches/patch-configure
index fd82013d3b7..f53e21d1c04 100644
--- a/graphics/tiff/patches/patch-configure
+++ b/graphics/tiff/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2012/02/06 12:32:08 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2012/10/01 18:11:30 adam Exp $
 
 Fix unportable test(1) construct.
 
 --- configure.orig	2012-01-28 22:35:42.000000000 +0000
 +++ configure
-@@ -18044,7 +18044,7 @@ if test "${with_jpeg12_lib+set}" = set; 
+@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set; 
  fi
  
  
diff --git a/graphics/tiff/patches/patch-tools_tiff2pdf.c b/graphics/tiff/patches/patch-tools_tiff2pdf.c
deleted file mode 100644
index 7cfe7943acf..00000000000
--- a/graphics/tiff/patches/patch-tools_tiff2pdf.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tools_tiff2pdf.c,v 1.1 2012/07/19 21:41:45 wiz Exp $
-
-CVE-2012-3401, buffer overflow in tiff2pdf
-
---- tools/tiff2pdf.c.orig	2012-06-15 21:51:54.000000000 +0000
-+++ tools/tiff2pdf.c
-@@ -1066,6 +1066,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* 
- 				"Can't set directory %u of input file %s", 
- 				i,
- 				TIFFFileName(input));
-+			t2p->t2p_error = T2P_ERR_ERROR;
- 			return;
- 		}
- 		if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){