gentoo resync : 17.02.2018

3 files changed, 75 insertions, 15 deletions

diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 8f8fcbce4852..6001f8734365 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -11,6 +11,7 @@ AUX tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch 1278 BLAKE2B d2e9406584c
 AUX tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch 2992 BLAKE2B f588838219ba3323a15b35d04b168180229ce1ad9c018c2104d2663905aaafc2aae001f188f6c6c722190d086b1fd1422ca5bfd2a55b45c7120dfe1792b4d728 SHA512 0fc1b6b8a57629730b10c0c30d915ce8a9575cac5e1daa91ae74be4e866e4c9cf49031897c001b3ade8182274d875988d40c1d4214b2a427d4676762ca7f2c4c
 AUX tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch 849 BLAKE2B b0087382944185e1b91e65ae5b1a8998d31c4285308a1d9a2db20064f92b8aea07341a4a93242678f7ff332bf21d091a902907f74d320d2739b151efff25bec1 SHA512 9da30e7223522dfb4d8a8bc8b5bd545615cfe60a509f8583d29817ecbb1ff28ca38a6e00ee845e9484d9bc02666f99b0144ea08e5083eef2035e99b1825f4bd3
 AUX tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch 1228 BLAKE2B ca3babb8a10c96ecfb72914651f8e737ec4d2a7a7fbdc4b9c153e2a7f540fa1a0b5907bad374ddbce53364caba0282d848b03992b793c14490740ecb786fe47c SHA512 4add933c6b7e2938affb03e00da0bb28789cd9998f5496f4b592ae14d35175f6ce8a4e83ee639ef42211a8683bddad5b4c8375a1ba0a331bc72a40c45e691162
+AUX tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch 2443 BLAKE2B e18f4acec3dc8088eec5080272e6d759c0823cb1f8036d45bc5289cc22e8a487ff5d8761e0d2e49d4c450f407e859c00913988df9c45e51318b53c5fbec01483 SHA512 a489d4bdf5b3861fdf18107ff4a0224e2d458acf719af9d7eb6ef230285ceb5d37bc483c32800cc8180ccc69ffbc80d8887b8660265466ddd52a3447f1f44e61
 AUX tiff-4.0.9-CVE-2017-9935.patch 6636 BLAKE2B b7660dee9e379aea59f7225024697ea35b820837502e9e19157391c569c6b85473c4da5163f2e6fa8934c68cc32cbc45d025a2c336d21d79f461723a68a6e49f SHA512 ca1beda6e1550ac8a4bdf2bdefaba38f5fc40d2e842709ed1a803aeef5c34cd466f93fc6e7bb8e7ffb7e21a702d54584b84615e7c3dc3a8d2d29ceeadaeca7f6
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
@@ -18,5 +19,5 @@ DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb6
 EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
 EBUILD tiff-4.0.8.ebuild 2615 BLAKE2B 7cbfe610a0a6120946bcfcbbbbfdcd3de00d3355478900efe4206e95db378d60772f2e553a55719557d087669af653c7b151da93efc0afe0a287bf5d512a1bb3 SHA512 100bda64fb5f70919467585eac5d717d4cf7dfb6059c9a87482c370a3013eb566b73ad01160c0a9b5cab48e6b442182edbbe70d593293ce8984650032981c339
 EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09
-EBUILD tiff-4.0.9.ebuild 2486 BLAKE2B 39a931e22b9cc13b7ca8a863ddfa07e5812a3299465799b0bd156b044edb3154cb94a6d4cfe11cb1a3ff09a99df5d19485fd4f606a0072a898e848b3be0cba90 SHA512 fc596b278c56d07fa5f58a053528f73d4486935a3783d4d1653f0d83bd891697b70a9e0fc3098c419dc34a9f674398299037ea47870eed9d596a98109ff7f4c5
+EBUILD tiff-4.0.9-r2.ebuild 2359 BLAKE2B 65b2f2e66992a1d926aacd94439afc0f1fa48e568473fb750bacfa30048c618b1bb4e75555d18f434a13ec0736be7292e8c00921a6e7c605082fba7f8f2432f5 SHA512 5fea44e4882feffea242270d23a464348aa086dec354349f09ed4be0ae26664e8522fbec177820fe8e1c9d94764746a493fb0b7e38b249300bf316243a3625f7
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch
new file mode 100644
index 000000000000..101618ee7d57
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch
@@ -0,0 +1,58 @@
+From d4f213636b6f950498a1386083199bd7f65676b9 Mon Sep 17 00:00:00 2001
+From: Brian May <brian@linuxpenguins.xyz>
+Date: Thu, 7 Dec 2017 07:49:20 +1100
+Subject: [PATCH] tiff2pdf: Fix apparent incorrect type for transfer table
+
+The standard says the transfer table contains unsigned 16 bit values,
+I have no idea why we refer to them as floats.
+---
+ tools/tiff2pdf.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
+index c3ec074..484776c 100644
+--- a/tools/tiff2pdf.c
++++ b/tools/tiff2pdf.c
+@@ -237,7 +237,7 @@ typedef struct {
+ 	float tiff_whitechromaticities[2];
+ 	float tiff_primarychromaticities[6];
+ 	float tiff_referenceblackwhite[2];
+-	float* tiff_transferfunction[3];
++	uint16* tiff_transferfunction[3];
+ 	int pdf_image_interpolate;	/* 0 (default) : do not interpolate,
+ 					   1 : interpolate */
+ 	uint16 tiff_transferfunctioncount;
+@@ -1048,7 +1048,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+ 	uint16 paged=0;
+ 	uint16 xuint16=0;
+ 	uint16 tiff_transferfunctioncount=0;
+-	float* tiff_transferfunction[3];
++	uint16* tiff_transferfunction[3];
+ 
+ 	directorycount=TIFFNumberOfDirectories(input);
+ 	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE)));
+@@ -1153,8 +1153,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+                                  &(tiff_transferfunction[1]),
+                                  &(tiff_transferfunction[2]))) {
+ 
+-                        if((tiff_transferfunction[1] != (float*) NULL) &&
+-                           (tiff_transferfunction[2] != (float*) NULL)
++                        if((tiff_transferfunction[1] != (uint16*) NULL) &&
++                           (tiff_transferfunction[2] != (uint16*) NULL)
+                           ) {
+                             tiff_transferfunctioncount=3;
+                         } else {
+@@ -1851,8 +1851,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){
+ 			 &(t2p->tiff_transferfunction[0]),
+ 			 &(t2p->tiff_transferfunction[1]),
+ 			 &(t2p->tiff_transferfunction[2]))) {
+-		if((t2p->tiff_transferfunction[1] != (float*) NULL) &&
+-                   (t2p->tiff_transferfunction[2] != (float*) NULL)
++		if((t2p->tiff_transferfunction[1] != (uint16*) NULL) &&
++                   (t2p->tiff_transferfunction[2] != (uint16*) NULL)
+                   ) {
+ 			t2p->tiff_transferfunctioncount=3;
+ 		} else {
+--
+libgit2 0.26.0
+
diff --git a/media-libs/tiff/tiff-4.0.9.ebuild b/media-libs/tiff/tiff-4.0.9-r2.ebuild
index cebe715adcac..26a1889a21c7 100644
--- a/media-libs/tiff/tiff-4.0.9.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit autotools eutils libtool multilib-minimal
+EAPI=6
+
+inherit autotools libtool ltprune multilib-minimal
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://libtiff.maptools.org"
@@ -28,11 +29,9 @@ REQUIRED_USE="test? ( jpeg )" #483132
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0007-uninitialized-value.patch
 	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0013-validate-refblackwhite.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch
+	"${FILESDIR}"/${P}-CVE-2017-9935.patch #624696
+	"${FILESDIR}"/${P}-CVE-2017-9935-fix-incorrect-type.patch #624696
 )
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -49,14 +48,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
+	local myeconfargs=(
 		--without-x
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	# remove useless subdirs
 	if ! multilib_is_native_abi ; then
@@ -78,5 +79,5 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	prune_libtool_files --all
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
+	rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
 }