old

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 6 insertions, 81 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 5e26962cafd8..7845c3ed80d4 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.253 2013/08/28 12:57:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.254 2013/09/29 06:51:39 ssuominen Exp $
+
+  29 Sep 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/tiff-4.0.2-CVE-2012-3401.patch, -files/tiff-4.0.2-bigendian.patch,
+  -tiff-4.0.2-r1.ebuild:
+  old
 
   28 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
   -files/tiff-3.9.5-CVE-2012-1173.patch, -tiff-3.9.5-r3.ebuild,
diff --git a/media-libs/tiff/files/tiff-4.0.2-CVE-2012-3401.patch b/media-libs/tiff/files/tiff-4.0.2-CVE-2012-3401.patch
deleted file mode 100644
index 9b4994547e16..000000000000
--- a/media-libs/tiff/files/tiff-4.0.2-CVE-2012-3401.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/427166
-
---- tools/tiff2pdf.c
-+++ tools/tiff2pdf.c
-@@ -1066,6 +1066,7 @@
- 				"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)){
diff --git a/media-libs/tiff/files/tiff-4.0.2-bigendian.patch b/media-libs/tiff/files/tiff-4.0.2-bigendian.patch
deleted file mode 100644
index 3a090d26758c..000000000000
--- a/media-libs/tiff/files/tiff-4.0.2-bigendian.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.gentoo.org/422843
-http://pkgs.fedoraproject.org/cgit/libtiff.git/plain/libtiff-4.0.2-bigendian.patch
-http://pkgs.fedoraproject.org/cgit/libtiff.git/commit/?id=5f9a7dda1bb1991bf36f98ee37700c75433c9738
-
---- test/raw_decode.c
-+++ test/raw_decode.c
-@@ -85,9 +85,9 @@ static int check_rgb_pixel( int pixel, i
- static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, unsigned char *buffer ) {
- 	/* RGBA images are upside down - adjust for normal ordering */
- 	int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128;
--	unsigned char *rgba = buffer + 4 * adjusted_pixel;
-+	unsigned int *rgba = (unsigned int*)(buffer + 4 * adjusted_pixel);
- 	
--	if( rgba[0] == red && rgba[1] == green && rgba[2] == blue && rgba[3] == alpha ) {
-+	if( TIFFGetR(*rgba) == red && TIFFGetG(*rgba) == green && TIFFGetB(*rgba) == blue && TIFFGetA(*rgba) == alpha ) {
- 		return 0;
- 	}
- 
diff --git a/media-libs/tiff/tiff-4.0.2-r1.ebuild b/media-libs/tiff/tiff-4.0.2-r1.ebuild
deleted file mode 100644
index 39e13dba3e39..000000000000
--- a/media-libs/tiff/tiff-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.8 2013/08/28 12:57:12 ssuominen 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="libtiff"
-SLOT="0"
-KEYWORDS="m68k"
-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-2012-3401.patch \
-		"${FILESDIR}"/${P}-bigendian.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}
-}