main/tiff: remove uneeded patch. Don't patch Changelog (fails)

5 files changed, 10 insertions, 190 deletions

diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index 1938591794..bf84f4da29 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=tiff
 pkgver=4.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides support for the Tag Image File Format or TIFF"
 url="http://www.libtiff.org/"
 arch="all"
@@ -57,14 +57,14 @@ tools() {
 }
 
 md5sums="d1d2e940dea0b5ad435f21f03d96dd72  tiff-4.0.6.tar.gz
-df8f798e758ab11e2c860c488d38d09d  CVE-2015-8665.patch
-a12f14861bfbd312617058f2a9def2f1  CVE-2015-8781-8782-8783.patch
-6d354e0113daeb5fefc1093171451e2e  CVE-2015-8784.patch"
+1ed2295ff179a6b64803d33f0f865740  CVE-2015-8665.patch
+96d2a934914a548d244e0a055f370334  CVE-2015-8781-8782-8783.patch
+8b3e84314fc2c0eeabd8d2c410f85727  CVE-2015-8784.patch"
 sha256sums="4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c  tiff-4.0.6.tar.gz
-b510cbee8df5a7484a95490c39e5768359eab51a698f12bfb19d0c0c1f665940  CVE-2015-8665.patch
-1d248eeb9ebe50627b7358d80f3de6709ab423e360a3bcbbfb5fa5aa56227b25  CVE-2015-8781-8782-8783.patch
-99fb2babac2f54f8733ab4f8e6a4ba921a62a7dc9738fdc6e72aa2a68e53cb2d  CVE-2015-8784.patch"
+1e4158f2a85e4c597b2a6d290c54d4ee815c8930f80824363945506bda3fc798  CVE-2015-8665.patch
+f7c953c51f4f14b8627aad9bfe5b183b5d56e62e96e24d80a233e0b849c0c743  CVE-2015-8781-8782-8783.patch
+504332761f3e72d8424fd59d4e2c75dd280f61efbbd4e60f6bc0e1f91ed9e972  CVE-2015-8784.patch"
 sha512sums="2c8dbaaaab9f82a7722bfe8cb6fcfcf67472beb692f1b7dafaf322759e7016dad1bc58457c0f03db50aa5bd088fef2b37358fcbc1524e20e9e14a9620373fdf8  tiff-4.0.6.tar.gz
-377a1b1d49dcbec2e54252e893365a76e411c0b21a42e1e77ae77fa3f93f56e1898b3261172f8d6d6156bc1275d5daab05feea34918dad3124ca0690ce7865b4  CVE-2015-8665.patch
-cb4917a4c2e1ea4bfe94e06b5972d0030ad47b4affc51e4ef6449aec0933dcadd0ac85386812db52214c778912f1537111fc17a0c378d53091cb18e460db36b3  CVE-2015-8781-8782-8783.patch
-980ca57984903a909ed8fc6068066c21242f599c570f37363f5a97a13ee0e59c3075478301c7af2516c0c6ef96e7a8cd7e743e9d5ec5eedb454220c984e2b439  CVE-2015-8784.patch"
+4507d3852d57922574897d53f366d80d71d0d83850aa3c3993b956fabce26165f315838c17430d1abd41f160c40a4e3d8e6b31ff150e81059669ccfe29f90126  CVE-2015-8665.patch
+4ca7823f666df8f29eba0f62a14f71e440eef20fcc8d3a1a77cf65a07e1e737bdcfb49641ee5b62ce28877ef428106996254989d2100615dc7cf2be7aa903002  CVE-2015-8781-8782-8783.patch
+46c917d435bca839bc2bcdb170e1a9724e07da9ba9cdf1230168f1cef7b1e62c4af19ebe4892d9d56f29fcf2820b8f55e81539eca70120893b2f0894efcc370f  CVE-2015-8784.patch"
diff --git a/main/tiff/CVE-2015-8665.patch b/main/tiff/CVE-2015-8665.patch
index 8a4bd3d687..f80d736e15 100644
--- a/main/tiff/CVE-2015-8665.patch
+++ b/main/tiff/CVE-2015-8665.patch
@@ -8,26 +8,9 @@ Subject: [PATCH] * libtiff/tif_getimage.c: fix out-of-bound reads in
  limingxing and CVE-2015-8683 reported by zzf of Alibaba.
 
 ---
- ChangeLog              |  8 ++++++++
  libtiff/tif_getimage.c | 35 ++++++++++++++++++++++-------------
  2 files changed, 30 insertions(+), 13 deletions(-)
 
-diff --git a/ChangeLog b/ChangeLog
-index a7d283a..4beb30b 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2015-12-26  Even Rouault <even.rouault at spatialys.com>
-+
-+	* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
-+	interface in case of unsupported values of SamplesPerPixel/ExtraSamples
-+	for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in
-+	TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and
-+	CVE-2015-8683 reported by zzf of Alibaba.
-+
- 2015-12-21  Even Rouault <even.rouault at spatialys.com>
- 
- 	* libtiff/tif_dirread.c: workaround false positive warning of Clang Static
 diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
 index cdeff08..261aad6 100644
 --- a/libtiff/tif_getimage.c
diff --git a/main/tiff/CVE-2015-8683.patch b/main/tiff/CVE-2015-8683.patch
deleted file mode 100644
index 8a4bd3d687..0000000000
--- a/main/tiff/CVE-2015-8683.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From f94a29a822f5528d2334592760fbb7938f15eb55 Mon Sep 17 00:00:00 2001
-From: erouault <erouault>
-Date: Sat, 26 Dec 2015 17:32:03 +0000
-Subject: [PATCH] * libtiff/tif_getimage.c: fix out-of-bound reads in
- TIFFRGBAImage interface in case of unsupported values of
- SamplesPerPixel/ExtraSamples for LogLUV / CIELab. Add explicit call to
- TIFFRGBAImageOK() in TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by
- limingxing and CVE-2015-8683 reported by zzf of Alibaba.
-
----
- ChangeLog              |  8 ++++++++
- libtiff/tif_getimage.c | 35 ++++++++++++++++++++++-------------
- 2 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a7d283a..4beb30b 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2015-12-26  Even Rouault <even.rouault at spatialys.com>
-+
-+	* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
-+	interface in case of unsupported values of SamplesPerPixel/ExtraSamples
-+	for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in
-+	TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and
-+	CVE-2015-8683 reported by zzf of Alibaba.
-+
- 2015-12-21  Even Rouault <even.rouault at spatialys.com>
- 
- 	* libtiff/tif_dirread.c: workaround false positive warning of Clang Static
-diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
-index cdeff08..261aad6 100644
---- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -182,20 +182,22 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
- 				    "Planarconfiguration", td->td_planarconfig);
- 				return (0);
- 			}
--			if( td->td_samplesperpixel != 3 )
-+			if( td->td_samplesperpixel != 3 || colorchannels != 3 )
-             {
-                 sprintf(emsg,
--                        "Sorry, can not handle image with %s=%d",
--                        "Samples/pixel", td->td_samplesperpixel);
-+                        "Sorry, can not handle image with %s=%d, %s=%d",
-+                        "Samples/pixel", td->td_samplesperpixel,
-+                        "colorchannels", colorchannels);
-                 return 0;
-             }
- 			break;
- 		case PHOTOMETRIC_CIELAB:
--            if( td->td_samplesperpixel != 3 || td->td_bitspersample != 8 )
-+            if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 )
-             {
-                 sprintf(emsg,
--                        "Sorry, can not handle image with %s=%d and %s=%d",
-+                        "Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
-                         "Samples/pixel", td->td_samplesperpixel,
-+                        "colorchannels", colorchannels,
-                         "Bits/sample", td->td_bitspersample);
-                 return 0;
-             }
-@@ -255,6 +257,9 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
- 	int colorchannels;
- 	uint16 *red_orig, *green_orig, *blue_orig;
- 	int n_color;
-+	
-+	if( !TIFFRGBAImageOK(tif, emsg) )
-+		return 0;
- 
- 	/* Initialize to normal values */
- 	img->row_offset = 0;
-@@ -2509,29 +2514,33 @@ PickContigCase(TIFFRGBAImage* img)
- 		case PHOTOMETRIC_RGB:
- 			switch (img->bitspersample) {
- 				case 8:
--					if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
-+					if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
-+						img->samplesperpixel >= 4)
- 						img->put.contig = putRGBAAcontig8bittile;
--					else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
-+					else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
-+							 img->samplesperpixel >= 4)
- 					{
- 						if (BuildMapUaToAa(img))
- 							img->put.contig = putRGBUAcontig8bittile;
- 					}
--					else
-+					else if( img->samplesperpixel >= 3 )
- 						img->put.contig = putRGBcontig8bittile;
- 					break;
- 				case 16:
--					if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
-+					if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
-+						img->samplesperpixel >=4 )
- 					{
- 						if (BuildMapBitdepth16To8(img))
- 							img->put.contig = putRGBAAcontig16bittile;
- 					}
--					else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
-+					else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
-+							 img->samplesperpixel >=4 )
- 					{
- 						if (BuildMapBitdepth16To8(img) &&
- 						    BuildMapUaToAa(img))
- 							img->put.contig = putRGBUAcontig16bittile;
- 					}
--					else
-+					else if( img->samplesperpixel >=3 )
- 					{
- 						if (BuildMapBitdepth16To8(img))
- 							img->put.contig = putRGBcontig16bittile;
-@@ -2540,7 +2549,7 @@ PickContigCase(TIFFRGBAImage* img)
- 			}
- 			break;
- 		case PHOTOMETRIC_SEPARATED:
--			if (buildMap(img)) {
-+			if (img->samplesperpixel >=4 && buildMap(img)) {
- 				if (img->bitspersample == 8) {
- 					if (!img->Map)
- 						img->put.contig = putRGBcontig8bitCMYKtile;
-@@ -2636,7 +2645,7 @@ PickContigCase(TIFFRGBAImage* img)
- 			}
- 			break;
- 		case PHOTOMETRIC_CIELAB:
--			if (buildMap(img)) {
-+			if (img->samplesperpixel == 3 && buildMap(img)) {
- 				if (img->bitspersample == 8)
- 					img->put.contig = initCIELabConversion(img);
- 				break;
diff --git a/main/tiff/CVE-2015-8781-8782-8783.patch b/main/tiff/CVE-2015-8781-8782-8783.patch
index 1d056cffa9..c8073baa08 100644
--- a/main/tiff/CVE-2015-8781-8782-8783.patch
+++ b/main/tiff/CVE-2015-8781-8782-8783.patch
@@ -7,25 +7,9 @@ Subject: [PATCH] * libtiff/tif_luv.c: fix potential out-of-bound writes in
  input data.
 
 ---
- ChangeLog         |  7 +++++++
  libtiff/tif_luv.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
  2 files changed, 51 insertions(+), 11 deletions(-)
 
-diff --git a/ChangeLog b/ChangeLog
-index 4beb30b..b8aa23c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2015-12-27  Even Rouault <even.rouault at spatialys.com>
-+
-+	* libtiff/tif_luv.c: fix potential out-of-bound writes in decode
-+	functions in non debug builds by replacing assert()s by regular if
-+	checks (bugzilla #2522).
-+	Fix potential out-of-bound reads in case of short input data.
-+
- 2015-12-26  Even Rouault <even.rouault at spatialys.com>
- 
- 	* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
 diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
 index 3dc13f1..b66ff64 100644
 --- a/libtiff/tif_luv.c
diff --git a/main/tiff/CVE-2015-8784.patch b/main/tiff/CVE-2015-8784.patch
index 75504e1240..ab48ddf738 100644
--- a/main/tiff/CVE-2015-8784.patch
+++ b/main/tiff/CVE-2015-8784.patch
@@ -6,26 +6,9 @@ Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in
  (bugzilla #2508)
 
 ---
- ChangeLog          |  6 ++++++
  libtiff/tif_next.c | 10 ++++++++--
  2 files changed, 14 insertions(+), 2 deletions(-)
 
-diff --git a/ChangeLog b/ChangeLog
-index b8aa23c..04926a3 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,5 +1,11 @@
- 2015-12-27  Even Rouault <even.rouault at spatialys.com>
- 
-+	* libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
-+	triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
-+	(bugzilla #2508)
-+
-+2015-12-27  Even Rouault <even.rouault at spatialys.com>
-+
- 	* libtiff/tif_luv.c: fix potential out-of-bound writes in decode
- 	functions in non debug builds by replacing assert()s by regular if
- 	checks (bugzilla #2522).
 diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c
 index dd669cc..0a5b635 100644
 --- a/libtiff/tif_next.c