summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-12-06 20:37:32 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-12-07 08:23:00 +0000
commit301bae2e27f652249d470c9150f1412f773a2cb8 (patch)
treeba76a8946020449ba92e3bea8efdd5dba7d160ca
parent91378f2eaa253dd4a22c20f20998a924a76f67c3 (diff)
downloadaports-301bae2e27f652249d470c9150f1412f773a2cb8.tar.bz2
aports-301bae2e27f652249d470c9150f1412f773a2cb8.tar.xz
main/tiff: security upgrade to 4.0.3 (CVE-2012-4447,CVE-2012-4564)
fixes #1501
-rw-r--r--main/tiff/APKBUILD10
-rw-r--r--main/tiff/CVE-2012-3401.patch11
2 files changed, 4 insertions, 17 deletions
diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index f1eb30ca9..2bfdb997a 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -1,18 +1,17 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=tiff
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.0.3
+pkgrel=0
pkgdesc="Provides support for the Tag Image File Format or TIFF"
url="http://www.libtiff.org/"
arch="all"
license="GPL"
depends=
-depends_dev="zlib-dev jpeg-dev"
+depends_dev="zlib-dev libjpeg-turbo-dev"
makedepends="libtool autoconf automake $depends_dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
source="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$pkgver.tar.gz
- CVE-2012-3401.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -51,5 +50,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-md5sums="04a08fa1e07e696e820a0c3f32465a13 tiff-4.0.2.tar.gz
-8c862de25b906d3fcefce2fb06c7b604 CVE-2012-3401.patch"
+md5sums="051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz"
diff --git a/main/tiff/CVE-2012-3401.patch b/main/tiff/CVE-2012-3401.patch
deleted file mode 100644
index 847bd0d13..000000000
--- a/main/tiff/CVE-2012-3401.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur tiff-4.0.2.orig/tools/tiff2pdf.c tiff-4.0.2/tools/tiff2pdf.c
---- tiff-4.0.2.orig/tools/tiff2pdf.c 2012-06-15 17:51:54.000000000 -0400
-+++ tiff-4.0.2/tools/tiff2pdf.c 2012-07-05 13:34:36.569691068 -0400
-@@ -1066,6 +1066,7 @@
- "Can't set directory %u of input file %s",
- i,
- TIFFFileName(input));
-+ t2p->t2p_error = T2P_ERR_ERROR;
- return;
- }
- if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){