diff --git a/srcpkgs/openjpeg2/patches/CVE-2016-7163-1.patch b/srcpkgs/openjpeg2/patches/CVE-2016-7163-1.patch deleted file mode 100644 index d8da16f496..0000000000 --- a/srcpkgs/openjpeg2/patches/CVE-2016-7163-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001 -From: trylab -Date: Tue, 6 Sep 2016 13:55:49 +0800 -Subject: [PATCH] Fix an integer overflow issue (#809) - -Prevent an integer overflow issue in function opj_pi_create_decode of -pi.c. ---- - src/lib/openjp2/pi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c -index cffad66..36e2ff0 100644 ---- src/lib/openjp2/pi.c -+++ src/lib/openjp2/pi.c -@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, - l_current_pi = l_pi; - - /* memory allocation for include */ -- l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ /* prevent an integer overflow issue */ -+ l_current_pi->include = 00; -+ if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U))) -+ { -+ l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ } -+ - if - (!l_current_pi->include) - { --- -2.10.0 - diff --git a/srcpkgs/openjpeg2/patches/CVE-2016-7163-2.patch b/srcpkgs/openjpeg2/patches/CVE-2016-7163-2.patch deleted file mode 100644 index 7a040ad1f5..0000000000 --- a/srcpkgs/openjpeg2/patches/CVE-2016-7163-2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001 -From: Matthieu Darbois -Date: Thu, 8 Sep 2016 07:34:46 +0200 -Subject: [PATCH] Cast to size_t before multiplication - -Need to cast to size_t before multiplication otherwise overflow check is useless. ---- - src/lib/openjp2/pi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c -index 36e2ff0..809b33d 100644 ---- src/lib/openjp2/pi.c -+++ src/lib/openjp2/pi.c -@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, - l_current_pi->include = 00; - if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U))) - { -- l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); -+ l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16)); - } - - if --- -2.10.0 - diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template index f0d3d875b9..6918441b2d 100644 --- a/srcpkgs/openjpeg2/template +++ b/srcpkgs/openjpeg2/template @@ -1,7 +1,7 @@ # Template file for 'openjpeg2' pkgname=openjpeg2 -version=2.1.1 -revision=2 +version=2.1.2 +revision=1 wrksrc="openjpeg-${version}" build_style=cmake maintainer="Dominik Honnef " @@ -10,7 +10,7 @@ license="2-clause-BSD" short_desc="Open-source JPEG 2000 codec written in C language (Version 2)" makedepends="libpng-devel lcms2-devel tiff-devel" distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz" -checksum=82c27f47fc7219e2ed5537ac69545bf15ed8c6ba8e6e1e529f89f7356506dbaa +checksum=4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7 post_install() { vlicense LICENSE