CVS commit: pkgsrc/graphics/tiff

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri May  5 19:16:58 UTC 2017

Modified Files:
        pkgsrc/graphics/tiff: Makefile
Added Files:
        pkgsrc/graphics/tiff/patches: patch-tools_tiffcrop.c

Log Message:
Apply fix from upstream to fix CVE-2016-10092, ref.
http://bugzilla.maptools.org/show_bug.cgi?id=2620 and
https://github.com/vadz/libtiff/commit/9657bbe3cdce4aaa90e07d50c1c70ae52da0ba6a
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/graphics/tiff/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/tiff/patches/patch-tools_tiffcrop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/tiff/Makefile
diff -u pkgsrc/graphics/tiff/Makefile:1.126 pkgsrc/graphics/tiff/Makefile:1.127
--- pkgsrc/graphics/tiff/Makefile:1.126 Wed May  3 23:00:59 2017
+++ pkgsrc/graphics/tiff/Makefile       Fri May  5 19:16:57 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2017/05/03 23:00:59 sevan Exp $
+# $NetBSD: Makefile,v 1.127 2017/05/05 19:16:57 he Exp $
 
 DISTNAME=      tiff-4.0.7
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://download.osgeo.org/libtiff/
 

Added files:

Index: pkgsrc/graphics/tiff/patches/patch-tools_tiffcrop.c
diff -u /dev/null pkgsrc/graphics/tiff/patches/patch-tools_tiffcrop.c:1.1
--- /dev/null   Fri May  5 19:16:58 2017
+++ pkgsrc/graphics/tiff/patches/patch-tools_tiffcrop.c Fri May  5 19:16:57 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-tools_tiffcrop.c,v 1.1 2017/05/05 19:16:57 he Exp $
+
+Fix for CVE-2016-10092, ref. http://bugzilla.maptools.org/show_bug.cgi?id=2620
+and
+https://github.com/vadz/libtiff/commit/9657bbe3cdce4aaa90e07d50c1c70ae52da0ba6a
+
+--- tools/tiffcrop.c.orig      2016-11-19 01:45:30.000000000 +0000
++++ tools/tiffcrop.c
+@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (T
+                                   (unsigned long) strip, (unsigned long)rows);
+                         return 0;
+                 }
+-                bufp += bytes_read;
++                bufp += stripsize;
+         }
+ 
+         return 1;