security bump. - libtiff has memory allocation problems and numerous integer overflows. Due to the nature of this and the way it could be abused 3.6.1-r2 is is being marked stable on all arches and older ebuilds have been removed. Testing was preformed by vapier/sejo/kloeri for every arch we have except ppc64 who failed to have anybody test.

19 files changed, 44 insertions, 299 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 6c9bb59cb8e5..b67a85b5eeab 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/tiff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.27 2004/10/10 18:06:54 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.28 2004/10/13 14:03:34 solar Exp $
+
+*tiff-3.6.1-r2 (13 Oct 2004)
+
+  13 Oct 2004; <solar@gentoo.org> -files/config.site-3.5.6_beta,
+  -files/config.site-3.6.1-r1, -tiff-3.5.5.ebuild, -tiff-3.5.7-r1.ebuild,
+  -tiff-3.5.7-r2.ebuild, -tiff-3.6.0.ebuild, -tiff-3.6.0_beta2.ebuild,
+  -tiff-3.6.1-r1.ebuild, +tiff-3.6.1-r2.ebuild, -tiff-3.6.1.ebuild:
+  security bump. - libtiff has memory allocation problems and numerous integer
+  overflows. Due to the nature of this and the way it could be abused 3.6.1-r2
+  is is being marked stable on all arches and older ebuilds have been removed.
+  Testing was preformed by vapier/sejo/kloeri for every arch we have except
+  ppc64 who failed to have anybody test.
 
   10 Oct 2004; Hasan Khalil <gongloo@gentoo.org> tiff-3.6.1-r1.ebuild:
   fix for non-gnu make.
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e19b922b6757..a86704ae7d68 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,20 +1,12 @@
+MD5 3f0d959e083eb1467b8e85d7297d9978 tiff-3.6.1-r2.ebuild 2136
+SHA1 ea9617e7b9def440f0f43f3e439573af272398c8 tiff-3.6.1-r2.ebuild 2136
 MD5 39c22b1781ea950b0097c93b01ec5145 ChangeLog 3625
+SHA1 afae2af3a497dc882cc7111892ed1e7a1309d830 ChangeLog 3625
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 c31d9d63858dbe4359a2fe322cf9270a tiff-3.5.5.ebuild 1694
-MD5 6ef6236d88b8697f8a0d0cd0c137fbe9 tiff-3.5.7-r1.ebuild 1088
-MD5 0f539d87b6bbcccd29b4e881d7572fe7 tiff-3.5.7-r2.ebuild 1247
-MD5 1f5924fda085dbb6d5cde797be448269 tiff-3.6.0.ebuild 1076
-MD5 6541afecc746d30a44f0d28b7ba912d3 tiff-3.6.0_beta2.ebuild 1069
-MD5 7d9f6f86d24f88c10af093cb7b60b787 tiff-3.6.1-r1.ebuild 2067
-MD5 d219bd7d9f4ff3a5380d73f9b7943a8e tiff-3.6.1.ebuild 1069
+SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 metadata.xml 160
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site 488
-MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site-3.5.6_beta 488
-MD5 cc09334404bed71d88cbee093ecfbea3 files/digest-tiff-3.5.5 63
-MD5 5e55504066911b414c36963ad6ca9070 files/digest-tiff-3.5.7-r1 63
-MD5 5e55504066911b414c36963ad6ca9070 files/digest-tiff-3.5.7-r2 63
-MD5 6e51a8db6b120904c1e2ddb0f0eaf349 files/digest-tiff-3.6.0 64
-MD5 0bdb0f11a1ee24db3e7fc07875ca4c44 files/digest-tiff-3.6.0_beta2 70
-MD5 f53e1604a1fd165e2e83afca8a3e63aa files/digest-tiff-3.6.1 64
-MD5 9401ca061c9d5140dfbefbac98d58212 files/digest-tiff-3.6.1-r1 145
+SHA1 b45b9e5ba7f61e97f07314c201ea7424e4d9f0b4 files/config.site 488
+MD5 cad49e9764cabaf8ae55434dfba57f4d files/digest-tiff-3.6.1-r2 632
+SHA1 a17a3a9c97030d8d509da0b60f03f566fa6a30a4 files/digest-tiff-3.6.1-r2 632
 MD5 dca7d9db2819ce30468b1a44b7575aaa files/tiff-3.6.1-r1-man.so.patch 364
-MD5 bae48bb199ec2a87e521c417819003e6 files/config.site-3.6.1-r1 355
+SHA1 d28ab469b8a07bf282480cf93e7db46be52225b3 files/tiff-3.6.1-r1-man.so.patch 364
diff --git a/media-libs/tiff/files/config.site-3.5.6_beta b/media-libs/tiff/files/config.site-3.5.6_beta
deleted file mode 100644
index 31f4da21316e..000000000000
--- a/media-libs/tiff/files/config.site-3.5.6_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-JPEG="yes"			# yes|no configure JPEG support (see below)
-ZIP="yes"			# yes|no configure Deflate support (see below)
-HTML="yes"			# yes|no install HTML documentation
-DIR_BIN="${D}/usr/bin"		# directory for tools
-DIR_LIB="${D}/usr/lib"		# directory for libraries
-DIR_INC="${D}/usr/include"		# directory for include files
-DIR_MAN="${D}/usr/share/man"		# directory for manual pages
-
-DIRS_LIBINC="/usr/include" 
-DIR_JPEGLIB="/usr/lib"		
-DIR_GZLIB="/usr/lib"			# directory for libz
-DSOSUF="so"
diff --git a/media-libs/tiff/files/config.site-3.6.1-r1 b/media-libs/tiff/files/config.site-3.6.1-r1
deleted file mode 100644
index 1f588bd9896b..000000000000
--- a/media-libs/tiff/files/config.site-3.6.1-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-JPEG="yes"			# yes|no configure JPEG support (see below)
-ZIP="yes"			# yes|no configure Deflate support (see below)
-HTML="yes"			# yes|no install HTML documentation
-DIR_BIN="/usr/bin"		# directory for tools
-DIR_INC="/usr/include"		# directory for include files
-DIR_MAN="/usr/share/man"	# directory for manual pages
-DIRS_LIBINC="/usr/include" 
-DSOSUF="so"
diff --git a/media-libs/tiff/files/digest-tiff-3.5.5 b/media-libs/tiff/files/digest-tiff-3.5.5
deleted file mode 100644
index 5ab87cd89dfa..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 407d65a98c7621ad6e2c64cd3d1e7a40 tiff-v3.5.5.tar.gz 900890
diff --git a/media-libs/tiff/files/digest-tiff-3.5.7-r1 b/media-libs/tiff/files/digest-tiff-3.5.7-r1
deleted file mode 100644
index 83cf7f85cd29..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.5.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82243b5ae9b7c9e492aeebc501680990 tiff-v3.5.7.tar.gz 951139
diff --git a/media-libs/tiff/files/digest-tiff-3.5.7-r2 b/media-libs/tiff/files/digest-tiff-3.5.7-r2
deleted file mode 100644
index 83cf7f85cd29..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.5.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82243b5ae9b7c9e492aeebc501680990 tiff-v3.5.7.tar.gz 951139
diff --git a/media-libs/tiff/files/digest-tiff-3.6.0 b/media-libs/tiff/files/digest-tiff-3.6.0
deleted file mode 100644
index d30c398fda3c..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec0ca41f0e5c7cb4aa605fab9ddbaef9 tiff-v3.6.0.tar.gz 1029166
diff --git a/media-libs/tiff/files/digest-tiff-3.6.0_beta2 b/media-libs/tiff/files/digest-tiff-3.6.0_beta2
deleted file mode 100644
index c58043cfcca4..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.6.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 647ba1a4c9a22ace5611d82de14cae10 tiff-v3.6.0-beta2.tar.gz 1020669
diff --git a/media-libs/tiff/files/digest-tiff-3.6.1 b/media-libs/tiff/files/digest-tiff-3.6.1
deleted file mode 100644
index 0ea5df4bf7d1..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3f0ee7617593c2703755672fb1bfed3 tiff-v3.6.1.tar.gz 1072165
diff --git a/media-libs/tiff/files/digest-tiff-3.6.1-r1 b/media-libs/tiff/files/digest-tiff-3.6.1-r1
deleted file mode 100644
index 88102d56ce8e..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.6.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b3f0ee7617593c2703755672fb1bfed3 tiff-v3.6.1.tar.gz 1072165
-MD5 2cd1c94d237d47104106de3bf4f08baa libtiff-lzw-compression-kit-1.5.tar.gz 9646
diff --git a/media-libs/tiff/files/digest-tiff-3.6.1-r2 b/media-libs/tiff/files/digest-tiff-3.6.1-r2
new file mode 100644
index 000000000000..e426f609b0b4
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.6.1-r2
@@ -0,0 +1,8 @@
+MD5 b3f0ee7617593c2703755672fb1bfed3 tiff-v3.6.1.tar.gz 1072165
+SHA1 f7817145d8756152cc341804df6477f37ef93c38 tiff-v3.6.1.tar.gz 1072165
+MD5 2cd1c94d237d47104106de3bf4f08baa libtiff-lzw-compression-kit-1.5.tar.gz 9646
+SHA1 97d103ca8595cf6759fc6c52f4199be4b02b95b0 libtiff-lzw-compression-kit-1.5.tar.gz 9646
+MD5 d73911faab0e6f8e47e05841135b6885 libtiff-3.6.1-alt-bound.patch.bz2 8557
+SHA1 4294a1622a688bb12c9b3e2db3aff5a0e51e7265 libtiff-3.6.1-alt-bound.patch.bz2 8557
+MD5 7fb0f9cb001f5dc9e8c5b0e36abd30fc libtiff-3.6.1-chris-bound.patch.bz2 789
+SHA1 5a682c4c2a24c37581857604bf66a5ead52532d9 libtiff-3.6.1-chris-bound.patch.bz2 789
diff --git a/media-libs/tiff/tiff-3.5.5.ebuild b/media-libs/tiff/tiff-3.5.5.ebuild
deleted file mode 100644
index 9d681df944e5..000000000000
--- a/media-libs/tiff/tiff-3.5.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.5.ebuild,v 1.4 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_P=${P/tiff-/tiff-v}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/old/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die "configure failed"
-	emake || die "emake died"
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc}
-	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "install failed"
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "This version was resurrected to work around a bug in fax2tiff"
-	einfo "for use with Hylafax.  See bug #48077 for more info."
-	einfo "It also doesn't appear to provide libtiff.so (only libtiff.a),"
-	einfo "so it looks like you'll need the current stable tiff, then"
-	einfo "this one with AUTOCLEAN=no.  To get back to a proper tiff,"
-	einfo "unmerge both and then emerge the current stable tiff again."
-	ewarn "I repeat: do not try to build hylafax or anything else against"
-	ewarn "tiff-3.5.5 because it won't work.  You've been warned."
-	einfo "What can I say; it's a sucky work-around..."
-}
diff --git a/media-libs/tiff/tiff-3.5.7-r1.ebuild b/media-libs/tiff/tiff-3.5.7-r1.ebuild
deleted file mode 100644
index acdc32c14ca9..000000000000
--- a/media-libs/tiff/tiff-3.5.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r1.ebuild,v 1.18 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_P=${P/tiff-/tiff-v}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~mips"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die "configure failed"
-	emake || die "emake barfed"
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc}
-	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "make install failed"
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.5.7-r2.ebuild b/media-libs/tiff/tiff-3.5.7-r2.ebuild
deleted file mode 100644
index 268ec0961a57..000000000000
--- a/media-libs/tiff/tiff-3.5.7-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r2.ebuild,v 1.1 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_P=${P/tiff-/tiff-v}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE="private"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die "configure failed"
-	emake || die "emake barfed"
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc}
-	dodir /usr/share/doc/${PF}/html
-	if use private ; then
-	    make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install-private || die "make install-private failed"
-	else
-	    make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "make install failed"
-	fi
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.6.0.ebuild b/media-libs/tiff/tiff-3.6.0.ebuild
deleted file mode 100644
index eb28580b20aa..000000000000
--- a/media-libs/tiff/tiff-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0.ebuild,v 1.8 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_S=${P/tiff-/tiff-v}
-MY_P=${PN}-v${PV/_beta/-beta}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ia64 ppc64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/}
-	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.6.0_beta2.ebuild b/media-libs/tiff/tiff-3.6.0_beta2.ebuild
deleted file mode 100644
index 745286ccee2b..000000000000
--- a/media-libs/tiff/tiff-3.6.0_beta2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0_beta2.ebuild,v 1.8 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_S=${P/tiff-/tiff-v}
-MY_P=${PN}-v${PV/_beta/-beta}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa amd64 ia64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/}
-	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.6.1-r1.ebuild b/media-libs/tiff/tiff-3.6.1-r2.ebuild
index 18fb6e4c4062..fc7f162be89c 100644
--- a/media-libs/tiff/tiff-3.6.1-r1.ebuild
+++ b/media-libs/tiff/tiff-3.6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1-r1.ebuild,v 1.12 2004/10/10 18:06:54 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1-r2.ebuild,v 1.1 2004/10/13 14:03:34 solar Exp $
 
 inherit eutils
 
@@ -10,11 +10,13 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
 HOMEPAGE="http://www.libtiff.org/"
 SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz
-	ftp://ftp.remotesensing.org/libtiff/libtiff-lzw-compression-kit-1.5.tar.gz"
+	ftp://ftp.remotesensing.org/libtiff/libtiff-lzw-compression-kit-1.5.tar.gz
+	mirror://gentoo/libtiff-3.6.1-alt-bound.patch.bz2
+	mirror://gentoo/libtiff-3.6.1-chris-bound.patch.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc mips alpha arm hppa amd64 ia64 s390 macos ppc-macos"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 macos ppc-macos ~ppc64"
 IUSE="lzw-tiff"
 
 DEPEND=">=media-libs/jpeg-6b
@@ -30,13 +32,14 @@ src_unpack() {
 		cp README-LZW-COMPRESSION ${S}/.
 	fi
 	cd ${S}
-	cp ${FILESDIR}/config.site-3.6.1-r1 config.site
-	echo "DIR_HTML=\"/usr/share/doc/${PF}/html\"" >> config.site
-	echo "DIR_LIB=\"/usr/$(get_libdir)\"" >> config.site
-	echo "DIR_JPEGLIB=\"/usr/$(get_libdir)\"" >> config.site
-	echo "DIR_GZLIB=\"/usr/$(get_libdir)\"" >> config.site
-
-	epatch ${FILESDIR}/${PF}-man.so.patch || die "man.so patch failed"
+	cp ${FILESDIR}/config.site config.site
+	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
+	epatch ${FILESDIR}/${PN}-3.6.1-r1-man.so.patch || die "man.so patch failed"
+
+	#security fixes for memory allocation problems and numerous integer overflows.
+	epatch ${DISTDIR}/lib${PN}-${PV}-alt-bound.patch.bz2
+	epatch ${DISTDIR}/lib${PN}-${PV}-alt-bound-fix2.patch.bz2
+	epatch ${DISTDIR}/lib${PN}-${PV}-chris-bound.patch.bz2
 }
 
 src_compile() {
@@ -45,10 +48,9 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,$(get_libdir),share/man,share/doc/}
+	dodir /usr/{bin,lib,share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
-	# 'make' before environment variables on a command-line does not work with non-gnu make.
-	DESTDIR="${D}" ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" make install || die
+	ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" make install || die
 	preplib /usr
 	dodoc README TODO VERSION README-LZW-COMPRESSION
 }
diff --git a/media-libs/tiff/tiff-3.6.1.ebuild b/media-libs/tiff/tiff-3.6.1.ebuild
deleted file mode 100644
index 53a92ef2ad5a..000000000000
--- a/media-libs/tiff/tiff-3.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1.ebuild,v 1.6 2004/09/17 04:31:40 nerdboy Exp $
-
-MY_S=${P/tiff-/tiff-v}
-MY_P=${PN}-v${PV/_beta/-beta}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa mips amd64 ~ia64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/}
-	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}