Version bump, plus patch for bug #290222

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

5 files changed, 125 insertions, 2 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/Manifest b/dev-ml/camlimages/Manifest
index 02ca0115dc3a..473f12120312 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,11 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX META 143 RMD160 dedf7cbe1a4511c1791ae536bfd078c47c6db69b SHA1 e7777bcbc6ba245734131eb1ee9645269db7338e SHA256 2a934de5f1649633f656014b95f342029de034fd3c7a7057d6d3164201b97579
 AUX META.camlimages.in 850 RMD160 25b79bc73cdc1010ee62efe8f0ce5ae557f6cad7 SHA1 8f77fbe9f52b44bc054876040e58bc803ca54e5a SHA256 0303478d950eb12bcbc9dbab8b315830d9b60a757fb9c770fe505b609a103a66
 AUX camlimages-2.20-ocaml-3.09.diff 385 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 SHA1 c53ec44ab5c363b085eeca099d6cda7349b14a8b SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f
 AUX camlimages-3.0.1-CVE-2009-2295.patch 4347 RMD160 e383255355958e23ccf1136eb2482868fbba403c SHA1 0285ff2fb792946443ab9e25d83472dc6a51640d SHA256 5b8c460ee211169bd65e42469a7ed3428dc4ace6a76ecd67c2c99dcf1d392ac0
 AUX camlimages-3.0.1-lablgtk.patch 1375 RMD160 537f4e3008388fad9ffcd05f8b3ddfe171940a73 SHA1 053cf492697b65532cf06d2da702482d1acbb8c9 SHA256 413efcc6b767966ea2c6abb4219f821574987bb8094a615c7575e60e7a617aea
+AUX camlimages-3.0.2-ocaml-autoconf11.patch 355 RMD160 4775a64d3021dfb4268aede3a121cf78eccfcf65 SHA1 ea69cd1dfb5aca48203584020bab3a948c896087 SHA256 b02c43105ffc90144c66dcef68f8c65dfdc39d0ba39adc8976f05d7f0d7b9668
+AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 RMD160 ccf0d82e20c4c11ebe38e7331e8fcee751a78eaa SHA1 71c43011cf3005787678e0885b4904f55473ede1 SHA256 1db69c1993cba70226dfd4e179e9f4754d3d43fcb571e319d97accd91947493f
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
 DIST camlimages-3.0.1.tar.gz 1320064 RMD160 fcc2be8bd98bf06a268d7247118d8f4f4bcbacb5 SHA1 ca53397c76fa82da4bfa1ad0650032483a352d0c SHA256 d4e0edc9f11d5997166f5cd08b0e043fa7b917bd0d271f6591c24220ae6b3521
+DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
 EBUILD camlimages-2.20-r2.ebuild 2058 RMD160 0a8f53c87d151169aeca09b8e8b63cc5627c3352 SHA1 26caa179abad9eb56cfebd84317d9c665fda5653 SHA256 df3986810fb42abb66b80d70b333ec1e0aa2978d5254c8f4f153551d7095317c
 EBUILD camlimages-3.0.1.ebuild 1332 RMD160 85e579ffdc806512066a821993b306216d6576e5 SHA1 a7faec95b95b821d5d6692782c881711573b19f6 SHA256 ead906eeb6c2959aa6136c55e156f03a1e9d1e80e417f2b426200344e9828428
-MISC ChangeLog 3310 RMD160 81ef36f926c56592bc212c11bd4a17066d04b45b SHA1 b4b2e48745e781671f6fe7e0d6dccd54180fdb29 SHA256 f4a6ab71b39ff1a649933633a1353675b8f3dca2915dc172c7b6556161bef7f6
+EBUILD camlimages-3.0.2.ebuild 1387 RMD160 5477af0f0a288f9527ca858a1319d258666ff329 SHA1 a06d1c8ef619d856bcf40026a1c6d269362afe65 SHA256 17fadbdff8481847576af15612ff0e91a0eeb4a24e712368ade8b68b4b337abd
+MISC ChangeLog 3573 RMD160 89f47b8d6b37a20081f5e540649b2140a9127930 SHA1 e2edd4adf82b33837d71090604280c7f2377571b SHA256 db1b6e3d8e3e14ec3d2126c7d8834f456b1b2188f25cc18de903ec2f3d365303
 MISC metadata.xml 234 RMD160 75062c045394f9d93ad6d830d4959666fac81241 SHA1 ff9422155c085b977935e76dbb87dc9f6ed6bb42 SHA256 d43df7cc2b17c0287287c854adb59220224c48e5f0f7c13232f61b440af6a87e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksNZRAACgkQvFcC4BYPU0ra5gCfWbbCwpL3x+S2aCf6OQpXLt2/
+3N8An33AXQyRNEprNuyyAAvatiYjFmsh
+=Cw2u
+-----END PGP SIGNATURE-----
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");