Two new version releases and 2 patches to stable (see ChangeLog).

(Portage version: 2.1.9.46/cvs/Linux x86_64, RepoMan options: --force)

7 files changed, 153 insertions, 21 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 0f0e5954f5a3..b8e28abef450 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/tiff
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.166 2010/11/05 21:01:24 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.167 2011/04/16 21:25:41 nerdboy Exp $
+
+*tiff-4.0.0_beta7 (16 Apr 2011)
+*tiff-3.9.5 (16 Apr 2011)
+*tiff-3.9.4-r1 (16 Apr 2011)
+
+  16 Apr 2011; Steve Arnold <nerdboy@gentoo.org> -tiff-3.9.4.ebuild,
+  +tiff-3.9.4-r1.ebuild, +files/tiff-3.9.4-CVE-2011-0192.patch,
+  +files/tiff-3.9.4-CVE-2011-1167.patch, +tiff-3.9.5.ebuild,
+  -tiff-4.0.0_beta6.ebuild, +tiff-4.0.0_beta7.ebuild,
+  -files/tiff-4.0.0_beta6-cr2-bitspersample.patch:
+  Two new version releases and 2 patches to stable.  Should cover bugs
+  357271, 359871, and 363121.
 
   05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   tiff-4.0.0_beta6.ebuild:
diff --git a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch
new file mode 100644
index 000000000000..dbeb8825db0a
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch
@@ -0,0 +1,13 @@
+Index: libtiff/tif_fax3.h
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.h,v
+retrieving revision 1.7
+retrieving revision 1.9
+diff -r1.7 -r1.9
+480a481,486
+> 	    if (b1 <= (int) (a0 + TabEnt->Param)) {			\
+> 		if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) {	\
+> 		    unexpected("VL", a0);				\
+> 		    goto eol2d;						\
+> 		}							\
+> 	    }								\
diff --git a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch
new file mode 100644
index 000000000000..5783a2b23a0c
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch
@@ -0,0 +1,62 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/ChangeLog,v
+retrieving revision 1.602.2.130
+diff -r1.602.2.130 ChangeLog
+0a1,7
+> 2011-03-12  Frank Warmerdam  <warmerdam@pobox.com>
+> 
+> 	* libtiff/tif_thunder.c: Correct potential buffer overflow with 
+> 	thunder encoded files with wrong bitspersample set.  The libtiff 
+> 	development team would like to thank Marin Barbella and TippingPoint's
+> 	Zero Day Initiative for reporting this vulnerability (ZDI-CAN-1004).
+> 
+Index: libtiff/tif_thunder.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_thunder.c,v
+retrieving revision 1.5.2.1
+diff -r1.5.2.1 tif_thunder.c
+27a28
+> #include <assert.h>
+58,62c59,65
+< #define	SETPIXEL(op, v) { \
+< 	lastpixel = (v) & 0xf; \
+< 	if (npixels++ & 1) \
+< 	    *op++ |= lastpixel; \
+< 	else \
+---
+> #define	SETPIXEL(op, v) {                     \
+> 	lastpixel = (v) & 0xf;                \
+>         if ( npixels < maxpixels )         \
+>         {                                     \
+> 	  if (npixels++ & 1)                  \
+> 	    *op++ |= lastpixel;               \
+> 	  else                                \
+63a67,84
+>         }                                     \
+> }
+> 
+> static int
+> ThunderSetupDecode(TIFF* tif)
+> {
+> 	static const char module[] = "ThunderSetupDecode";
+> 
+>         if( tif->tif_dir.td_bitspersample != 4 )
+>         {
+>                 TIFFErrorExt(tif->tif_clientdata, module,
+>                              "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.",
+>                              (int) tif->tif_dir.td_bitspersample );
+>                 return 0;
+>         }
+>         
+> 
+> 	return (1);
+145c166,167
+< 	return (1);
+---
+> 
+>         return (1);
+153a176
+>         tif->tif_setupdecode = ThunderSetupDecode;
+165a189
+> 
diff --git a/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch b/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
deleted file mode 100644
index a1e45db195ca..000000000000
--- a/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 64c39fc..60bde82 100644
---- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -2727,7 +2727,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleShort(TIFF* tif, TIFFDi
- 	uint16* m;
- 	uint16* na;
- 	uint16 nb;
--	if (direntry->tdir_count!=(uint64)tif->tif_dir.td_samplesperpixel)
-+	if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
- 		return(TIFFReadDirEntryErrCount);
- 	err=TIFFReadDirEntryShortArray(tif,direntry,&m);
- 	if (err!=TIFFReadDirEntryErrOk)
diff --git a/media-libs/tiff/tiff-3.9.4.ebuild b/media-libs/tiff/tiff-3.9.4-r1.ebuild
index 3f939e344991..a4bf8e9e3833 100644
--- a/media-libs/tiff/tiff-3.9.4.ebuild
+++ b/media-libs/tiff/tiff-3.9.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4.ebuild,v 1.10 2010/07/23 20:43:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4-r1.ebuild,v 1.1 2011/04/16 21:25:41 nerdboy Exp $
 
 EAPI=3
-inherit libtool
+inherit eutils libtool
 
 DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
 HOMEPAGE="http://www.remotesensing.org/libtiff/"
@@ -14,11 +14,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg static-libs zlib"
 
+RDEPEND="${DEPEND}"
+
 DEPEND="jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
 	zlib? ( sys-libs/zlib )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2011-0192.patch
+	epatch "${FILESDIR}"/${P}-CVE-2011-1167.patch
 	elibtoolize
 }
 
diff --git a/media-libs/tiff/tiff-3.9.5.ebuild b/media-libs/tiff/tiff-3.9.5.ebuild
new file mode 100644
index 000000000000..473818a88ed6
--- /dev/null
+++ b/media-libs/tiff/tiff-3.9.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.5.ebuild,v 1.1 2011/04/16 21:25:41 nerdboy Exp $
+
+EAPI=3
+inherit libtool
+
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
+HOMEPAGE="http://www.remotesensing.org/libtiff/"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg static-libs zlib"
+
+RDEPEND="${DEPEND}"
+
+DEPEND="jpeg? ( virtual/jpeg )
+	jbig? ( media-libs/jbigkit )
+	zlib? ( sys-libs/zlib )"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable cxx) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		--without-x \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+	if use jbig; then
+		echo
+		elog "JBIG support is intended for Hylafax fax compression, so we"
+		elog "really need more feedback in other areas (most testing has"
+		elog "been done with fax).  Be sure to recompile anything linked"
+		elog "against tiff if you rebuild it with jbig support."
+		echo
+	fi
+}
diff --git a/media-libs/tiff/tiff-4.0.0_beta6.ebuild b/media-libs/tiff/tiff-4.0.0_beta7.ebuild
index 9d0d0b3efdd0..baab75abedf8 100644
--- a/media-libs/tiff/tiff-4.0.0_beta6.ebuild
+++ b/media-libs/tiff/tiff-4.0.0_beta7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.6 2010/11/05 21:01:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta7.ebuild,v 1.1 2011/04/16 21:25:41 nerdboy Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg static-libs zlib"
 
+RDEPEND="${DEPEND}"
+
 DEPEND="jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
 	zlib? ( sys-libs/zlib )"
@@ -24,7 +26,6 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.9.2-CVE-2009-2347.patch
-	epatch "${FILESDIR}"/${P}-cr2-bitspersample.patch
 	elibtoolize
 }