From 0740a75c5fdd58c35872002859c3d32162e0e89b Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 25 Dec 2002 14:25:27 +0000
Subject: Fix core dump when fax2tiff is started without arguments. Patch from
 Ingolf Steinbach in PR 19306. Bump PKGREVISION to 1.

---
 graphics/tiff/Makefile         |  3 ++-
 graphics/tiff/distinfo         |  3 ++-
 graphics/tiff/patches/patch-ag | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 graphics/tiff/patches/patch-ag

(limited to 'graphics')

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 88aee8c69eb..b24095bfe31 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2002/10/20 09:15:23 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2002/12/25 14:25:27 wiz Exp $
 
 DISTNAME=	tiff-v3.5.7
 PKGNAME=	tiff-3.5.7
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index d2431d271bb..90df943456d 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/03/05 19:33:16 martti Exp $
+$NetBSD: distinfo,v 1.9 2002/12/25 14:25:27 wiz Exp $
 
 SHA1 (tiff-v3.5.7.tar.gz) = a4c3e27b6625ee9daec7c7c35ec3dedf59c14ca7
 Size (tiff-v3.5.7.tar.gz) = 951139 bytes
@@ -10,3 +10,4 @@ SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
 SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
 SHA1 (patch-ae) = 146a27e003ec0d194f31b021b961699f3ffe9f94
 SHA1 (patch-af) = e168502fbdc7f94439aa71a5f67d85ce41d1a68e
+SHA1 (patch-ag) = 32ff74fe27c0fd00948c50db97a2ee71f34560ef
diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag
new file mode 100644
index 00000000000..016022736a7
--- /dev/null
+++ b/graphics/tiff/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.3 2002/12/25 14:25:27 wiz Exp $
+
+--- tools/fax2tiff.c.orig	Fri Jan 28 22:18:16 2000
++++ tools/fax2tiff.c
+@@ -63,6 +63,13 @@ DummyReadProc(thandle_t fd, tdata_t buf,
+ }
+ 
+ static tsize_t
++DummySeekProc(thandle_t fd, toff_t offset, int whence)
++{
++	(void) fd; (void) offset; (void) whence;
++	return (0);
++}
++
++static tsize_t
+ DummyWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
+ {
+ 	(void) fd; (void) buf; (void) size;
+@@ -89,7 +96,7 @@ main(int argc, char* argv[])
+ 	/* smuggle a descriptor out of the library */
+ 	faxTIFF = TIFFClientOpen("(FakeInput)", "w", (thandle_t) -1,
+ 				 DummyReadProc, DummyWriteProc,
+-				 NULL, NULL, NULL, NULL, NULL);
++				 DummySeekProc, NULL, NULL, NULL, NULL);
+ 	if (faxTIFF == NULL)
+ 		return (EXIT_FAILURE);
+ 	faxTIFF->tif_mode = O_RDONLY;
-- 
cgit v1.2.3