tiff: version bump to 4.0.7
BUG=chromium:689931
TEST=precq passes
Change-Id: Ia227380eea0ca16ec23aee9c195f4519949607b9
Reviewed-on: https://chromium-review.googlesource.com/455156
(cherry picked from commit 279cce86370f3172495df330d796b69ba0504194)
Reviewed-on: https://chromium-review.googlesource.com/456680
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 886e284..18a948c 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1 +1 @@
-DIST tiff-4.0.6.tar.gz 2192991 SHA256 4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c SHA512 2c8dbaaaab9f82a7722bfe8cb6fcfcf67472beb692f1b7dafaf322759e7016dad1bc58457c0f03db50aa5bd088fef2b37358fcbc1524e20e9e14a9620373fdf8 WHIRLPOOL 809e61a22f7d6dfdf81917a084678ec39ed3cff4e03184d61c67501946d3fab0645cb3fe800d9249771879ee91245085e123349f68340bb63bd18024db8e03a6
+DIST tiff-4.0.7.tar.gz 2076392 SHA256 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 SHA512 941357bdd5f947cdca41a1d31ae14b3fadc174ae5dce7b7981dbe58f61995f575ac2e97a7cc4fcc435184012017bec0920278263490464644f2cdfad9a6c5ddc WHIRLPOOL 3090a0d8a5ad3595c97888edab3c48379175cad993567d20be5f397b1c5c1d21012de55c5da5e664ee483d294fe9eb5f3464e14f564fb79c1357094ff67e313d
diff --git a/media-libs/tiff/files/tiff-4.0.6-gif2tiff_removal.patch b/media-libs/tiff/files/tiff-4.0.6-gif2tiff_removal.patch
deleted file mode 100644
index ea5c2c3..0000000
--- a/media-libs/tiff/files/tiff-4.0.6-gif2tiff_removal.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# Removing vulnerable gif2tiff (CVE-2016-5102)
-# Upstream seems to no longer ship this tool with >=tiff-4.0.7 versions.
-
-http://bugzilla.maptools.org/show_bug.cgi?id=2552
-https://bugzilla.redhat.com/show_bug.cgi?id=1343407
-https://bugs.gentoo.org/585274
-
---- tiff-4.0.6/man/Makefile.am
-+++ tiff-4.0.6/man/Makefile.am
-@@ -27,7 +27,6 @@
- bmp2tiff.1 \
- fax2ps.1 \
- fax2tiff.1 \
-- gif2tiff.1 \
- pal2rgb.1 \
- ppm2tiff.1 \
- ras2tiff.1 \
---- tiff-4.0.6/test/Makefile.am
-+++ tiff-4.0.6/test/Makefile.am
-@@ -68,7 +68,6 @@
- TESTSCRIPTS = \
- bmp2tiff_palette.sh \
- bmp2tiff_rgb.sh \
-- gif2tiff.sh \
- ppm2tiff_pbm.sh \
- ppm2tiff_pgm.sh \
- ppm2tiff_ppm.sh \
---- tiff-4.0.6/tools/Makefile.am
-+++ tiff-4.0.6/tools/Makefile.am
-@@ -34,7 +34,6 @@
- bmp2tiff \
- fax2ps \
- fax2tiff \
-- gif2tiff \
- pal2rgb \
- ppm2tiff \
- ras2tiff \
-@@ -73,9 +72,6 @@
- fax2tiff_SOURCES = fax2tiff.c
- fax2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-
--gif2tiff_SOURCES = gif2tiff.c
--gif2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
--
- pal2rgb_SOURCES = pal2rgb.c
- pal2rgb_LDADD = $(LIBTIFF) $(LIBPORT)
-
diff --git a/media-libs/tiff/tiff-4.0.6-r1.ebuild b/media-libs/tiff/tiff-4.0.7.ebuild
similarity index 86%
rename from media-libs/tiff/tiff-4.0.6-r1.ebuild
rename to media-libs/tiff/tiff-4.0.7.ebuild
index 4abeef2..84eee33 100644
--- a/media-libs/tiff/tiff-4.0.6-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.7.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils libtool multilib-minimal
DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://www.remotesensing.org/libtiff/"
+HOMEPAGE="http://libtiff.maptools.org"
SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
@@ -31,12 +30,12 @@
/usr/include/tiffconf.h
)
-PATCHES=(
- "${FILESDIR}/${P}-gif2tiff_removal.patch" # 585274
-)
-
src_prepare() {
- epatch "${PATCHES[@]}"
+ 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
}
