From 61f9bd1801a8c44c2f9d3ef834d4d84ddf3d0b1a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 9 Nov 2019 21:15:56 +0100
Subject: [PATCH] tiff: update to 4.1.0.

---
 srcpkgs/tiff/patches/CVE-2019-6128.patch | 49 ------------------------
 srcpkgs/tiff/template                    |  6 +--
 2 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/tiff/patches/CVE-2019-6128.patch

diff --git a/srcpkgs/tiff/patches/CVE-2019-6128.patch b/srcpkgs/tiff/patches/CVE-2019-6128.patch
deleted file mode 100644
index adb8a9d7381..00000000000
--- a/srcpkgs/tiff/patches/CVE-2019-6128.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001
-From: Scott Gayou <github.scott@gmail.com>
-Date: Wed, 23 Jan 2019 15:03:53 -0500
-Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128.
-
-pal2rgb failed to free memory on a few errors. This was reported
-here: http://bugzilla.maptools.org/show_bug.cgi?id=2836.
----
- tools/pal2rgb.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git tools/pal2rgb.c tools/pal2rgb.c
-index 01d8502e..9492f1cf 100644
---- tools/pal2rgb.c
-+++ tools/pal2rgb.c
-@@ -118,12 +118,14 @@ main(int argc, char* argv[])
- 	    shortv != PHOTOMETRIC_PALETTE) {
- 		fprintf(stderr, "%s: Expecting a palette image.\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
- 		fprintf(stderr,
- 		    "%s: No colormap (not a valid palette image).\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	bitspersample = 0;
-@@ -131,11 +133,14 @@ main(int argc, char* argv[])
- 	if (bitspersample != 8) {
- 		fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	out = TIFFOpen(argv[optind+1], "w");
--	if (out == NULL)
-+	if (out == NULL) {
-+		(void) TIFFClose(in);
- 		return (-2);
-+	}
- 	cpTags(in, out);
- 	TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
- 	TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);
--- 
-2.18.1
-
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index 6aca7fd94ad..87035ceeee1 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,7 +1,7 @@
 # Template file for 'tiff'
 pkgname=tiff
-version=4.0.10
-revision=2
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
 hostmakedepends="automake libtool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="libtiff"
 homepage="http://libtiff.maptools.org/"
 distfiles="http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
-checksum=2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
+checksum=5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634
 
 pre_configure() {
 	autoreconf -fi