--- camlimages-3.0.1.orig/debian/control +++ camlimages-3.0.1/debian/control @@ -0,0 +1,110 @@ +Source: camlimages +Section: devel +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Ralf Treinen , + Stefano Zacchiroli , + Sylvain Le Gall , + Mehdi Dogguy +Build-Depends: cdbs (>= 0.4.23), + debhelper (>= 5), + dpatch, + ocaml-nox (>= 3.11.1), + ocaml, + ocaml-findlib (>> 1.2.5), + libpng12-dev, + libjpeg62-dev, + libtiff4-dev, + libxpm-dev, + libfreetype6-dev (>= 2.1.7), + libgif-dev, + liblablgtk2-ocaml-dev (>> 2.12.0-3), + chrpath, + ghostscript, + dh-ocaml (>= 0.9), + automake1.9 +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlimages.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlimages.git +Homepage: http://gallium.inria.fr/camlimages/ + +Package: libcamlimages-ocaml +Architecture: any +Section: ocaml +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: + ${ocaml:Provides} +Description: OCaml image processing library (Runtime library) + CamlImages is an image processing library for OCaml, which provides: + . + * basic functions for image processing and loading/saving + various image file formats (hence providing a translation + facility from format to format) + . + * an interface with the Caml graphics library allows to display + images in the Graphics module screen and to mix them with Caml + drawings + . + * a freetype interface, integrated into the library: you can + draw texts into images using any truetype fonts + . + In addition, the library can handle huge images that cannot be + (or can hardly be) stored into the main memory (the library then + automatically creates swap files and escapes them to reduce the + memory usage). + . + This package contains only the shared runtime stub libraries. + +Package: libcamlimages-ocaml-dev +Architecture: any +Section: ocaml +Depends: + ${ocaml:Depends}, + libpng12-dev, + libjpeg62-dev, + libtiff4-dev, + libxpm-dev, + libfreetype6-dev, + libgif-dev, + ${shlibs:Depends}, + ${misc:Depends} +Provides: + ${ocaml:Provides} +Description: OCaml image processing library (Development package) + CamlImages is an image processing library for OCaml, which provides: + . + * basic functions for image processing and loading/saving + various image file formats (hence providing a translation + facility from format to format) + . + * an interface with the Caml graphics library allows to display + images in the Graphics module screen and to mix them with Caml + drawings + . + * a freetype interface, integrated into the library: you can + draw texts into images using any truetype fonts + . + In addition, the library can handle huge images that cannot be + (or can hardly be) stored into the main memory (the library then + automatically creates swap files and escapes them to reduce the + memory usage). + . + This package contains the development part of the camlimages + library. + +Package: libcamlimages-ocaml-doc +Architecture: all +Section: doc +Suggests: libcamlimages-ocaml-dev +Depends: ${misc:Depends} +Conflicts: libcamlimages-ocaml-dev (<< 1:3.0.1-2) +Description: OCaml CamlImages library documentation + This package provides documentation for the OCaml CamlImages + library. + . + The library itself is provided in the libcamlimages-ocaml and + libcamlimages-ocaml-dev packages. + --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.doc-base.1 +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.doc-base.1 @@ -0,0 +1,9 @@ +Document: libcamlimages-ocaml-doc +Title: CamlImages Introduction +Author: Jun Furuse and Pierre Weis +Abstract: This is a short introduction to CamlImages +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libcamlimages-ocaml-doc/doc/eng.html +Files: /usr/share/doc/libcamlimages-ocaml-doc/doc/* --- camlimages-3.0.1.orig/debian/gbp.conf +++ camlimages-3.0.1/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- camlimages-3.0.1.orig/debian/compat +++ camlimages-3.0.1/debian/compat @@ -0,0 +1 @@ +5 --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.install +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.install @@ -0,0 +1 @@ +doc/* /usr/share/doc/libcamlimages-ocaml-doc/doc --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-dev.install.in +++ camlimages-3.0.1/debian/libcamlimages-ocaml-dev.install.in @@ -0,0 +1 @@ +debian/tmp/usr/lib/ocaml/site-lib/camlimages @OCamlStdlibDir@ --- camlimages-3.0.1.orig/debian/rules +++ camlimages-3.0.1/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f +# debian/rules for camlimages package +# Copyright (C) 2006-2008 Sylvain Le Gall +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301, USA. + +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/ocaml.mk + +PACKAGE := libcamlimages-ocaml +DESTDIR := $(CURDIR)/debian/$(PACKAGE) + +PACKAGE_DEV := libcamlimages-ocaml-dev +DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV) + +PACKAGE_DOC := libcamlimages-ocaml-doc +DESTDIR_DOC := $(CURDIR)/debian/$(PACKAGE_DOC) + +LABLGTK2_DIR := $(shell ocamlfind query lablgtk2) + +DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2 --without-lablgtk + +DEB_MAKE_CLEAN_TARGET := distclean + +DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend +DEB_DH_INSTALL_ARGS := -X LICENSE -X README -X INSTALL -X Makefile + +OCAML_OCAMLDOC_FLAGS := $(shell ocamlfind query -i-format lablgtk2) + +install/libcamlimages-ocaml-doc:: + $(MAKE) -C '$(CURDIR)/examples' clean + +install/libcamlimages-ocaml-dev:: + mv '$(CURDIR)/debian/tmp/usr/lib/ocaml/stublibs/dllcamlimages.so' \ + '$(DESTDIR)/$(OCAML_DLL_DIR)/' + chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.doc-base.2 +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.doc-base.2 @@ -0,0 +1,9 @@ +Document: libcamlimages-ocaml-doc-api-ref +Title: CamlImages OCamldoc API Reference +Abstract: API reference manual for CamlImages (generated via OCamldoc) +Author: Jun Furuse and Pierre Weis +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libcamlimages-ocaml-doc/html/api/index.html +Files: /usr/share/doc/libcamlimages-ocaml-doc/html/api/* --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.ocamldoc.in +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.ocamldoc.in @@ -0,0 +1,2 @@ + -package lablgtk2 +--include debian/tmp/@OCamlStdlibDir@/site-lib/camlimages/ --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml.dirs.in +++ camlimages-3.0.1/debian/libcamlimages-ocaml.dirs.in @@ -0,0 +1 @@ +@OCamlDllDir@ --- camlimages-3.0.1.orig/debian/copyright +++ camlimages-3.0.1/debian/copyright @@ -0,0 +1,37 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Packaged-By: Stefano Zacchiroli +Packaged-Date: Fri, 11 Jan 2002 23:56:25 +0100 +Upstream-Author: Jun Furuse + Pierre Weis +Original-Source-Location: http://gallium.inria.fr/camlimages/ + +Files: * +Copyright: © 1999-2004, INRIA +License: LGPL-2 + +As a special exception to the GNU Library General Public License, you +may link, statically or dynamically, a "work that uses the Library" +with a publicly distributed version of the Library to produce an +executable file containing portions of the Library, and distribute +that executable file under terms of your choice, without any of the +additional requirements listed in clause 6 of the GNU Library General +Public License. By "a publicly distributed version of the Library", +we mean either the unmodified Library as distributed by INRIA, or a +modified version of the Library that is distributed under the +conditions defined in clause 3 of the GNU Library General Public +License. This exception does not however invalidate any other reasons +why the executable file might be covered by the GNU Library General +Public License. + +On Debian systems, the complete text of the GNU Library General Public License +version 2 can be found in '/usr/share/common-licenses/LGPL-2'. + +Files: debian/* +Copyright: © 2004-2008 Sylvain Le Gall + © 2002-2008 Stefano Zacchiroli + © 2003-2004 Sven Luther + © 2008 Ralf Treinen +License: GPL-2+ + +The Debian packaging is licensed under the GNU General Public License, see +`/usr/share/common-licenses/GPL-2' for the full text. --- camlimages-3.0.1.orig/debian/TODO +++ camlimages-3.0.1/debian/TODO @@ -0,0 +1,2 @@ +- split different predicates in META file +- write a bounce of Makefile for examples compilation --- camlimages-3.0.1.orig/debian/README.source +++ camlimages-3.0.1/debian/README.source @@ -0,0 +1,5 @@ +This package use dpatch for patching the source. + +Please consider reading dpatch manpage to patch the source. + + -- Sylvain Le Gall Sun, 22 Jun 2008 23:26:52 +0200 --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-dev.dirs.in +++ camlimages-3.0.1/debian/libcamlimages-ocaml-dev.dirs.in @@ -0,0 +1 @@ +@OCamlStdlibDir@ --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.docs +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.docs @@ -0,0 +1 @@ +README --- camlimages-3.0.1.orig/debian/libcamlimages-ocaml-doc.examples +++ camlimages-3.0.1/debian/libcamlimages-ocaml-doc.examples @@ -0,0 +1 @@ +examples/* --- camlimages-3.0.1.orig/debian/watch +++ camlimages-3.0.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://gallium.inria.fr/camlimages/ camlimages-(.*)\.tar\.gz + --- camlimages-3.0.1.orig/debian/changelog +++ camlimages-3.0.1/debian/changelog @@ -0,0 +1,402 @@ +camlimages (1:3.0.1-5build2) lucid; urgency=low + + * No-change rebuild for OCaml 3.11.2 transition (LP: #527627). + + -- Ilya Barygin Thu, 25 Feb 2010 20:53:34 +0300 + +camlimages (1:3.0.1-5build1) lucid; urgency=low + + * No-change rebuild for liblablgtk2-ocaml transition. + + -- Ilya Barygin Sun, 31 Jan 2010 10:30:57 +0300 + +camlimages (1:3.0.1-5) unstable; urgency=low + + * Add a patch to fix integer overflows in tiffread.c + Fixes: CVE-2009-3296 + + -- Mehdi Dogguy Sun, 01 Nov 2009 14:04:33 +0100 + +camlimages (1:3.0.1-4) unstable; urgency=low + + * Update e-mail address + * Use dh_ocamldoc to generate and install the documentation + (Closes: #549763) + * Reorder inclusions in debian/rules to workaround a CDBS bug. + * Bump standards to 3.8.3 + * Use new features of dh-ocaml (>= 0.9) + * Tighten build-dependencies on lablgtk2 and findlib + * Fix duplicate-short-description + + -- Mehdi Dogguy Tue, 06 Oct 2009 17:09:31 +0200 + +camlimages (1:3.0.1-3) unstable; urgency=low + + * Add a patch fix_more_integer_overflows to fix security issues, + (Closes: 540146) + Fixes: CVE-2009-2660 + + -- Sylvain Le Gall Fri, 07 Aug 2009 23:56:55 +0200 + +camlimages (1:3.0.1-2) unstable; urgency=low + + [ Mehdi Dogguy ] + * Add myself to uploaders + * Fix missing comma in control file, Closes: #535675. + * Move library packages to ocaml section. + * Get rid of usage of old OCaml's stdlib location, fixes FTBFS. + * Add versioned dependencies to ocaml-findlib and lablgtk2 to ease + OCaml 3.11.1 transition. + * Bump standards to 3.8.2 + * Move documentation from the -dev package to the -doc one. + * Add a patch fix_integer_overflows to fix security issue (CVE-2009-2295) + + [ Sylvain Le Gall ] + * Use a unique ID foreach document managed by doc-base + + -- Mehdi Dogguy Thu, 02 Jul 2009 11:39:30 +0200 + +camlimages (1:3.0.1-1) unstable; urgency=low + + [ Ralf Treinen ] + * Updated debian/watch. + + [ Sylvain Le Gall ] + * New upstream version: + * Remove useless patches + * Adapt debian/rules and other debhelper files + * Add debian/patches/fix_3_0_1 to fix various problem (probably due to + OCaml 3.11 migration) + * Depends on version 2.12 of lablgtk2 + * Add dh-ocaml build-dependency (rules/ocaml.mk) + * Add ${misc:Depends} to dependencies + * Update Homepage field into debian/control and debian/copyright + * Add license version for debian packaging + * Directly use eng.html rather than creating a linked index.html file + + -- Sylvain Le Gall Thu, 05 Mar 2009 00:19:32 +0100 + +camlimages (1:2.2.0-4) unstable; urgency=low + + * Update copyright file to something more compliant with + http://wiki.debian.org/Proposals/CopyrightFormat + * Change Objective CAML for OCaml in debian/control + * Add *-dev dependency back, in fact they are used (Closes: #489085) + + -- Sylvain Le Gall Thu, 03 Jul 2008 16:33:16 +0200 + +camlimages (1:2.2.0-3) unstable; urgency=low + + [ Stefano Zacchiroli ] + * fix vcs-svn field to point just above the debian/ dir + + [ Ralf Treinen ] + * Changed doc-base section to Programming/OCaml + + [ Sylvain Le Gall ] + * Switch to libgif-dev (Closes: #486874) + * Remove useless debian/control.in + * Upgrade Standard-Version to 3.8.0 and drop dpkg-dev versionned + depends + * Add Homepage field + * Narrow Uploaders field to only people that have done something on + the package + * Enhance description, using list + * Update META.camlimages (Closes: #404412, #404393, #404395) + * Add README.source explaining to read dpatch manpage + * Change build-depends on gs to ghostscript + * Revamp debian/copyright + * Remove useless *-dev dependency on C library, they are useless + + -- Sylvain Le Gall Mon, 23 Jun 2008 00:17:32 +0200 + +camlimages (1:2.2.0-2) unstable; urgency=low + + * Build for ocaml 3.10.0 + * Generate ocamldoc API documentation + * Use OCAML_DLL_DIR/OCamlDllDir + + -- Sylvain Le Gall Tue, 04 Sep 2007 00:26:44 +0200 + +camlimages (1:2.2.0-1) experimental; urgency=low + + * Change email address to gildor@debian.org everywhere + * Upgrade debian/watch version to 3, + * Upgrade debhelper debian/compat to 5, + * Replace dependency Source-Version by binary:Version, + * Use CDBS for debian/rules, + * Use @OCamlTeam@ for Uploaders field in debian/control.in, + * Add versioned Build-Depends on dpkg-dev (>= 1.13.19), + * Add an epoch to reflect the change in the upstream + numbering scheme and update debian/watch file accordingly, + * Rebuild for ocaml 3.10.0 + + -- Sylvain Le Gall Tue, 24 Jul 2007 01:07:51 +0200 + +camlimages (2.20-8) unstable; urgency=low + + * Change my email address to gildor@debian.org, + * Set me as only uploaders, + * Made debian/control a PHONY target, + * Upgrade standards version to 3.7.2 (no change), + * Hijack the package, with the permission of the + Debian OCaml Maintainer group, + + -- Sylvain Le Gall Tue, 13 Jun 2006 19:09:31 +0200 + +camlimages (2.20-7) unstable; urgency=low + + * Rebuild for OCaml 3.09.1 + + -- Sylvain Le Gall Tue, 7 Feb 2006 00:29:48 +0100 + +camlimages (2.20-6) unstable; urgency=low + + * Remove any dependencies to liblablgtk-ocaml + + -- Sylvain Le Gall Tue, 6 Dec 2005 22:20:31 +0100 + +camlimages (2.20-5) unstable; urgency=low + + * Remove direct reference to ocaml library dir + * Remove dependency to lablgtk, only support lablgtk2 + * Upgrade to standard version 3.6.2.0 (no change) + * Remove hardcoded ocaml ABI version + * Patch tiff/tiffread.c to remove reference to uint16 + + -- Sylvain Le Gall Fri, 2 Dec 2005 01:30:19 +0100 + +camlimages (2.20-4) unstable; urgency=low + + * Transition to svn-buildpackage + + -- Sylvain Le Gall Mon, 22 Aug 2005 23:48:19 +0200 + +camlimages (2.20-3) unstable; urgency=medium + + * Transition to ocaml 3.08.3 : depends on ocaml-3.08.3 + + -- Sylvain Le Gall Wed, 30 Mar 2005 22:55:04 +0200 + +camlimages (2.20-2) unstable; urgency=low + + * Rebuild for binary compatibility with ocaml 3.08.2 + + -- Sylvain Le Gall Sun, 12 Dec 2004 12:10:46 +0100 + +camlimages (2.20-1) unstable; urgency=low + + * Fixed FTBFS caused by upstream forgetting that not every arch out there + has a native code compiler :/ + + -- Sven Luther Fri, 22 Oct 2004 15:53:42 +0200 + +camlimages (2.20-0) unstable; urgency=low + + * New upstream release. Previous seemed to be 2.1.2 or something such, and + new is 2.2, so i changed the version number to 2.20 to not introduce an + epoch. (Closes: #274819) + * The Image module has been renamed to Images to avoid conflict with other + ocaml libraries. Software using camlimages need thus to be adapted, but + this is a trivial change. + Build-depend on libcamlimages-ocaml-dev (>= 2.20-0) is recomended for + debian packages though. + + -- Sven Luther Thu, 21 Oct 2004 10:01:03 +0200 + +camlimages (2.12-6) unstable; urgency=low + + * Fixed dependencies for libtiff4 + + -- Sylvain LE GALL Fri, 30 Jul 2004 01:03:37 +0200 + +camlimages (2.12-5) unstable; urgency=low + + * Typo in control ( rpath doesn't exists ) + + -- Sylvain LE GALL Thu, 29 Jul 2004 01:42:10 +0200 + +camlimages (2.12-4) unstable; urgency=low + + * Rebuilt for ocaml 3.08. File modified : + - control ( ocaml-3.07 -> ocaml-3.08 ) + - libcamlimages-ocaml-dev.dirs ( 3.07 -> 3.08 ) + - libcamlimages-ocaml-dev.files ( 3.07 -> 3.08 ) + - libcamlimages-ocaml.dirs ( 3.07 -> 3.08 ) + + -- Sylvain LE GALL Fri, 27 Jul 2004 23:44:56 +0200 + +camlimages (2.12-2) unstable; urgency=low + + * Fix dependency on xlibs-dev : xlibs-dev package is a transition + package, now depend on libxpm-dev + + -- Sylvain LE GALL Fri, 21 May 2004 21:43:56 +0200 + +camlimages (2.12-1) unstable; urgency=low + + * New upstream release + * Stop using 01_fix_freetype_build.dpatch since it is applied upstream + * Stop using 02_fix_lablgtk2_build.dpatch since upstream fork a lablgtk2 + support + * Build for both lablgtk and lablgtk2 + * Reworked META files and move it to METAS/ : + - use camlimages.graphics for graphics support + - use camlimages.lablgtk for lablgtk support + - use camlimages.lablgtk2 for lablgtk2 support + + -- Sylvain LE GALL Thu, 6 May 2004 00:59:17 +0200 + +camlimages (2.11-6) unstable; urgency=low + + * Forget to remove the depends on libpng10-dev + + -- Sylvain LE GALL Wed, 14 Jan 2004 20:53:40 +0100 + +camlimages (2.11-5) unstable; urgency=low + + * Added watch to ease the maintainer task + * Use dpatch : + - dependency on dpatch + - set dependency in rules : clean to unpatch, configure-stamp to + patch-stamp, build-stamp to patch-stamp + - add dir debian/patches + - add file debian/patches/00list + * Fix the freetype inclusion bug by changing the way it is included in + freetyp2/ftintf.c ( closes: #227319 ) + * Fix the lablgtk2 build by using [>`drawable] Gobject.object instead of + Gdk.drawable + * Fix installation problem which need to write ld.conf ( simply remove this + part in makefile ) + * Move to DESTDIR makefile variable to install in the good directory + * Give up using debian/tmp. Directly install in + debian/libcamlimages-ocaml-dev and then moves things around + * Move to standard version 3.6.1 + * Depend on chrpath to remove the rpath in *.so + * Use dh_link to create link + * Stop using "-ln -s", because it creates things in the source... Better + user "cp".. ( this not a real improvement ) + * Build depends ( and consequently depends ) on libpng12-0-dev + * Set Maintainer to Debian Ocaml Task Force and uploaders to members of this + team + + -- Sylvain LE GALL Thu, 8 Jan 2004 17:19:14 +0100 + +camlimages (2.11-4) unstable; urgency=low + + * Rebuilt with ocaml-3.07 + * Changed png dependencies to libpng10{,-dev}; they should be the + right one according to libpng README.Debian + * Added deps on ocaml-findlib (used now in debian/rules to guess + lablgtk installation dir) + * Added debian/compat in place of old DH_COMPAT Makefile variable + + -- Stefano Zacchiroli Fri, 3 Oct 2003 13:41:29 +0200 + +camlimages (2.11-3) unstable; urgency=low + + * Removed unnecessary rpath to /usr/local/lib, thanks to Remi Vanicat + (Closes: Bug#189280) + * Bumped Standards-Version to 3.5.9 + * Changed section of libcamlimages-ocaml-dev package to new section + libdevel + + -- Stefano Zacchiroli Sat, 19 Apr 2003 15:54:07 +0200 + +camlimages (2.11-2) unstable; urgency=low + + * Maintainer upload (BTW, thanks Sven for the NMU) + * Fallback to libpng2 both for dependencies and build dependencies + (Closes: Bug#182270) + * Fallback to lablgtk 1.2.5 + * Added deps on lablgtk for binary packages + * Moved creation of -doc package in binary-indep debian/rules target + (Closes: Bug#182093) + * findlib's META file + - bumped version to 2.11 in META + - added predicate "ci_lablgtk" to link in ci_lablgtk.cm{,x}a + - added dependency on findlib's lablgtk package + + -- Stefano Zacchiroli Fri, 7 Mar 2003 17:07:26 +0100 + +camlimages (2.11-1.1) unstable; urgency=low + + * Rebuilt with lablgtk2 and libpng12-0. + NMU with the maintainers authorization. + + -- Sven Luther Thu, 13 Feb 2003 17:45:49 +0100 + +camlimages (2.11-1) unstable; urgency=low + + * New upstream release + * Fine grained build dependency on liblablgtk-ocaml-dev + + -- Stefano Zacchiroli Fri, 24 Jan 2003 20:36:16 +0100 + +camlimages (2.10-5) unstable; urgency=low + + * Libdir transition to /usr/lib/ocaml/3.06 + * Changed depends and build depends to ocaml{,-base}-3.06-1 + * Bumpder Standards-Version to 3.5.8 + * Applied patch from Remi Vanicat to avoid build failure against + /usr/include/tiff.h + + -- Stefano Zacchiroli Mon, 16 Dec 2002 14:30:22 +0100 + +camlimages (2.10-4) unstable; urgency=low + + * Better test for ocamlopt presence + * Rebuilt with 'correct' md5sum + + -- Stefano Zacchiroli Thu, 19 Sep 2002 17:20:55 +0200 + +camlimages (2.10-3) unstable; urgency=low + + * Rebuilt against ocaml-3.06 (Closes: Bug#158258, Bug#158271) + * Build depends on libpng3-dev instead of libpng-dev (Closes: Bug#154229) + * Changed deps and build-deps to ocaml-3.06 and ocaml-base-3.06 as + mandated by the new ocaml packaging policy + * Removed mention of old package "camlimages" from debian/control + * Removed debian patch for disappeared label "image" in Gdk.Draw.image + from lablgtk + * Bumped build-deps on liblablgtk-ocaml-dev to >= 1.2.5 + + -- Stefano Zacchiroli Tue, 27 Aug 2002 08:23:33 +0200 + +camlimages (2.10-2) unstable; urgency=low + + * Moved shared objects in /usr/lib/ocaml/stublibs + * Switched to debhelper 4 + * Commented out dh_ocamlld, no longer needed + + -- Stefano Zacchiroli Sun, 7 Jul 2002 14:52:11 +0200 + +camlimages (2.10-1) unstable; urgency=low + + * New upstream release + + -- Stefano Zacchiroli Sun, 2 Jun 2002 17:24:46 +0200 + +camlimages (2.00-3) unstable; urgency=low + + * Versioned conflict on camlimages. + * Fixed build-depends for the renaming of lablgtk package + liblablgtk-ocaml-dev + + -- Stefano Zacchiroli Mon, 25 Feb 2002 17:57:25 +0100 + +camlimages (2.00-2) unstable; urgency=low + + * Split runtime and development parts of the library. + * Changed packages names according to the debian ocaml policy draft posted + on the debian-ocaml-maint ML. + * Split -doc package. + * Some aesthetical changes in debian/rules. + + -- Stefano Zacchiroli Mon, 25 Feb 2002 16:05:10 +0100 + +camlimages (2.00-1) unstable; urgency=low + + * Initial Release (Closes: Bug#128831) + + -- Stefano Zacchiroli Fri, 11 Jan 2002 23:56:25 +0100 --- camlimages-3.0.1.orig/debian/patches/fix_integer_overflows.dpatch +++ camlimages-3.0.1/debian/patches/fix_integer_overflows.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_integer_overflows.dpatch by Mehdi Dogguy +## +## DP: Fix multiple integer overflows. +## DP: http://www.ocert.org/advisories/ocert-2009-009.html + +@DPATCH@ +diff -urNad camlimages~/src/pngread.c camlimages/src/pngread.c +--- camlimages~/src/pngread.c 2009-06-23 11:22:20.000000000 +0200 ++++ camlimages/src/pngread.c 2009-07-03 17:51:31.000000000 +0200 +@@ -15,6 +15,8 @@ + #include "config.h" + #endif + ++#include ++ + #include + + #include +@@ -26,6 +28,12 @@ + #define PNG_TAG_INDEX16 2 + #define PNG_TAG_INDEX4 3 + ++/* Test if x or y are negative, or if multiplying x * y would cause an ++ * arithmetic overflow. ++ */ ++#define oversized(x, y) \ ++ ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) ++ + value read_png_file_as_rgb24( name ) + value name; + { +@@ -81,6 +89,9 @@ + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + &interlace_type, NULL, NULL); + ++ if (oversized (width, height)) ++ failwith ("png error: image contains oversized or bogus width and height"); ++ + if ( color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { + png_set_gray_to_rgb(png_ptr); +@@ -102,10 +113,16 @@ + + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + ++ if (oversized (rowbytes, height)) ++ failwith ("png error: image contains oversized or bogus rowbytes and height"); ++ + { + int i; + png_bytep *row_pointers; + ++ if (oversized (sizeof (png_bytep), height)) ++ failwith ("png error: image contains oversized or bogus height"); ++ + row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height); + + res = alloc_tuple(3); +@@ -235,6 +252,9 @@ + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + &interlace_type, NULL, NULL); + ++ if (oversized (width, height)) ++ failwith ("png error: image contains oversized or bogus width and height"); ++ + if ( color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { + png_set_gray_to_rgb(png_ptr); +@@ -251,6 +271,9 @@ + + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + ++ if (oversized (rowbytes, height)) ++ failwith ("png error: image contains oversized or bogus rowbytes and height"); ++ + /* + fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr); + */ +@@ -259,6 +282,9 @@ + png_bytep *row_pointers; + char mesg[256]; + ++ if (oversized (sizeof (png_bytep), height)) ++ failwith ("png error: image contains oversized or bogus height"); ++ + row_pointers = (png_bytep*)stat_alloc(sizeof(png_bytep) * height); + res = alloc_tuple(3); + --- camlimages-3.0.1.orig/debian/patches/fix_3_0_1_release.dpatch +++ camlimages-3.0.1/debian/patches/fix_3_0_1_release.dpatch @@ -0,0 +1,97 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_3_0_1_release.dpatch by Sylvain Le Gall +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix bugs in the release 3.0.1 for OCaml 3.11 migration + +@DPATCH@ +diff -urNad camlimages~/examples/liv/liv.ml camlimages/examples/liv/liv.ml +--- camlimages~/examples/liv/liv.ml 2009-03-17 22:47:59.000000000 +0100 ++++ camlimages/examples/liv/liv.ml 2009-03-17 22:49:11.000000000 +0100 +@@ -12,6 +12,9 @@ + + (* $Id: liv.ml,v 1.7 2006/09/29 13:21:41 rousse Exp $ *) + ++module D = Display ++open D ++ + open Images;; + open OImages;; + +@@ -21,14 +24,13 @@ + + open Livmisc;; + open Gui;; +-open Display;; + open Tout;; + + open Gc;; + + exception Skipped;; + +-let base_filters = ref ([] : Display.filter list);; ++let base_filters = ref ([] : D.filter list);; + + let r = Gc.get () in + r.max_overhead <- 0; Gc.set r; +@@ -52,15 +54,15 @@ + "-root", + Arg.String + (function +- | "center" -> Display.root_mode := `CENTER +- | "random" -> Display.root_mode := `RANDOM ++ | "center" -> D.root_mode := `CENTER ++ | "random" -> D.root_mode := `RANDOM + | _ -> raise (Failure "root mode")), + ": on root [center|random]"; + "-transition", + Arg.String + (function +- | "myst" -> Display.transition := `MYST +- | "transparent" -> Display.transition := `TRANSPARENT ++ | "myst" -> D.transition := `MYST ++ | "transparent" -> D.transition := `TRANSPARENT + | _ -> raise (Failure "transition")), + ": transition [myst|transparent]"; + "-transparentborder", +diff -urNad camlimages~/src/Makefile.am camlimages/src/Makefile.am +--- camlimages~/src/Makefile.am 2009-03-17 22:47:59.000000000 +0100 ++++ camlimages/src/Makefile.am 2009-03-17 22:49:11.000000000 +0100 +@@ -85,6 +85,7 @@ + oColor.mli \ + oImages.mli \ + reduce.mli \ ++ geometry.mli \ + blend.mli \ + graphic_image.mli \ + bmp.mli \ +diff -urNad camlimages~/src/Makefile.in camlimages/src/Makefile.in +--- camlimages~/src/Makefile.in 2009-03-17 22:47:59.000000000 +0100 ++++ camlimages/src/Makefile.in 2009-03-17 22:49:11.000000000 +0100 +@@ -341,6 +341,7 @@ + images.mli \ + oColor.mli \ + oImages.mli \ ++ geometry.mli \ + reduce.mli \ + blend.mli \ + graphic_image.mli \ +diff -urNad camlimages~/src/geometry.mli camlimages/src/geometry.mli +--- camlimages~/src/geometry.mli 1970-01-01 01:00:00.000000000 +0100 ++++ camlimages/src/geometry.mli 2009-03-17 22:49:26.000000000 +0100 +@@ -0,0 +1,15 @@ ++type size = Scale of float | Pixel of int | Guess ++type aspect_opts = Keep_at_most | Keep_at_least | Dont_keep ++type resize_switch = Always | Bigger_only | Smaller_only ++type from = TopLeft | BottomRight | Center ++type position = AtPixel of from * int | AtScale of from * float ++type t = { geom_width : int; geom_height : int; geom_x : int; geom_y : int; } ++type spec = { ++ spec_width : size; ++ spec_height : size; ++ spec_aspect : aspect_opts; ++ spec_switch : resize_switch; ++ spec_x : int; ++ spec_y : int; ++} ++val compute : spec -> int -> int -> t --- camlimages-3.0.1.orig/debian/patches/00list +++ camlimages-3.0.1/debian/patches/00list @@ -0,0 +1,4 @@ +fix_3_0_1_release +fix_integer_overflows +fix_more_integer_overflows +tiffread --- camlimages-3.0.1.orig/debian/patches/fix_more_integer_overflows.dpatch +++ camlimages-3.0.1/debian/patches/fix_more_integer_overflows.dpatch @@ -0,0 +1,167 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_more_integer_overflows.dpatch by Sylvain Le Gall +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix multiple integer overflows round 2. +## DP: http://security-tracker.debian.net/tracker/CVE-2009-2660 + +@DPATCH@ +diff -urNad camlimages~/src/gifread.c camlimages/src/gifread.c +--- camlimages~/src/gifread.c 2009-07-31 22:57:24.000000000 +0200 ++++ camlimages/src/gifread.c 2009-08-07 23:45:01.000000000 +0200 +@@ -20,6 +20,8 @@ + #include + #include + ++#include "oversized.h" ++ + #include + #include + +@@ -191,6 +193,9 @@ + + GifFileType *GifFile = (GifFileType*) hdl; + ++ if( oversized( GifFile->Image.Width, sizeof(GifPixelType) ) ){ ++ failwith_oversized("gif"); ++ } + buf = alloc_string( GifFile->Image.Width * sizeof(GifPixelType) ); + + if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) +diff -urNad camlimages~/src/jpegread.c camlimages/src/jpegread.c +--- camlimages~/src/jpegread.c 2009-07-31 22:57:24.000000000 +0200 ++++ camlimages/src/jpegread.c 2009-08-07 23:45:01.000000000 +0200 +@@ -20,6 +20,8 @@ + #include + #include + ++#include "oversized.h" ++ + #include + #include + +@@ -156,6 +158,12 @@ + */ + /* JSAMPLEs per row in output buffer */ + ++ if( oversized(cinfo.output_width, cinfo.output_components) ){ ++ jpeg_destroy_decompress(&cinfo); ++ fclose(infile); ++ failwith_oversized("jpeg"); ++ } ++ + row_stride = cinfo.output_width * cinfo.output_components; + + /* Make a one-row-high sample array that will go away when done with image */ +@@ -177,6 +185,12 @@ + jpeg_read_scanlines(&cinfo, buffer + cinfo.output_scanline, 1); + } + ++ if( oversized(row_stride, cinfo.output_height) ){ ++ jpeg_destroy_decompress(&cinfo); ++ fclose(infile); ++ failwith_oversized("jpeg"); ++ } ++ + { + CAMLlocalN(r,3); + r[0] = Val_int(cinfo.output_width); +@@ -352,6 +366,7 @@ + + { + CAMLlocalN(r,3); ++ // CR jfuruse: integer overflow + r[0] = Val_int(cinfop->output_width); + r[1] = Val_int(cinfop->output_height); + r[2] = alloc_tuple(3); +diff -urNad camlimages~/src/oversized.h camlimages/src/oversized.h +--- camlimages~/src/oversized.h 1970-01-01 01:00:00.000000000 +0100 ++++ camlimages/src/oversized.h 2009-08-07 23:45:01.000000000 +0200 +@@ -0,0 +1,9 @@ ++#include ++/* Test if x or y are negative, or if multiplying x * y would cause an ++ * arithmetic overflow. ++ */ ++#define oversized(x, y) \ ++ ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) ++ ++#define failwith_oversized(lib) \ ++ failwith("#lib error: image contains oversized or bogus width and height"); +diff -urNad camlimages~/src/pngread.c camlimages/src/pngread.c +--- camlimages~/src/pngread.c 2009-08-07 23:44:02.000000000 +0200 ++++ camlimages/src/pngread.c 2009-08-07 23:51:15.000000000 +0200 +@@ -19,6 +19,8 @@ + + #include + ++#include "oversized.h" ++ + #include + #include + #include +@@ -28,12 +30,6 @@ + #define PNG_TAG_INDEX16 2 + #define PNG_TAG_INDEX4 3 + +-/* Test if x or y are negative, or if multiplying x * y would cause an +- * arithmetic overflow. +- */ +-#define oversized(x, y) \ +- ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) +- + value read_png_file_as_rgb24( name ) + value name; + { +@@ -90,7 +86,7 @@ + &interlace_type, NULL, NULL); + + if (oversized (width, height)) +- failwith ("png error: image contains oversized or bogus width and height"); ++ failwith_oversized("png"); + + if ( color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { +@@ -114,14 +110,14 @@ + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + if (oversized (rowbytes, height)) +- failwith ("png error: image contains oversized or bogus rowbytes and height"); ++ failwith_oversized("png"); + + { + int i; + png_bytep *row_pointers; + + if (oversized (sizeof (png_bytep), height)) +- failwith ("png error: image contains oversized or bogus height"); ++ failwith_oversized("png"); + + row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height); + +@@ -253,7 +249,7 @@ + &interlace_type, NULL, NULL); + + if (oversized (width, height)) +- failwith ("png error: image contains oversized or bogus width and height"); ++ failwith_oversized("png"); + + if ( color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { +@@ -272,7 +268,7 @@ + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + if (oversized (rowbytes, height)) +- failwith ("png error: image contains oversized or bogus rowbytes and height"); ++ failwith_oversized("png"); + + /* + fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr); +@@ -283,7 +279,7 @@ + char mesg[256]; + + if (oversized (sizeof (png_bytep), height)) +- failwith ("png error: image contains oversized or bogus height"); ++ failwith_oversized("png"); + + row_pointers = (png_bytep*)stat_alloc(sizeof(png_bytep) * height); + res = alloc_tuple(3); --- camlimages-3.0.1.orig/debian/patches/tiffread.dpatch +++ camlimages-3.0.1/debian/patches/tiffread.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## tiffread.dpatch by Mehdi Dogguy +## +## 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 + #include + ++#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");