pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/openjpeg openjpeg: updated to 2.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/5970d02a7b0e
branches: trunk
changeset: 444382:5970d02a7b0e
user: adam <adam%pkgsrc.org@localhost>
date: Wed Jan 06 12:32:34 2021 +0000
description:
openjpeg: updated to 2.4.0
OpenJPEG 2.4.0
No API/ABI break compared to v2.3.1, but additional symbols for subset of components decoding (hence the MINOR version bump).
Encoder: add support for multithreading
Encoder: add support for generation of PLT markers
Encoder: single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements)
Encoder: support IMF profiles
Many bug fixes (including security fixes)
diffstat:
graphics/openjpeg/Makefile | 5 +-
graphics/openjpeg/PLIST | 14 +-
graphics/openjpeg/distinfo | 13 +-
graphics/openjpeg/patches/patch-src_bin_jp2_convertbmp.c | 77 ----------------
graphics/openjpeg/patches/patch-src_lib_openjp2_j2k.c | 22 ----
graphics/openjpeg/patches/patch-src_lib_openjp2_tcd.c | 34 -------
6 files changed, 14 insertions(+), 151 deletions(-)
diffs (209 lines):
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/Makefile
--- a/graphics/openjpeg/Makefile Wed Jan 06 12:22:52 2021 +0000
+++ b/graphics/openjpeg/Makefile Wed Jan 06 12:32:34 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2020/05/12 10:44:46 nia Exp $
+# $NetBSD: Makefile,v 1.22 2021/01/06 12:32:34 adam Exp $
-DISTNAME= openjpeg-2.3.1
-PKGREVISION= 3
+DISTNAME= openjpeg-2.4.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=uclouvain/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/PLIST
--- a/graphics/openjpeg/PLIST Wed Jan 06 12:22:52 2021 +0000
+++ b/graphics/openjpeg/PLIST Wed Jan 06 12:32:34 2021 +0000
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2017/10/06 21:00:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/01/06 12:32:34 adam Exp $
bin/opj_compress
bin/opj_decompress
bin/opj_dump
-include/openjpeg-2.3/openjpeg.h
-include/openjpeg-2.3/opj_config.h
-include/openjpeg-2.3/opj_stdint.h
+include/openjpeg-2.4/openjpeg.h
+include/openjpeg-2.4/opj_config.h
+include/openjpeg-2.4/opj_stdint.h
lib/libopenjp2.a
lib/libopenjp2.so
lib/libopenjp2.so.${PKGVERSION}
lib/libopenjp2.so.7
-lib/openjpeg-2.3/OpenJPEGConfig.cmake
-lib/openjpeg-2.3/OpenJPEGTargets-noconfig.cmake
-lib/openjpeg-2.3/OpenJPEGTargets.cmake
+lib/openjpeg-2.4/OpenJPEGConfig.cmake
+lib/openjpeg-2.4/OpenJPEGTargets-noconfig.cmake
+lib/openjpeg-2.4/OpenJPEGTargets.cmake
lib/pkgconfig/libopenjp2.pc
man/man1/opj_compress.1
man/man1/opj_decompress.1
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/distinfo
--- a/graphics/openjpeg/distinfo Wed Jan 06 12:22:52 2021 +0000
+++ b/graphics/openjpeg/distinfo Wed Jan 06 12:32:34 2021 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.18 2020/05/12 10:44:46 nia Exp $
+$NetBSD: distinfo,v 1.19 2021/01/06 12:32:34 adam Exp $
-SHA1 (openjpeg-2.3.1.tar.gz) = 38321fa9730252039ad0b7f247a160a8164f5871
-RMD160 (openjpeg-2.3.1.tar.gz) = 31b75aa70f5d26dd1b7e374a9e4b6be1842fefe7
-SHA512 (openjpeg-2.3.1.tar.gz) = 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
-Size (openjpeg-2.3.1.tar.gz) = 2214401 bytes
+SHA1 (openjpeg-2.4.0.tar.gz) = bbbf4dc4d9ce95286843cd39ac2febd3fd516c9d
+RMD160 (openjpeg-2.4.0.tar.gz) = 662070ce960ac0d90fb803385602e34c42c9f910
+SHA512 (openjpeg-2.4.0.tar.gz) = 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
+Size (openjpeg-2.4.0.tar.gz) = 2233229 bytes
SHA1 (patch-CMakeLists.txt) = 3738946db63df4d623c6ce486bd22fa4d57336e2
SHA1 (patch-src_bin_jp2_CMakeLists.txt) = c9f709c23d6bab7a3c705640d66a00ec90ddabc7
-SHA1 (patch-src_bin_jp2_convertbmp.c) = bceb4a99820568386e48eb00ab13ab9987d1e86a
SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = d839121ec2d008e5d3e1676d3e7ac3642bc946f7
-SHA1 (patch-src_lib_openjp2_j2k.c) = b342aa64c6583a8e4f79495412e5506f40a9023e
SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = fc0c170789dbe0a2ebc9dce0ef0d21aa6b2edd49
-SHA1 (patch-src_lib_openjp2_tcd.c) = da3354c101485f1b5f92f59d5f1be07a006e3056
SHA1 (patch-src_lib_openmj2_t2.c) = a4ce0faa349f1a23453ef7632fbcc3af2d045337
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/patches/patch-src_bin_jp2_convertbmp.c
--- a/graphics/openjpeg/patches/patch-src_bin_jp2_convertbmp.c Wed Jan 06 12:22:52 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-$NetBSD: patch-src_bin_jp2_convertbmp.c,v 1.1 2020/01/07 20:19:46 sevan Exp $
-
-CVE-2019-12973
-https://github.com/uclouvain/openjpeg/pull/1185
-https://nvd.nist.gov/vuln/detail/CVE-2019-12973
-
---- src/bin/jp2/convertbmp.c.orig 2020-01-07 11:06:41.960834648 +0000
-+++ src/bin/jp2/convertbmp.c
-@@ -632,12 +632,18 @@ static OPJ_BOOL bmp_read_rle4_data(FILE*
- while (y < height) {
- int c = getc(IN);
- if (c == EOF) {
-- break;
-+ return OPJ_FALSE;
- }
-
- if (c) { /* encoded mode */
-- int j;
-- OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN);
-+ int j, c1_int;
-+ OPJ_UINT8 c1;
-+
-+ c1_int = getc(IN);
-+ if (c1_int == EOF) {
-+ return OPJ_FALSE;
-+ }
-+ c1 = (OPJ_UINT8)c1_int;
-
- for (j = 0; (j < c) && (x < width) &&
- ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
-@@ -646,7 +652,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE*
- } else { /* absolute mode */
- c = getc(IN);
- if (c == EOF) {
-- break;
-+ return OPJ_FALSE;
- }
-
- if (c == 0x00) { /* EOL */
-@@ -657,8 +663,14 @@ static OPJ_BOOL bmp_read_rle4_data(FILE*
- break;
- } else if (c == 0x02) { /* MOVE by dxdy */
- c = getc(IN);
-+ if (c == EOF) {
-+ return OPJ_FALSE;
-+ }
- x += (OPJ_UINT32)c;
- c = getc(IN);
-+ if (c == EOF) {
-+ return OPJ_FALSE;
-+ }
- y += (OPJ_UINT32)c;
- pix = pData + y * stride + x;
- } else { /* 03 .. 255 : absolute mode */
-@@ -668,12 +680,20 @@ static OPJ_BOOL bmp_read_rle4_data(FILE*
- for (j = 0; (j < c) && (x < width) &&
- ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
- if ((j & 1) == 0) {
-- c1 = (OPJ_UINT8)getc(IN);
-+ int c1_int;
-+ c1_int = getc(IN);
-+ if (c1_int == EOF) {
-+ return OPJ_FALSE;
-+ }
-+ c1 = (OPJ_UINT8)c1_int;
- }
- *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU));
- }
- if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */
-- getc(IN);
-+ c = getc(IN);
-+ if (c == EOF) {
-+ return OPJ_FALSE;
-+ }
- }
- }
- }
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/patches/patch-src_lib_openjp2_j2k.c
--- a/graphics/openjpeg/patches/patch-src_lib_openjp2_j2k.c Wed Jan 06 12:22:52 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_lib_openjp2_j2k.c,v 1.1 2020/05/12 10:44:46 nia Exp $
-
-CVE-2020-6851
-https://github.com/uclouvain/openjpeg/commit/d7064fad0f8a2b485c4b520697e6741c6d94f5c5.patch
-
---- src/lib/openjp2/j2k.c.orig 2019-04-02 12:45:15.000000000 +0000
-+++ src/lib/openjp2/j2k.c
-@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
- l_img_comp = p_image->comps;
- for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
- OPJ_INT32 l_h, l_w;
-+ if( p_image->x0 > (OPJ_UINT32)INT_MAX ||
-+ p_image->y0 > (OPJ_UINT32)INT_MAX ||
-+ p_image->x1 > (OPJ_UINT32)INT_MAX ||
-+ p_image->y1 > (OPJ_UINT32)INT_MAX ) {
-+ opj_event_msg(p_manager, EVT_ERROR,
-+ "Image coordinates above INT_MAX are not supported\n");
-+ return OPJ_FALSE;
-+ }
-
- l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
- (OPJ_INT32)l_img_comp->dx);
diff -r acf6ef8b2ee8 -r 5970d02a7b0e graphics/openjpeg/patches/patch-src_lib_openjp2_tcd.c
--- a/graphics/openjpeg/patches/patch-src_lib_openjp2_tcd.c Wed Jan 06 12:22:52 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_lib_openjp2_tcd.c,v 1.1 2020/05/12 10:44:46 nia Exp $
-
-CVE-2020-8112
-https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch
-
---- src/lib/openjp2/tcd.c.orig 2019-04-02 12:45:15.000000000 +0000
-+++ src/lib/openjp2/tcd.c
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile
- /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
- l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
- l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
-- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
-- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
-+ {
-+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
-+ (OPJ_INT32)l_pdx)) << l_pdx;
-+ if (tmp > (OPJ_UINT32)INT_MAX) {
-+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+ return OPJ_FALSE;
-+ }
-+ l_br_prc_x_end = (OPJ_INT32)tmp;
-+ }
-+ {
-+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
-+ (OPJ_INT32)l_pdy)) << l_pdy;
-+ if (tmp > (OPJ_UINT32)INT_MAX) {
-+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+ return OPJ_FALSE;
-+ }
-+ l_br_prc_y_end = (OPJ_INT32)tmp;
-+ }
- /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
-
- l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
Home |
Main Index |
Thread Index |
Old Index