version bump wrt security bug #276339. this ebuild is based on tiff-3.8.2-r5.ebuild as opengl-support is currently broken in -r6.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 95 insertions, 5 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index cfb2a4e64a2a..5a687470a8dd 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.118 2009/06/23 08:23:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.119 2009/07/04 19:26:44 maekke Exp $
+
+*tiff-3.8.2-r7 (04 Jul 2009)
+
+  04 Jul 2009; Markus Meier <maekke@gentoo.org> +tiff-3.8.2-r7.ebuild,
+  +files/tiff-3.8.2-CVE-2009-2285.patch:
+  version bump wrt security bug #276339. this ebuild is based on
+  tiff-3.8.2-r5.ebuild as opengl-support is currently broken in -r6.
 
   23 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   tiff-3.8.2-r6.ebuild:
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 3cfa895e193a..88098f72bfab 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX tiff-3.8.2-CVE-2008-2327.patch 2120 RMD160 0e38bd59939cb6e3602196142e99756de198665e SHA1 1da2ec6a47c0666cad9d07fb8427c1c75ca27b10 SHA256 a63665993ced33869981f052b78549e2cb540dad1302b8b71fcf1c8d4e730ad1
+AUX tiff-3.8.2-CVE-2009-2285.patch 848 RMD160 9c9e725a89e961bce12b9b3d1cf138f8975bc100 SHA1 70577613151cc4c5acc3c256d525c54ad8e113bf SHA256 2f8a9f0dbabf231b834e745f4394042ac72cc6bdd38655998d44a5b495d2228a
 AUX tiff-3.8.2-opengl.patch 437 RMD160 0302bd531617fc9439aee22b3f2ec1e5d587f6cf SHA1 6c8dbec20d66ae834accc8f50ed7567a33f1fcfc SHA256 b3c112596ff5e4902cfbfa88f34937a9ea0d240f029cc4a55f9f102e6b281f9d
 AUX tiff-3.8.2-tiffsplit.patch 646 RMD160 14633a8b89b71f6c9aa027c25233854331d8633f SHA1 445b7bbdeaadf8362127173a4908f7e5f31ac30d SHA256 79f88d303634d52478fe36fff972aa133d3bf1d23ab4c8ad35d3baba40461a48
 AUX tiff-jbig.patch 14636 RMD160 88f8069cda0e1a897961e2c69e6b787a7776124d SHA1 293c174bd1137c63a85dbfc761616752d2f3644f SHA256 73e70f6cf3e63abfd7b5569e2aae0a6811020c883065dfc36d563ca2e547ccd1
@@ -10,12 +11,13 @@ DIST tiff-3.8.2.tar.gz 1336295 RMD160 1b4d825e3be08764e953fc58246d0c25ab4dd17d S
 EBUILD tiff-3.8.2-r4.ebuild 1676 RMD160 166ef986e50dcbd5c1ba0cb25c519c7e47ab48c6 SHA1 71a6df2515d9d999c9c5746963e53cc5511b1ae0 SHA256 488a2a035026a7a4d6360e365bd9aadce903f79c830cc21fb6df5e771f8819ac
 EBUILD tiff-3.8.2-r5.ebuild 1697 RMD160 1640ed433b90db09a0f73461bd9ab60f8d7125eb SHA1 18316a2a06723b5b703f51bcb4bbf2d76bd5ffac SHA256 018a51f8681722825c6a49da115b01b43026827e167434e1d2c4786cd642bc51
 EBUILD tiff-3.8.2-r6.ebuild 2634 RMD160 e353c5c9db7711d60e5be602024c5392fcce4218 SHA1 f8631e2ceadc1ad75ed9858b223cdb4055b85b4a SHA256 6e376b0ea2a2155a3b352e3d69f4454e2b86b8d8f74b683d2a4eabf22fdf6eae
-MISC ChangeLog 16406 RMD160 f9132ddbb74b3f0b5b3d49a5548c97c222e5ad48 SHA1 a76bf79e8e60dc1949d6b8aa2e4df674b56d7457 SHA256 9744a0c7a8b4b091e65d5905acfbb1557cabff1ef5dd0cf052a92a896cd0ce01
+EBUILD tiff-3.8.2-r7.ebuild 1697 RMD160 36f93d95336f4e26cf94d24803814f7345950859 SHA1 31749c76c5fb528526c1f55b9c3298fd2c47eb05 SHA256 7858b50b2766bfd06cee3935b21f44c00919dd2f6fd241291a0263ed33a998c0
+MISC ChangeLog 16680 RMD160 761b34d55839f9c687640c45e65c61a6d1125956 SHA1 b6fde612cca6a61088a757952e6cec860c013f08 SHA256 1058fe27aa81039f42137785426cab91d1b818fcc98ded79c95d6c74b53b347e
 MISC metadata.xml 447 RMD160 8df7883ab02a353acd993037450e7bbc984c052d SHA1 8ffef6a88ae70afbdea7f3be25e1e9a28b6698c5 SHA256 ee7391b2521ef9676ead67466ad7249f05f8d3c9bd8d8984bc0ceac8dcb804b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpAkPYACgkQAiZjviIA2XhqEACgstz0Mj9pwO+lUOq9xefIuaF5
-t7QAoPOhHs6nbBYonBO0VHLNFtEPwZ5d
-=cBYw
+iEYEARECAAYFAkpPrVgACgkQkKaRLQcq0GL8oQCfVCZFv5Ltse1pIz4tvvWtbiWR
+opsAn2Ya36UUiCZy0sPzh8c1xUkENz7y
+=81uw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch b/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch
new file mode 100644
index 000000000000..3eeb75668362
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.8.2-CVE-2009-2285.patch
@@ -0,0 +1,23 @@
+Index: tiff-3.8.2/libtiff/tif_lzw.c
+===================================================================
+--- tiff-3.8.2.orig/libtiff/tif_lzw.c
++++ tiff-3.8.2/libtiff/tif_lzw.c
+@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
+ 			NextCode(tif, sp, bp, code, GetNextCode);
+ 			if (code == CODE_EOI)
+ 				break;
+-			if (code == CODE_CLEAR) {
++			if (code >= CODE_CLEAR) {
+ 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+ 				"LZWDecode: Corrupted LZW table at scanline %d",
+ 				tif->tif_row);
+@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
+ 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
+ 			if (code == CODE_EOI)
+ 				break;
+-			if (code == CODE_CLEAR) {
++			if (code >= CODE_CLEAR) {
+ 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+ 				"LZWDecode: Corrupted LZW table at scanline %d",
+ 				tif->tif_row);
+
diff --git a/media-libs/tiff/tiff-3.8.2-r7.ebuild b/media-libs/tiff/tiff-3.8.2-r7.ebuild
new file mode 100644
index 000000000000..4f9779bc47b0
--- /dev/null
+++ b/media-libs/tiff/tiff-3.8.2-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.8.2-r7.ebuild,v 1.1 2009/07/04 19:26:44 maekke Exp $
+
+EAPI=2
+
+inherit eutils 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
+	mirror://gentoo/${P}-pdfsec-patches.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="jpeg jbig nocxx zlib"
+
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	jbig? ( >=media-libs/jbigkit-1.6-r1 )
+	zlib? ( >=sys-libs/zlib-1.1.3-r2 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-tiff2pdf-20080903.patch
+	epatch "${FILESDIR}"/${P}-tiffsplit.patch
+	if use jbig; then
+		epatch "${FILESDIR}"/${PN}-jbig.patch
+	fi
+	epatch "${WORKDIR}"/${P}-goo-sec.patch
+	epatch "${FILESDIR}"/${P}-CVE-2008-2327.patch
+	epatch "${FILESDIR}"/${P}-CVE-2009-2285.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable !nocxx cxx) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		--with-pic --without-x \
+		--with-docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc README TODO VERSION
+}
+
+pkg_postinst() {
+	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
+}