Fix for CVE-2009-0793, bug #264604

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 87 insertions, 1 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index eaba7de3d3ad..31bb8701e1cd 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/lcms
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.97 2009/04/06 13:01:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.98 2009/04/06 13:38:46 dang Exp $
+
+*lcms-1.18-r1 (06 Apr 2009)
+
+  06 Apr 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +files/lcms-CVE-2009-0793.patch, +lcms-1.18-r1.ebuild:
+  Bump to lcms-1.18-r1
+
+  Fix for CVE-2009-0793, bug #264604
 
   06 Apr 2009; Raúl Porcel <armin76@gentoo.org> lcms-1.18.ebuild:
   arm/ia64/s390/sh stable wrt #260269
diff --git a/media-libs/lcms/files/lcms-CVE-2009-0793.patch b/media-libs/lcms/files/lcms-CVE-2009-0793.patch
new file mode 100644
index 000000000000..6cdcc6adcab7
--- /dev/null
+++ b/media-libs/lcms/files/lcms-CVE-2009-0793.patch
@@ -0,0 +1,23 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN lcms-1.18.orig/src/cmsxform.c lcms-1.18/src/cmsxform.c
+--- lcms-1.18.orig/src/cmsxform.c	2009-03-21 11:31:52.000000000 -0400
++++ lcms-1.18/src/cmsxform.c	2009-04-06 09:24:26.000000000 -0400
+@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
+                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
+                 FromLstarToXYZ(GrayTRC, Shapes1);
+ 
++		if (GrayTRC == NULL)
++			return NULL;
++
+                 // Reversing must be done after curve translation
+ 
+                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
+@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
+ 
+                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
+ 
++		if (GrayTRC == NULL)
++			return NULL;
++
+                 Shapes[0] = cmsDupGamma(GrayTRC);
+                 Shapes[1] = cmsDupGamma(GrayTRC);
+                 Shapes[2] = cmsDupGamma(GrayTRC); 
diff --git a/media-libs/lcms/lcms-1.18-r1.ebuild b/media-libs/lcms/lcms-1.18-r1.ebuild
new file mode 100644
index 000000000000..f6915fafa42b
--- /dev/null
+++ b/media-libs/lcms/lcms-1.18-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.18-r1.ebuild,v 1.1 2009/04/06 13:38:46 dang Exp $
+
+EAPI="2"
+
+inherit libtool eutils multilib
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="http://www.littlecms.com/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tiff jpeg zlib python"
+
+RDEPEND="tiff? ( media-libs/tiff )
+	jpeg? ( media-libs/jpeg )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-1.3.31 )"
+
+src_prepare() {
+	# Fix for CVE-2009-0793, bug #264604
+	epatch "${FILESDIR}"/${PN}-CVE-2009-0793.patch
+
+	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
+	if use python; then
+		cd "${S}"/python
+		./swig_lcms || die "swig_lcms failed"
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with jpeg) \
+		$(use_with python) \
+		$(use_with tiff) \
+		$(use_with zlib)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		BINDIR="${D}"/usr/bin \
+		libdir=/usr/$(get_libdir) \
+		install || die "make install failed"
+
+	insinto /usr/share/lcms/profiles
+	doins testbed/*.icm
+
+	dodoc AUTHORS README* INSTALL NEWS doc/*
+}