[arch-commits] Commit in libtiff/repos (6 files)
Date: Monday, July 17, 2017 @ 07:26:28
Author: arojas
Revision: 300674
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libtiff/repos/extra-i686/CVE-2016-10095.patch
(from rev 300673, libtiff/trunk/CVE-2016-10095.patch)
libtiff/repos/extra-i686/PKGBUILD
(from rev 300673, libtiff/trunk/PKGBUILD)
libtiff/repos/extra-x86_64/CVE-2016-10095.patch
(from rev 300673, libtiff/trunk/CVE-2016-10095.patch)
libtiff/repos/extra-x86_64/PKGBUILD
(from rev 300673, libtiff/trunk/PKGBUILD)
Deleted:
libtiff/repos/extra-i686/PKGBUILD
libtiff/repos/extra-x86_64/PKGBUILD
---+
/PKGBUILD | 80
extra-i686/CVE-2016-10095.patch | 175
extra-i686/PKGBUILD | 33 --
extra-x86_64/CVE-2016-10095.patch | 175
extra-x86_64/PKGBUILD | 33 --
5 files changed, 430 insertions(+), 66 deletions(-)
Copied: libtiff/repos/extra-i686/CVE-2016-10095.patch (from rev 300673,
libtiff/trunk/CVE-2016-10095.patch)
===
--- extra-i686/CVE-2016-10095.patch (rev 0)
+++ extra-i686/CVE-2016-10095.patch 2017-07-17 07:26:28 UTC (rev 300674)
@@ -0,0 +1,175 @@
+From 4d4fa0b68ae9ae038959ee4f69ebe288ec892f06 Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Thu, 1 Jun 2017 12:44:04 +
+Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fdirinfo.c,=20tif=5Fdirread.c:?=
+ =?UTF-8?q?=20add=20=5FTIFFCheckFieldIsValidForCodec(),=20and=20use=20it?=
+ =?UTF-8?q?=20in=20TIFFReadDirectory()=20so=20as=20to=20ignore=20fields=20?=
+ =?UTF-8?q?whose=20tag=20is=20a=20codec-specified=20tag=20but=20this=20cod?=
+ =?UTF-8?q?ec=20is=20not=20enabled.=20This=20avoids=20TIFFGetField()=20to?=
+ =?UTF-8?q?=20behave=20differently=20depending=20on=20whether=20the=20code?=
+ =?UTF-8?q?c=20is=20enabled=20or=20not,=20and=20thus=20can=20avoid=20stack?=
+ =?UTF-8?q?=20based=20buffer=20overflows=20in=20a=20number=20of=20TIFF=20u?=
+ =?UTF-8?q?tilities=20such=20as=20tiffsplit,=20tiffcmp,=20thumbnail,=20etc?=
+ =?UTF-8?q?.=20Patch=20derived=20from=200063-Handle-properly-CODEC-specifi?=
+ =?UTF-8?q?c-tags.patch=20(http://bugzilla.maptools.org/show=5Fbug.cgi=3Fi?=
+ =?UTF-8?q?d=3D2580)=20by=20Rapha=C3=ABl=20Hertzog.=20Fixes:=20http://bugz?=
+ =?UTF-8?q?illa.maptools.org/show=5Fbug.cgi=3Fid=3D2580=20http://bugzilla.?=
+ =?UTF-8?q?maptools.org/show=5Fbug.cgi=3Fid=3D2693=20http://bugzilla.mapto?=
+ =?UTF-8?q?ols.org/show=5Fbug.cgi=3Fid=3D2625=20(CVE-2016-10095)=20http://?=
+ =?UTF-8?q?bugzilla.maptools.org/show=5Fbug.cgi=3Fid=3D2564=20(CVE-2015-75?=
+ =?UTF-8?q?54)=20http://bugzilla.maptools.org/show=5Fbug.cgi=3Fid=3D2561?=
+ =?UTF-8?q?=20(CVE-2016-5318)=20http://bugzilla.maptools.org/show=5Fbug.cg?=
+ =?UTF-8?q?i=3Fid=3D2499=20(CVE-2014-8128)=20http://bugzilla.maptools.org/?=
+ =?UTF-8?q?show=5Fbug.cgi=3Fid=3D2441=20http://bugzilla.maptools.org/show?=
+ =?UTF-8?q?=5Fbug.cgi=3Fid=3D2433?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ libtiff/tif_dir.h | 1 +
+ libtiff/tif_dirinfo.c | 103 ++
+ libtiff/tif_dirread.c | 4 ++
+ 4 files changed, 128 insertions(+)
+
+diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
+index e12b44b2..5206be49 100644
+--- a/libtiff/tif_dir.h
b/libtiff/tif_dir.h
+@@ -291,6 +291,7 @@ struct _TIFFField {
+ extern int _TIFFMergeFields(TIFF*, const TIFFField[], uint32);
+ extern const TIFFField* _TIFFFindOrRegisterField(TIFF *, uint32,
TIFFDataType);
+ extern TIFFField* _TIFFCreateAnonField(TIFF *, uint32, TIFFDataType);
++extern int _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag);
+
+ #if defined(__cplusplus)
+ }
+diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
+index 0c8ef424..97c0df05 100644
+--- a/libtiff/tif_dirinfo.c
b/libtiff/tif_dirinfo.c
+@@ -956,6 +956,109 @@ TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo
info[], uint32 n)
+ return 0;
+ }
+
++int
++_TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
++{
++ /* Filter out non-codec specific tags */
++ switch (tag) {
++ /* Shared tags */
++ case TIFFTAG_PREDICTOR:
++ /* JPEG tags */
++ case TIFFTAG_JPEGTABLES:
++ /* OJPEG tags */
++ case TIFFTAG_JPEGIFOFFSET:
++ case TIFFTAG_JPEGIFBYTECOUNT:
++ case TIFFTAG_JPEGQTABLES:
++ case TIFFTAG_JPEGDCTABLES:
++ case TIFFTAG_JPEGACTABLES:
++ case TIFFTAG_JPEGPROC:
++ case TIFFTAG_JPEGRESTARTINTERVAL:
++ /* CCITT* */
++ case TIFFTAG_BADFAXLINES:
++ case TIFFTAG_CLEANFAXDATA:
++ case TIFFTAG_CONSECUTIVEBADFAXLINES:
++ case TIFFTAG_GROUP3OPTIONS:
++ case TIFFTAG_GROUP4OPTIONS:
++ break;
++ default:
++ return 1;
[arch-commits] Commit in libtiff/repos (6 files)
Date: Wednesday, December 14, 2016 @ 16:30:14
Author: arojas
Revision: 283304
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libtiff/repos/extra-i686/PKGBUILD
(from rev 283303, libtiff/trunk/PKGBUILD)
libtiff/repos/extra-i686/fix-hylafax.patch
(from rev 283303, libtiff/trunk/fix-hylafax.patch)
libtiff/repos/extra-x86_64/PKGBUILD
(from rev 283303, libtiff/trunk/PKGBUILD)
libtiff/repos/extra-x86_64/fix-hylafax.patch
(from rev 283303, libtiff/trunk/fix-hylafax.patch)
Deleted:
libtiff/repos/extra-i686/PKGBUILD
libtiff/repos/extra-x86_64/PKGBUILD
+
/PKGBUILD | 78 +++
extra-i686/PKGBUILD| 32
extra-i686/fix-hylafax.patch | 33
extra-x86_64/PKGBUILD | 32
extra-x86_64/fix-hylafax.patch | 33
5 files changed, 144 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-12-14 16:29:35 UTC (rev 283303)
+++ extra-i686/PKGBUILD 2016-12-14 16:30:14 UTC (rev 283304)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger
-
-pkgname=libtiff
-pkgver=4.0.7
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images"
-arch=('i686' 'x86_64')
-url="http://www.simplesystems.org/libtiff/";
-license=('custom')
-depends=('gcc-libs' 'libjpeg' 'zlib' 'xz')
-makedepends=('freeglut' 'glu' 'mesa' 'jbigkit')
-optdepends=('freeglut: for using tiffgt')
-source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('2c1b64478e88f93522a42dd5271214a0e5eae648')
-
-build() {
- cd tiff-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd tiff-${pkgver}
- make check
-}
-
-package() {
- cd tiff-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: libtiff/repos/extra-i686/PKGBUILD (from rev 283303,
libtiff/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-12-14 16:30:14 UTC (rev 283304)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger
+
+pkgname=libtiff
+pkgver=4.0.7
+pkgrel=2
+pkgdesc="Library for manipulation of TIFF images"
+arch=('i686' 'x86_64')
+url="http://www.simplesystems.org/libtiff/";
+license=('custom')
+depends=('gcc-libs' 'libjpeg' 'zlib' 'xz')
+makedepends=('freeglut' 'glu' 'mesa' 'jbigkit')
+optdepends=('freeglut: for using tiffgt')
+source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz
fix-hylafax.patch)
+sha1sums=('2c1b64478e88f93522a42dd5271214a0e5eae648'
+ '32166444112dc283ffa4ffdb56c81f246243434c')
+
+prepare() {
+ cd tiff-$pkgver
+ # http://bugzilla.maptools.org/show_bug.cgi?id=2636
+ patch -p1 -i ../fix-hylafax.patch
+}
+
+build() {
+ cd tiff-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd tiff-${pkgver}
+ make check
+}
+
+package() {
+ cd tiff-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: libtiff/repos/extra-i686/fix-hylafax.patch (from rev 283303,
libtiff/trunk/fix-hylafax.patch)
===
--- extra-i686/fix-hylafax.patch(rev 0)
+++ extra-i686/fix-hylafax.patch2016-12-14 16:30:14 UTC (rev 283304)
@@ -0,0 +1,33 @@
+From 7757b91a71631ada835740733f3dab51eda36df8 Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Tue, 13 Dec 2016 18:15:48 +
+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-bi
