old

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

3 files changed, 5 insertions, 94 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index d68e217b2d61..87b1d140fed5 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.210 2012/09/16 17:37:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.211 2012/09/16 17:42:44 ssuominen Exp $
+
+  16 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -tiff-4.0.1-r1.ebuild,
+  -files/tiff-4.0.1-CVE-2012-1173.patch:
+  old
 
   16 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> tiff-4.0.2-r1.ebuild:
   amd64/ppc/ppc64/x86 stable wrt #427166
diff --git a/media-libs/tiff/files/tiff-4.0.1-CVE-2012-1173.patch b/media-libs/tiff/files/tiff-4.0.1-CVE-2012-1173.patch
deleted file mode 100644
index 799ec478040a..000000000000
--- a/media-libs/tiff/files/tiff-4.0.1-CVE-2012-1173.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2369#c6
-
-Index: libtiff/tif_getimage.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v
-retrieving revision 1.78
-diff -r1.78 tif_getimage.c
-694a695
-> 	tmsize_t bufsize;
-702c703,708
-< 	buf = (unsigned char*) _TIFFmalloc((alpha?4:3)*tilesize);
----
-> 	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
-> 	if (bufsize == 0) {
-> 		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
-> 		return (0);
-> 	}
-> 	buf = (unsigned char*) _TIFFmalloc(bufsize);
-707c713
-< 	_TIFFmemset(buf, 0, (alpha?4:3)*tilesize);
----
-> 	_TIFFmemset(buf, 0, bufsize);
-919a926
-> 	tmsize_t bufsize;
-925c932,937
-< 	p0 = buf = (unsigned char *)_TIFFmalloc((alpha?4:3)*stripsize);
----
-> 	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
-> 	if (bufsize == 0) {
-> 		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
-> 		return (0);
-> 	}
-> 	p0 = buf = (unsigned char *)_TIFFmalloc(bufsize);
-930c942
-< 	_TIFFmemset(buf, 0, (alpha?4:3)*stripsize);
----
-> 	_TIFFmemset(buf, 0, bufsize);
-Index: libtiff/tiffiop.h
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v
-retrieving revision 1.82
-diff -r1.82 tiffiop.h
-253c253
-< #define TIFFSafeMultiply(t,v,m) ((((t)m != (t)0) && (((t)((v*m)/m)) == (t)v)) ? (t)(v*m) : (t)0)
----
-> #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
diff --git a/media-libs/tiff/tiff-4.0.1-r1.ebuild b/media-libs/tiff/tiff-4.0.1-r1.ebuild
deleted file mode 100644
index fb6d1410bb99..000000000000
--- a/media-libs/tiff/tiff-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.1-r1.ebuild,v 1.9 2012/04/26 20:36:59 aballier Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs zlib"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	jbig? ( media-libs/jbigkit )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-*.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	rm -f \
-		"${ED}"/usr/lib*/libtiff*.la \
-		"${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}