| 1 |
commit: 7ec3d94b9cb12fb65a0274021d154b9b0d7977c8 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 31 03:43:18 2017 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 31 03:43:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec3d94b |
| 7 |
|
| 8 |
media-libs/tiff: pull in upstream fix for fax2tiff #598938 |
| 9 |
|
| 10 |
media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch | 39 +++++++++++++++++++++++++ |
| 11 |
media-libs/tiff/tiff-4.0.7-r1.ebuild | 1 + |
| 12 |
2 files changed, 40 insertions(+) |
| 13 |
|
| 14 |
diff --git a/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch b/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch |
| 15 |
new file mode 100644 |
| 16 |
index 00000000000..f3476e98d6f |
| 17 |
--- /dev/null |
| 18 |
+++ b/media-libs/tiff/files/tiff-4.0.7-fax2tiff.patch |
| 19 |
@@ -0,0 +1,39 @@ |
| 20 |
+https://bugs.gentoo.org/598938 |
| 21 |
+ |
| 22 |
+From 82c53c6f19d8d7854b9b88aa16802f31b1cc258c Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Bob Friesenhahn <bfriesen@××××××××××××××××.us> |
| 24 |
+Date: Sun, 20 Nov 2016 18:04:52 +0000 |
| 25 |
+Subject: [PATCH] =?UTF-8?q?*=20tools/fax2tiff.c=20(main):=20Applied=20patc?= |
| 26 |
+ =?UTF-8?q?h=20by=20J=C3=B6rg=20Ahrens=20to=20fix=20passing=20client=20dat?= |
| 27 |
+ =?UTF-8?q?a=20for=20Win32=20builds=20using=20tif=5Fwin32.c=20(USE=5FWIN32?= |
| 28 |
+ =?UTF-8?q?=5FFILEIO=20defined)=20for=20file=20I/O.=20=20Patch=20was=20pro?= |
| 29 |
+ =?UTF-8?q?vided=20via=20email=20on=20November=2020,=202016.?= |
| 30 |
+MIME-Version: 1.0 |
| 31 |
+Content-Type: text/plain; charset=UTF-8 |
| 32 |
+Content-Transfer-Encoding: 8bit |
| 33 |
+ |
| 34 |
+--- |
| 35 |
+ ChangeLog | 7 +++++++ |
| 36 |
+ tools/fax2tiff.c | 5 +++-- |
| 37 |
+ 2 files changed, 10 insertions(+), 2 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c |
| 40 |
+index e00de5277bc2..01f85540ac9c 100644 |
| 41 |
+--- a/tools/fax2tiff.c |
| 42 |
++++ b/tools/fax2tiff.c |
| 43 |
+@@ -283,10 +283,11 @@ main(int argc, char* argv[]) |
| 44 |
+ } |
| 45 |
+ #if defined(_WIN32) && defined(USE_WIN32_FILEIO) |
| 46 |
+ client_data.fh = _get_osfhandle(fileno(in)); |
| 47 |
++ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fh); |
| 48 |
+ #else |
| 49 |
+ client_data.fd = fileno(in); |
| 50 |
++ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fd); |
| 51 |
+ #endif |
| 52 |
+- TIFFSetClientdata(faxTIFF, (thandle_t) &client_data); |
| 53 |
+ TIFFSetFileName(faxTIFF, (const char*)argv[optind]); |
| 54 |
+ TIFFSetField(out, TIFFTAG_IMAGEWIDTH, xsize); |
| 55 |
+ TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 1); |
| 56 |
+-- |
| 57 |
+2.12.0 |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/media-libs/tiff/tiff-4.0.7-r1.ebuild b/media-libs/tiff/tiff-4.0.7-r1.ebuild |
| 61 |
index ca37cb0af05..dbf9257f2cc 100644 |
| 62 |
--- a/media-libs/tiff/tiff-4.0.7-r1.ebuild |
| 63 |
+++ b/media-libs/tiff/tiff-4.0.7-r1.ebuild |
| 64 |
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}" |
| 65 |
REQUIRED_USE="test? ( jpeg )" #483132 |
| 66 |
|
| 67 |
PATCHES=( |
| 68 |
+ "${FILESDIR}"/${P}-fax2tiff.patch #598938 |
| 69 |
"${FILESDIR}"/${P}-CVE-2016-10266.patch |
| 70 |
"${FILESDIR}"/${P}-bug2598.patch |
| 71 |
"${FILESDIR}"/${P}-bug2604.patch |
Archives