old

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

8 files changed, 10 insertions, 321 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 5d935dfe09f6..5e26962cafd8 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,12 @@
 # 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.252 2013/08/28 12:10:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.253 2013/08/28 12:57:12 ssuominen Exp $
+
+  28 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/tiff-3.9.5-CVE-2012-1173.patch, -tiff-3.9.5-r3.ebuild,
+  -tiff-4.0.3-r1.ebuild, -tiff-4.0.3-r2.ebuild, -tiff-4.0.3-r3.ebuild,
+  -tiff-4.0.3.ebuild, tiff-4.0.2-r1.ebuild:
+  old
 
   28 Aug 2013; Agostino Sarubbo <ago@gentoo.org> tiff-4.0.3-r4.ebuild:
   Stable for sparc, wrt bug #480466
diff --git a/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch b/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch
deleted file mode 100644
index 4e9dca811143..000000000000
--- a/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2369#c5
-
-Index: libtiff/tif_getimage.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v
-retrieving revision 1.63.2.6
-diff -r1.63.2.6 tif_getimage.c
-675a676
-> 	tsize_t bufsize;
-682c683,688
-< 	buf = (unsigned char*) _TIFFmalloc((alpha?4:3)*tilesize);
----
-> 	bufsize = TIFFSafeMultiply(tsize_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);
-687c693
-< 	_TIFFmemset(buf, 0, (alpha?4:3)*tilesize);
----
-> 	_TIFFmemset(buf, 0, bufsize);
-882a889
-> 	tsize_t bufsize;
-888c895,900
-< 	p0 = buf = (unsigned char *)_TIFFmalloc((alpha?4:3)*stripsize);
----
-> 	bufsize = TIFFSafeMultiply(tsize_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);
-893c905
-< 	_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.51.2.7
-diff -r1.51.2.7 tiffiop.h
-249c249
-< #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-3.9.5-r3.ebuild b/media-libs/tiff/tiff-3.9.5-r3.ebuild
deleted file mode 100644
index 255c99a37698..000000000000
--- a/media-libs/tiff/tiff-3.9.5-r3.ebuild
+++ /dev/null
@@ -1,58 +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-3.9.5-r3.ebuild,v 1.5 2012/12/11 08:44:51 ssuominen Exp $
-
-# this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
-
-EAPI=4
-inherit eutils libtool multilib
-
-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="libtiff"
-SLOT="3"
-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 zlib"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	jbig? ( media-libs/jbigkit )
-	zlib? ( sys-libs/zlib )
-	!media-libs/tiff-compat
-	!=media-libs/tiff-3*:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-*.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--libdir=/libdir \
-		--disable-static \
-		$(use_enable cxx) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		--without-x
-}
-
-src_install() {
-	# Let `make install` and libtool handle insecure runpath(s)
-	dodir tmp
-	emake DESTDIR="${ED}/tmp" install
-
-	# .so.3 (upstream) is used by sci-chemistry/icm
-	# .so.4 (Debian) is used by net-im/skype
-	exeinto /usr/$(get_libdir)
-	doexe "${ED}"/tmp/libdir/libtiff$(get_libname 3)
-	dosym libtiff$(get_libname 3) /usr/$(get_libdir)/libtiff$(get_libname 4)
-	if use cxx; then
-		doexe "${ED}"/tmp/libdir/libtiffxx$(get_libname 3)
-		dosym libtiffxx$(get_libname 3) /usr/$(get_libdir)/libtiffxx$(get_libname 4)
-	fi
-
-	rm -rf "${ED}"/tmp
-}
diff --git a/media-libs/tiff/tiff-4.0.2-r1.ebuild b/media-libs/tiff/tiff-4.0.2-r1.ebuild
index 09be9dc27074..39e13dba3e39 100644
--- a/media-libs/tiff/tiff-4.0.2-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.7 2012/12/11 08:44:51 ssuominen Exp $
+# $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
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 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"
+KEYWORDS="m68k"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/tiff/tiff-4.0.3-r1.ebuild b/media-libs/tiff/tiff-4.0.3-r1.ebuild
deleted file mode 100644
index 5debabdf6cc0..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +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.3-r1.ebuild,v 1.3 2013/02/18 22:41:23 zmedico 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="~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 ~arm-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}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	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
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3-r2.ebuild b/media-libs/tiff/tiff-4.0.3-r2.ebuild
deleted file mode 100644
index 9ec23ed36cf0..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r2.ebuild
+++ /dev/null
@@ -1,49 +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.3-r2.ebuild,v 1.12 2013/08/05 09:44:22 ssuominen Exp $
-
-EAPI=5
-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="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 ~arm-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:0= )
-	jbig? ( media-libs/jbigkit:= )
-	lzma? ( app-arch/xz-utils:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
-	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
-	epatch "${FILESDIR}"/${P}-libjpeg-turbo.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
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3-r3.ebuild b/media-libs/tiff/tiff-4.0.3-r3.ebuild
deleted file mode 100644
index b30bbe7270bf..000000000000
--- a/media-libs/tiff/tiff-4.0.3-r3.ebuild
+++ /dev/null
@@ -1,75 +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.3-r3.ebuild,v 1.2 2013/08/10 17:15:29 aballier Exp $
-
-EAPI=5
-inherit eutils libtool multilib-minimal
-
-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="~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 ~arm-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:0=[${MULTILIB_USEDEP}] )
-	jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
-	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
-	epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" 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}
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		cd tools
-		emake
-		cd "${BUILD_DIR}"
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.3.ebuild b/media-libs/tiff/tiff-4.0.3.ebuild
deleted file mode 100644
index 6f050e1dac93..000000000000
--- a/media-libs/tiff/tiff-4.0.3.ebuild
+++ /dev/null
@@ -1,44 +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.3.ebuild,v 1.2 2012/12/11 08:44:51 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="~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() {
-	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
-	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}