From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJP9y-0000t4-Pc for garchives@archives.gentoo.org; Mon, 09 May 2011 12:01:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D34A41C0A3; Mon, 9 May 2011 12:01:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 804711C0A3 for ; Mon, 9 May 2011 12:01:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB7BD1B407C for ; Mon, 9 May 2011 12:01:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C44C780508 for ; Mon, 9 May 2011 12:01:34 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <44e3e0cf80cdb068601e3a16140ac6098e481ca0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-libs/tiff/files/, media-libs/tiff/ X-VCS-Repository: proj/sci X-VCS-Files: media-libs/tiff/ChangeLog media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch media-libs/tiff/metadata.xml media-libs/tiff/tiff-3.9.4-r1.ebuild X-VCS-Directories: media-libs/tiff/files/ media-libs/tiff/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 44e3e0cf80cdb068601e3a16140ac6098e481ca0 Date: Mon, 9 May 2011 12:01:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4ec303af9bc3fd4d82f41c3219b94265 commit: 44e3e0cf80cdb068601e3a16140ac6098e481ca0 Author: Justin Lecher gentoo org> AuthorDate: Mon May 9 11:58:45 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon May 9 11:58:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D44e3e0cf tiff -> tiff-compat --- media-libs/tiff/ChangeLog | 17 ----- .../tiff/files/tiff-3.9.4-CVE-2011-0192.patch | 13 ---- .../tiff/files/tiff-3.9.4-CVE-2011-1167.patch | 62 --------------= ------ media-libs/tiff/metadata.xml | 12 ---- media-libs/tiff/tiff-3.9.4-r1.ebuild | 59 --------------= ----- 5 files changed, 0 insertions(+), 163 deletions(-) diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog deleted file mode 100644 index baad88d..0000000 --- a/media-libs/tiff/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for media-libs/tiff -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*tiff-3.9.4-r1 (07 May 2011) - - 07 May 2011; Christoph Junghans +tiff-3.9.4-r1.ebu= ild, - -tiff-3.9.4-r2.ebuild: - Undo the bump (see bug #364181) - -*tiff-3.9.4-r2 (06 May 2011) - - 06 May 2011; Christoph Junghans -tiff-3.9.4-r1.ebu= ild, - +tiff-3.9.4-r2.ebuild, +files/tiff-3.9.4-CVE-2011-0192.patch, - +files/tiff-3.9.4-CVE-2011-1167.patch: - Version bump to avoid conflict with tree - 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 deleted file mode 100644 index dbeb882..0000000 --- a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtiff/tif_fax3.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -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 <=3D (int) (a0 + TabEnt->Param)) { \ -> if (b1 < (int) (a0 + TabEnt->Param) || pa !=3D 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 deleted file mode 100644 index 5783a2b..0000000 --- a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: ChangeLog -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -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 ->=20 -> * libtiff/tif_thunder.c: Correct potential buffer overflow with=20 -> thunder encoded files with wrong bitspersample set. The libtiff=20 -> development team would like to thank Marin Barbella and TippingPoint'= s -> Zero Day Initiative for reporting this vulnerability (ZDI-CAN-1004). ->=20 -Index: libtiff/tif_thunder.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -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 -58,62c59,65 -< #define SETPIXEL(op, v) { \ -< lastpixel =3D (v) & 0xf; \ -< if (npixels++ & 1) \ -< *op++ |=3D lastpixel; \ -< else \ ---- -> #define SETPIXEL(op, v) { \ -> lastpixel =3D (v) & 0xf; \ -> if ( npixels < maxpixels ) \ -> { \ -> if (npixels++ & 1) \ -> *op++ |=3D lastpixel; \ -> else \ -63a67,84 -> } \ -> } ->=20 -> static int -> ThunderSetupDecode(TIFF* tif) -> { -> static const char module[] =3D "ThunderSetupDecode"; ->=20 -> if( tif->tif_dir.td_bitspersample !=3D 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; -> } -> =20 ->=20 -> return (1); -145c166,167 -< return (1); ---- ->=20 -> return (1); -153a176 -> tif->tif_setupdecode =3D ThunderSetupDecode; -165a189 ->=20 diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml deleted file mode 100644 index afea603..0000000 --- a/media-libs/tiff/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - -graphics - - nerdboy@gentoo.org - Steve Arnold - Primary Maintainer - -TIFF image library and tools, mostly for scanner and fa= x - support, but also used by GIS and other imaging tools. - diff --git a/media-libs/tiff/tiff-3.9.4-r1.ebuild b/media-libs/tiff/tiff-= 3.9.4-r1.ebuild deleted file mode 100644 index 1087aa6..0000000 --- a/media-libs/tiff/tiff-3.9.4-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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-r1.ebuild,= v 1.2 2011/04/23 16:38:13 nerdboy Exp $ - -EAPI=3D3 -inherit eutils libtool - -# This is ebuild for libtiff.so.3 only for SONAME binary compatibility - -DESCRIPTION=3D"Library for manipulation of TIFF (Tag Image File Format) = images" -HOMEPAGE=3D"http://www.remotesensing.org/libtiff/" -SRC_URI=3D"ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" - -LICENSE=3D"as-is" -SLOT=3D"3" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-int= erix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-sola= ris ~x64-solaris ~x86-solaris" -IUSE=3D"+cxx jbig jpeg static-libs zlib" - -RDEPEND=3D"jpeg? ( virtual/jpeg ) - !=3Dmedia-libs/tiff-3* - jbig? ( media-libs/jbigkit ) - zlib? ( sys-libs/zlib )" - -DEPEND=3D"${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2011-0192.patch - epatch "${FILESDIR}"/${P}-CVE-2011-1167.patch - 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=3D"${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - exeinto /usr/$(get_libdir) - doexe libtiff/.libs/libtiff.so.3 || die - doexe libtiff/.libs/libtiffxx.so.3 || die -} - -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 -}