summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/lcms/Manifest2
-rw-r--r--media-libs/lcms/lcms-2.9.ebuild2
-rw-r--r--media-libs/libcdr/Manifest2
-rw-r--r--media-libs/libcdr/libcdr-0.1.3.ebuild50
-rw-r--r--media-libs/libfreehand/Manifest2
-rw-r--r--media-libs/libfreehand/libfreehand-0.1.1.ebuild48
-rw-r--r--media-libs/libgltf/Manifest2
-rw-r--r--media-libs/libgltf/libgltf-0.0.2.ebuild50
-rw-r--r--media-libs/libgphoto2/Manifest2
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.14.ebuild2
-rw-r--r--media-libs/mediastreamer/Manifest1
-rw-r--r--media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild190
-rw-r--r--media-libs/spandsp/Manifest2
-rw-r--r--media-libs/spandsp/spandsp-0.0.6_pre12-r1.ebuild4
-rw-r--r--media-libs/tiff/Manifest42
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-CVE-2016-10266.patch46
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch53
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-CVE-2017-5225.patch74
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2130.patch112
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2535.patch54
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2594.patch28
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2597.patch41
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2598.patch31
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2599.patch54
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2604.patch108
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2605.patch55
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2607.patch41
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2608.patch104
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2610.patch46
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2619.patch46
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2620.patch29
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2621.patch49
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2627.patch59
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2631.patch34
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2633-bug2634.patch41
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2635.patch33
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2638.patch29
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2639.patch58
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2640.patch28
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2642-bug2643-bug2646-bug2647.patch278
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2644.patch45
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2648.patch33
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2650-2.patch26
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2650.patch54
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2651.patch86
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2653.patch33
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2658.patch33
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2659-2.patch41
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2659.patch34
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-bug2665.patch43
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch39
-rw-r--r--media-libs/tiff/files/tiff-4.0.7-hylafax-hack.patch38
-rw-r--r--media-libs/tiff/tiff-4.0.7-r3.ebuild121
-rw-r--r--media-libs/tiff/tiff-4.0.9.ebuild (renamed from media-libs/tiff/tiff-4.0.7.ebuild)13
-rw-r--r--media-libs/vamp-plugin-sdk/Manifest2
-rw-r--r--media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild4
56 files changed, 214 insertions, 2363 deletions
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 3a689e619bc0..e0f8c720df53 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,7 +3,7 @@ DIST lcms2-2.8.tar.gz 6687005 SHA256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d
DIST lcms2-2.9.tar.gz 10953949 SHA256 d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b WHIRLPOOL 1eac52a026386b7bf8aa3fac66b485c622bd8f659c1351d5dde4acfd1fd0d6a64489b43464e203a84062b7a88a39a4ea41149c6102710016127ab10d36bc3db5
EBUILD lcms-2.8-r1.ebuild 1421 SHA256 97e7085de1873fc64d699bc3e79fbfd2684d9bc49df21e47f5c71e2b2429792a SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd WHIRLPOOL 38909c5dd7bd43cf53ecd013008950910a672763bf0f06a58803dea7ab6ee81a8ca0046823742e3180939dc67890614193504ac249b2b7ee714362026e647bf4
EBUILD lcms-2.8-r2.ebuild 1278 SHA256 585de4f89ad686d026a4e8d27476ac0652f47633fbbb2ea1bbafe443b4c3ff3a SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c WHIRLPOOL 3e01ed5f1dcd0ee7c5b3322694b0c3e8ed704aef50fa79e89bf57df5a4be9feb1c78ab77f83478a8342c262f3915c89a8295007ee5c54722bb8e1bc99500f2b6
-EBUILD lcms-2.9.ebuild 1225 SHA256 c0e38aefd15fe50b6b849363492c10b5171901cd4544f1358d69c819614af6fd SHA512 1ad660283e5dfa532cf71b36b1f33c1cf8465bd5739534414df23d85aa724789453353787572aea88daa773cd6e6a6bdad8874f6e4346c7d897ed7dd947cad2f WHIRLPOOL 21c76ec5d58e8f20349613d6782e696800a76ea4f2be81fe7c9aa8eb2eeeecb0436f687eb1b2fc438ecd16c6a9cce8cc4d9d321d77cd9f3a1509d1756573143d
+EBUILD lcms-2.9.ebuild 1219 SHA256 6f40c99b9d18baec87f3c3c75600e98801f3cd8ed0d5a62e8cf61d628df88d6c SHA512 d4f1a6759f4e4d93bc27eeb23b852df408d778d1faafeb068cb8d53d093cfec48f46ae94d026d4cc8348a8f91149f8bfbb846de0b58780d6883a48e372a949e3 WHIRLPOOL 9a3671e43947f2dca2eaffd699254e05e315e0694695bd4ae832b25aebfa0a85eefc4e56a2a564c9414017aa06b9c2b9697f0034f7156b8058ab8b0c9867fb2c
MISC ChangeLog 2713 SHA256 9494581fec240107f6ff405f1012e0c8752d763deacffb3755399ad58ccd5cf6 SHA512 a01e22d2f7d81bc24da9588fb822ef77bb3b0deaf040272ef8e7e995340c0c12303e9cfe715f93b666bee398e6bed28449a120a2418aa2c2a7c6616682eb2a68 WHIRLPOOL 450805688be07e3ffaffede192b810f0fe4937ab8643139ba21bbd64324886d5aa15f2c41096ef0234b65b405f929f6a8fffd8792d6aafe858415bdb913ed2fc
MISC ChangeLog-2015 24486 SHA256 503b862894e9944e0d92a2acb686c434ae88d0ea194fac394c4b9cbb7cc558df SHA512 5fa2b476f3689e58f3cd8ae9249b84eb9e018a9e44308122beb8940f7808bd6065d26172bb7acd94878d7190777eeeaa284e05cd60d01b0d3f4f2f6d196d6b2a WHIRLPOOL f0104eab39e7e7664715859bbab130a4a13dcb356744a822f295f421434631bd8e6a32caffae506d431408743e00dd5b17a7089e5d5945b41e8be4f7a2871d91
MISC metadata.xml 333 SHA256 973fc54521af3c0fc589fecbdbca3cce0f43f72d8bb3ccfe963ad127bd9e7284 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e WHIRLPOOL 7ec90a30e6f86f3a9770b51870d251fe1c91806153dab66fefa070eae38df50a82b040f85f54a3f2eaf9080bf449f9dac28232edc04bb089b2e98d56dc357b2e
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index c74830ba65eb..c2d5d0099b06 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc jpeg static-libs test +threads tiff"
RDEPEND="
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index f973e996c6d4..396a0df5085c 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,6 +1,4 @@
-DIST libcdr-0.1.3.tar.xz 596772 SHA256 66e28e502abef7f6f494ce03de037d532f5e7888cfdee62c01203c8325b33f22 SHA512 9811efb13f7dd72c69a98e81b44a261e913ffe87200486c8e07200d75790004d4fdf30e29f779b0ddd2ad09e3d1e8813ef501e9448c1789f89256f71bdb5fadd WHIRLPOOL 6772ac928a66f21c689f39a3abc762d043baf89d009d86ce79d68aa8b1354a4965a2f489bf8bd754c4a76bee3ac3695658ee4ec14ed7cf19986e48c22b0e4f97
DIST libcdr-0.1.4.tar.xz 609592 SHA256 e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6 WHIRLPOOL 30dd5538e2b1d5e4749c838902e04b5f59cd5a5376468209307850ab5bb2807822d8b6aeab44e3559227bdc5011b7ecba5a150c255f57c63e3cacfe577a04f7f
-EBUILD libcdr-0.1.3.ebuild 1094 SHA256 28f137f0dd04b98db1414d16b227d174b158d7de9dc3c23ba4408b9b83bd0920 SHA512 9e152c4f6869ca846ee3ccb775aacea88e50a894880c884f7a9596e17ed3ea91b27753e15e438ffdea26e27e44f72218939433fc24d29fd333a72e579b65a91d WHIRLPOOL bbf00b37a73799a406c8be181f5f2f6a1c1cf73f06e31f4f2d85e414972753d8f493b7fa5f08ac5b85dd61db756d1cbfdab8186685c9faa2a07f7888e36e17d5
EBUILD libcdr-0.1.4.ebuild 1094 SHA256 28f137f0dd04b98db1414d16b227d174b158d7de9dc3c23ba4408b9b83bd0920 SHA512 9e152c4f6869ca846ee3ccb775aacea88e50a894880c884f7a9596e17ed3ea91b27753e15e438ffdea26e27e44f72218939433fc24d29fd333a72e579b65a91d WHIRLPOOL bbf00b37a73799a406c8be181f5f2f6a1c1cf73f06e31f4f2d85e414972753d8f493b7fa5f08ac5b85dd61db756d1cbfdab8186685c9faa2a07f7888e36e17d5
EBUILD libcdr-9999.ebuild 1097 SHA256 349723996c2175a26eed0d7f9b8ca1adb03013f91cccc1abaa9796684330ba71 SHA512 d7a2f06ad221999261b61c58516103fae638628f4b9b1466fc592c6ce37d3761ede332e4ec434d8004e13b320a55849306a8d1c0425e58902175395286d4f6bc WHIRLPOOL 2ee6608a57686a228b70d21049d6b40cf05f65da863f5fdf0f3e6446ca271489172ac6a9db65536cad46ae690c2c3208dca953aaec263d7ca35edc82cf454818
MISC ChangeLog 5059 SHA256 cc3681764e3dc27c8dd0a5b1e9e4bff7edb26ebfcb47ce3ddd4c0eaff2075469 SHA512 e68c2ae4076096b99af2bbf6da7697d0797e8cbdc7f2e173909b790e5a277f8e6ac8cc27c56942a4e2d50a2e832e779f243caded999371aa05e737396f7a9c2c WHIRLPOOL cb5d2463023ab5aeb4bb0f840793fab12cdc387c57f55eb49cee54d4c59a99f772c5fd3eb6b82f1563a71cfe93fda950afbc26a36f89a0f9d4bd2d3d5db2d4ec
diff --git a/media-libs/libcdr/libcdr-0.1.3.ebuild b/media-libs/libcdr/libcdr-0.1.3.ebuild
deleted file mode 100644
index b114fa2e952e..000000000000
--- a/media-libs/libcdr/libcdr-0.1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/librevenge
- media-libs/lcms:2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable static-libs static) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 902097c1be7a..c001abb7315c 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,6 +1,4 @@
-DIST libfreehand-0.1.1.tar.xz 492916 SHA256 ec6676d0c63f7feac7801a1fe18dd7abe9044b39c3882fc99b9afef39bdf1d30 SHA512 552b6b8c00aabe0d557fdacf4bfe8b0b4c2d34ec6f15820f3a54da76b4f24ca5842ba38ea756d05b947a0e8cf48d351429abef64b25508ea032a92965e9c91e2 WHIRLPOOL 2b82b4a3790df93fb52ec872ed38c1c991ce63b35fd25c87c60c2816f3275b6fa8f7d607fc6f9bd41c6bcbc0fca44efc11e5486b4d0bd47077543ce5e69d9fd8
DIST libfreehand-0.1.2.tar.xz 516132 SHA256 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 WHIRLPOOL 54ae55cc80304f15244d0eac671264afdf2d30c589ddc917eb9db4ce7409b95f7bbbfe17b9d97b3b0954f0ab1e1a3342f09df435d93c3945dedd4767e81d1038
-EBUILD libfreehand-0.1.1.ebuild 1028 SHA256 738ffb0416571cea421424f668edb12dd372fcfdf854df05b40f968b36831093 SHA512 69b48456b5cb05fa10b67a3aafd5a284fbb8bc7899649893685e8b895a091d5470add499f5a99a0691632d2c1bb05b5ab305c7ee3dbf94d8e46d745b8029ee86 WHIRLPOOL cfeb9f2b364c906a0317a0806382e901898e07c4613ba0d10886ca047a4f90e29d34c450fa59c573153c2e066fede660fe379944983914ac19750c2e84aef4a3
EBUILD libfreehand-0.1.2.ebuild 1102 SHA256 36a784b8d7a61beb9bfd3f325b5540cfb386aeb2870308ab291a3f220ef5ff4d SHA512 404b63f3579f642619a1574cb71698355bfc2c01ebd6dc1252d8204f09c0a8e74e2c49e31a5806950774ee06e2b07798e35e0d47db7060fdac6b98c42d3c766e WHIRLPOOL 0e27c74320c557ec757e1f2d552607d5ca98569bba3b7deb6a596998038f929acee207e8e822d116531a753820b0712261caa7637ab75252ea7ddfd0ad9b6a01
EBUILD libfreehand-9999.ebuild 1092 SHA256 2fa3c7305b45feba0cc588afa5db782d54479e595240e1b43b96db1d968092dc SHA512 d21d085e44c862de43052f1431bd8e730e9d1044f392bd3dec48b69b917867c74b80d681dc0e3d8a51c4d6c04bfa2be501e735de8b04993a3122f7e749e452d0 WHIRLPOOL d89a72a26809a4c3475c8f7229984ee3b3c6206c58c56ebfed1986d3d2102fe543391c58a10554a2463a4f5a65b369ac44d7b486ec1de62f9feda1e47a9fc109
MISC ChangeLog 4089 SHA256 f2a64e7b0145e4905fdab650a2e9821341d33484a8953674d2384e7e75be2250 SHA512 e1aa850c9b53fc34bbcaf8454290dd3898311bd0f70293406215d6e69c81722aeaf2dbcdbaaaa07931e9d042772a8d6acf60691434608b1c5e3165793d7e75b4 WHIRLPOOL d903724cda3072e7cdd245279d67144eb2c8196ae6663baca78a1c80df510fabad58877ed8b014ef33a7cecbf19a254a3f8d52210cfa081f278f775e21731dbd
diff --git a/media-libs/libfreehand/libfreehand-0.1.1.ebuild b/media-libs/libfreehand/libfreehand-0.1.1.ebuild
deleted file mode 100644
index 13c0f9bb04f8..000000000000
--- a/media-libs/libfreehand/libfreehand-0.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library for import of FreeHand drawings"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- dev-libs/librevenge
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/icu:=
- dev-util/gperf
- media-libs/lcms
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libgltf/Manifest b/media-libs/libgltf/Manifest
index fae6d1fe1337..6cd21fdbb6c9 100644
--- a/media-libs/libgltf/Manifest
+++ b/media-libs/libgltf/Manifest
@@ -1,6 +1,4 @@
-DIST libgltf-0.0.2.tar.bz2 538040 SHA256 d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b SHA512 74ca5e5e0f38ee5a67e870b49f4adf6c9710dc696afb776149618c05d15e3527d605143230f7ceacd199b609bcbb683cfc72d8e4ef22ba5b9ca777c8a2b53dcf WHIRLPOOL fbac1dc41cab63d4f322893d1b55d513fe8eefad5d625db703134dc429b3b87b5b6d36c481810d6e819c8f8213846b700d318421ac7858347c5ddf1cd875a246
DIST libgltf-0.1.0.tar.gz 736163 SHA256 119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da SHA512 c4ef222d638a3f691bcce493776ef451830168ef0569c417f0acdd305e5f261500767943f92a3e65d6b00aecf6c02bdae56f52e0943b8d36490ef66474d9252a WHIRLPOOL 3994d7200b351dbc73c1041aad1ff802344226a61c5d46e366f5f42ecf3d5fbd5410c40d2eb9cd6b0b92d25f496ebf06cdc9c942470d6b6a99c9e69ff31d9106
-EBUILD libgltf-0.0.2.ebuild 1003 SHA256 f5c83c1b42e278d7a952fa1baa5cf9c6eb5469824a3b20b42c65898199668bad SHA512 d428a7ea7c9e40e6fc9823ce887c2c46831a713d91120a15a735ff0b10f3a3a04c30e54fb7812c082efd96a3cb04a92af4b277d41a1ff24b972402bb46ecca3f WHIRLPOOL c465d093652942f417c6e189699645e5207d283c1d46799b2fbebfda70e0720bcecca32a0448168e65b8a6908781ad76a6f6c35de4d38cb262a3b56c4dd4347a
EBUILD libgltf-0.1.0.ebuild 1043 SHA256 c32c52a45032ac9e976dcaa2809f65cd27f53425e620c7a0ff169bdbc735f160 SHA512 7cbd4cb546e24e2b34dd579cd0f286ced4dde7c923ce0669cc6ff288ca1ec9e823f0a3f46e0e79f99b9f1235fa332200ef723a0751211e2abcc747b7b4af2c63 WHIRLPOOL 9cd7ff057d0a633c3f069b6ffec7975a437c99edf2a14725891ae9d8052955c29180bdca8deef39bce393b1f463bb25ba9a383ff3c06829187d653d008446479
EBUILD libgltf-9999.ebuild 1045 SHA256 629732d3c39f325977c85bd5e5cf01eb06807e2726d9881b086f6d7f652a232f SHA512 0b6ad4de2a8a8bf219c6cbd27c575d7064a161cb5a591974ca52f357f182f288c580b9fa73bd3a4a8fd496e4930ef9affc16df0d405a5fd04b2e00e564116db1 WHIRLPOOL affd0d5db1c17ffed730ca839bfd542d51491283feebad49d75dafa3bfe0027de660d8b258e1c430198d2896782de8a62b9d1b656d6050cb556d76eb5e653449
MISC ChangeLog 3437 SHA256 c3ef933c49c42e618cccebc62c9872b99450714032f65694cdd6c38cf06dfe76 SHA512 31236dae8d80d34ec7922f6cd23948c35cb5449e3786cb109c0ac9002d2ed889a020739f8a4d1b63f2f16140b611cb576cf33225528f77bcd99d9d9ed42fe745 WHIRLPOOL 6937663a150f5f64a6171379aa796dc1d33066e3937b7ab5d5ebfdbe4fcb5c03666bee7c41a2c86d6b0b7d4468eac1d42aa73acb1eea1cfcd905c9c256f201ca
diff --git a/media-libs/libgltf/libgltf-0.0.2.ebuild b/media-libs/libgltf/libgltf-0.0.2.ebuild
deleted file mode 100644
index 71a7cd7e05b7..000000000000
--- a/media-libs/libgltf/libgltf-0.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-inherit eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
-HOMEPAGE="http://www.libreoffice.org"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
-IUSE="debug test"
-
-RDEPEND="virtual/opengl"
-
-DEPEND="${RDEPEND}
- dev-libs/boost
- media-libs/glew:=
- media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
-"
-
-# testsuite not in tarball
-# only in git; unsure
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --disable-werror \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 09fb6a0bf2d8..b633656da133 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,7 @@
DIST libgphoto2-2.5.12.tar.bz2 6974928 SHA256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 WHIRLPOOL b690d5b55a7dc11cdd04e694e4ec4a44c0b3801c3e778610c32b414fd7e6e89f1ef49ac1c9b5f36a57d35afbb94c08e4e4f8cb9663c4106658eaaeaea1ddf5bd
DIST libgphoto2-2.5.14.tar.bz2 6992238 SHA256 d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 WHIRLPOOL 45a8cb9380f96da0fb680be95db3c028c07d7cc5f66126609f7a6539a5b5fd7e4edb45d00c43cb9c491e026311cd6161666280eb93ea784538c90297fbc1cc9c
EBUILD libgphoto2-2.5.12.ebuild 6180 SHA256 ae6be57b1a0f742de8fcb796c22c8c021e56e659d07f87efd13b6e6b48edbd18 SHA512 f93d213bfbc4e4a61fe7aea4a63e5c3d3d5e59a0c5c262463bf6b4f36687f47ec3082ab7554a2e56f286ff7b4393a52dafeb29feecf8d6e6a9c12430e4c2f583 WHIRLPOOL 75a5a5fe19a7972287398ea7cce92e4c0c1a538cb5000f8f44151c1c7d2274506d8b2d23e43435f58502a8da5dc0377041c9f75e6bd49b89af5f0658b7b325e7
-EBUILD libgphoto2-2.5.14.ebuild 6276 SHA256 5c8c0dd77984d6237689e97e0c2ad1703c043dec1bea47955c5b5c12735f8649 SHA512 75e6c31254b5e667f450d5ba61d86f5c91c94b83554fd7f22641178e3a391e17ab6a0e584ee1b4885e7defbc9e0f5734d8207bf18a7363e0675233d65cafcd47 WHIRLPOOL c53b1f05812feeba70b074a466e1331fd6611137c34873d1b4fc3e8b4f2b9dbc83fa8def8c7aab7359c18955a4f8ebbbdf50dfc4193d3e8482ab8039daff8aca
+EBUILD libgphoto2-2.5.14.ebuild 6274 SHA256 ac0156e1e98782a631b23a63068d8a090efb4cce5f2271dbcd4afa029d20327d SHA512 4b0da544ced9b2f71aade49b49024fa172567f580caa243db2ff24ffa2246dbd8f7369dfd5c350cb9e6bb698066f8b851edf5b96efab5d98d312eb066218dca0 WHIRLPOOL 9e0325557e5e709ccb52c79fa1d1d0522b686ff71da91556b36051d3736058b77e907c2aef453c552419980c1d46bab86a61e39cde71db9ef76ae0a142193cae
MISC ChangeLog 6886 SHA256 45a3751db9b40a23e36945565ece8e9cd60be8f0b581681cb9fda43f1304a376 SHA512 027cef9bab94be877fbb38d11a2ce700232d8e7bf22ec0c958cbd91b339db6f1745bcc2987b92604562b9dc19cba4d694e1e5c7e250902ce78433d44f79c6c64 WHIRLPOOL 10649a261dd4b65393f5b032adc9a6140335550876c717cf12ee5b482030a93388e71edce4c0cefb1332a62b1cc854860651342e9976bf91c1ec179883c49d6d
MISC ChangeLog-2015 45252 SHA256 d6ac5af90c263c4380722889f201ef21c12dd7e4ee18d6f7429fa623afd37421 SHA512 ff4d88756d8113d2e251810a2c8630116ba5b474837a8c2bb23c1f9a9424982b660508b6c74b3a9034e5916b3ebe54fd7b94ba38eb3ddcc0e777e0f8bb5e5ad1 WHIRLPOOL 5d5bacd539ceebf412e1db13d85d56ce38e2f2307b8211baa54db4745c685b2b904087d3d9ebf8c7b3f8fbb5a619fe919990686e3545d2289c8c7df73908788e
MISC metadata.xml 520 SHA256 604907467a908596bcbffd2eb1daff70570b1ba6667d8c4c9b6d4d5e262dd07a SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 WHIRLPOOL 68d8ac8eb045b9f4e384dc3fb6629de2b9e651395038a500e71062cc0aceb31377df92bb78ba29a1fa425884d3ded0ce4c6cc7c0ea59825e98663a81f1f390c6
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
index 546aa0f76345..a27b482cb3bf 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index a32b071f56b3..6ada4c35b888 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -18,6 +18,7 @@ DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce
EBUILD mediastreamer-2.7.3-r3.ebuild 3898 SHA256 2077b820c16fc457955bafd310db7690540696f3621c810894529f55305bf7fa SHA512 941d6199e23c2e2d42e5e784fb125ab6ca128e839f691a45a3c5faf2ffe1cbc7189e506f8c1a129e92283fc4428573d78d4f9971b3d75f6c25d36e1f77ff176e WHIRLPOOL b282a6606c3570d29b18c77919c56acb960cc8309f7f3c61d1b6d5874d8d8b0c818252a6c25b75a8f2b62577d969590f25c329a8eea99f0623db03e78c5a4d3a
EBUILD mediastreamer-2.8.2.ebuild 3824 SHA256 5faadb8c8a2d0927b216a6f0bdb35f217f1f47ab8ee6cc20921d5c2ca4a79198 SHA512 9336b58a8b0ef34d58ee9f3d37cb40911e25a5c1979bbf9507370f3d9018de5c13833d8cfbaeb3482810bf1c9d366a0541ea576c345af5837fc4e4ca9d0579c1 WHIRLPOOL aba97ac0447ba5a4e106a07cd49ab76ddd0dab8c5a0e896b72527722b35c8b53e1ead57e534c929eea7785336b60aa33af65ba4972c423df1d1d88677b7872ce
EBUILD mediastreamer-2.9.0-r1.ebuild 4584 SHA256 6fc9b068e3039063acdeca5b86b46a9c45d0f7f78ba84426947bb237ba7fde56 SHA512 2b05c989175bb8fccf7d5bccce914ddfeec8c5ef28e76d34bbcdf811aa19b0343ead4b41fbcd5aa3fd0aa8cba9921d7d1ecabf253842108b45b01c69b162ade9 WHIRLPOOL c36559129c88429139e7432990310e222cb52c246a819e93e04f1c1fcd560c0ec5a8960c898ea7d39f0eab981c17462a5e011174a60b9a3c64062a077695e827
+EBUILD mediastreamer-2.9.0-r2.ebuild 4636 SHA256 c42b421fec4f715466574d26381f644836a0a27b0c1c680799a5cdc9d360f188 SHA512 2153f2eb4ee90ffcc5e049f53341ad84261c9fff6de7087d8166a885809e1ad112ac85405b17814a8a869dc58354bcfca1c342ab730e1177837d460177a48569 WHIRLPOOL 168017090ff236855d9ed59670e2ad7404fa47950c045d61144d7d217d6bf9fa716e731ebc1e86272403fd9b71d63e54a63d367f836ec3e996e7cc2303f215bf
EBUILD mediastreamer-2.9.0.ebuild 4469 SHA256 3d17d02ca0eb5000f29ed005535d73ec1be9a3a7ea354ef0882c2576170ee15c SHA512 acf3c4d57f6e34e576ed7793c7b44da186ca48f667f4749e628ed2e3b9da0768ad49802063e782140964e8bd21286d6b470f394574a89c4004308791383dc610 WHIRLPOOL d6d0b17017b8d58e5c820d199c7232daf5de8bd96f69f68e6c11fce198a962ef1be4d9c5cdeecf5903295cad2ce307833709f97d037b99d06352cbce4336e922
MISC ChangeLog 3214 SHA256 24296e592166c5d92785c54136e8abc8aa8175b8c01255efa4a5869a727f89f8 SHA512 c3bb18a80f85413dc871c98c8e2ea9461df4bee7d96eb817e80f8f5c7c57435060e39cf01476d37bdd720885b3e7a3547a5a3194add94b10463b28937938e0f8 WHIRLPOOL 6d423c370294784e43932463ee592ad9d8b6ee430b65f126f5c9a2fde7a9d578d9e915ee4011316307ff33fe28bf877d4a66db835e58a7d396a44de41bf5d2f6
MISC ChangeLog-2015 12379 SHA256 3a133d76dba8a19dd4089acc331cfe6934ba43b9257db57d34c5bf2afa4e8420 SHA512 b2ecc5bd583c3cc6fff33c8d80a5854ed9737603d943bdc8aeb26c1723a9c7de60a266fb8551c056c4af843146b21bd973369e0eeec446322b0db00b1c37593d WHIRLPOOL b54f36dce60826fe1efd23c5c897fce921322940ce9eb5e747f849c27ff3f36e59898fb8f03a2569194441772111b0f4ef35ccd8b7129ccb08325e590c059881
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
new file mode 100644
index 000000000000..48cb07c5b2d7
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="https://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Many cameras will not work or will crash an application if mediastreamer2 is
+# not built with v4l2 support (taken from configure.ac)
+# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
+IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
+ ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
+ silk +speex static-libs test theora upnp v4l video x264 X"
+
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
+ opengl? ( video )
+ theora? ( video )
+ v4l? ( video )
+ video? ( || ( opengl sdl X ) )
+ X? ( video )"
+
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
+ g726? ( >=media-libs/spandsp-0.0.6_pre1 )
+ gsm? ( media-sound/gsm )
+ opus? ( media-libs/opus )
+ ortp? ( >=net-libs/ortp-0.21.0:=[ipv6?] )
+ pcap? ( sys-libs/libcap )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+ speex? (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
+ upnp? ( net-libs/libupnp:0 )
+ video? (
+ libav? ( >=media-video/libav-9.12:0= )
+ !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
+ opengl? (
+ media-libs/glew:=
+ virtual/opengl
+ x11-libs/libX11
+ )
+ sdl? ( media-libs/libsdl[video,X] )
+ theora? ( media-libs/libtheora )
+ v4l? (
+ media-libs/libv4l
+ sys-kernel/linux-headers
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXv
+ )
+ )
+"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cunit-2.1_p2[ncurses] )
+ video? ( dev-util/xxdi )
+ X? ( x11-proto/videoproto )
+"
+PDEPEND="
+ amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+ g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
+ ilbc? ( media-plugins/mediastreamer-ilbc )
+ silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )
+ video? ( x264? ( media-plugins/mediastreamer-x264 ) )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-v4l-automagic.patch"
+ "${FILESDIR}/${P}-libav9.patch"
+ "${FILESDIR}/${P}-underlinking.patch"
+ "${FILESDIR}/${P}-tests.patch"
+ "${FILESDIR}/${P}-xxd.patch"
+ "${FILESDIR}/${P}-ffmpeg3.patch"
+)
+
+src_prepare() {
+ default
+
+ # variable causes "command not found" warning and is not
+ # needed anyway
+ sed -i \
+ -e 's/$(ACLOCAL_MACOS_FLAGS)//' \
+ Makefile.am || die
+
+ # respect user's CFLAGS
+ sed -i \
+ -e "s:-O2::;s: -g::" \
+ configure.ac || die "patching configure.ac failed"
+
+ # change default paths
+ sed -i \
+ -e "s:\(prefix/share\):\1/${PN}:" \
+ configure.ac || die "patching configure.ac failed"
+
+ # fix doc installation dir
+ sed -i \
+ -e "s:\$(pkgdocdir):\$(docdir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # fix html installation dir
+ sed -i \
+ -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # linux/videodev.h dropped in 2.6.38
+ sed -i \
+ -e 's:linux/videodev.h ::' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ --datadir="${EPREFIX}"/usr/share/${PN}
+ # arts is deprecated
+ --disable-artsc
+ # don't want -Werror
+ --disable-strict
+ --disable-libv4l1
+ # don't use bundled libs
+ --enable-external-ortp
+ $(use_enable alsa)
+ $(use_enable coreaudio macsnd)
+ $(use_enable debug)
+ $(use_enable filters)
+ $(use_enable g726 spandsp)
+ $(use_enable gsm)
+ $(use_enable ipv6)
+ $(use_enable ntp-timestamp)
+ $(use_enable opengl glx)
+ $(use_enable opus)
+ $(use_enable ortp)
+ $(use_enable oss)
+ $(use_enable pcap)
+ $(use_enable portaudio)
+ $(use_enable pulseaudio)
+ $(use_enable sdl)
+ $(use_enable speex)
+ $(use_enable static-libs static)
+ $(use_enable theora)
+ $(use_enable upnp)
+ $(use_enable v4l)
+ $(use_enable v4l libv4l2)
+ $(use_enable video)
+ $(use_enable X x11)
+ $(use_enable X xv)
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ # Mac OS X Audio Queue is an audio recording facility, available on
+ # 10.5 (Leopard, Darwin9) and onward
+ if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
+ then
+ myeconfargs+=( --enable-macaqsnd )
+ else
+ myeconfargs+=( --disable-macaqsnd )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ default
+ cd tester || die
+ ./mediastreamer2_tester || die
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins tester/*.c
+ fi
+}
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index bfd067c75cb2..8c720fc54041 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -2,7 +2,7 @@ DIST spandsp-0.0.6.tar.gz 3309837 SHA256 cc053ac67e8ac4bb992f258fd94f275a7872df9
DIST spandsp-0.0.6pre12.tgz 2566669 SHA256 81820ab80be853ecfea79b75e5b5cf592ff7083853cc22ced46d57da47f9d0e8 SHA512 19a7fe491b836fe604373aa2d31d4b35dde19e593a8f3d5d2a4b866ea69a137ba5ebfd43c34f74e8f7800a7eb1ba93d1a0401540e310bad2b73aecb17c45de0b WHIRLPOOL c7ddee4f308af16dd77b612df0ce339ff89c8ec80cb77139d460299a76e291c334315f0ee48a51a6a6af125f1dc0d824fcf43e03fb206a909b5fec159e1cbf01
DIST spandsp-0.0.6pre21.tgz 3278758 SHA256 bd152152bf0b204661ab9439c5a649098bcb8cefebcbfa959dd602442739aa50 SHA512 6f846021cd6a1605d371a8e5d1ac3a5b6adc5b85de2517e24a5afaa57b4864202c2d16c1196959f7f11d866732d17d301d2d37121228cec75077678f8fc3e488 WHIRLPOOL e3c375888c562a933ca9be22a916d57b538ee702b77d0e4ce078eadd93e8701e1bcd76296ba6b88934888a4a3f5b6c216441a5e5f8aea8134984fe4213f38736
EBUILD spandsp-0.0.6.ebuild 2037 SHA256 cea0964d450fd0f7503ec2d9598e6adcc0a4517f4cf688c3b7f4551caa767c61 SHA512 21ae0905cffe4a40351114c0292aef1847d6ed8db354319ef8a905399f96ee3dc8b1fb267e710d41994fbb9f482d870575689de657e301f4dec7eef12235e0e7 WHIRLPOOL 7195701f4d5e7b2131b2bad2ed861587558484b3e785ca01929f964d9b9a464ed7acfd8a4fbcb381c7e1538376e35a114ad7cb9f3c3acea309d192b1144749f6
-EBUILD spandsp-0.0.6_pre12-r1.ebuild 1286 SHA256 829bad029a5fe055e4c91fb1fba9be2c56f79d21b92a9226038fa8b69850d1f0 SHA512 4e067b539d08b5369cd3b6b290400ec725238de997e6a4d1fd48bfe2d7b3b6fa5089ad282bdb7796b8c925b9b17cdf4702c5c4c19e7f9dc4f5d2d0fb65048ea2 WHIRLPOOL 23e23173c49f753aa8f112e547d9ddfe83c6409319c1d4d6635b161cae5d0a3e2c33e143346990cacdfc9ae2541c9fa5e9b177d023e6104084aa0770adcaad7c
+EBUILD spandsp-0.0.6_pre12-r1.ebuild 1290 SHA256 1e79faba1bd37d3961ca4770e458ee1e960964cd30071da46433ca5aa6e1b933 SHA512 9ab74ba79a7c814a427415b4b03430d8cbecb1b2e7fc766c4e3facbb783ba2bf321f868fc7ba293afa52db7764c176d762c34c24b75eaad50722cb608d5f6b78 WHIRLPOOL bbb5eb0ad1800a99c3ef6b8e4d63c672747ea4152ba2b765a5fa8e3b14052a8466f5c02714f48a52d7abcb2baa9de44f7206e97915338a63b9ca0f370b4f74c1
EBUILD spandsp-0.0.6_pre21.ebuild 1420 SHA256 7bb3ccf99fa862748dfe5ef0581e8d3436cd10022d3480469fb7f703d0b6e100 SHA512 7b7a36520e5f0f76d066078df5d3fd277540c1f7670a4beed8f3166e35f0be7eb67dace9e303586197919ba70ca00805eef0137dc3448f8b046d6b60d18f5099 WHIRLPOOL 251e8751eaa68b9aae53db4923af6d4f3131a81d9fffa461ba9989bf37b56f367626dad1c199464406f8990d66b6cdc7ecf981ff5abd2c9e8b4497f01dd46d50
MISC ChangeLog 2707 SHA256 dd5cdd91b8b535c80bd0a45ab42322f7dae128d1659b3c061f18b1b76b17df44 SHA512 027e618d045811e1b590696d1af9385edcd15b5661162f0e58aedea2058acfa18cf5bcda74ddcab5ea08d6552eb8ab9aa891f7ce958e63fdedf7a2121a4b1cc7 WHIRLPOOL 0bdad222c23c1485f286a0fac494f42a9b60f4b72deeea4eeb6243cbbf215b0ee277debf5c70ccdbdc75a1e2d8f67e693fdbd50fca36868763fb55d584fbbf15
MISC ChangeLog-2015 7192 SHA256 42b0095042b3178454a9f60f7592a4b3fe22613986bfbae75f3d3f7a0dc42120 SHA512 53c5f2b2267b89a385426829d62f067c62857423ca7143e83bab21ec7a0f15c39efff253bebf4eb8e94ac25512f6ecdbec1e38882f19518d13737b811f0efe4a WHIRLPOOL d02b3144311aecde891618925bc029974afe2a0b5203c80354363ca456af5dd912b916cbc06a09a8d21ae2d2f065f7db7312bd82506c7866205957e8b4794812
diff --git a/media-libs/spandsp/spandsp-0.0.6_pre12-r1.ebuild b/media-libs/spandsp/spandsp-0.0.6_pre12-r1.ebuild
index d045fb6aff25..d4a79a03ace6 100644
--- a/media-libs/spandsp/spandsp-0.0.6_pre12-r1.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6_pre12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ia64 ppc ppc64 x86"
IUSE="doc fixed-point static-libs"
RDEPEND="media-libs/tiff"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 22e144c2a46b..c6c3a332745d 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -3,43 +3,6 @@ AUX tiff-3.9.7-CVE-2012-4564.patch 1987 SHA256 525f667e2148229520b50d6136c0ecd34
AUX tiff-3.9.7-CVE-2012-5581.patch 8156 SHA256 f47b30c8fc0578df7285f6cf318f29d410db4b82550b3fbc9582beeb9a834415 SHA512 2e215edeb6f4f5d6e14753874a67d76cfec34b3f6ffc420e1c7ede2007a6b2f64c09505e879e83db1de87f28c82c806c4379b38bf7f8735bb2bae675543683f0 WHIRLPOOL 8f7cdca5ec968eab6ec8749e2185c7416fb2055da56ce3b159a637ede9f296e9a37af7c91ff8da1c743bb05371662725374d3febdde2109f18baa57391ac8e16
AUX tiff-3.9.7-printdir-width.patch 1523 SHA256 597406f727b26fd06106e1e22a1e4e4620b3ffa54a49c2c4b0b8ee6b1d54908b SHA512 9bf2edcbda2ed5dba01839cf1bb34316801b4c5a2b6c71ed46f8777518cf1bc77084db94eaf1ebde84583fa2e1749a5fc5151e321b4d83975b13c3e9ebe96436 WHIRLPOOL 3f9a830622866cbc1fab8109fa9ad787c50230871286e6bdc3594b0d33c887acdca03b19df8d4537ff0e21a6f6a2e48062ff731616b300ead923d8e61253094b
AUX tiff-3.9.7-tiffinfo-exif.patch 1847 SHA256 2b333f3161f88aef3f764de316c4e8f10906932d33ee575b98f7723b2bff1db7 SHA512 6f211dc864bfb314a1c7edb8855b68cfbbdbbde1ba9422c1c578acbb15e5769323eec366bef618a8100b0ccb8057b2997762ebbd0f943be10882411861ec72fb WHIRLPOOL 4fb1375cc34c889f2148d8b998929f29f8901c38ac3af0839abcd827adf707045b00e7516e7b92df6cd2968dcbbe98ac135662300bc4fe05fb4b43b30f340baa
-AUX tiff-4.0.7-CVE-2016-10266.patch 2045 SHA256 ba601397311aee6944b2013928c7e633b7b9df8c04747c2b7fa66a958098e547 SHA512 ac7d827e715112f1ce3ab86aa096d8f6957ece3ee51b828dfad97771ed25d4058518035103fe82cf46074b49d374592d73f0ffe2a7d9c277d20086d02c91ef7b WHIRLPOOL 807ddb40ec4858045a86736fc14699f04091777dcb93a8b1609b7f856799089cd5e07b4b023dac4c24473b92fb04ec068d58747d164748ba99112919b3dfaa84
-AUX tiff-4.0.7-CVE-2016-10267.patch 1547 SHA256 c4456c25984ff3a74efd755fed1f5bf0f95b570ffe3a47de797626d7e770d0fb SHA512 2c1bcce682ebefd26347e4bce3f1adeb42ce814927f5bc1f099a193b12359504dc4324051f3bf8411a6a3af775e735551dd4ece5229739d1f7e692ecb7179a79 WHIRLPOOL c065d7bc76e1a6bf43e3996e3fcfd23e9ea29db13f8830ed3348d591adf4ffa0b25d7c375bb19e13747520ece89715ea660ecd5a514292fe7a4d217fe523136b
-AUX tiff-4.0.7-CVE-2017-5225.patch 2528 SHA256 8a56aafe16a27c33319141a6e8af5efc47973fabf3d270ff4963a0fde2da8b31 SHA512 0e8dd037df0e962ae4ea56098c023f443a8d20d850fc08c4454884ee60e139f9600bebc5ae44ae272aabe9e97f99665019e556e2484ea9c98b19b99385134000 WHIRLPOOL 0360e6797ae289e0b16f75bc84de3bdd986b4df823fb0dce7ae51595c46c75459e38803e3053253f0f82e8532ad33a1f06dac490b99c9945118dd4d053032ea1
-AUX tiff-4.0.7-bug2130.patch 3732 SHA256 d7997ea154b8ca281da294cc51ba3ba2d7799e18c096e40bb670055f368f067d SHA512 1430355ece6593e0d690aabef1580fa4d5fdc28240771e2e181dadbbcd3c32cad7793437331db6e6080209a080cf8ed3c4ee08fae0c465e5bdbe83584bc5b34e WHIRLPOOL eaa45155a3a5abe1b47e743659ac196bbf22d85be4587df0ab04f0a17c2875d9bcafd9037726aff5e07af1668ab8bc8d0c9e1ccc72d37e2d19f188d2b6df75df
-AUX tiff-4.0.7-bug2535.patch 1857 SHA256 3be096e7bb4d4b3208da61698f2eeca88336a8714f17996fc07ed113fe731ed9 SHA512 056ebeff43745290af9287358378180c04b3099a7d77fef22a0cc41725ef99d3e5a130c66769ccbec79547a1207853b2d56a8fc8f50e69576a58db02af9167a4 WHIRLPOOL a407ed6cd0645a1aa8502db631a15e1025e87286a9dc6f89dcecd2704fa8ed97edc2ec686f32a31085397d88bac6fd68b0e3c7e3ecbb24866f4744ee3823c294
-AUX tiff-4.0.7-bug2594.patch 920 SHA256 9a624c1fff5a7dabff6d1f2f67bb0fd9b8504a2556639035245e557ee2c96d83 SHA512 301353f930fbb0fd43f1dbd7ea7c31cb069d2ac9db025a9434dd2fe4de3458aa2c8b464b587d2fc25220dc2a8149a0970b96f0d40dc415134c947e4deb3eede8 WHIRLPOOL 758c3edb8441a922867c01a3f3036c78339982e22089f1ffe58f247e6130a11074253c46eec639714c516e5fdc2ede5c5b5d0ab39031031f0b38634bf3e084bb
-AUX tiff-4.0.7-bug2597.patch 1312 SHA256 2972182bd4966581844ad1908c36e0166a06d7832c63569be7f6b2321041993f SHA512 0cf3a6cb80c7421a681104560c2cdbed32fa9d544ae990b3d67c4768d4609db3448444742bf2893aedf03845a1b8c3b3188a8b5a8f6c506c3857b2e3a9e46b8f WHIRLPOOL 79870fc8332677dbc5d77fb92b04417712138ef04540d17a37cf30880a414f2940690ce8fe878f82b8a29735d44bb4af82ad04e516e20d611021520d53a60008
-AUX tiff-4.0.7-bug2598.patch 1085 SHA256 eb1f52d044652d99a117b5a97fe18d2bc1dba99d44ffc8d09d8e5946aa73978c SHA512 fd8228b1e1529153312653bed78e4ac662d8b2f6ac4b3714092c3524363be9a2f1048a874b6b4075acf47bcfb417738eb2b6b3fc8ba302fdcca43a52a9ce8754 WHIRLPOOL 19d858d6f1f7a2e13586cefd3cb538b207656845f809e7bdb8503f7f3dba5a7c753c7a38a342fa41e86f81d6894758eae20f0a61f9471d494bcf619339f36bd9
-AUX tiff-4.0.7-bug2599.patch 2173 SHA256 1649d629657870eb5d050c6c0889271d9c4bf029476e80be814161451d5d0091 SHA512 b24118267d9f6598369240c63f03398d2823499879e89ea5427ac144a29f9eaa246c436aa9393487627f978bcc7669c7d1024e247ddd560b099d9bbfd42a1fbb WHIRLPOOL 40657586ced72688acbd66f7bbfca01e6b1333175bdff2e35a2b50eddff75616cd05888ebbb150e9f4b439fddf94f67b4b0f60f7a6f925e3dec91afb5d2a222c
-AUX tiff-4.0.7-bug2604.patch 4132 SHA256 1021d95174247612bac263ae2d69914f3ac8800f7f59691eea96b0c2cea43bad SHA512 37f17f363c610da317b2bf5792dcd3a0a23de91dafba600dc05a7096e7eca9e310ec5395d81a8696854a9f0a2eeb1fb787dc7828b0c7e4510894fa02354b7311 WHIRLPOOL 34be05a439f56022f29555b71f55ac44f8f9ef21006975393d587ef6793452ee689ecd4e9834dc45f0d31f66bcc8b612b470499a53ffe74eb0af045740974e40
-AUX tiff-4.0.7-bug2605.patch 1617 SHA256 2987d5da4f762b2d880761f632c2225ec97e1c1b260774ce8935427501a90c3d SHA512 26cfba6bbfe06eedd2969eb674dac45f37d1deb1ebd7f1f3a531cbc0caba65efa79161f00dfd6b9adeb2ee5412857f7dd372dd3c4d62db12f29c93d130c0029f WHIRLPOOL 004f35954940a621d74eac54633b02531da3ec1ee83192f72d44aad27022e0b6a6ec41ca0a5ef9ef0824c38d5f8eff1e39f6b2273b19b4a6174ce5c2ba3b31aa
-AUX tiff-4.0.7-bug2607.patch 1326 SHA256 dc572bf83af4a5258c10a6416daf49d44638c578de173fdfd843da611ec5ac98 SHA512 c705564dc39314403a0171ee7a5f96567e14b7c7e23729b1a5853a51a02e9c9d12cbcf1ccf3c46755aafd8df1f35ac9cb462d7997a1122fb2f744e6a7c6241b9 WHIRLPOOL 0d5412237283dff67833113a4a176540de0b0ca8b4dc89155007b3095059cf05f5b569f4e8790791fe32aace3f303b6aa9a92a2b960dffea1a7ccc7402a7f519
-AUX tiff-4.0.7-bug2608.patch 4143 SHA256 1ee769ceba4c8afa0adb27ee5204b33086d5ab39f204ebb64854696c3be26d50 SHA512 19e8cf418f0f485a257ce847c755b52e56f73a2371032263bd121af357a3b1fe01aa462d3d0e7c427a69a2daa7374f721fc766e02a037f6c73cd92615ef39b33 WHIRLPOOL 4d69d4047bf822924c6b1d434959ceb3249149730bf9f91bb9db0544770b59c529f05b7f7e056ae80345bcdf374f2fcc2c3946fd2373bde2028db3bf6156b3d9
-AUX tiff-4.0.7-bug2610.patch 1408 SHA256 730cc8453d91cf82d5f7f245b0247c9436ecb2c21d2035f8e47d62618c7c3fec SHA512 c36f6feab9764985147b55e6f0a13f20fabc327090828f0dccbf948f770ccab0b1320da5a0cede978fe6e44167ed04d73d68db3df55dd5292eaaea245ce69c4c WHIRLPOOL 1f0563bb9eadfe1f30f9420497bd25fc899471a0fa4f8572c52d127f80d2a531d309c1cf6692193b6a05f785dd572b57a4c54a7ea3fc9b5951d57fbcdfa3f44e
-AUX tiff-4.0.7-bug2619.patch 1788 SHA256 08b3d76163636241de25609a2fd0fe763651417421fcf81f46b79e6f9632c42e SHA512 a1b8e93cd4738df92e011645780edc8cf726deb14b6ea89e08816edcd132869e2af7a87b29dc4ec8f047f23a977f71e368c48974ea5f47ac0bf0a46899d1ba3e WHIRLPOOL 811e87d1406b577a401c10fae42bb3ccb7323d332f68e6b79ede271a8fa543df0caa0458509df7f7c58aba750a1d3fb5623e84e8f11ca0c54bc07161fc443f29
-AUX tiff-4.0.7-bug2620.patch 999 SHA256 86bad0b58a62814b2f3d190004c706b0a4edd671df6edacca4242f1a68f2d1dd SHA512 11d1db473aa2c8d095efb98fce44d028761f9d160dad372f2dd9dd94ee7165cee7c38074cbe86ebfc89fac0da8d1ba6c111a90425451d9e29c991b18e3d63590 WHIRLPOOL a8455230f1e5fcd895b30f872aa5ac09f991493401d89a48c87414a0a5f8916c73e83947ca55f7cd7c4f251428f27b8f0f3a4b6f0c71bc1fbc2d558dfc9d6f7d
-AUX tiff-4.0.7-bug2621.patch 1607 SHA256 e65e24840bd34a23b385ba7e267349887d225a8d571b3b7bccecb1a6df0c15ab SHA512 abab14c816df59a353c25651832d14bfce1d4aad5041072e9ba15237db108fb8e81c6b6204c741e59ea1ed45f21da64331baa57064ff912939dbe240554ccf9b WHIRLPOOL a9fdd82095ea10b3a949bcd7a95f8865e2b407a2c72bd895b558c2a8d418f79cb2ec897392f770a68574fba6310f16d387422df4f0160b9fbf7db4f3041efcf1
-AUX tiff-4.0.7-bug2627.patch 1943 SHA256 cdaeb714552b03dc7ea555073814716fb1e26ad4c03df21a89b0d1fe95bb0562 SHA512 144e8fec21dec7c9c52c19908d7f33a46b700513d419784d665fbffe7ae587790b5ca10895295108e985c6897b9d9f61ebdcd3febd23ca069c55b358e96af0fc WHIRLPOOL 768e37a14ad3f4ababd395ab1c945c398eb0ea858fe6a6cf3350a06f3bbf007b56a6f5f9588a936d8b0afa50dd60632e91577bc2d5cad3398da2fd01d92a2b87
-AUX tiff-4.0.7-bug2631.patch 1157 SHA256 b6515fb191a07b676c5c38f809611673560c66730a8b637fe6418375c8a92052 SHA512 c55398609a38c231c084526e9875061e776823e953f0c805cb08c2d04bf9d4345c595eda43feb6d929c747cb5032a57c49be9d556bd85bc66ffb4b943fa17ad0 WHIRLPOOL d83179c7786e90ef4cd64127f507211d201fb79bad645375c716619a7c9ffddee7c87575af5c8ae98d758a4b2d6b83be5b3b16d52841321c204282b419ae0361
-AUX tiff-4.0.7-bug2633-bug2634.patch 1313 SHA256 8b0463f85d3572f7789d040e9f7fc6229073ddf9996d865316b4164bd59eb173 SHA512 b431a052fdc180545c08a5e0ac6e8fe09a84fe2339c00487f96da7ded6e4de496ae8f6a00f5e20e389afb9bcb91f2ec692e0e5442738679b49877f98c719067d WHIRLPOOL 6628ad8b471e77ab71ad2ab83e14d61fd9a695ecf8837bb83e88d2798cd6045da0553523e5a8c95dec6e477f26200bce7274e1337a366d379b63be8b564b98ff
-AUX tiff-4.0.7-bug2635.patch 1221 SHA256 d93cbf3e5609fd441019517313cb323d87fb726c80fb708a76bfe8a0599da479 SHA512 f820081833fa4d03c8d3dcaadef4bbe146b0d34fbca07682f3cdd14dce8b3d0e239524eb3dfdcca9984758b647239791bcd2d1171658370dc04c42a02548e175 WHIRLPOOL 33b39ae3e6301198e4173501c30f8ed9c47d863526490df1060187294c441baa5404fadf3ffbe99933044fde1f34bbdc20de5915f3d53acd29fb3616e644e7ef
-AUX tiff-4.0.7-bug2638.patch 980 SHA256 625069ce41f765d294b944fa047eeb9b1a9b28b68729667db715f419c6c26c9c SHA512 32bc9f7395fed8a3d2c007dd8d716b7ad35feecdec933704c65e3bf56ca2856217a2de46b10001975659b6c35d401a01b3c3465c31e4365507417afe9124921d WHIRLPOOL 7143fcddd445b85ec25615a12c5431b0a0f5f0ca2cf16a12fefbeed272234c28f8f42b416f5cf110118309f90c08e8b5eff5bd479cf3915ee33563b717826c8b
-AUX tiff-4.0.7-bug2639.patch 2354 SHA256 25e62415a86d1ac3641f7dee7a2d3962f77621bbcf4f318611ddc11e1df2eb10 SHA512 5cc200ff4ee63c06a4cff8ca0ecec9623815ad2acaaeb034b27030f2789a8ef071a6cef28974b6f821215a1b0b14a0543792adc4aae11797fa89f2a7c7bcb757 WHIRLPOOL 633e5286f43df469e03c4f50ed40de5fce7c37ea3cafdad637d8564ac91c4eb9bb2e91325202683d3a27041d2b493e6785edecd91e3fa81265efee271b435edb
-AUX tiff-4.0.7-bug2640.patch 988 SHA256 ddfa06afb9f5d5998bb198952bdd06de652a58c3654d48dc9eac805cce61af9b SHA512 b8b4afc23e28218d78f7b6f91dce1183c1615fa8994d288220dfb35a2e7ba700901f3b7aa6159d7f525ae42d7e9c94d6240b21b3875df139cf9c453e947ad70b WHIRLPOOL 50db4c258db9dc77953a3621c38eb121953287dc8be8f2cec1f58f2e55b85ccc9e31a02ba544d903dfba9b99ab16c3d4a98f3415f3a5c5579b34ae013f3aded8
-AUX tiff-4.0.7-bug2642-bug2643-bug2646-bug2647.patch 8547 SHA256 8524ad692ce512cd6b21dae509e0994cb5252073cff4fd749665a621291391d1 SHA512 0273effe1287d5f96eba994d81151e3eefce20e6d1d85bd21cb72a8d54d05bb82bcb60a97c778598856e7b7ed45d12b2e3fec52a6bac2aa2f52dd96365ec7b9a WHIRLPOOL 2c8e01f8e0f91093c9c606921ec4d4db926a6e1dccf204a68b780650de5ee3b7976eddd046f0e70fbf3916b1cf2119164bd9df0c5d90b01c27e2401f781b748f
-AUX tiff-4.0.7-bug2644.patch 1863 SHA256 80f61149983375fcf6fbedb4f90b6a5d254379217bed3860af1b1e686a61a73d SHA512 d50bb84b1842eda41ad8d7eead50ded6be928851d04f4ba71bc003cbf6d8a646539a457bab58d5327422e0b8a4ce53c1bd2cc79125924c21d64cc95ecd0307be WHIRLPOOL 7ccf2a979a98a31513bcfbd07374b4c502266eacbe85d2b6a36b6c7c26a7a196d190cfbc6b3fae3775d5962ab0df8ec2c4ac067d50afc9c6e7674f37ff0b7818
-AUX tiff-4.0.7-bug2648.patch 1200 SHA256 edf80470417a31299ba6b218b6e559b81f313cc43b326e1e4f789301b81e82fc SHA512 082695dadfc13b7efe1761b46b8a3144d151844a6bec620734251221c1d062b14c8c94a641abda9f822f1d7b8715a28bf5311e832d0c5b67679d3f4863463980 WHIRLPOOL c2e44d57761aff34ca94cc9620eba2b8ea6efb562477875e28356653613a651c09874197109154fdec086c6560d914cd6ce901fd79207273ed3b830f6e868ee4
-AUX tiff-4.0.7-bug2650-2.patch 811 SHA256 4ee2aa8c63dca66eebccc747835d91e36a468117233c1d162848e317e3c20d06 SHA512 600b72d84da2428d95da3f439ddee3805f9ac5b0f70a45681536f508847bdbb55b37292c33ea3a5e3d4c11f923554371f5417763c62d50ac5a7dc93a2520a537 WHIRLPOOL 95377f712047835d9dbedbb37f05e0c9999f9207de0b71e7d311d2758d3e4f7afa4eb87c7aae8b6d2fda04227339676f3a84952336d615d4ed65272549b1b131
-AUX tiff-4.0.7-bug2650.patch 1815 SHA256 d677602d992fd743212cb2e5afc9eb4ba15b6c49f3f79f3b4a0ebce4a95d4dc9 SHA512 35c32307adb65ccc64fa9d11662aff1ade1404b46892240bbf695311d89ec9a44f31fa9c8cb06e82aaa455a1afd4f85cb8b71ffa6a59a3ffbb83014df36a5fa7 WHIRLPOOL 4d9cf41de4b515bafeae8db193d03b55e4de25c60ee511b296f7384ba4d3708f7798dbe6aee952ff54ced75156fd5649490d2493c3671454b88134ce92496a17
-AUX tiff-4.0.7-bug2651.patch 2650 SHA256 954f174792dae1338a811f4bfba464b05eefd38d44931a5b57686682dc26e752 SHA512 ce26abcc52e762470e32317cda6884fa78d23f81099f88a1dfd24bcf61a8b69037bb867ecc6e53b6b9395eb399c0e7b78c78701fa63eece4f18258b31dc887c4 WHIRLPOOL 40b5403b18ae66cecc5076fe6d5980f3931f7716be810d8f49ac3f62d3f7cf2cf875fe38015f9c01ad91f360b0c889df7f2f1be978bcb08dd2c09c09c8221361
-AUX tiff-4.0.7-bug2653.patch 1211 SHA256 8ce494118e93e7e7f1e23d2badcd266bd576212328cea4526a00a73245f2b79f SHA512 0b069f3580b33aa0f8d569314f18bf4f493ebee4ab92378acbb098618f01304b70ac80dbb90bb8a700013e8444728ea7c7bc806b43aa7362c673a408a5b5937e WHIRLPOOL e1502cc8c3ee5d1f48d9469ac90e355ce0f7a7adc342f1918f6b5c4844f5e074be988de2cb3e8bf0449fabe4ac58159beaa0c9825629fd0f0a988a3d53b6685d
-AUX tiff-4.0.7-bug2658.patch 1177 SHA256 8154f80a01abf592391e54400d77853e0b12b2819a1fecb5313de47a17fa148c SHA512 2eeb99a4aea2257ae5fa7457d0d9dd4aa5f60a20451641fe149ba7044232b54d2a43686cdbde1f10891efbf9de3bd3036b8836dd23dcc30e0771c60a1ae71548 WHIRLPOOL c77941b48b68c108a20c6a2d06dd96b7f2c7774d4e4338e9cca5b1e6ec939e5dcef58fcedaeb3fe28c7184b875b4913c2da82caa874c0e413b92f7c750cd8005
-AUX tiff-4.0.7-bug2659-2.patch 1314 SHA256 4d71f38b73c87467cefe333d436ce003f617a8c8bfba7787f2a27f49ba27547d SHA512 88847700664d19319ca6789cce5716006591e1e467c43c6fd5bb15295b0a49382cd36b3681d8a3aa69f8fc624265c9c559cccb75b84d6055431f14feedb7f08c WHIRLPOOL cfaf35a392a300d82e0c421f8630dbe668887d1e391e3a48d3d8673388f5ce53e239f3d5cd8be77eab64082fb3b2d9215f2637981e513205c908ec0a3eefc2c7
-AUX tiff-4.0.7-bug2659.patch 1173 SHA256 5a781c94a6700f56c222d147a699f6ae5d13542660c981bb9c8667be0a6d686e SHA512 c43716c63c56fc5815a931e645ab8fe8405363c8364bd1b3b6e06abcca60d3c3497d7945553ade4e9b89f67d37a6a5017cef1601c6408db39a525279f7a03150 WHIRLPOOL e72d98a5bdb079f9b44441e62670a3c38153fa99497e8b59f828380a261d930eafedb48c9a0b204d2ffa12a0146dafd8560fbafc84735d3d0a7f8a908ce5f913
-AUX tiff-4.0.7-bug2665.patch 1634 SHA256 ccc07f5fafd86a5dd6f45fe90b8bc997c4d451b519e2dc01adf18d8e668a253a SHA512 36d56f8bbee3d62e90ca7cf294d0f14b624a95376c1a85a3b51b89176ccde4e1601e895fb85b5d56e06c7de89fee5e7d07d2bc7f6500165199e1715d477deb09 WHIRLPOOL d87ce573fa2760ce29ca10a8dd230f05cd5cfcddba26b94f7151315d168bdf1436ef1a84046b477be3d689736ba13ad99185729f3c72aaeb2452931e2c5bed81
-AUX tiff-4.0.7-fax2tiff.patch 1516 SHA256 36ad571cfd362052c25c1c206daf6abdb20109f4562cce56aee59789b2f2a788 SHA512 0b692df0ef4517b23e183bd4e521db6f97a9d34a59229f66d06ad02e1f021f2e9981f3c5d7c45b3a65fed5755190deb67cd49dd2332f71b1ea5adc07cbc4d4ea WHIRLPOOL f978c02fb25b2fde8dc715440c34635ded17845ecb58c1c34b90b54064be116910df369cdd2dc02ce23fb1a98eaf503aa37eeef3e77ff640cf4cf09188bee1f6
-AUX tiff-4.0.7-hylafax-hack.patch 1626 SHA256 41439abd34c29b0d021c490a2b2e567eed30e46d4e8bdf99cb2a5e8ab3fb02ef SHA512 f6d6da8e60b94560fa3a47b3779160893317817b56ea216482da65113249724b5d9023eb50d30660a2fc2e49b2f9147ce1dc12b198173c5ffc3f44e95308d843 WHIRLPOOL 558d196da71545bdf2030475b03b8764e779873dc6dd7306a5bfada042a80784991ad2201a3e45783f3d2f655c6f7b667b478a960a9ee97c6e014eba00d10d78
AUX tiff-4.0.7-pdfium-0005-Leak-TIFFFetchStripThing.patch 613 SHA256 6dde45c9e55687c6067666edb58a372272fffd75e96df88477c22e28831b49e1 SHA512 d29d1eefece677e5802c649a41f96af4dbd6c39e487327dd123b905e7fdfb8982b5e82eae365e5df11832c1682008805a5a7cf572577c5483ec530d881024b3b WHIRLPOOL 1022b81b68b1ad744e9a4177949550df514dff2d2420635557f06abc4ca31425f4b5fd10fdbefef278fbe54f953b9da5e338dc3d48b49d12155011b4baf92785
AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 SHA256 72bce2bf5995769bc2c1762654c761a4e908f36ee367fc08d7501a31197afad5 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9 WHIRLPOOL ddd3c9d98dff75d14446cb94ea3d9b93030f299975849b8fd1740431974d489e17141e30dc2bc74555dadee95d73cb453696de521a8e49177ebf887f2391e9ea
AUX tiff-4.0.7-pdfium-0007-uninitialized-value.patch 802 SHA256 0c97c3fd78482d276ebfb8d241e9da5d2169cb43f1d5dece50ccd889bbccfdb2 SHA512 198907ad009d5faf2dd079d1a4e7355d439828a23643158531b15821be0cb3fc9b93da1ccf8baae8f4029b08ae2a55a94c7ef97ea5af6c48a9e013822a5f763d WHIRLPOOL b420eaa2e0eb6c92957e3260c279f11928ac64ebbc41200f6424c3e1b88087d8594ab575998b1a2131b052fcb44988510525d2d22b9d2cbe024801644e8ee323
@@ -49,12 +12,11 @@ AUX tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch 2992 SHA256 778b2907
AUX tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch 849 SHA256 fb44bb590ffd32e534790039f96e4247c36e09a1ca0dbb4e524b135963476d21 SHA512 9da30e7223522dfb4d8a8bc8b5bd545615cfe60a509f8583d29817ecbb1ff28ca38a6e00ee845e9484d9bc02666f99b0144ea08e5083eef2035e99b1825f4bd3 WHIRLPOOL 37b314b8d4124151ccbee6584bddfadedc79627726325911291721f06837996bed915250a70ddff40a37570e644cbefbee35f97dc8396ed8e7fd6dc983d911bc
AUX tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch 1228 SHA256 d422933c693c839b39faa2fcd27da9c44ab501134cd1c876f1233757df2b10ff SHA512 4add933c6b7e2938affb03e00da0bb28789cd9998f5496f4b592ae14d35175f6ce8a4e83ee639ef42211a8683bddad5b4c8375a1ba0a331bc72a40c45e691162 WHIRLPOOL d5cd7a908f699b15b1bab0fbcb1678fa692143a350aa6df4bb62e16572afb05516116b36e248fb59f5517ce88f03340c93a58c4f81c9137be55c5817bf61f111
DIST tiff-3.9.7.tar.gz 1468097 SHA256 f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77 WHIRLPOOL c06b35da66c365c1fe7f0e6e06a400e139d3e2b5b280aa764015c2f0383a6191ffb3d335cdf2211b687bbb0caacf641be409148986a9813dfde5822a650a9b1c
-DIST tiff-4.0.7.tar.gz 2076392 SHA256 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 SHA512 941357bdd5f947cdca41a1d31ae14b3fadc174ae5dce7b7981dbe58f61995f575ac2e97a7cc4fcc435184012017bec0920278263490464644f2cdfad9a6c5ddc WHIRLPOOL 3090a0d8a5ad3595c97888edab3c48379175cad993567d20be5f397b1c5c1d21012de55c5da5e664ee483d294fe9eb5f3464e14f564fb79c1357094ff67e313d
DIST tiff-4.0.8.tar.gz 2065574 SHA256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6 WHIRLPOOL 13fce447c586fef080c6201f0f5b010bc8b0e096bc9b806ab3b80eb6a672c789f88b5fc34a51585aa7072bb8407ecc958d1d7824fad379f86968f051de2fa96d
+DIST tiff-4.0.9.tar.gz 2305681 SHA256 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd WHIRLPOOL e67378d8d7c17d892e5f075d4e13aa299042a9f989fd6051b23d986518a11f2bbbcb13f491d87da6e6455aa28df2cce0fb65761237e256ac2e37889272f2ddf7
EBUILD tiff-3.9.7-r1.ebuild 2084 SHA256 f91faee9c25897294062a3c4c7216b04ff10c2f8dbe8af17304920907d513b45 SHA512 9204dbe59144189fc74619eb9cc87e3cc13bdefb00ff569ab1b7986e8f0112a94283febbceba27ad61cf265977c7cffd653844a86ff59b23446a0fff4740677e WHIRLPOOL eaac4889c4c62dd04f07f15d3f0324287cdbc412d1d33a59cd7011ec982178fb6e669a518505d2cfafe354a870caf4d6240b09a4189c3f808e6b85cf662a3fee
-EBUILD tiff-4.0.7-r3.ebuild 3984 SHA256 3819e6fee147b8921924907bb02fe7fab8d26bde6d75f80c61d7a1778600b3f7 SHA512 914b7b47017c321679df09960acc4aa8baa76a59a85dcdd8eda90ac026f41da5f4d8cee3cc93f330b815fbef76a8364e4b7a1759d68eb026bbb9bab53ace281c WHIRLPOOL 6e126b9fb491b549038074633afb04588248313d767a194f2312a2802019a386dee5630bf77805d2076267c24cfb74013125aa0b3b7662bde0e66288c5de348f
-EBUILD tiff-4.0.7.ebuild 2008 SHA256 7cffa060f0e71b14c2567e04f1063d0cad813b922812d6184e9a61087660c672 SHA512 120485820216c3e2a1eeb5cdb168edb73cbf8e56ca52a1830ba5f305e8d3c2ff25c343b5cdbe492c7ae46f5ba71e83408f0c84a7f4acf1bbd1cc67bb3a59dd0c WHIRLPOOL a8c37e06ca2dc89807c2aba210b17282d1d1dfe268ae603fc9f8c4c2339f394b4f88e7acba3c76e36c39848699d9bd6ea2329243847f19b31ce5316e4a77a6c4
EBUILD tiff-4.0.8.ebuild 2631 SHA256 ebfe0ae7422e5f3ecddd55f71e48c39f7d3a703cab46d5e87f1ea2322a77c8ea SHA512 0f751cb980e6375726e3d1cf3747c2d36e48f2a6321972d82f54a7732fc92a8d671f673d5b78ed865c3a99f1192890178c6a8891863dce5cbed04b9309ee09b0 WHIRLPOOL 273af4fefa206144023c9a24bd2a7de0e598d5956d20d26761d38473eacc572a9cfe01072c979f377ffc9aa2ea6f2892cda023300f71256ccf9cea1f3938dd1c
+EBUILD tiff-4.0.9.ebuild 2498 SHA256 c0a273da1003ce12a7c636c1c3f1d24c5fc104f33774a2bb4a14e1f85355e99f SHA512 731e3f99dc2f938513d243a4c1c86e92ff4abce397c719daf4f1b3e6e95350c8751dc7e4d1e06049b326f1b2d6a3790c5d51498ef516981a30d649f76a242972 WHIRLPOOL 4dc00125fc7974b6322bef80d9d5f128f9ce2b329b092d48df8571666b0bd1805cb4ae8edeb4a9284b13ec9d9f469ea7bffe4a41f1024c8ec22f67e697f37e44
MISC ChangeLog 7141 SHA256 af3ea485ff770a8e47745811a8d9956e6a2e1ecf3331d2fd250cf1184ec0b344 SHA512 e729de79059b9e40c78ae4d888c1c918f49103d4703deba418c7256178a906fe01a3fb39baa4979d9c86794e395899b1892dda5f27070b47d10897bc70c41e38 WHIRLPOOL c89a85615767e526cd6fe414be8fd13a5925c51fe54dde96d1a731e011a6f44b6f61f056b3b1098bf4186055a8ebd83d9775e357fb4996ad47d89bdfc8291b89
MISC ChangeLog-2015 37881 SHA256 76a38680402174816a0d1f744702de8b9d788bdd7bdc91386769521833446e49 SHA512 e0fc407d273a8e6282de4d9466d9ee3ec19490f72b70ed939a7d8a4d5a4a0534d754473a2a90ce0917024ba7b7c5c4d0b393576116b62841d2796d786183390d WHIRLPOOL c287bc4ba38bb5485c1b2bd6a9080682b9155edebf7d7b42121b2653a04e43060a8f2576b99c4e378d401329eb4d7620174faa94ccc32f3dfe76f9e72d6ab1c3
MISC metadata.xml 550 SHA256 1410eefa2efb14159708ab807679ea0ee37fad70104fd5f6bf09a42cb84dda66 SHA512 f57f42dda3a4300ad235f36115f9b431f8328308ced2bb2522f0d0031630abecab970ba4648630fc138d31d6d7c624b9028fdbabc97f2b1f9529457b2ca7f63b WHIRLPOOL 5ed169b8ba3f7539eee60b43e8185c374f962a232f8b5e28e40e396b9aec7b3436c85fde2dd38f225484dfc1585d4052fcb66c2c13abc77c45c16b7f46e9c87b
diff --git a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10266.patch b/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10266.patch
deleted file mode 100644
index 67e0ca41c995..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10266.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2596
-
-From d7520d28685b96a28421ef01fb66cea8d1a96dfc Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 2 Dec 2016 21:56:56 +0000
-Subject: [PATCH] * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow
- in TIFFReadEncodedStrip() that caused an integer division by zero. Reported
- by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596
-
----
- ChangeLog | 7 +++++++
- libtiff/tif_read.c | 4 ++--
- libtiff/tiffiop.h | 6 +++++-
- 3 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
-index 80035929f033..29a311db0cb7 100644
---- a/libtiff/tif_read.c
-+++ b/libtiff/tif_read.c
-@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
- rowsperstrip=td->td_rowsperstrip;
- if (rowsperstrip>td->td_imagelength)
- rowsperstrip=td->td_imagelength;
-- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip);
-+ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip);
- stripinplane=(strip%stripsperplane);
- plane=(uint16)(strip/stripsperplane);
- rows=td->td_imagelength-stripinplane*rowsperstrip;
-diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
-index 8bcd0c172c08..5294ee78ffaf 100644
---- a/libtiff/tiffiop.h
-+++ b/libtiff/tiffiop.h
-@@ -250,6 +250,10 @@ struct tiff {
- #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \
- ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \
- 0U)
-+/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */
-+/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */
-+#define TIFFhowmany_32_maxuint_compat(x, y) \
-+ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0))
- #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
- #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y))
- #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y)))
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch b/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch
deleted file mode 100644
index 04d9729ff731..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2611
-
-From bd06f6c97dff0b30de0f80227d782ea448c14b19 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 11:15:18 +0000
-Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case
- of failure in OJPEGPreDecode(). This will avoid a divide by zero, and
- potential other issues. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2611
-
----
- ChangeLog | 7 +++++++
- libtiff/tif_ojpeg.c | 10 +++++++++-
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
-index 30a1812634e0..93839d8f3e11 100644
---- a/libtiff/tif_ojpeg.c
-+++ b/libtiff/tif_ojpeg.c
-@@ -244,6 +244,7 @@ typedef enum {
-
- typedef struct {
- TIFF* tif;
-+ int decoder_ok;
- #ifndef LIBJPEG_ENCAP_EXTERNAL
- JMP_BUF exit_jmpbuf;
- #endif
-@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s)
- }
- sp->write_curstrile++;
- }
-+ sp->decoder_ok = 1;
- return(1);
- }
-
-@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif)
- static int
- OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
- {
-+ static const char module[]="OJPEGDecode";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- (void)s;
-+ if( !sp->decoder_ok )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized");
-+ return 0;
-+ }
- if (sp->libjpeg_jpeg_query_style==0)
- {
- if (OJPEGDecodeRaw(tif,buf,cc)==0)
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-CVE-2017-5225.patch b/media-libs/tiff/files/tiff-4.0.7-CVE-2017-5225.patch
deleted file mode 100644
index 7f961474ba9c..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-CVE-2017-5225.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://bugs.gentoo.org/610330
-
-From 24bc05876f5a1a300a3c4eb0fa8e8cea6a256f9f Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 19:25:44 +0000
-Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow
- and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based
- overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and
- http://bugzilla.maptools.org/show_bug.cgi?id=2657
-
----
- ChangeLog | 7 +++++++
- tools/tiffcp.c | 26 +++++++++++++++++++++++---
- 2 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 49c9d37125a6..489459a7f6a4 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16);
- static int
- tiffcp(TIFF* in, TIFF* out)
- {
-- uint16 bitspersample, samplesperpixel = 1;
-+ uint16 bitspersample = 1, samplesperpixel = 1;
- uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK;
- copyFunc cf;
- uint32 width, length;
-@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow)
- register uint32 n;
- uint32 row;
- tsample_t s;
-+ uint16 bps = 0;
-+
-+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
-+ if( bps != 8 )
-+ {
-+ TIFFError(TIFFFileName(in),
-+ "Error, can only handle BitsPerSample=8 in %s",
-+ "cpContig2SeparateByRow");
-+ return 0;
-+ }
-
- inbuf = _TIFFmalloc(scanlinesizein);
- outbuf = _TIFFmalloc(scanlinesizeout);
-@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow)
- register uint32 n;
- uint32 row;
- tsample_t s;
-+ uint16 bps = 0;
-+
-+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
-+ if( bps != 8 )
-+ {
-+ TIFFError(TIFFFileName(in),
-+ "Error, can only handle BitsPerSample=8 in %s",
-+ "cpSeparate2ContigByRow");
-+ return 0;
-+ }
-
- inbuf = _TIFFmalloc(scanlinesizein);
- outbuf = _TIFFmalloc(scanlinesizeout);
-@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel)
- uint32 w, l, tw, tl;
- int bychunk;
-
-- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv);
-+ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv);
- if (shortv != config && bitspersample != 8 && samplesperpixel > 1) {
- fprintf(stderr,
- "%s: Cannot handle different planar configuration w/ bits/sample != 8\n",
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2130.patch b/media-libs/tiff/files/tiff-4.0.7-bug2130.patch
deleted file mode 100644
index b565fecc029b..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2130.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From c2faaeaa7887c24c574297e8e2f36208df9dc229 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 20:33:35 +0000
-Subject: [PATCH] * libtiff/tif_luv.c, tif_lzw.c, tif_packbits.c: return 0 in
- Encode functions instead of -1 when TIFFFlushData1() fails. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2130
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_luv.c | 12 ++++++------
- libtiff/tif_lzw.c | 8 +++++---
- libtiff/tif_packbits.c | 6 +++---
- 4 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
-index f42ac0131fee..1f6d8ba3ea5a 100644
---- a/libtiff/tif_luv.c
-+++ b/libtiff/tif_luv.c
-@@ -473,7 +473,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-@@ -505,7 +505,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-@@ -565,7 +565,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-@@ -624,7 +624,7 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-@@ -656,7 +656,7 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
-index 240e19c2e058..5ba35ec1305f 100644
---- a/libtiff/tif_lzw.c
-+++ b/libtiff/tif_lzw.c
-@@ -969,7 +969,8 @@ LZWEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- */
- if (op > limit) {
- tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata);
-- TIFFFlushData1(tif);
-+ if( !TIFFFlushData1(tif) )
-+ return 0;
- op = tif->tif_rawdata;
- }
- PutNextCode(op, ent);
-@@ -1054,7 +1055,8 @@ LZWPostEncode(TIFF* tif)
-
- if (op > sp->enc_rawlimit) {
- tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata);
-- TIFFFlushData1(tif);
-+ if( !TIFFFlushData1(tif) )
-+ return 0;
- op = tif->tif_rawdata;
- }
- if (sp->enc_oldcode != (hcode_t) -1) {
-diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c
-index d2a0165de9dd..0495e688a6be 100644
---- a/libtiff/tif_packbits.c
-+++ b/libtiff/tif_packbits.c
-@@ -99,7 +99,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
- slop = (long)(op - lastliteral);
- tif->tif_rawcc += (tmsize_t)(lastliteral - tif->tif_rawcp);
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- while (slop-- > 0)
- *op++ = *lastliteral++;
-@@ -107,7 +107,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
- } else {
- tif->tif_rawcc += (tmsize_t)(op - tif->tif_rawcp);
- if (!TIFFFlushData1(tif))
-- return (-1);
-+ return (0);
- op = tif->tif_rawcp;
- }
- }
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2535.patch b/media-libs/tiff/files/tiff-4.0.7-bug2535.patch
deleted file mode 100644
index c44a8f05d20d..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2535.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c4e376852d82936885833441169684267983691f Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 12:51:59 +0000
-Subject: [PATCH] * libtiff/tif_dirwrite.c: in
- TIFFWriteDirectoryTagCheckedRational, replace assertion by runtime check to
- error out if passed value is strictly negative. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2535
-
-* tools/tiffcrop.c: remove extraneous TIFFClose() in error code path, that
-caused double free.
-Related to http://bugzilla.maptools.org/show_bug.cgi?id=2535
----
- ChangeLog | 11 +++++++++++
- libtiff/tif_dirwrite.c | 11 ++++++++---
- tools/tiffcrop.c | 3 +--
- 3 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
-index d34f6f611d39..055324db078f 100644
---- a/libtiff/tif_dirwrite.c
-+++ b/libtiff/tif_dirwrite.c
-@@ -2094,10 +2094,15 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
- static int
- TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value)
- {
-+ static const char module[] = "TIFFWriteDirectoryTagCheckedRational";
- uint32 m[2];
-- assert(value>=0.0);
- assert(sizeof(uint32)==4);
-- if (value<=0.0)
-+ if( value < 0 )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
-+ return 0;
-+ }
-+ else if (value==0.0)
- {
- m[0]=0;
- m[1]=1;
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index 21dd08720d77..c69177e052d4 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -7996,7 +7996,6 @@ writeCroppedImage(TIFF *in, TIFF *out, struct image_data *image,
- if (!TIFFWriteDirectory(out))
- {
- TIFFError("","Failed to write IFD for page number %d", pagenum);
-- TIFFClose(out);
- return (-1);
- }
-
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2594.patch b/media-libs/tiff/files/tiff-4.0.7-bug2594.patch
deleted file mode 100644
index b2bc26e9064c..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2594.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a56820e2022e23610c1ea99fbf621d73d1e36348 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 14:18:48 +0000
-Subject: [PATCH] * tools/tiffinfo.c: fix null pointer dereference in -r mode
- when the image has no StripByteCount tag. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2594
-
----
- ChangeLog | 7 +++++++
- tools/tiffinfo.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
-index b02c7d46bed0..4d58055de85c 100644
---- a/tools/tiffinfo.c
-+++ b/tools/tiffinfo.c
-@@ -417,7 +417,7 @@ TIFFReadRawData(TIFF* tif, int bitrev)
- uint64* stripbc=NULL;
-
- TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbc);
-- if (nstrips > 0) {
-+ if (stripbc != NULL && nstrips > 0) {
- uint32 bufsize = (uint32) stripbc[0];
- tdata_t buf = _TIFFmalloc(bufsize);
- tstrip_t s;
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2597.patch b/media-libs/tiff/files/tiff-4.0.7-bug2597.patch
deleted file mode 100644
index 9cd29cfab77b..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2597.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5ad5e64f8530a827482645986f5bb4e4613d0aa7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 14:42:40 +0000
-Subject: [PATCH] * tools/tiffcp.c: avoid potential division by zero is
- BitsPerSamples tag is missing. Reported by Agostino sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2597
-
----
- ChangeLog | 7 +++++++
- tools/tiffcp.c | 10 ++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 6dfb9a91bfa9..c8e48c3c2bb3 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -1378,7 +1378,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- uint8* bufp = (uint8*) buf;
- uint32 tw, tl;
- uint32 row;
-- uint16 bps, bytes_per_sample;
-+ uint16 bps = 0, bytes_per_sample;
-
- tilebuf = _TIFFmalloc(tilesize);
- if (tilebuf == 0)
-@@ -1387,6 +1387,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- (void) TIFFGetField(in, TIFFTAG_TILEWIDTH, &tw);
- (void) TIFFGetField(in, TIFFTAG_TILELENGTH, &tl);
- (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
-+ if( bps == 0 )
-+ {
-+ TIFFError(TIFFFileName(in), "Error, cannot read BitsPerSample");
-+ status = 0;
-+ goto done;
-+ }
- assert( bps % 8 == 0 );
- bytes_per_sample = bps/8;
-
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2598.patch b/media-libs/tiff/files/tiff-4.0.7-bug2598.patch
deleted file mode 100644
index c0a0d1a8db1a..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2598.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugzilla.maptools.org/show_bug.cgi?id=2598
-
-From bc3d7392e43545c7c6375897458a7a3e8ee4d9d8 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 2 Dec 2016 22:13:32 +0000
-Subject: [PATCH] * tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips
- that can cause various issues, such as buffer overflows in the library.
- Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2598
-
----
- ChangeLog | 7 +++++++
- tools/tiffcp.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 338a3d113bf8..6dfb9a91bfa9 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -985,7 +985,7 @@ DECLAREcpFunc(cpDecodedStrips)
- tstrip_t s, ns = TIFFNumberOfStrips(in);
- uint32 row = 0;
- _TIFFmemset(buf, 0, stripsize);
-- for (s = 0; s < ns; s++) {
-+ for (s = 0; s < ns && row < imagelength; s++) {
- tsize_t cc = (row + rowsperstrip > imagelength) ?
- TIFFVStripSize(in, imagelength - row) : stripsize;
- if (TIFFReadEncodedStrip(in, s, buf, cc) < 0
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2599.patch b/media-libs/tiff/files/tiff-4.0.7-bug2599.patch
deleted file mode 100644
index 929bb447bf71..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2599.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9bbbe303c8e5db20d7f687ee1ca19c98fb852044 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 15:30:31 +0000
-Subject: [PATCH] * tools/tif_dir.c: when TIFFGetField(, TIFFTAG_NUMBEROFINKS,
- ) is called, limit the return number of inks to SamplesPerPixel, so that code
- that parses ink names doesn't go past the end of the buffer. Reported by
- Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599
-
-Reported by Agostino Sarubbo.
----
- ChangeLog | 10 +++++++++-
- libtiff/tif_dir.c | 28 +++++++++++++++++++++++++++-
- 2 files changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
-index ad21655a6ee9..2574e748b3be 100644
---- a/libtiff/tif_dir.c
-+++ b/libtiff/tif_dir.c
-@@ -854,6 +854,32 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap)
- if( fip == NULL ) /* cannot happen since TIFFGetField() already checks it */
- return 0;
-
-+ if( tag == TIFFTAG_NUMBEROFINKS )
-+ {
-+ int i;
-+ for (i = 0; i < td->td_customValueCount; i++) {
-+ uint16 val;
-+ TIFFTagValue *tv = td->td_customValues + i;
-+ if (tv->info->field_tag != tag)
-+ continue;
-+ val = *(uint16 *)tv->value;
-+ /* Truncate to SamplesPerPixel, since the */
-+ /* setting code for INKNAMES assume that there are SamplesPerPixel */
-+ /* inknames. */
-+ /* Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 */
-+ if( val > td->td_samplesperpixel )
-+ {
-+ TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField",
-+ "Truncating NumberOfInks from %u to %u",
-+ val, td->td_samplesperpixel);
-+ val = td->td_samplesperpixel;
-+ }
-+ *va_arg(ap, uint16*) = val;
-+ return 1;
-+ }
-+ return 0;
-+ }
-+
- /*
- * We want to force the custom code to be used for custom
- * fields even if the tag happens to match a well known
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2604.patch b/media-libs/tiff/files/tiff-4.0.7-bug2604.patch
deleted file mode 100644
index cc3f4cf3ce91..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2604.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ebc6029128555df725e6ad77a983134350bfc831 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 2 Dec 2016 23:05:51 +0000
-Subject: [PATCH] * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based
- buffer overflow on generation of PixarLog / LUV compressed files, with
- ColorMap, TransferFunction attached and nasty plays with bitspersample. The
- fix for LUV has not been tested, but suffers from the same kind of issue of
- PixarLog. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2604
-
----
- ChangeLog | 10 ++++++++++
- libtiff/tif_luv.c | 20 +++++++++++++++-----
- libtiff/tif_pixarlog.c | 19 ++++++++++++++++---
- 3 files changed, 41 insertions(+), 8 deletions(-)
-
-diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
-index ca08f30a76b6..f42ac0131fee 100644
---- a/libtiff/tif_luv.c
-+++ b/libtiff/tif_luv.c
-@@ -158,6 +158,7 @@
- typedef struct logLuvState LogLuvState;
-
- struct logLuvState {
-+ int encoder_state; /* 1 if encoder correctly initialized */
- int user_datafmt; /* user data format */
- int encode_meth; /* encoding method */
- int pixel_size; /* bytes per pixel */
-@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif)
- td->td_photometric, "must be either LogLUV or LogL");
- break;
- }
-+ sp->encoder_state = 1;
- return (1);
- notsupported:
- TIFFErrorExt(tif->tif_clientdata, module,
-@@ -1563,19 +1565,27 @@ notsupported:
- static void
- LogLuvClose(TIFF* tif)
- {
-+ LogLuvState* sp = (LogLuvState*) tif->tif_data;
- TIFFDirectory *td = &tif->tif_dir;
-
-+ assert(sp != 0);
- /*
- * For consistency, we always want to write out the same
- * bitspersample and sampleformat for our TIFF file,
- * regardless of the data format being used by the application.
- * Since this routine is called after tags have been set but
- * before they have been recorded in the file, we reset them here.
-+ * Note: this is really a nasty approach. See PixarLogClose
- */
-- td->td_samplesperpixel =
-- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
-- td->td_bitspersample = 16;
-- td->td_sampleformat = SAMPLEFORMAT_INT;
-+ if( sp->encoder_state )
-+ {
-+ /* See PixarLogClose. Might avoid issues with tags whose size depends
-+ * on those below, but not completely sure this is enough. */
-+ td->td_samplesperpixel =
-+ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
-+ td->td_bitspersample = 16;
-+ td->td_sampleformat = SAMPLEFORMAT_INT;
-+ }
- }
-
- static void
-diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
-index f4af2bab7ce5..9836dce63450 100644
---- a/libtiff/tif_pixarlog.c
-+++ b/libtiff/tif_pixarlog.c
-@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif)
- static void
- PixarLogClose(TIFF* tif)
- {
-+ PixarLogState* sp = (PixarLogState*) tif->tif_data;
- TIFFDirectory *td = &tif->tif_dir;
-
-+ assert(sp != 0);
- /* In a really sneaky (and really incorrect, and untruthful, and
- * troublesome, and error-prone) maneuver that completely goes against
- * the spirit of TIFF, and breaks TIFF, on close, we covertly
-@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif)
- * readers that don't know about PixarLog, or how to set
- * the PIXARLOGDATFMT pseudo-tag.
- */
-- td->td_bitspersample = 8;
-- td->td_sampleformat = SAMPLEFORMAT_UINT;
-+
-+ if (sp->state&PLSTATE_INIT) {
-+ /* We test the state to avoid an issue such as in
-+ * http://bugzilla.maptools.org/show_bug.cgi?id=2604
-+ * What appends in that case is that the bitspersample is 1 and
-+ * a TransferFunction is set. The size of the TransferFunction
-+ * depends on 1<<bitspersample. So if we increase it, an access
-+ * out of the buffer will happen at directory flushing.
-+ * Another option would be to clear those targs.
-+ */
-+ td->td_bitspersample = 8;
-+ td->td_sampleformat = SAMPLEFORMAT_UINT;
-+ }
- }
-
- static void
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2605.patch b/media-libs/tiff/files/tiff-4.0.7-bug2605.patch
deleted file mode 100644
index 335e4348d3f3..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2605.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From cd4832257daf222833ae172b3923268fec5b71b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 16:50:02 +0000
-Subject: [PATCH] * tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non
- assert check. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2605
-
----
- ChangeLog | 6 ++++++
- tools/tiffcp.c | 17 +++++++++++++----
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 6d96bb89f555..49c9d37125a6 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -45,7 +45,6 @@
- #include <string.h>
-
- #include <ctype.h>
--#include <assert.h>
-
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-@@ -1393,7 +1392,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- status = 0;
- goto done;
- }
-- assert( bps % 8 == 0 );
-+ if( (bps % 8) != 0 )
-+ {
-+ TIFFError(TIFFFileName(in), "Error, cannot handle BitsPerSample that is not a multiple of 8");
-+ status = 0;
-+ goto done;
-+ }
- bytes_per_sample = bps/8;
-
- for (row = 0; row < imagelength; row += tl) {
-@@ -1584,7 +1588,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
- _TIFFfree(obuf);
- return 0;
- }
-- assert( bps % 8 == 0 );
-+ if( (bps % 8) != 0 )
-+ {
-+ TIFFError(TIFFFileName(out), "Error, cannot handle BitsPerSample that is not a multiple of 8");
-+ _TIFFfree(obuf);
-+ return 0;
-+ }
- bytes_per_sample = bps/8;
-
- for (row = 0; row < imagelength; row += tl) {
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2607.patch b/media-libs/tiff/files/tiff-4.0.7-bug2607.patch
deleted file mode 100644
index 532259e91cb9..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2607.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c99f44478d6f0491da5b98c8cea14f565a021e22 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 15:44:15 +0000
-Subject: [PATCH] * tools/tiffcp.c: avoid potential division by zero is
- BitsPerSamples tag is missing. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2607
-
----
- ChangeLog | 7 +++++++
- tools/tiffcp.c | 10 ++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index c8e48c3c2bb3..142cbb0ecfc2 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -1569,7 +1569,7 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
- uint8* bufp = (uint8*) buf;
- uint32 tl, tw;
- uint32 row;
-- uint16 bps, bytes_per_sample;
-+ uint16 bps = 0, bytes_per_sample;
-
- obuf = _TIFFmalloc(TIFFTileSize(out));
- if (obuf == NULL)
-@@ -1578,6 +1578,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
- (void) TIFFGetField(out, TIFFTAG_TILELENGTH, &tl);
- (void) TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw);
- (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
-+ if( bps == 0 )
-+ {
-+ TIFFError(TIFFFileName(out), "Error, cannot read BitsPerSample");
-+ _TIFFfree(obuf);
-+ return 0;
-+ }
- assert( bps % 8 == 0 );
- bytes_per_sample = bps/8;
-
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2608.patch b/media-libs/tiff/files/tiff-4.0.7-bug2608.patch
deleted file mode 100644
index afe2c25a293e..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2608.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 92adbddc283782d71d81dbccf72ed2c279f90097 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 11:02:15 +0000
-Subject: [PATCH] * libtiff/tif_dirread.c: modify
- ChopUpSingleUncompressedStrip() to instanciate compute ntrips as
- TIFFhowmany_32(td->td_imagelength, rowsperstrip), instead of a logic based on
- the total size of data. Which is faulty is the total size of data is not
- sufficient to fill the whole image, and thus results in reading outside of
- the StripByCounts/StripOffsets arrays when using TIFFReadScanline(). Reported
- by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608.
-
-* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done
-for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since
-the above change is a better fix that makes it unnecessary.
----
- ChangeLog | 15 +++++++++++++++
- libtiff/tif_dirread.c | 24 +++++++++++-------------
- libtiff/tif_strip.c | 11 +----------
- 3 files changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 01070f2ecebd..f2905286c0d0 100644
---- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
- uint64 rowblockbytes;
- uint64 stripbytes;
- uint32 strip;
-- uint64 nstrips64;
-- uint32 nstrips32;
-+ uint32 nstrips;
- uint32 rowsperstrip;
- uint64* newcounts;
- uint64* newoffsets;
-@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
- return;
-
- /*
-- * never increase the number of strips in an image
-+ * never increase the number of rows per strip
- */
- if (rowsperstrip >= td->td_rowsperstrip)
- return;
-- nstrips64 = TIFFhowmany_64(bytecount, stripbytes);
-- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */
-- return;
-- nstrips32 = (uint32)nstrips64;
-+ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip);
-+ if( nstrips == 0 )
-+ return;
-
-- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64),
-+ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
- "for chopped \"StripByteCounts\" array");
-- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64),
-+ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
- "for chopped \"StripOffsets\" array");
- if (newcounts == NULL || newoffsets == NULL) {
- /*
-@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
- * Fill the strip information arrays with new bytecounts and offsets
- * that reflect the broken-up format.
- */
-- for (strip = 0; strip < nstrips32; strip++) {
-+ for (strip = 0; strip < nstrips; strip++) {
- if (stripbytes > bytecount)
- stripbytes = bytecount;
- newcounts[strip] = stripbytes;
-- newoffsets[strip] = offset;
-+ newoffsets[strip] = stripbytes ? offset : 0;
- offset += stripbytes;
- bytecount -= stripbytes;
- }
- /*
- * Replace old single strip info with multi-strip info.
- */
-- td->td_stripsperimage = td->td_nstrips = nstrips32;
-+ td->td_stripsperimage = td->td_nstrips = nstrips;
- TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
-
- _TIFFfree(td->td_stripbytecount);
-diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c
-index b6098dd31241..6e9f2ef6ddf2 100644
---- a/libtiff/tif_strip.c
-+++ b/libtiff/tif_strip.c
-@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif)
- TIFFDirectory *td = &tif->tif_dir;
- uint32 nstrips;
-
-- /* If the value was already computed and store in td_nstrips, then return it,
-- since ChopUpSingleUncompressedStrip might have altered and resized the
-- since the td_stripbytecount and td_stripoffset arrays to the new value
-- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in
-- tif_dirread.c ~line 3612.
-- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */
-- if( td->td_nstrips )
-- return td->td_nstrips;
--
- nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 :
- TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip));
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2610.patch b/media-libs/tiff/files/tiff-4.0.7-bug2610.patch
deleted file mode 100644
index f76e83922d6c..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2610.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ee00edfbe833647d59ad87cac82f1b4c0c902179 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 16:40:01 +0000
-Subject: [PATCH] * tools/tiffcp.c: fix uint32 underflow/overflow that can
- cause heap-based buffer overflow. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2610
-
----
- ChangeLog | 7 +++++++
- tools/tiffcp.c | 8 ++++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 142cbb0ecfc2..6d96bb89f555 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -1163,7 +1163,7 @@ bad:
-
- static void
- cpStripToTile(uint8* out, uint8* in,
-- uint32 rows, uint32 cols, int outskew, int inskew)
-+ uint32 rows, uint32 cols, int outskew, int64 inskew)
- {
- while (rows-- > 0) {
- uint32 j = cols;
-@@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
- tdata_t tilebuf;
- uint32 imagew = TIFFScanlineSize(in);
- uint32 tilew = TIFFTileRowSize(in);
-- int iskew = imagew - tilew;
-+ int64 iskew = (int64)imagew - (int64)tilew;
- uint8* bufp = (uint8*) buf;
- uint32 tw, tl;
- uint32 row;
-@@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
- status = 0;
- goto done;
- }
-- if (colb + tilew > imagew) {
-+ if (colb > iskew) {
- uint32 width = imagew - colb;
- uint32 oskew = tilew - width;
- cpStripToTile(bufp + colb,
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2619.patch b/media-libs/tiff/files/tiff-4.0.7-bug2619.patch
deleted file mode 100644
index 0e0053883a32..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2619.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cb840651f037c59895b67d44b46a34127bb082dd Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 13:00:03 +0000
-Subject: [PATCH] * tools/tiffcrop.c: fix integer division by zero when
- BitsPerSample is missing. Reported by Agostina Sarubo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2619
-
----
- ChangeLog | 6 ++++++
- tools/tiffcrop.c | 8 ++++----
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index 9122aab37530..21dd08720d77 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -1164,7 +1164,7 @@ writeBufferToSeparateStrips (TIFF* out, uint8* buf,
- tdata_t obuf;
-
- (void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
-- (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
-+ (void) TIFFGetFieldDefaulted(out, TIFFTAG_BITSPERSAMPLE, &bps);
- bytes_per_sample = (bps + 7) / 8;
- if( width == 0 ||
- (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / width ||
-@@ -4760,7 +4760,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
- int i, bytes_per_sample, bytes_per_pixel, shift_width, result = 1;
- uint32 j;
- int32 bytes_read = 0;
-- uint16 bps, planar;
-+ uint16 bps = 0, planar;
- uint32 nstrips;
- uint32 strips_per_sample;
- uint32 src_rowsize, dst_rowsize, rows_processed, rps;
-@@ -4780,7 +4780,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
- }
-
- memset (srcbuffs, '\0', sizeof(srcbuffs));
-- TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
-+ TIFFGetFieldDefaulted(in, TIFFTAG_BITSPERSAMPLE, &bps);
- TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &planar);
- TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rps);
- if (rps > length)
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2620.patch b/media-libs/tiff/files/tiff-4.0.7-bug2620.patch
deleted file mode 100644
index 1b37177c5f91..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2620.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 76c4b35f114bc9614700accd22cc4a0b4b6b92d3 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 11:35:56 +0000
-Subject: [PATCH] * tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i
- (ignore) mode so that the output buffer is correctly incremented to avoid
- write outside bounds. Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2620
-
----
- ChangeLog | 7 +++++++
- tools/tiffcrop.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index 722b132cee6d..bdcbd63ed70b 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf)
- (unsigned long) strip, (unsigned long)rows);
- return 0;
- }
-- bufp += bytes_read;
-+ bufp += stripsize;
- }
-
- return 1;
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2621.patch b/media-libs/tiff/files/tiff-4.0.7-bug2621.patch
deleted file mode 100644
index 7bb1d57e3e9f..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2621.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d7045ed1501ec99c4e56174813bb1cb5c9a559ef Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 3 Dec 2016 12:19:32 +0000
-Subject: [PATCH] * tools/tiffcrop.c: add 3 extra bytes at end of strip buffer
- in readSeparateStripsIntoBuffer() to avoid read outside of heap allocated
- buffer. Reported by Agostina Sarubo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2621
-
----
- ChangeLog | 7 +++++++
- tools/tiffcrop.c | 14 ++++++++++++--
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index bdcbd63ed70b..9122aab37530 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -4815,10 +4815,17 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
- nstrips = TIFFNumberOfStrips(in);
- strips_per_sample = nstrips /spp;
-
-+ /* Add 3 padding bytes for combineSeparateSamples32bits */
-+ if( (size_t) stripsize > 0xFFFFFFFFU - 3U )
-+ {
-+ TIFFError("readSeparateStripsIntoBuffer", "Integer overflow when calculating buffer size.");
-+ exit(-1);
-+ }
-+
- for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
- {
- srcbuffs[s] = NULL;
-- buff = _TIFFmalloc(stripsize);
-+ buff = _TIFFmalloc(stripsize + 3);
- if (!buff)
- {
- TIFFError ("readSeparateStripsIntoBuffer",
-@@ -4827,6 +4834,9 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
- _TIFFfree (srcbuffs[i]);
- return 0;
- }
-+ buff[stripsize] = 0;
-+ buff[stripsize+1] = 0;
-+ buff[stripsize+2] = 0;
- srcbuffs[s] = buff;
- }
-
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2627.patch b/media-libs/tiff/files/tiff-4.0.7-bug2627.patch
deleted file mode 100644
index 11a3f3cd3f5c..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2627.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f88bfadb6d1fac1d0d081058216da659e1f5a628 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 18 Dec 2016 22:28:42 +0000
-Subject: [PATCH] * libtiff/tif_getimage.c: fix potential memory leaks in error
- code path of TIFFRGBAImageBegin(). Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2627
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_getimage.c | 21 +++++++++------------
- 2 files changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
-index c0eb6df0b09a..2ea838556732 100644
---- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -283,6 +283,13 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
- img->redcmap = NULL;
- img->greencmap = NULL;
- img->bluecmap = NULL;
-+ img->Map = NULL;
-+ img->BWmap = NULL;
-+ img->PALmap = NULL;
-+ img->ycbcr = NULL;
-+ img->cielab = NULL;
-+ img->UaToAa = NULL;
-+ img->Bitdepth16To8 = NULL;
- img->req_orientation = ORIENTATION_BOTLEFT; /* It is the default */
-
- img->tif = tif;
-@@ -468,13 +475,6 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
- photoTag, img->photometric);
- goto fail_return;
- }
-- img->Map = NULL;
-- img->BWmap = NULL;
-- img->PALmap = NULL;
-- img->ycbcr = NULL;
-- img->cielab = NULL;
-- img->UaToAa = NULL;
-- img->Bitdepth16To8 = NULL;
- TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img->width);
- TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img->height);
- TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &img->orientation);
-@@ -494,10 +494,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
- return 1;
-
- fail_return:
-- _TIFFfree( img->redcmap );
-- _TIFFfree( img->greencmap );
-- _TIFFfree( img->bluecmap );
-- img->redcmap = img->greencmap = img->bluecmap = NULL;
-+ TIFFRGBAImageEnd( img );
- return 0;
- }
-
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2631.patch b/media-libs/tiff/files/tiff-4.0.7-bug2631.patch
deleted file mode 100644
index 6e1011b072dc..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2631.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 101253c74cde97203dab28c4f3bd0994cea5804c Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 14 Jan 2017 13:12:33 +0000
-Subject: [PATCH] * tools/raw2tiff.c: avoid integer division by zero. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2631
-
----
- ChangeLog | 5 +++++
- tools/raw2tiff.c | 10 ++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c
-index 7298e80a95c9..083e9ee73f0f 100644
---- a/tools/raw2tiff.c
-+++ b/tools/raw2tiff.c
-@@ -408,8 +408,14 @@ guessSize(int fd, TIFFDataType dtype, _TIFF_off_t hdr_size, uint32 nbands,
- } else if (*width == 0 && *length == 0) {
- unsigned int fail = 0;
- fprintf(stderr, "Image width and height are not specified.\n");
-+ w = (uint32) sqrt(imagesize / longt);
-+ if( w == 0 )
-+ {
-+ fprintf(stderr, "Too small image size.\n");
-+ return -1;
-+ }
-
-- for (w = (uint32) sqrt(imagesize / longt);
-+ for (;
- w < sqrt(imagesize * longt);
- w++) {
- if (imagesize % w == 0) {
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2633-bug2634.patch b/media-libs/tiff/files/tiff-4.0.7-bug2633-bug2634.patch
deleted file mode 100644
index d68e86ebea2f..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2633-bug2634.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 95a32fbbadf54e7527c7e3b66fd603503b29dde9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 17 Dec 2016 19:45:28 +0000
-Subject: [PATCH] * tools/tiff2ps.c: fix 2 heap-based buffer overflows (in
- PSDataBW and PSDataColorContig). Reported by Agostino Sarubbo. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2633 and
- http://bugzilla.maptools.org/show_bug.cgi?id=2634.
-
----
- ChangeLog | 7 +++++++
- tools/tiff2ps.c | 9 +++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c
-index 82a5d84b41f5..71df4309ee0c 100644
---- a/tools/tiff2ps.c
-+++ b/tools/tiff2ps.c
-@@ -2440,6 +2440,11 @@ PSDataColorContig(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
- unsigned char *cp, c;
-
- (void) w;
-+ if( es <= 0 )
-+ {
-+ TIFFError(filename, "Inconsistent value of es: %d", es);
-+ return;
-+ }
- tf_buf = (unsigned char *) _TIFFmalloc(tf_bytesperrow);
- if (tf_buf == NULL) {
- TIFFError(filename, "No space for scanline buffer");
-@@ -2692,7 +2697,7 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
-
- if (alpha) {
- int adjust;
-- while (cc-- > 0) {
-+ while (cc-- > 1) {
- DOBREAK(breaklen, 1, fd);
- /*
- * For images with alpha, matte against
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2635.patch b/media-libs/tiff/files/tiff-4.0.7-bug2635.patch
deleted file mode 100644
index 8756115c9058..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2635.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a7b470d67f2b98599b2c9cd9945db6eea735cc47 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 18 Dec 2016 10:37:59 +0000
-Subject: [PATCH] * tools/tiff2pdf.c: prevent heap-based buffer overflow in -j
- mode on a paletted image. Note: this fix errors out before the overflow
- happens. There could probably be a better fix. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2635
-
----
- ChangeLog | 7 +++++++
- tools/tiff2pdf.c | 8 +++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index fe8a6ea7e101..afea414bebf6 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -3654,6 +3654,12 @@ tsize_t t2p_sample_realize_palette(T2P* t2p, unsigned char* buffer){
- uint32 j=0;
- sample_count=t2p->tiff_width*t2p->tiff_length;
- component_count=t2p->tiff_samplesperpixel;
-+ if( sample_count * component_count > t2p->tiff_datasize )
-+ {
-+ TIFFError(TIFF2PDF_MODULE, "Error: sample_count * component_count > t2p->tiff_datasize");
-+ t2p->t2p_error = T2P_ERR_ERROR;
-+ return 1;
-+ }
-
- for(i=sample_count;i>0;i--){
- palette_offset=buffer[i-1] * component_count;
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2638.patch b/media-libs/tiff/files/tiff-4.0.7-bug2638.patch
deleted file mode 100644
index 15541576c586..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2638.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f5536843f2ae641542bb81a3023dbc581fac184 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 20 Dec 2016 17:13:26 +0000
-Subject: [PATCH] * tools/tiff2pdf.c: fix wrong usage of memcpy() that can
- trigger unspecified behaviour. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2638
-
----
- ChangeLog | 6 ++++++
- tools/tiff2pdf.c | 5 +++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index afea414bebf6..78ffa77d123a 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -3593,7 +3593,8 @@ void t2p_tile_collapse_left(
-
- edgescanwidth = (scanwidth * edgetilewidth + (tilewidth - 1))/ tilewidth;
- for(i=0;i<tilelength;i++){
-- _TIFFmemcpy(
-+ /* We use memmove() since there can be overlaps in src and dst buffers for the first items */
-+ memmove(
- &(((char*)buffer)[edgescanwidth*i]),
- &(((char*)buffer)[scanwidth*i]),
- edgescanwidth);
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2639.patch b/media-libs/tiff/files/tiff-4.0.7-bug2639.patch
deleted file mode 100644
index b894775dc703..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2639.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6a61192a98665d870dcb835452cb9c5757ccd27c Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 20 Dec 2016 17:24:35 +0000
-Subject: [PATCH] * tools/tiff2pdf.c: avoid potential invalid memory read in
- t2p_writeproc. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2639
-
----
- ChangeLog | 6 ++++++
- tools/tiff2pdf.c | 20 +++++++++++---------
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index 78ffa77d123a..5348f1a765fe 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -2896,6 +2896,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
- }
- if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
- if (count >= 4) {
-+ int retTIFFReadRawTile;
- /* Ignore EOI marker of JpegTables */
- _TIFFmemcpy(buffer, jpt, count - 2);
- bufferoffset += count - 2;
-@@ -2903,22 +2904,23 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
- table_end[0] = buffer[bufferoffset-2];
- table_end[1] = buffer[bufferoffset-1];
- xuint32 = bufferoffset;
-- bufferoffset -= 2;
-- bufferoffset += TIFFReadRawTile(
-+ bufferoffset -= 2;
-+ retTIFFReadRawTile= TIFFReadRawTile(
- input,
- tile,
- (tdata_t) &(((unsigned char*)buffer)[bufferoffset]),
- -1);
-+ if( retTIFFReadRawTile < 0 )
-+ {
-+ _TIFFfree(buffer);
-+ t2p->t2p_error = T2P_ERR_ERROR;
-+ return(0);
-+ }
-+ bufferoffset += retTIFFReadRawTile;
- /* Overwrite SOI marker of image scan with previously */
- /* saved end of JpegTables */
- buffer[xuint32-2]=table_end[0];
- buffer[xuint32-1]=table_end[1];
-- } else {
-- bufferoffset += TIFFReadRawTile(
-- input,
-- tile,
-- (tdata_t) &(((unsigned char*)buffer)[bufferoffset]),
-- -1);
- }
- }
- t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2640.patch b/media-libs/tiff/files/tiff-4.0.7-bug2640.patch
deleted file mode 100644
index 2569f47a54b0..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2640.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 548b62fae49637b621766c721884d59a55c9a2d8 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 20 Dec 2016 17:28:17 +0000
-Subject: [PATCH] * tools/tiff2pdf.c: avoid potential heap-based overflow in
- t2p_readwrite_pdf_image_tile(). Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2640
-
----
- ChangeLog | 6 ++++++
- tools/tiff2pdf.c | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index 5348f1a765fe..8e4e24ef9e82 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -2895,7 +2895,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
- return(0);
- }
- if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
-- if (count >= 4) {
-+ if (count > 4) {
- int retTIFFReadRawTile;
- /* Ignore EOI marker of JpegTables */
- _TIFFmemcpy(buffer, jpt, count - 2);
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2642-bug2643-bug2646-bug2647.patch b/media-libs/tiff/files/tiff-4.0.7-bug2642-bug2643-bug2646-bug2647.patch
deleted file mode 100644
index 6f01774b9d53..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2642-bug2643-bug2646-bug2647.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From f049eba476a1ed60adc6534452ccf0022c2d1908 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 16:09:02 +0000
-Subject: [PATCH] * libtiff/tif_dir.c, tif_dirread.c, tif_dirwrite.c: implement
- various clampings of double to other data types to avoid undefined behaviour
- if the output range isn't big enough to hold the input value. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2643
- http://bugzilla.maptools.org/show_bug.cgi?id=2642
- http://bugzilla.maptools.org/show_bug.cgi?id=2646
- http://bugzilla.maptools.org/show_bug.cgi?id=2647
-
----
- ChangeLog | 10 ++++++
- libtiff/tif_dir.c | 20 ++++++++---
- libtiff/tif_dirread.c | 12 +++++--
- libtiff/tif_dirwrite.c | 92 ++++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 116 insertions(+), 18 deletions(-)
-
-diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
-index 2574e748b3be..36c7ae57641a 100644
---- a/libtiff/tif_dir.c
-+++ b/libtiff/tif_dir.c
-@@ -31,6 +31,7 @@
- * (and also some miscellaneous stuff)
- */
- #include "tiffiop.h"
-+#include <float.h>
-
- /*
- * These are used in the backwards compatibility code...
-@@ -154,6 +155,15 @@ bad:
- return (0);
- }
-
-+static float TIFFClampDoubleToFloat( double val )
-+{
-+ if( val > FLT_MAX )
-+ return FLT_MAX;
-+ if( val < -FLT_MAX )
-+ return -FLT_MAX;
-+ return (float)val;
-+}
-+
- static int
- _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
- {
-@@ -312,13 +322,13 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
- dblval = va_arg(ap, double);
- if( dblval < 0 )
- goto badvaluedouble;
-- td->td_xresolution = (float) dblval;
-+ td->td_xresolution = TIFFClampDoubleToFloat( dblval );
- break;
- case TIFFTAG_YRESOLUTION:
- dblval = va_arg(ap, double);
- if( dblval < 0 )
- goto badvaluedouble;
-- td->td_yresolution = (float) dblval;
-+ td->td_yresolution = TIFFClampDoubleToFloat( dblval );
- break;
- case TIFFTAG_PLANARCONFIG:
- v = (uint16) va_arg(ap, uint16_vap);
-@@ -327,10 +337,10 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
- td->td_planarconfig = (uint16) v;
- break;
- case TIFFTAG_XPOSITION:
-- td->td_xposition = (float) va_arg(ap, double);
-+ td->td_xposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
- break;
- case TIFFTAG_YPOSITION:
-- td->td_yposition = (float) va_arg(ap, double);
-+ td->td_yposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
- break;
- case TIFFTAG_RESOLUTIONUNIT:
- v = (uint16) va_arg(ap, uint16_vap);
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index eae3430612d0..f8628fd6d5d2 100644
---- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -40,6 +40,7 @@
- */
-
- #include "tiffiop.h"
-+#include <float.h>
-
- #define IGNORE 0 /* tag placeholder used below */
- #define FAILED_FII ((uint32) -1)
-@@ -2406,7 +2407,14 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloatArray(TIFF* tif, TIFFDirEnt
- ma=(double*)origdata;
- mb=data;
- for (n=0; n<count; n++)
-- *mb++=(float)(*ma++);
-+ {
-+ double val = *ma++;
-+ if( val > FLT_MAX )
-+ val = FLT_MAX;
-+ else if( val < -FLT_MAX )
-+ val = -FLT_MAX;
-+ *mb++=(float)val;
-+ }
- }
- break;
- }
-diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
-index 055324db078f..f7339685130d 100644
---- a/libtiff/tif_dirwrite.c
-+++ b/libtiff/tif_dirwrite.c
-@@ -30,6 +30,7 @@
- * Directory Write Support Routines.
- */
- #include "tiffiop.h"
-+#include <float.h>
-
- #ifdef HAVE_IEEEFP
- #define TIFFCvtNativeToIEEEFloat(tif, n, fp)
-@@ -939,6 +940,69 @@ bad:
- return(0);
- }
-
-+static float TIFFClampDoubleToFloat( double val )
-+{
-+ if( val > FLT_MAX )
-+ return FLT_MAX;
-+ if( val < -FLT_MAX )
-+ return -FLT_MAX;
-+ return (float)val;
-+}
-+
-+static int8 TIFFClampDoubleToInt8( double val )
-+{
-+ if( val > 127 )
-+ return 127;
-+ if( val < -128 || val != val )
-+ return -128;
-+ return (int8)val;
-+}
-+
-+static int16 TIFFClampDoubleToInt16( double val )
-+{
-+ if( val > 32767 )
-+ return 32767;
-+ if( val < -32768 || val != val )
-+ return -32768;
-+ return (int16)val;
-+}
-+
-+static int32 TIFFClampDoubleToInt32( double val )
-+{
-+ if( val > 0x7FFFFFFF )
-+ return 0x7FFFFFFF;
-+ if( val < -0x7FFFFFFF-1 || val != val )
-+ return -0x7FFFFFFF-1;
-+ return (int32)val;
-+}
-+
-+static uint8 TIFFClampDoubleToUInt8( double val )
-+{
-+ if( val < 0 )
-+ return 0;
-+ if( val > 255 || val != val )
-+ return 255;
-+ return (uint8)val;
-+}
-+
-+static uint16 TIFFClampDoubleToUInt16( double val )
-+{
-+ if( val < 0 )
-+ return 0;
-+ if( val > 65535 || val != val )
-+ return 65535;
-+ return (uint16)val;
-+}
-+
-+static uint32 TIFFClampDoubleToUInt32( double val )
-+{
-+ if( val < 0 )
-+ return 0;
-+ if( val > 0xFFFFFFFFU || val != val )
-+ return 0xFFFFFFFFU;
-+ return (uint32)val;
-+}
-+
- static int
- TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
- {
-@@ -959,7 +1023,7 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
- if (tif->tif_dir.td_bitspersample<=32)
- {
- for (i = 0; i < count; ++i)
-- ((float*)conv)[i] = (float)value[i];
-+ ((float*)conv)[i] = TIFFClampDoubleToFloat(value[i]);
- ok = TIFFWriteDirectoryTagFloatArray(tif,ndir,dir,tag,count,(float*)conv);
- }
- else
-@@ -971,19 +1035,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
- if (tif->tif_dir.td_bitspersample<=8)
- {
- for (i = 0; i < count; ++i)
-- ((int8*)conv)[i] = (int8)value[i];
-+ ((int8*)conv)[i] = TIFFClampDoubleToInt8(value[i]);
- ok = TIFFWriteDirectoryTagSbyteArray(tif,ndir,dir,tag,count,(int8*)conv);
- }
- else if (tif->tif_dir.td_bitspersample<=16)
- {
- for (i = 0; i < count; ++i)
-- ((int16*)conv)[i] = (int16)value[i];
-+ ((int16*)conv)[i] = TIFFClampDoubleToInt16(value[i]);
- ok = TIFFWriteDirectoryTagSshortArray(tif,ndir,dir,tag,count,(int16*)conv);
- }
- else
- {
- for (i = 0; i < count; ++i)
-- ((int32*)conv)[i] = (int32)value[i];
-+ ((int32*)conv)[i] = TIFFClampDoubleToInt32(value[i]);
- ok = TIFFWriteDirectoryTagSlongArray(tif,ndir,dir,tag,count,(int32*)conv);
- }
- break;
-@@ -991,19 +1055,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
- if (tif->tif_dir.td_bitspersample<=8)
- {
- for (i = 0; i < count; ++i)
-- ((uint8*)conv)[i] = (uint8)value[i];
-+ ((uint8*)conv)[i] = TIFFClampDoubleToUInt8(value[i]);
- ok = TIFFWriteDirectoryTagByteArray(tif,ndir,dir,tag,count,(uint8*)conv);
- }
- else if (tif->tif_dir.td_bitspersample<=16)
- {
- for (i = 0; i < count; ++i)
-- ((uint16*)conv)[i] = (uint16)value[i];
-+ ((uint16*)conv)[i] = TIFFClampDoubleToUInt16(value[i]);
- ok = TIFFWriteDirectoryTagShortArray(tif,ndir,dir,tag,count,(uint16*)conv);
- }
- else
- {
- for (i = 0; i < count; ++i)
-- ((uint32*)conv)[i] = (uint32)value[i];
-+ ((uint32*)conv)[i] = TIFFClampDoubleToUInt32(value[i]);
- ok = TIFFWriteDirectoryTagLongArray(tif,ndir,dir,tag,count,(uint32*)conv);
- }
- break;
-@@ -2102,12 +2166,17 @@ TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir,
- TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
- return 0;
- }
-+ else if( value != value )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata,module,"Not-a-number value is illegal");
-+ return 0;
-+ }
- else if (value==0.0)
- {
- m[0]=0;
- m[1]=1;
- }
-- else if (value==(double)(uint32)value)
-+ else if (value <= 0xFFFFFFFFU && value==(double)(uint32)value)
- {
- m[0]=(uint32)value;
- m[1]=1;
-@@ -2148,12 +2217,13 @@ TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry*
- }
- for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
- {
-- if (*na<=0.0)
-+ if (*na<=0.0 || *na != *na)
- {
- nb[0]=0;
- nb[1]=1;
- }
-- else if (*na==(float)(uint32)(*na))
-+ else if (*na >= 0 && *na <= (float)0xFFFFFFFFU &&
-+ *na==(float)(uint32)(*na))
- {
- nb[0]=(uint32)(*na);
- nb[1]=1;
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2644.patch b/media-libs/tiff/files/tiff-4.0.7-bug2644.patch
deleted file mode 100644
index b4ec01a32177..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2644.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 699097af4e22e48fc78ae7ae02807ec37f0d31fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 13:28:01 +0000
-Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0
- in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(),
- and return 0 in that case (instead of infinity as before presumably)
- Apparently some sanitizers do not like those divisions by zero. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2644
-
----
- ChangeLog | 8 ++++++++
- libtiff/tif_dirread.c | 12 +++++++++---
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index f2905286c0d0..eae3430612d0 100644
---- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD
- m.l = direntry->tdir_offset.toff_long8;
- if (tif->tif_flags&TIFF_SWAB)
- TIFFSwabArrayOfLong(m.i,2);
-- if (m.i[0]==0)
-+ /* Not completely sure what we should do when m.i[1]==0, but some */
-+ /* sanitizers do not like division by 0.0: */
-+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
-+ if (m.i[0]==0 || m.i[1]==0)
- *value=0.0;
- else
- *value=(double)m.i[0]/(double)m.i[1];
-@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF
- m.l=direntry->tdir_offset.toff_long8;
- if (tif->tif_flags&TIFF_SWAB)
- TIFFSwabArrayOfLong(m.i,2);
-- if ((int32)m.i[0]==0)
-+ /* Not completely sure what we should do when m.i[1]==0, but some */
-+ /* sanitizers do not like division by 0.0: */
-+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
-+ if ((int32)m.i[0]==0 || m.i[1]==0)
- *value=0.0;
- else
- *value=(double)((int32)m.i[0])/(double)m.i[1];
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2648.patch b/media-libs/tiff/files/tiff-4.0.7-bug2648.patch
deleted file mode 100644
index a3e2f59dc275..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2648.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 569ffefa61f3237fa2221730621c869216c465a6 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 16:13:50 +0000
-Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in
- JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift
- exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_jpeg.c | 9 ++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
-index 09ef4949f9ee..e45e2a4e17f8 100644
---- a/libtiff/tif_jpeg.c
-+++ b/libtiff/tif_jpeg.c
-@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif)
- "Invalig horizontal/vertical sampling value");
- return (0);
- }
-+ if( td->td_bitspersample > 16 )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "BitsPerSample %d not allowed for JPEG",
-+ td->td_bitspersample);
-+ return (0);
-+ }
-
- /*
- * A ReferenceBlackWhite field *must* be present since the
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2650-2.patch b/media-libs/tiff/files/tiff-4.0.7-bug2650-2.patch
deleted file mode 100644
index eba5b8f50bac..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2650-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 08e5d199b0a1c80fc81a1cc718e5d9d019517e37 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 17:48:11 +0000
-Subject: [PATCH] Initialize variable to fix MSVC warning (caused by previous
- commit)
-
----
- libtiff/tif_read.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
-index 8c5af6a8f5f7..b2edb029a90c 100644
---- a/libtiff/tif_read.c
-+++ b/libtiff/tif_read.c
-@@ -420,7 +420,7 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size,
- return ((tmsize_t)(-1));
- }
- } else {
-- tmsize_t ma;
-+ tmsize_t ma = 0;
- tmsize_t n;
- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||
- ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size))
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2650.patch b/media-libs/tiff/files/tiff-4.0.7-bug2650.patch
deleted file mode 100644
index 2aac26987d51..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2650.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5368b55d0f88a34ede3d21782d3142b2e11e6eb9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 16:33:34 +0000
-Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on
- signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2650
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_read.c | 29 +++++++++++++++++++----------
- 2 files changed, 25 insertions(+), 10 deletions(-)
-
-diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
-index 29a311db0cb7..8c5af6a8f5f7 100644
---- a/libtiff/tif_read.c
-+++ b/libtiff/tif_read.c
-@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size,
- return ((tmsize_t)(-1));
- }
- } else {
-- tmsize_t ma,mb;
-+ tmsize_t ma;
- tmsize_t n;
-- ma=(tmsize_t)td->td_stripoffset[strip];
-- mb=ma+size;
-- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size))
-- n=0;
-- else if ((mb<ma)||(mb<size)||(mb>tif->tif_size))
-- n=tif->tif_size-ma;
-- else
-- n=size;
-+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||
-+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size))
-+ {
-+ n=0;
-+ }
-+ else if( ma > TIFF_TMSIZE_T_MAX - size )
-+ {
-+ n=0;
-+ }
-+ else
-+ {
-+ tmsize_t mb=ma+size;
-+ if (mb>tif->tif_size)
-+ n=tif->tif_size-ma;
-+ else
-+ n=size;
-+ }
- if (n!=size) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- TIFFErrorExt(tif->tif_clientdata, module,
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2651.patch b/media-libs/tiff/files/tiff-4.0.7-bug2651.patch
deleted file mode 100644
index 1b800189c594..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2651.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 669faf71833c4c2e72774b2e732ca4d28b149c83 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 19:02:49 +0000
-Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add
- _TIFFcalloc()
-
-* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero
-initialize tif_rawdata.
-Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651
----
- ChangeLog | 8 ++++++++
- libtiff/tif_read.c | 6 ++++--
- libtiff/tif_unix.c | 10 +++++++++-
- libtiff/tif_vms.c | 10 +++++++++-
- libtiff/tif_win32.c | 10 +++++++++-
- libtiff/tiffio.h | 3 ++-
- 6 files changed, 41 insertions(+), 6 deletions(-)
-
-diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
-index b2edb029a90c..6a8c7daf3dfa 100644
---- a/libtiff/tif_read.c
-+++ b/libtiff/tif_read.c
-@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size)
- "Invalid buffer size");
- return (0);
- }
-- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize);
-+ /* Initialize to zero to avoid uninitialized buffers in case of */
-+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */
-+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize);
- tif->tif_flags |= TIFF_MYBUFFER;
- }
- if (tif->tif_rawdata == NULL) {
-diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c
-index 81e9d6653c2a..80c437cfa37a 100644
---- a/libtiff/tif_unix.c
-+++ b/libtiff/tif_unix.c
-@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s)
- return (malloc((size_t) s));
- }
-
-+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
-+{
-+ if( nmemb == 0 || siz == 0 )
-+ return ((void *) NULL);
-+
-+ return calloc((size_t) nmemb, (size_t)siz);
-+}
-+
- void
- _TIFFfree(void* p)
- {
-diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
-index 24b824f1bd56..090baed87135 100644
---- a/libtiff/tif_win32.c
-+++ b/libtiff/tif_win32.c
-@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s)
- return (malloc((size_t) s));
- }
-
-+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
-+{
-+ if( nmemb == 0 || siz == 0 )
-+ return ((void *) NULL);
-+
-+ return calloc((size_t) nmemb, (size_t)siz);
-+}
-+
- void
- _TIFFfree(void* p)
- {
-diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
-index 6e508181dbce..ef61b5c06a03 100644
---- a/libtiff/tiffio.h
-+++ b/libtiff/tiffio.h
-@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void);
- */
-
- extern void* _TIFFmalloc(tmsize_t s);
-+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz);
- extern void* _TIFFrealloc(void* p, tmsize_t s);
- extern void _TIFFmemset(void* p, int v, tmsize_t c);
- extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c);
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2653.patch b/media-libs/tiff/files/tiff-4.0.7-bug2653.patch
deleted file mode 100644
index b65a94daeac2..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2653.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5083c41f3a6824f392adf3a6dce1548afded4211 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 12:15:01 +0000
-Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in
- JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2653
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_jpeg.c | 9 ++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
-index dc4364c821a4..09ef4949f9ee 100644
---- a/libtiff/tif_jpeg.c
-+++ b/libtiff/tif_jpeg.c
-@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif)
- case PHOTOMETRIC_YCBCR:
- sp->h_sampling = td->td_ycbcrsubsampling[0];
- sp->v_sampling = td->td_ycbcrsubsampling[1];
-+ if( sp->h_sampling == 0 || sp->v_sampling == 0 )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "Invalig horizontal/vertical sampling value");
-+ return (0);
-+ }
-+
- /*
- * A ReferenceBlackWhite field *must* be present since the
- * default value is inappropriate for YCbCr. Fill in the
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2658.patch b/media-libs/tiff/files/tiff-4.0.7-bug2658.patch
deleted file mode 100644
index 9f2bb6a50ee2..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2658.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 928f0b0b2881ac32b32d9e165e88e3c9aed0fb9c Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 11 Jan 2017 16:38:26 +0000
-Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fgetimage.c:=20add=20explicit?=
- =?UTF-8?q?=20uint32=20cast=20in=20putagreytile=20to=20avoid=20UndefinedBe?=
- =?UTF-8?q?haviorSanitizer=20warning.=20Patch=20by=20Nicol=C3=A1s=20Pe?=
- =?UTF-8?q?=C3=B1a.=20Fixes=20http://bugzilla.maptools.org/show=5Fbug.cgi?=
- =?UTF-8?q?=3Fid=3D2658?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- ChangeLog | 7 +++++++
- libtiff/tif_getimage.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
-index 2ea838556732..52a2402f7171 100644
---- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -1302,7 +1302,7 @@ DECLAREContigPutFunc(putagreytile)
- while (h-- > 0) {
- for (x = w; x-- > 0;)
- {
-- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1);
-+ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1);
- pp += samplesperpixel;
- }
- cp += toskew;
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2659-2.patch b/media-libs/tiff/files/tiff-4.0.7-bug2659-2.patch
deleted file mode 100644
index 539536fe4ffb..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2659-2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41236c5f744eaa691e23e55f5a5dd556a65e211e Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 12 Jan 2017 19:23:20 +0000
-Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in
- OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and
- OJPEGReadHeaderInfoSecTablesAcTable
-
----
- ChangeLog | 3 ++-
- libtiff/tif_ojpeg.c | 8 +++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
-index ac70d1b14c4f..bd4cff5d8921 100644
---- a/libtiff/tif_ojpeg.c
-+++ b/libtiff/tif_ojpeg.c
-@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
- TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET);
- p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64);
- if (p!=64)
-+ {
-+ _TIFFfree(ob);
- return(0);
-+ }
- sp->qtable[m]=ob;
- sp->sof_tq[m]=m;
- }
-@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
- rb[sizeof(uint32)+5+n]=o[n];
- p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
- if (p!=q)
-+ {
-+ _TIFFfree(rb);
- return(0);
-+ }
- sp->dctable[m]=rb;
- sp->sos_tda[m]=(m<<4);
- }
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2659.patch b/media-libs/tiff/files/tiff-4.0.7-bug2659.patch
deleted file mode 100644
index 8afab46b888f..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2659.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7c501dbfb5315f31798f9123026210260cbe7432 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 12 Jan 2017 17:43:25 +0000
-Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fojpeg.c:=20fix=20leak=20in=20?=
- =?UTF-8?q?OJPEGReadHeaderInfoSecTablesAcTable=20when=20read=20fails.=20Pa?=
- =?UTF-8?q?tch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugzilla.?=
- =?UTF-8?q?maptools.org/show=5Fbug.cgi=3Fid=3D2659?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- ChangeLog | 7 +++++++
- libtiff/tif_ojpeg.c | 5 ++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
-index 93839d8f3e11..ac70d1b14c4f 100644
---- a/libtiff/tif_ojpeg.c
-+++ b/libtiff/tif_ojpeg.c
-@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif)
- rb[sizeof(uint32)+5+n]=o[n];
- p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
- if (p!=q)
-+ {
-+ _TIFFfree(rb);
- return(0);
-+ }
- sp->actable[m]=rb;
- sp->sos_tda[m]=(sp->sos_tda[m]|m);
- }
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2665.patch b/media-libs/tiff/files/tiff-4.0.7-bug2665.patch
deleted file mode 100644
index 020adca8e7aa..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-bug2665.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e345ce2ad81c85eb8e469b7b959067b2681957ca Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 18 Feb 2017 20:30:26 +0000
-Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fpixarlog.c:=20fix=20memory=20?=
- =?UTF-8?q?leak=20in=20error=20code=20path=20of=20PixarLogSetupDecode().?=
- =?UTF-8?q?=20Patch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugz?=
- =?UTF-8?q?illa.maptools.org/show=5Fbug.cgi=3Fid=3D2665?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- ChangeLog | 6 ++++++
- libtiff/tif_pixarlog.c | 8 +++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
-index 9836dce63450..972ee75e0324 100644
---- a/libtiff/tif_pixarlog.c
-+++ b/libtiff/tif_pixarlog.c
-@@ -699,6 +699,9 @@ PixarLogSetupDecode(TIFF* tif)
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- sp->user_datafmt = PixarLogGuessDataFmt(td);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
-+ _TIFFfree(sp->tbuf);
-+ sp->tbuf = NULL;
-+ sp->tbuf_size = 0;
- TIFFErrorExt(tif->tif_clientdata, module,
- "PixarLog compression can't handle bits depth/data format combination (depth: %d)",
- td->td_bitspersample);
-@@ -706,6 +709,9 @@ PixarLogSetupDecode(TIFF* tif)
- }
-
- if (inflateInit(&sp->stream) != Z_OK) {
-+ _TIFFfree(sp->tbuf);
-+ sp->tbuf = NULL;
-+ sp->tbuf_size = 0;
- TIFFErrorExt(tif->tif_clientdata, module, "%s", sp->stream.msg ? sp->stream.msg : "(null)");
- return (0);
- } else {
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch b/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch
deleted file mode 100644
index f3476e98d6ff..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/598938
-
-From 82c53c6f19d8d7854b9b88aa16802f31b1cc258c Mon Sep 17 00:00:00 2001
-From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-Date: Sun, 20 Nov 2016 18:04:52 +0000
-Subject: [PATCH] =?UTF-8?q?*=20tools/fax2tiff.c=20(main):=20Applied=20patc?=
- =?UTF-8?q?h=20by=20J=C3=B6rg=20Ahrens=20to=20fix=20passing=20client=20dat?=
- =?UTF-8?q?a=20for=20Win32=20builds=20using=20tif=5Fwin32.c=20(USE=5FWIN32?=
- =?UTF-8?q?=5FFILEIO=20defined)=20for=20file=20I/O.=20=20Patch=20was=20pro?=
- =?UTF-8?q?vided=20via=20email=20on=20November=2020,=202016.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- ChangeLog | 7 +++++++
- tools/fax2tiff.c | 5 +++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
-index e00de5277bc2..01f85540ac9c 100644
---- a/tools/fax2tiff.c
-+++ b/tools/fax2tiff.c
-@@ -283,10 +283,11 @@ main(int argc, char* argv[])
- }
- #if defined(_WIN32) && defined(USE_WIN32_FILEIO)
- client_data.fh = _get_osfhandle(fileno(in));
-+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fh);
- #else
- client_data.fd = fileno(in);
-+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fd);
- #endif
-- TIFFSetClientdata(faxTIFF, (thandle_t) &client_data);
- TIFFSetFileName(faxTIFF, (const char*)argv[optind]);
- TIFFSetField(out, TIFFTAG_IMAGEWIDTH, xsize);
- TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 1);
---
-2.12.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.7-hylafax-hack.patch b/media-libs/tiff/files/tiff-4.0.7-hylafax-hack.patch
deleted file mode 100644
index 69158200ac73..000000000000
--- a/media-libs/tiff/files/tiff-4.0.7-hylafax-hack.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/612172
-
-From 96bb01f5d834e0b01c0231768c43b8d309aede34 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 13 Dec 2016 18:15:48 +0000
-Subject: [PATCH] * libtiff/tif_fax3.h: revert change done on 2016-01-09 that
- made Param member of TIFFFaxTabEnt structure a uint16 to reduce size of the
- binary. It happens that the Hylafax software uses the tables that follow this
- typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, TIFFFaxBlackTable), also they
- are not in a public libtiff header. Raised by Lee Howard. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2636
-
----
- ChangeLog | 10 ++++++++++
- libtiff/tif_fax3.h | 6 ++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
-index e0b2ca6bfc9d..45ce43f1cf2e 100644
---- a/libtiff/tif_fax3.h
-+++ b/libtiff/tif_fax3.h
-@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
- #define S_MakeUp 11
- #define S_EOL 12
-
-+/* WARNING: do not change the layout of this structure as the Halyfax software */
-+/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
- typedef struct { /* state table entry */
- unsigned char State; /* see above */
- unsigned char Width; /* width of code in bits */
-- uint16 Param; /* unsigned 16-bit run length in bits */
-+ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
- } TIFFFaxTabEnt;
-
- extern const TIFFFaxTabEnt TIFFFaxMainTable[];
---
-2.12.0
-
diff --git a/media-libs/tiff/tiff-4.0.7-r3.ebuild b/media-libs/tiff/tiff-4.0.7-r3.ebuild
deleted file mode 100644
index b77d5196171d..000000000000
--- a/media-libs/tiff/tiff-4.0.7-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
- ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
- "${FILESDIR}"/${P}-fax2tiff.patch #598938
- "${FILESDIR}"/${P}-CVE-2016-10266.patch
- "${FILESDIR}"/${P}-bug2598.patch
- "${FILESDIR}"/${P}-bug2604.patch
- "${FILESDIR}"/${P}-bug2608.patch
- "${FILESDIR}"/${P}-CVE-2016-10267.patch
- "${FILESDIR}"/${P}-bug2620.patch
- "${FILESDIR}"/${P}-bug2621.patch
- "${FILESDIR}"/${P}-bug2619.patch
- "${FILESDIR}"/${P}-bug2594.patch
- "${FILESDIR}"/${P}-bug2597.patch
- "${FILESDIR}"/${P}-bug2599.patch
- "${FILESDIR}"/${P}-bug2607.patch
- "${FILESDIR}"/${P}-bug2610.patch
- "${FILESDIR}"/${P}-bug2605.patch
- "${FILESDIR}"/${P}-hylafax-hack.patch #612172
- "${FILESDIR}"/${P}-bug2633-bug2634.patch
- "${FILESDIR}"/${P}-bug2635.patch
- "${FILESDIR}"/${P}-bug2627.patch
- "${FILESDIR}"/${P}-bug2638.patch
- "${FILESDIR}"/${P}-bug2639.patch
- "${FILESDIR}"/${P}-bug2640.patch
- "${FILESDIR}"/${P}-bug2653.patch
- "${FILESDIR}"/${P}-bug2535.patch
- "${FILESDIR}"/${P}-bug2644.patch
- "${FILESDIR}"/${P}-bug2642-bug2643-bug2646-bug2647.patch
- "${FILESDIR}"/${P}-bug2648.patch
- "${FILESDIR}"/${P}-bug2650.patch
- "${FILESDIR}"/${P}-bug2658.patch
- "${FILESDIR}"/${P}-bug2650-2.patch
- "${FILESDIR}"/${P}-bug2651.patch
- "${FILESDIR}"/${P}-CVE-2017-5225.patch #610330
- "${FILESDIR}"/${P}-bug2130.patch
- "${FILESDIR}"/${P}-bug2659.patch
- "${FILESDIR}"/${P}-bug2659-2.patch
- "${FILESDIR}"/${P}-bug2631.patch
- "${FILESDIR}"/${P}-bug2665.patch
- "${FILESDIR}"/${PN}-4.0.7-pdfium-0005-Leak-TIFFFetchStripThing.patch
- "${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-0017-safe_skews_in_gtTileContig.patch
- "${FILESDIR}"/${PN}-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch
- "${FILESDIR}"/${PN}-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/tiffconf.h
-)
-
-src_prepare() {
- default
-
- # tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
- sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
- eautoreconf
-}
-
-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) \
- --without-x
-
- # remove useless subdirs
- if ! multilib_is_native_abi ; then
- sed -i \
- -e 's/ tools//' \
- -e 's/ contrib//' \
- -e 's/ man//' \
- -e 's/ html//' \
- Makefile || die
- fi
-}
-
-multilib_src_test() {
- if ! multilib_is_native_abi ; then
- emake -C tools
- fi
- emake check
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.7.ebuild b/media-libs/tiff/tiff-4.0.9.ebuild
index 59be2b40a56c..403bd9768b40 100644
--- a/media-libs/tiff/tiff-4.0.7.ebuild
+++ b/media-libs/tiff/tiff-4.0.9.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
inherit autotools eutils libtool multilib-minimal
DESCRIPTION="Tag Image File Format (TIFF) library"
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
@@ -26,6 +26,15 @@ DEPEND="${RDEPEND}"
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
+)
+
MULTILIB_WRAPPED_HEADERS=(
/usr/include/tiffconf.h
)
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 75671ee2ae26..05e243264790 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,7 +1,7 @@
DIST vamp-plugin-sdk-2.6.tar.gz 174908 SHA256 aa533266e35f866292c30eeac126d2d4abdf2028f1340c0e02354057013728e9 SHA512 0de0eee37629b86c664d42837eb4dbac8bb311af71082b3d0a880c6b475a8de1ab7ac42daf7c1a234dc29690e5788b70011fa01a956941cf414347011e9c27d3 WHIRLPOOL 566afe1c020515325f3641f3dc053fcbe7d6a444c74987484e30677e5df288e7abbc0b6630b9c93425b6463bc0705325be783a39c203760277662aeaf05bb03b
DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 SHA256 c6fef3ff79d2bf9575ce4ce4f200cbf219cbe0a21cfbad5750e86ff8ae53cb0b SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 WHIRLPOOL 3f64fb07712e178642a24b6a2985fbc7e278003639d2f06f2ad9a6f34028c25e55345f867b29930d5728200c9248fd8c033ee0e93b83e1294086e6910aac12f2
EBUILD vamp-plugin-sdk-2.6-r1.ebuild 1481 SHA256 700347ae90eb59da5b2ce3af4d3296428d837a3bd2c55b6d282a7283a4446fa4 SHA512 ba875b0ab3e2ecd51aea2bc88873fe8e92ab2bbfbcab56f8a5c49bbad0184675d38200eb2a87c96f4f037ab922e494b75b446927ea7f5214f5a2c07b8324c9ed WHIRLPOOL 764f9859a9f6c61f2a186da5edac7f5fbcd94d4cc36c3ee1eac0234fe36308f4fda4e63028ee03c3218b5c052d422c8b0d4601acda6c1963150626139f673a8a
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1489 SHA256 7c7580cf5052dc42aaf6408bc21e5dc1fc83628c809e760571683095558032a8 SHA512 7e0b58786e65b9d3110fd3ae043ff85bb8cda8f47a836147eea6be82ef7e014d94a9a60e19951904aff7c627f60e49c74be0d438a8674e7dee4575411430ebea WHIRLPOOL 0d55305a2caddca57a2ef89c5ac28ed23712367b23939c7c5d1e3801072a34b9e9495d2f0e9b5cddd09b4ef804928630ff262e543df358da93f7ea99bbbcd458
+EBUILD vamp-plugin-sdk-2.7.1.ebuild 1529 SHA256 78538c47b45e293c475851498874a7dcc3fa2d98f79672a8c8859d16dd1f7abe SHA512 f177492acc3a4e3a3e7273a98f6c2ff19a8de1a9bc02690a22e2e9029bcece7d1fe476da157fd173f4bcfe81235282a5323c0a0fdaef005b536948d3311b5c92 WHIRLPOOL 1618c9a1e987435dcb4e491d406d55e9d1cbc38ea51f2aab2c920a97589f47ff212d861422371280a76b08d43422fe0f58186755f0cdea2f46d22b3780866879
MISC ChangeLog 4508 SHA256 363555e4215f8ae6c7238b303fe82cfcb4f4ee50633f641403f2c5ef9639182d SHA512 94653d463e9f1cef6ac298b270da0d1cf14142cc61b63f05d02b772a350df743d878417397eefe48e00563e50199f4aff39b9f440ddd85780ed1c25080d6249f WHIRLPOOL 7951a0629418d99ee26596c4e16af809e2e807941f7f92a296093f6bf1bfe491ce30bf20064114178d3e81a2d2c3521d3a4ce197aa766979315547487ccbf355
MISC ChangeLog-2015 7462 SHA256 ac2ef870874d367d5591d0536852e64b3b4baf4ab5cc3a7984432e74b28e9d62 SHA512 f91f77923ebf8cd7ee4704826381776daab73dfcf58ad854eadedd1386d649b7bc59c5b99b77593810aa91c9099b5744497bb72dd4cec5264c76a8ab67bf4400 WHIRLPOOL 506b3bd79f2834587471fbbfeea99bac05906157ca543fdc1e490bf1f51a634f37920ca1274bfcc0ece860c2208c61fc76f30135e398ca2070c9d732e9309823
MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
index 1f8d9e8b0d99..0e041f251367 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
multilib_src_configure() {
# multilib for default search paths
- sed -i -e "s:/usr/lib/vamp:/usr/$(get_libdir)/vamp:" src/vamp-hostsdk/PluginHostAdapter.cpp || die "sed failed"
+ sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" src/vamp-hostsdk/PluginHostAdapter.cpp || die "sed failed"
econf
}
@@ -39,7 +39,7 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${D}" INSTALL_SDK_LIBS="/usr/$(get_libdir)" INSTALL_PKGCONFIG="/usr/$(get_libdir)/pkgconfig" INSTALL_PLUGINS="/usr/$(get_libdir)/vamp" install
+ emake DESTDIR="${D}" INSTALL_SDK_LIBS="${EPREFIX}/usr/$(get_libdir)" INSTALL_PKGCONFIG="${EPREFIX}/usr/$(get_libdir)/pkgconfig" INSTALL_PLUGINS="${EPREFIX}/usr/$(get_libdir)/vamp" install
multilib_is_native_abi && use doc && dohtml -r build/doc/html/*
}