From fdc09b99d011b459867361655445192dbf3fe702 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 27 Jul 2018 20:58:42 +0300 Subject: [PATCH] tiff-4.0.9:ver.bump --- .../graphics/tiff/files/fix-hylafax.patch | 33 ------------------- .../tiff/files/tiff-3.9.1-CVE-2011-0191.diff | 13 -------- .../tiff/files/tiff-3.9.1-no_contrib.diff | 24 -------------- .../tiff/files/tiff-3.9.2-libjpeg7+.diff | 10 ------ multimedia/graphics/tiff/pspec.xml | 25 +++++++++----- 5 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 multimedia/graphics/tiff/files/fix-hylafax.patch delete mode 100644 multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff delete mode 100644 multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff delete mode 100644 multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff diff --git a/multimedia/graphics/tiff/files/fix-hylafax.patch b/multimedia/graphics/tiff/files/fix-hylafax.patch deleted file mode 100644 index 635b6aef3d..0000000000 --- a/multimedia/graphics/tiff/files/fix-hylafax.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7757b91a71631ada835740733f3dab51eda36df8 Mon Sep 17 00:00:00 2001 -From: erouault -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 | 4 +++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h -index aafb5a7..2b64290 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[]; diff --git a/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff b/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff deleted file mode 100644 index ff51719b81..0000000000 --- a/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- libtiff/tif_dir.c 2011-04-04 05:58:54.000000000 -0400 -+++ libtiff/tif_dir.c.oden 2011-04-04 05:59:08.000000000 -0400 -@@ -370,6 +370,10 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va - case TIFFTAG_YCBCRSUBSAMPLING: - td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int); - td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int); -+ if (td->td_ycbcrsubsampling[0] > 4) -+ td->td_ycbcrsubsampling[0] = (td->td_compression == 7) ? 1 : 2; -+ if (td->td_ycbcrsubsampling[1] > 4) -+ td->td_ycbcrsubsampling[1] = (td->td_compression == 7) ? 1 : 2; - break; - case TIFFTAG_TRANSFERFUNCTION: - v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1; diff --git a/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff b/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff deleted file mode 100644 index eff5d4ec8d..0000000000 --- a/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur tiff-3.9.1/Makefile.am tiff-3.9.1.oden/Makefile.am ---- tiff-3.9.1/Makefile.am 2009-08-21 18:46:01.000000000 +0200 -+++ tiff-3.9.1.oden/Makefile.am 2009-08-30 12:43:13.000000000 +0200 -@@ -47,7 +47,7 @@ - - dist_doc_DATA = $(docfiles) - --SUBDIRS = port libtiff tools build contrib test man html -+SUBDIRS = port libtiff tools build test man html - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -diff -Naur tiff-3.9.1/Makefile.in tiff-3.9.1.oden/Makefile.in ---- tiff-3.9.1/Makefile.in 2009-08-28 20:41:13.000000000 +0200 -+++ tiff-3.9.1.oden/Makefile.in 2009-08-30 12:43:33.000000000 +0200 -@@ -331,7 +331,7 @@ - nmake.opt - - dist_doc_DATA = $(docfiles) --SUBDIRS = port libtiff tools build contrib test man html -+SUBDIRS = port libtiff tools build test man html - all: all-recursive - - .SUFFIXES: diff --git a/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff b/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff deleted file mode 100644 index ebb229c3dc..0000000000 --- a/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- libtiff/tif_jpeg.c 2010-09-30 13:43:31.045146032 +0200 -+++ libtiff/tif_jpeg.c.oden 2010-09-30 13:44:59.005141117 +0200 -@@ -850,6 +850,7 @@ JPEGPreDecode(TIFF* tif, tsample_t s) - if (downsampled_output) { - /* Need to use raw-data interface to libjpeg */ - sp->cinfo.d.raw_data_out = TRUE; -+ sp->cinfo.d.do_fancy_upsampling = FALSE; - tif->tif_decoderow = JPEGDecodeRaw; - tif->tif_decodestrip = JPEGDecodeRaw; - tif->tif_decodetile = JPEGDecodeRaw; diff --git a/multimedia/graphics/tiff/pspec.xml b/multimedia/graphics/tiff/pspec.xml index 05be51bb39..7fa4b2ef9a 100644 --- a/multimedia/graphics/tiff/pspec.xml +++ b/multimedia/graphics/tiff/pspec.xml @@ -12,20 +12,20 @@ library Library for manipulation of TIFF (Tag Image File Format) images This software provides support for the Tag Image File Format (TIFF), a widely used format for storing image data. - https://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz + https://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz libjpeg-turbo-devel jbigkit-devel - gentoo/tiff-4.0.7-pdfium-0005-Leak-TIFFFetchStripThing.patch - gentoo/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch - gentoo/tiff-4.0.7-pdfium-0007-uninitialized-value.patch - gentoo/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch - gentoo/tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch - gentoo/tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch - gentoo/tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch - gentoo/tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch + + + + + + + + @@ -80,6 +80,13 @@ + + 2018-07-27 + 4.0.9 + Version Bump. + Pisi Linux Community + admin@pisilinux.org + 2018-03-21 4.0.8