diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-12-01 18:01:04 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-12-01 18:01:04 +0000 |
| commit | d121ff38fff65ed7267690946402a1e59692ad2b (patch) | |
| tree | 1f1604cb6b9f45e89281ba3ca9c6387ff83513d6 | |
| parent | b84153e594fa34e6593014f6f3e39acc4165fad7 (diff) | |
| download | packages-d121ff38fff65ed7267690946402a1e59692ad2b.tar.gz packages-d121ff38fff65ed7267690946402a1e59692ad2b.tar.bz2 packages-d121ff38fff65ed7267690946402a1e59692ad2b.tar.xz packages-d121ff38fff65ed7267690946402a1e59692ad2b.zip | |
user/tiff: bugfix bump to 4.0.10
| -rw-r--r-- | user/tiff/APKBUILD | 14 | ||||
| -rw-r--r-- | user/tiff/CVE-2017-18013.patch | 34 |
2 files changed, 3 insertions, 45 deletions
diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD index f05bcbc2f..7bb89ee3e 100644 --- a/user/tiff/APKBUILD +++ b/user/tiff/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tiff -pkgver=4.0.9 -pkgrel=2 +pkgver=4.0.10 +pkgrel=0 pkgdesc="Library to read, create, and manipulate TIFF image files" url="http://www.libtiff.org/" arch="all" @@ -13,7 +13,6 @@ depends_dev="zlib-dev libjpeg-turbo-dev" makedepends="libtool autoconf automake $depends_dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz - CVE-2017-18013.patch " # secfixes: # 4.0.9-r1: @@ -36,12 +35,6 @@ source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz # 4.0.7-r1: # - CVE-2017-5225 -prepare() { - cd "$builddir" - update_config_sub - default_prepare -} - build() { cd "$builddir" ./configure \ @@ -71,5 +64,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz -2baa66963302ff51e34774d6e0703f769ba1ca7f527456ae13ea230af69280e024440390df9b5a51776fc29cb6d2d40713431a2c2d98f29e50e3f8f5a7f4d73b CVE-2017-18013.patch" +sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz" diff --git a/user/tiff/CVE-2017-18013.patch b/user/tiff/CVE-2017-18013.patch deleted file mode 100644 index 5a1d90082..000000000 --- a/user/tiff/CVE-2017-18013.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Sun, 31 Dec 2017 15:09:41 +0100 -Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770 - ---- - libtiff/tif_print.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c -index 9959d35..8deceb2 100644 ---- a/libtiff/tif_print.c -+++ b/libtiff/tif_print.c -@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", - (unsigned long) s, -- (unsigned __int64) td->td_stripoffset[s], -- (unsigned __int64) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); - #else - fprintf(fd, " %3lu: [%8llu, %8llu]\n", - (unsigned long) s, -- (unsigned long long) td->td_stripoffset[s], -- (unsigned long long) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); - #endif - } - } --- -libgit2 0.26.0 - |