Import patch from Fedora for endianess related test issues (test "raw_decode") wrt #422843

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

4 files changed, 39 insertions, 12 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index a7b04e8784c0..0fcc48372f28 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.208 2012/09/16 17:24:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.209 2012/09/16 17:31:12 ssuominen Exp $
+
+  16 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> tiff-4.0.2-r1.ebuild,
+  +files/tiff-4.0.2-bigendian.patch:
+  Import patch from Fedora for endianess related test issues (test
+  "raw_decode") wrt #422843
 
 *tiff-4.0.2-r1 (16 Sep 2012)
 
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 4ba57879506a..31c2c54fe95b 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -4,23 +4,24 @@ Hash: SHA256
 AUX tiff-3.9.5-CVE-2012-1173.patch 1621 SHA256 1697dda50fcd92599f8e567a55783d699d919964df895c5c9098eed41715621f SHA512 262ad17d9fb2c0e03dd5ead72b27d446efb44104db5330a1a0cb4998712b59e70a945eb5bbf4f0216dde475c56ef1d4977cf46ee189619402727921dadacbde6 WHIRLPOOL 2b9dcccd9c0a0285cdbd35ccad2fb0525fba3212b3b84ef9347f47a425ff4c92ed55a2cb2bd3f0af4e93cca3a0e78a76133006e5cab130b53b2dd8e422e51d39
 AUX tiff-4.0.1-CVE-2012-1173.patch 1609 SHA256 7d2cbdf754280a596acb4a823c2ee10999afcb245b91a90f13755741f04b0cd2 SHA512 e37d9cd0d6594e144f65275fab4afe026992dba242fbc7346183e0dc2dfc5d459522bdd9d0784dc4f01a442bcdfe90ea9887e5bbfe332fb2a6fe3e7456aef6d8 WHIRLPOOL 681cd396ed63664a35a1476cf787dc00c5babf261e00f34aa8d274d597a03c905b681ede682cdaf5177201eea7ebae1776bd9dc21ddb9691776591ac31ca3ac3
 AUX tiff-4.0.2-CVE-2012-3401.patch 296 SHA256 e0fbff1fdcb9189fde303edb378fce999beffb78e1cf3ab955e24accf489e807 SHA512 143aeab0c6008cb107343c757239ad7045a573f157b06b6771514c963405ac8b1a199b0978ca393e312da1587071b74a5e299f67d218e37a85d82e9e978c5d28 WHIRLPOOL 1039df55dac487f748d30670574efa85d24f274f3b750a14f2407a04cb423e8a6e45318e8977feba7be67d3dfcd9707d470f5ca83b40e081801a45126fb58427
+AUX tiff-4.0.2-bigendian.patch 897 SHA256 dfddd377370c4114cde09fed335edd40f4fc5411cf191b0048bb76466e3909f0 SHA512 b94084a6e3750e68fd4cd283bd39491e445b8907a4342e4239a5e4237e1e8847a5759d82636be20d152943bb85fd83f9d84d5de09e68668a67c4b93d9742a0e3 WHIRLPOOL 5cf1342132d7eda75a653bca5f4df71bd9cd8ede2e47bb590fff7485ceaad80d550c882b7f11ddd294abed3dbc666a218f366c94c15a5198d7ddb9a1115c6dbc
 DIST tiff-3.9.5.tar.gz 1455502 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33
 DIST tiff-4.0.1.tar.gz 1991580 SHA256 9a7a039e516c37478038740f1642818250bfb1414cf404cc8b569e5f9d4bf2f0
 DIST tiff-4.0.2.tar.gz 2022814 SHA256 aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da SHA512 bfc82b2780f2a7d89b1cd6d73ba45091fc74de996b2dad616cfdba59770b192449d6a9effba305f478a8e527d7246443a4e2bc1c5e2e6673a0037972f4a13413 WHIRLPOOL 1c89f2760413035f37dfde47d7c8884fa899e86b7911fd6b52b2920c830898b8f26f8d9a287ed6dc3820feb7fa21c50fb1dba278c57fb548806e8700c23e1ec9
 EBUILD tiff-3.9.5-r3.ebuild 1796 SHA256 4c8cc216911ad8f5a535b748247936a55b266c0e0ce8ecc717c151b1ba0e6c5e SHA512 38bd380017f647e5123f612609e289e435c9f33c50447442929484bf2cd5559409b62aaff5c4170dc597633101e687ade8af3ac2b0801ac41681e42ec7d248a6 WHIRLPOOL 016fa8526c290ec37fb253d9a391a016ac6b04157b674dd1c347e57cb94adadeb35c3396aec99c9f83c4db187a8f3d6b6e3469436f34eb2e746b3e223499a7e9
 EBUILD tiff-4.0.1-r1.ebuild 1391 SHA256 cd26ae3bc7885b6ceb1b5fe7e382cd9fa8e8ffd432d30137c886bd77f1b25bbb SHA512 466114cccceb34d08f1fb820dd18e4f9a13002dd6551be6fea4157ea81b5bd669db7b2218c45ce8c9cf9f6da8ac8c6fcd4c80f2a956bff4ff1f6bdcd0830991e WHIRLPOOL dda2faa073e0314c07a36d2c9130bcf749a8cbbf47dfcd749afdf5e12edef1ffc1f05a9ad13c7acacf869ae7a5b3cf76a049fa2922b11125f1266a9757e8cd37
-EBUILD tiff-4.0.2-r1.ebuild 1412 SHA256 a8df4274432f73ef555e744f9a64ed97faa8a53aef2239fe9618d9d223a07f43 SHA512 e233e035ed84afc87e9d902362303de078f5ae1f844bf9f1844eda61864e9746f68fce8aa2d7111d9c4fcc0267f49395c2b68bbefa4a91524ab6c046a586c0c2 WHIRLPOOL 40a1c2f50a7f545f65ed0faedeafb261dc46dc3fe765049a177a60ecb3702246a6b87fafe665c9a3be68e1ad7a812d65cd2b8e275bac1c51d5c41bd40defe70f
+EBUILD tiff-4.0.2-r1.ebuild 1456 SHA256 109370da0f3814910d8ab125a0685d16a9bdc36764dfd9e8968bb1a8d617fd5a SHA512 d4c61ba85f815ca7e44980a594b44915905da1440553995298a97e56fd22807fc309d3bb4b78e867f374c9023fbabca2357b72e4445dfa22a8f884c6d88db3dc WHIRLPOOL 24b9907530238717bd2699851fb74808346e83d7a3d53ec2373ee749b18cac9f486f4afec231a905c6730c840118bf03a175e6f5b377006f8ec6ce93fc607d85
 EBUILD tiff-4.0.2.ebuild 1343 SHA256 6976812272394dd2d2494bf66d2c8fa39b758f5e5b8ef0a51ae058a21b7447e2 SHA512 f9ac56ecf5414dccd489807f3e1307e0d0151ce3e247c3428043e61130474c70ee6d37372e425c598fa48cc52c5acd780969ea2b3317ef597a17f364ea609e47 WHIRLPOOL 80623108e393ef7460e52c1d2fe7f1d5c37c8924ae654a82c66fe25d78cbbe27679adc6939fb30e79d63852524ab8572112d5cb30fe2010fcbbe7435e72b6639
-MISC ChangeLog 28881 SHA256 a471af2dbc17d64a05d5ed7e14e06575a4185fdb66b7ec8bdddaf0d3e1b322fe SHA512 cfd3d48a98284790573b0d488989b0de17bd8e62c46bb55ca4f79c0d1bcc6ee8a7e14b3a0dc2fab1d4ffd00c89370c23fe477ac4ecb78f9dcf6a57b17b37c866 WHIRLPOOL b2de64cb0d1883b0a29996f5967dfa5a02c2163d03a6efbdd41553edc1cffa6fdf3df8a1be49467174040c9f6370e9707f0b9882f82cbf5f3f453da60c272bed
+MISC ChangeLog 29090 SHA256 9e4296b0c8d9ec708fe6044bb795ea2743c3d75dcf9828cd5840266fd8aa018a SHA512 88e4487feb2851d11f663241880abea57f8067257502df2c9f1fb8136c266bf7880e646b91ba1f2da72516aab1122b1b92080f74f03e416aa46c76e07f7eb1e1 WHIRLPOOL 88c7df9f99aa40133f41fc20c53565bcea5d964c824905226e40b88e00ccedff2c87399dbffa7e4b78d423cd35faf79d6df807c7d74eb1f03702695282bb94e4
 MISC metadata.xml 448 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9 SHA512 402cb48c7f4e4dc2ff90f4ae5ad67608382eb55435753b2831e6071b69dcd9e681402e16b5cfb60b4acb532d219fa844dca06801de491d73cd678e326df6c7a8 WHIRLPOOL c9d94507c54dd5e7178a25ed7195d65af9d0f97c03f78c72b5965f6c2f2e68369d7c7b1fddec0008ad039dd252abd7803c4a05f7276e89d660a48fa4138fa220
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQVgrrAAoJEEdUh39IaPFN2fEH/1PrIUoDHEcVWfTp4dvthffZ
-lPEsqdi9vTVxqqOph4VBf3+z3ogN3qV79YgCpEyWbrikeHToTZd3im2Bwoiqte6u
-7NZK0Tavv9JRC9Pt0yc/k/gC+6lkpnb5dYDvZ4qUseWnlsjdE0jBzr7ASNyyKEno
-BMssx0wrMMI+QMM+zTN83e80a0mD3NDVJZT7kjXpnL32UliOc7CG776QtkGrTUVr
-hdYJmUKQrkvThXNP8Ftp3Gc51PMC621BlXaHW8XxK6XH2WDL0xSG1BE3DZoja8cx
-IGrqACysjS+F2ij20zeGMpbOF8FZymx79tx+25ipLZM6t6LmUt/47F9XxeEb8QU=
-=o8nr
+iQEcBAEBCAAGBQJQVgxwAAoJEEdUh39IaPFNXv8H/A85tPwsVNwPZpW9s3Yfmrm5
+WvLwf4HyaC6Qb7NjGf+R4j8Hq80m0JJbwlf8ghV95exnbDOJWARnXnunnNAaJymk
+oKiLvq5EBFGiKMwVdZTQlWNpSMb3niemhx91Wk4qOIewEr0vjUK3w9N0oZv9Bhho
+gzViaIppQtdNSafGWUc4OiC8AmLLEDgaV/ToyfnuVkEiVIsu9+wF/WRb24tpxo9I
+UJ9S93LHR+2rBErvfO+CXQ9sUXna8i1BSWXXUqF+jAai994bFNaXsFJUJWKJg21e
+ONB9rw5ZH0yWLM5wDNjcXieOEbd5JFmUvASk96h+GxAjWjF9fueVULY4RCp3N0A=
+=EA1y
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/files/tiff-4.0.2-bigendian.patch b/media-libs/tiff/files/tiff-4.0.2-bigendian.patch
new file mode 100644
index 000000000000..3a090d26758c
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.2-bigendian.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/422843
+http://pkgs.fedoraproject.org/cgit/libtiff.git/plain/libtiff-4.0.2-bigendian.patch
+http://pkgs.fedoraproject.org/cgit/libtiff.git/commit/?id=5f9a7dda1bb1991bf36f98ee37700c75433c9738
+
+--- test/raw_decode.c
++++ test/raw_decode.c
+@@ -85,9 +85,9 @@ static int check_rgb_pixel( int pixel, i
+ static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, unsigned char *buffer ) {
+ 	/* RGBA images are upside down - adjust for normal ordering */
+ 	int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128;
+-	unsigned char *rgba = buffer + 4 * adjusted_pixel;
++	unsigned int *rgba = (unsigned int*)(buffer + 4 * adjusted_pixel);
+ 	
+-	if( rgba[0] == red && rgba[1] == green && rgba[2] == blue && rgba[3] == alpha ) {
++	if( TIFFGetR(*rgba) == red && TIFFGetG(*rgba) == green && TIFFGetB(*rgba) == blue && TIFFGetA(*rgba) == alpha ) {
+ 		return 0;
+ 	}
+ 
diff --git a/media-libs/tiff/tiff-4.0.2-r1.ebuild b/media-libs/tiff/tiff-4.0.2-r1.ebuild
index c870a56b6b6d..5f0de8242d91 100644
--- a/media-libs/tiff/tiff-4.0.2-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.1 2012/09/16 17:24:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.2 2012/09/16 17:31:12 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -22,7 +22,10 @@ RDEPEND="jpeg? ( virtual/jpeg )
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2012-3401.patch
+	epatch \
+		"${FILESDIR}"/${P}-CVE-2012-3401.patch \
+		"${FILESDIR}"/${P}-bigendian.patch
+
 	elibtoolize
 }