[arch-commits] Commit in libtiff/trunk (3 files)

[Eric Bélanger]

    Date: Sunday, June 20, 2010 @ 17:43:27
  Author: eric
Revision: 83314

upgpkg: libtiff 3.9.4-1
Upstream update

Modified:
  libtiff/trunk/ChangeLog
  libtiff/trunk/PKGBUILD
Deleted:
  libtiff/trunk/tiff-3.9.0-CVE-2009-2347.patch

--------------------------------+
 ChangeLog                      |    5 +++++
 PKGBUILD                       |   19 ++++++++++---------
 tiff-3.9.0-CVE-2009-2347.patch |   29 -----------------------------
 3 files changed, 15 insertions(+), 38 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-06-20 21:17:46 UTC (rev 83313)
+++ ChangeLog	2010-06-20 21:43:27 UTC (rev 83314)
@@ -1,3 +1,8 @@
+2010-06-20  Eric Belanger  <eric at archlinux.org>
+
+	* libtiff 3.9.4-1
+	* Upstream update
+
 2009-11-05  Eric Belanger  <eric at archlinux.org>
 
 	* libtiff 3.9.2-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-20 21:17:46 UTC (rev 83313)
+++ PKGBUILD	2010-06-20 21:43:27 UTC (rev 83314)
@@ -3,29 +3,30 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=libtiff
-pkgver=3.9.2
-pkgrel=2
+pkgver=3.9.4
+pkgrel=1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
-depends=('libjpeg>=8' 'zlib')
+depends=('libjpeg' 'zlib')
 makedepends=('libgl' 'freeglut' 'libxmu' 'libxi')
 optdepends=('freeglut: for using tiffgt')
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \
-        libtiff-CVE-2009-2285.patch tiff-3.9.0-CVE-2009-2347.patch)
-md5sums=('93e56e421679c591de7552db13384cb8' 'ff61077408727a82281f77a94f555e2a'\
-         '867fa3ec83e748abf247f9706ef13f9a')
-sha1sums=('5c054d31e350e53102221b7760c3700cf70b4327' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b'\
-         'cf8b68ed8f218d2429ab296c2033dc0292efe299')
+        libtiff-CVE-2009-2285.patch)
+md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a')
+sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b')
 
 build() {
   cd "${srcdir}/tiff-${pkgver}"
   patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1
-  patch -p0 < ../tiff-3.9.0-CVE-2009-2347.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1
   make || return 1
+}
+
+package() {
+  cd "${srcdir}/tiff-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Deleted: tiff-3.9.0-CVE-2009-2347.patch
===================================================================
--- tiff-3.9.0-CVE-2009-2347.patch	2010-06-20 21:17:46 UTC (rev 83313)
+++ tiff-3.9.0-CVE-2009-2347.patch	2010-06-20 21:43:27 UTC (rev 83314)
@@ -1,29 +0,0 @@
---- tools/tiff2rgba.c.orig	2009-08-27 00:05:33.000000000 -0400
-+++ tools/tiff2rgba.c	2009-08-27 00:23:44.000000000 -0400
-@@ -236,6 +236,7 @@
-     uint32  width, height;		/* image width & height */
-     uint32  row;
-     uint32  *wrk_line;
-+    size_t pixel_count;
-     int	    ok = 1;
- 
-     TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
-@@ -251,7 +252,17 @@
-     /*
-      * Allocate strip buffer
-      */
--    raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32));
-+   pixel_count = width * rowsperstrip;
-+
-+    /* XXX: Check the integer overflow. */
-+    if (!width || !rowsperstrip || pixel_count / width != rowsperstrip) {
-+        TIFFError(TIFFFileName(in),
-+		  "Malformed input file; can't allocate buffer for raster of %lux%lu size",
-+		  (unsigned long)width, (unsigned long)rowsperstrip);
-+        return 0;
-+    }
-+
-+   raster = (uint32*)_TIFFCheckMalloc(in, pixel_count, sizeof(uint32), "raster buffer");
-     if (raster == 0) {
-         TIFFError(TIFFFileName(in), "No space for raster buffer");
-         return (0);