From owner-svn-ports-branches@freebsd.org Sat Mar 30 22:05:28 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1DFF1565819; Sat, 30 Mar 2019 22:05:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F85581F24; Sat, 30 Mar 2019 22:05:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D9061D1D5; Sat, 30 Mar 2019 22:05:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2UM5R1E075297; Sat, 30 Mar 2019 22:05:27 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2UM5RNw075295; Sat, 30 Mar 2019 22:05:27 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201903302205.x2UM5RNw075295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 30 Mar 2019 22:05:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r497363 - in branches/2019Q1/graphics/openjpeg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in branches/2019Q1/graphics/openjpeg: . files X-SVN-Commit-Revision: 497363 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8F85581F24 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Mar 2019 22:05:28 -0000 Author: sunpoet Date: Sat Mar 30 22:05:26 2019 New Revision: 497363 URL: https://svnweb.freebsd.org/changeset/ports/497363 Log: MFH: r497122 Fix CVE-2018-5727 - Bump PORTREVISION for possible package change Obtained from: https://github.com/uclouvain/openjpeg/commit/d6b8aed5612e6be6d3a4053867fbd2ae0cb7c8af Security: 5efd7a93-2dfb-11e9-9549-e980e869c2e9 Approved by: ports-secteam (joneum) Added: branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c - copied unchanged from r497122, head/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c Modified: branches/2019Q1/graphics/openjpeg/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/graphics/openjpeg/Makefile ============================================================================== --- branches/2019Q1/graphics/openjpeg/Makefile Sat Mar 30 21:15:08 2019 (r497362) +++ branches/2019Q1/graphics/openjpeg/Makefile Sat Mar 30 22:05:26 2019 (r497363) @@ -3,8 +3,8 @@ PORTNAME= openjpeg PORTVERSION= 2.3.0 -PORTREVISION= 3 DISTVERSIONPREFIX= v +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org @@ -18,8 +18,9 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USE_LDCONFIG= yes USES= cmake cpe pkgconfig + +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R} Copied: branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c (from r497122, head/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c Sat Mar 30 22:05:26 2019 (r497363, copy of r497122, head/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c) @@ -0,0 +1,24 @@ +Obtained from: https://github.com/uclouvain/openjpeg/commit/d6b8aed5612e6be6d3a4053867fbd2ae0cb7c8af + +--- src/lib/openjp2/t1.c.orig 2017-10-04 22:23:14 UTC ++++ src/lib/openjp2/t1.c +@@ -2168,9 +2168,18 @@ OPJ_BOOL opj_t1_encode_cblks(opj_t1_t *t + t1->data = tiledp; + t1->data_stride = tile_w; + if (tccp->qmfbid == 1) { ++ /* Do multiplication on unsigned type, even if the ++ * underlying type is signed, to avoid potential ++ * int overflow on large value (the output will be ++ * incorrect in such situation, but whatever...) ++ * This assumes complement-to-2 signed integer ++ * representation ++ * Fixes https://github.com/uclouvain/openjpeg/issues/1053 ++ */ ++ OPJ_UINT32* OPJ_RESTRICT tiledp_u = (OPJ_UINT32*) tiledp; + for (j = 0; j < cblk_h; ++j) { + for (i = 0; i < cblk_w; ++i) { +- tiledp[tileIndex] *= (1 << T1_NMSEDEC_FRACBITS); ++ tiledp_u[tileIndex] <<= T1_NMSEDEC_FRACBITS; + tileIndex++; + } + tileIndex += tileLineAdvance;