Version bump, plus patch for bug #290222

(Portage version: 2.2_rc51/cvs/Linux x86_64)

4 files changed, 110 insertions, 1 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 171375ab0ae2..659b09b89e12 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.19 2009/08/09 13:12:45 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.20 2009/11/25 17:10:35 aballier Exp $
+
+*camlimages-3.0.2 (25 Nov 2009)
+
+  25 Nov 2009; Alexis Ballier <aballier@gentoo.org>
+  +camlimages-3.0.2.ebuild, +files/camlimages-3.0.2-ocaml-autoconf11.patch,
+  +files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch:
+  Version bump, plus patch for bug #290222
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> camlimages-3.0.1.ebuild:
   ppc stable #276235
diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild
new file mode 100644
index 000000000000..b8fcd2186742
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.1 2009/11/25 17:10:35 aballier Exp $
+
+EAPI=2
+
+inherit eutils autotools
+
+IUSE="doc gif gs gtk jpeg tiff truetype xpm"
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://cristal.inria.fr/camlimages/"
+SRC_URI="http://cristal.inria.fr/camlimages/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt]
+	gif? ( media-libs/giflib )
+	gtk? ( dev-ml/lablgtk )
+	gs? ( virtual/ghostscript )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/tiff )
+	media-libs/libpng
+	truetype? ( >=media-libs/freetype-2 )
+	xpm? ( x11-libs/libXpm )
+	"
+DEPEND="${DEPEND}
+	dev-ml/ocaml-autoconf
+	dev-ml/findlib"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch"
+	epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gif) \
+		$(use_with gs) \
+		$(use_with gtk lablgtk2) \
+		--without-lablgtk \
+		$(use_with jpeg) \
+		--with-png \
+		$(use_with tiff) \
+		$(use_with truetype freetype) \
+		$(use_with xpm)
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" ocamlsitelibdir="$(ocamlfind printconf destdir)/${PN}" install || die
+	dodoc README
+	use doc && dohtml doc/*
+}
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch b/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch
new file mode 100644
index 000000000000..a9e11d8ea4d2
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch
@@ -0,0 +1,12 @@
+Index: camlimages-3.0.2/configure.ac
+===================================================================
+--- camlimages-3.0.2.orig/configure.ac
++++ camlimages-3.0.2/configure.ac
+@@ -5,7 +5,6 @@ AM_INIT_AUTOMAKE([foreign])
+ 
+ # Check ocaml
+ AC_PROG_OCAML([3.08])
+-AC_PROG_OCAML_TOOL(OCAMLMKLIB, ocamlmklib)
+ AC_SUBST(OCAMLLIB)
+ 
+ # Check versions to build
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch b/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch
new file mode 100644
index 000000000000..78b2bca85bb0
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## tiffread.dpatch by Mehdi Dogguy <mehdi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix integer overflows in tiffread.c (CVE-2009-3296)
+
+@DPATCH@
+diff -urNad camlimages~/src/tiffread.c camlimages/src/tiffread.c
+--- camlimages~/src/tiffread.c	2009-10-31 21:47:57.000000000 +0100
++++ camlimages/src/tiffread.c	2009-11-01 13:51:58.000000000 +0100
+@@ -21,6 +21,8 @@
+ #include <caml/memory.h>
+ #include <caml/fail.h>
+ 
++#include "oversized.h"
++
+ /* These are defined in caml/config.h */
+ #define int16 int16tiff
+ #define uint16 uint16tiff
+@@ -64,6 +66,10 @@
+     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
+     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
+ 
++    if (oversized (imagewidth, imagelength)) {
++      failwith_oversized("tiff");
++    }
++
+     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
+       if( imagebits != 8 ){
+ 	failwith("Sorry, tiff rgb file must be 24bit-color");