diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-25 14:18:22 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-25 14:20:13 +0000 |
| commit | de2552b0dd8fbf08fa3872414d578f2fc17bdc34 (patch) | |
| tree | 720c50dd1397badc097081db98cab4cfcbe88b4f /main/jasper | |
| parent | 65fed6a0e82fcc8eea1893c8202bd811bd7e0dff (diff) | |
| download | aports-de2552b0dd8fbf08fa3872414d578f2fc17bdc34.tar.bz2 aports-de2552b0dd8fbf08fa3872414d578f2fc17bdc34.tar.xz | |
main/jasper: upgrade to 2.0.14
Diffstat (limited to 'main/jasper')
| -rw-r--r-- | main/jasper/APKBUILD | 8 | ||||
| -rw-r--r-- | main/jasper/CVE-2017-1000050.patch | 16 |
2 files changed, 3 insertions, 21 deletions
diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD index 3c4cfe45fd..d81de018bb 100644 --- a/main/jasper/APKBUILD +++ b/main/jasper/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=jasper -pkgver=2.0.12 -pkgrel=1 +pkgver=2.0.14 +pkgrel=0 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" url="http://www.ece.uvic.ca/~mdadams/jasper/" arch="all" @@ -10,7 +10,6 @@ depends= #"libjpeg>=8 freeglut libxi libxmu mesa" makedepends="libjpeg-turbo-dev cmake" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="http://www.ece.uvic.ca/~frodo/jasper/software/jasper-$pkgver.tar.gz - CVE-2017-1000050.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -40,5 +39,4 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="3b0f5a5640838b328d989a80461a23ca8ac98af054a7f15c13a543e769c98bb632b74114923c02c3b2de76747187747aec6e18a2cf14035a8d79eb3482fd553b jasper-2.0.12.tar.gz -2851d1cd7ed372cde5f9d6d6610e2c5507f5a8d571b1db9fc9afce64a1b35a78776d547b8281da770ab4d2f20c2e87cde989a16c17017c80ab12eedd8164cbb8 CVE-2017-1000050.patch" +sha512sums="9e5cffd2e899e37ba08890e2377ddfc3c2fb13d9fe00dea6b4612e4d241a6f4327de6835809b415c41ae4bf44208cf7871c1982ff5fc04ae6bc09fd376b0afc8 jasper-2.0.14.tar.gz" diff --git a/main/jasper/CVE-2017-1000050.patch b/main/jasper/CVE-2017-1000050.patch deleted file mode 100644 index 9a6a611e6d..0000000000 --- a/main/jasper/CVE-2017-1000050.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c -index 9a5e106..af4d9a4 100644 ---- a/src/libjasper/jp2/jp2_enc.c -+++ b/src/libjasper/jp2/jp2_enc.c -@@ -115,6 +115,11 @@ int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr) - iccstream = 0; - iccprof = 0; - -+ if (jas_image_numcmpts(image) < 1) { -+ jas_eprintf("image must have at least one component\n"); -+ goto error; -+ } -+ - allcmptssame = 1; - sgnd = jas_image_cmptsgnd(image, 0); - prec = jas_image_cmptprec(image, 0); |