[Midnightbsd-cvs] mports [24643] trunk/graphics/openjpeg: openjpeg 2.3.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Nov 21 21:16:48 EST 2018
Revision: 24643
http://svnweb.midnightbsd.org/mports/?rev=24643
Author: laffer1
Date: 2018-11-21 21:16:48 -0500 (Wed, 21 Nov 2018)
Log Message:
-----------
openjpeg 2.3.0
Modified Paths:
--------------
trunk/graphics/openjpeg/Makefile
trunk/graphics/openjpeg/distinfo
trunk/graphics/openjpeg/pkg-descr
trunk/graphics/openjpeg/pkg-plist
Added Paths:
-----------
trunk/graphics/openjpeg/files/
trunk/graphics/openjpeg/files/patch-src-bin-jp2-convertbmp.c
trunk/graphics/openjpeg/files/patch-src_bin_jp3d_convert.c
trunk/graphics/openjpeg/files/patch-src_bin_jpwl_convert.c
Modified: trunk/graphics/openjpeg/Makefile
===================================================================
--- trunk/graphics/openjpeg/Makefile 2018-11-22 02:14:44 UTC (rev 24642)
+++ trunk/graphics/openjpeg/Makefile 2018-11-22 02:16:48 UTC (rev 24643)
@@ -1,9 +1,9 @@
# $MidnightBSD$
PORTNAME= openjpeg
-PORTVERSION= 2.1.2
+PORTVERSION= 2.3.0
+PORTREVISION= 2
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= ports at MidnightBSD.org
@@ -10,15 +10,17 @@
COMMENT= Open-source JPEG 2000 codec
LICENSE= bsd2
+LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \
- libpng.so:${PORTSDIR}/graphics/png \
- libtiff.so:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS= cmake>=3:devel/cmake
+LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
+ libpng.so:graphics/png \
+ libtiff.so:graphics/tiff
USE_LDCONFIG= yes
USES= cmake cpe pkgconfig
-PLIST_SUB= VER=${PORTVERSION:R}
+PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R}
GH_ACCOUNT= uclouvain
USE_GITHUB= yes
Modified: trunk/graphics/openjpeg/distinfo
===================================================================
--- trunk/graphics/openjpeg/distinfo 2018-11-22 02:14:44 UTC (rev 24642)
+++ trunk/graphics/openjpeg/distinfo 2018-11-22 02:16:48 UTC (rev 24643)
@@ -1,2 +1,3 @@
-SHA256 (openjpeg-v2.1.2_GH0.tar.gz) = 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7
-SIZE (openjpeg-v2.1.2_GH0.tar.gz) = 1987071
+TIMESTAMP = 1542852978
+SHA256 (openjpeg-v2.3.0_GH0.tar.gz) = 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a
+SIZE (openjpeg-v2.3.0_GH0.tar.gz) = 2207329
Added: trunk/graphics/openjpeg/files/patch-src-bin-jp2-convertbmp.c
===================================================================
--- trunk/graphics/openjpeg/files/patch-src-bin-jp2-convertbmp.c (rev 0)
+++ trunk/graphics/openjpeg/files/patch-src-bin-jp2-convertbmp.c 2018-11-22 02:16:48 UTC (rev 24643)
@@ -0,0 +1,51 @@
+Fix CVE-2018-5785
+
+Obtained from: https://github.com/uclouvain/openjpeg/commit/ca16fe55014c57090dd97369256c7657aeb25975
+
+--- src/bin/jp2/convertbmp.c.orig 2017-10-04 22:23:14 UTC
++++ src/bin/jp2/convertbmp.c
+@@ -435,16 +435,31 @@ static OPJ_BOOL bmp_read_info_header(FIL
+ header->biRedMask |= (OPJ_UINT32)getc(IN) << 16;
+ header->biRedMask |= (OPJ_UINT32)getc(IN) << 24;
+
++ if (!header->biRedMask) {
++ fprintf(stderr, "Error, invalid red mask value %d\n", header->biRedMask);
++ return OPJ_FALSE;
++ }
++
+ header->biGreenMask = (OPJ_UINT32)getc(IN);
+ header->biGreenMask |= (OPJ_UINT32)getc(IN) << 8;
+ header->biGreenMask |= (OPJ_UINT32)getc(IN) << 16;
+ header->biGreenMask |= (OPJ_UINT32)getc(IN) << 24;
+
++ if (!header->biGreenMask) {
++ fprintf(stderr, "Error, invalid green mask value %d\n", header->biGreenMask);
++ return OPJ_FALSE;
++ }
++
+ header->biBlueMask = (OPJ_UINT32)getc(IN);
+ header->biBlueMask |= (OPJ_UINT32)getc(IN) << 8;
+ header->biBlueMask |= (OPJ_UINT32)getc(IN) << 16;
+ header->biBlueMask |= (OPJ_UINT32)getc(IN) << 24;
+
++ if (!header->biBlueMask) {
++ fprintf(stderr, "Error, invalid blue mask value %d\n", header->biBlueMask);
++ return OPJ_FALSE;
++ }
++
+ header->biAlphaMask = (OPJ_UINT32)getc(IN);
+ header->biAlphaMask |= (OPJ_UINT32)getc(IN) << 8;
+ header->biAlphaMask |= (OPJ_UINT32)getc(IN) << 16;
+@@ -831,6 +846,12 @@ opj_image_t* bmptoimage(const char *file
+ bmpmask32toimage(pData, stride, image, 0x00FF0000U, 0x0000FF00U, 0x000000FFU,
+ 0x00000000U);
+ } else if (Info_h.biBitCount == 32 && Info_h.biCompression == 3) { /* bitmask */
++ if ((Info_h.biRedMask == 0U) && (Info_h.biGreenMask == 0U) &&
++ (Info_h.biBlueMask == 0U)) {
++ Info_h.biRedMask = 0x00FF0000U;
++ Info_h.biGreenMask = 0x0000FF00U;
++ Info_h.biBlueMask = 0x000000FFU;
++ }
+ bmpmask32toimage(pData, stride, image, Info_h.biRedMask, Info_h.biGreenMask,
+ Info_h.biBlueMask, Info_h.biAlphaMask);
+ } else if (Info_h.biBitCount == 16 && Info_h.biCompression == 0) { /* RGBX */
Property changes on: trunk/graphics/openjpeg/files/patch-src-bin-jp2-convertbmp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/openjpeg/files/patch-src_bin_jp3d_convert.c
===================================================================
--- trunk/graphics/openjpeg/files/patch-src_bin_jp3d_convert.c (rev 0)
+++ trunk/graphics/openjpeg/files/patch-src_bin_jp3d_convert.c 2018-11-22 02:16:48 UTC (rev 24643)
@@ -0,0 +1,11 @@
+--- src/bin/jp3d/convert.c.orig 2018-08-02 17:40:37 UTC
++++ src/bin/jp3d/convert.c
+@@ -297,7 +297,7 @@ opj_volume_t* pgxtovolume(char *relpath,
+ fprintf(stdout, "[INFO] Loading %s \n", pgxfiles[pos]);
+
+ fseek(f, 0, SEEK_SET);
+- fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d", temp, &endian1, &endian2,
++ fscanf(f, "PG%31[ \t]%c%c%31[ \t+-]%d%31[ \t]%d%31[ \t]%d", temp, &endian1, &endian2
+ signtmp, &prec, temp, &w, temp, &h);
+
+ i = 0;
Property changes on: trunk/graphics/openjpeg/files/patch-src_bin_jp3d_convert.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/openjpeg/files/patch-src_bin_jpwl_convert.c
===================================================================
--- trunk/graphics/openjpeg/files/patch-src_bin_jpwl_convert.c (rev 0)
+++ trunk/graphics/openjpeg/files/patch-src_bin_jpwl_convert.c 2018-11-22 02:16:48 UTC (rev 24643)
@@ -0,0 +1,11 @@
+--- src/bin/jpwl/convert.c.orig 2018-08-02 17:47:37 UTC
++++ src/bin/jpwl/convert.c
+@@ -1348,7 +1348,7 @@ opj_image_t* pgxtoimage(const char *file
+ }
+
+ fseek(f, 0, SEEK_SET);
+- if (fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d", temp, &endian1,
++ if (fscanf(f, "PG%31[ \t]%c%c%31[ \t+-]%d%31[ \t]%d%31[ \t]%d", temp, &endian1,
+ &endian2, signtmp, &prec, temp, &w, temp, &h) != 9) {
+ fprintf(stderr,
+ "ERROR: Failed to read the right number of element from the fscanf() function!\n");
Property changes on: trunk/graphics/openjpeg/files/patch-src_bin_jpwl_convert.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/openjpeg/pkg-descr
===================================================================
--- trunk/graphics/openjpeg/pkg-descr 2018-11-22 02:14:44 UTC (rev 24642)
+++ trunk/graphics/openjpeg/pkg-descr 2018-11-22 02:16:48 UTC (rev 24643)
@@ -12,5 +12,4 @@
- JPIP (JPEG 2000 standard Part 9)
- OPJViewer, a GUI viewer for J2K, JP2, JPWL and MJ2 files
-WWW: https://code.google.com/p/openjpeg/
-WWW: http://openjpeg.mirror.sourceforge.net/
+WWW: http://www.openjpeg.org/
Modified: trunk/graphics/openjpeg/pkg-plist
===================================================================
--- trunk/graphics/openjpeg/pkg-plist 2018-11-22 02:14:44 UTC (rev 24642)
+++ trunk/graphics/openjpeg/pkg-plist 2018-11-22 02:16:48 UTC (rev 24643)
@@ -4,8 +4,9 @@
include/openjpeg-%%VER%%/openjpeg.h
include/openjpeg-%%VER%%/opj_config.h
include/openjpeg-%%VER%%/opj_stdint.h
+lib/libopenjp2.a
lib/libopenjp2.so
-lib/libopenjp2.so.%%VER%%.2
+lib/libopenjp2.so.%%PORTVERSION%%
lib/libopenjp2.so.7
lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
More information about the Midnightbsd-cvs
mailing list