From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- media-libs/openjpeg/Manifest | 7 +- .../files/openjpeg-2.3.1-CVE-2020-6851.patch | 29 +++ .../files/openjpeg-2.3.1-CVE-2020-8112.patch | 43 +++++ .../files/openjpeg-2.3.1-libtiff-4.1-compat.patch | 210 +++++++++++++++++++++ media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild | 2 +- media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 136 +++++++++++++ media-libs/openjpeg/openjpeg-2.3.1.ebuild | 133 ------------- 7 files changed, 424 insertions(+), 136 deletions(-) create mode 100644 media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch create mode 100644 media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch create mode 100644 media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch create mode 100644 media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild delete mode 100644 media-libs/openjpeg/openjpeg-2.3.1.ebuild (limited to 'media-libs/openjpeg') diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 37bb73a865df..1fa0aeaa8a5b 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -1,7 +1,10 @@ +AUX openjpeg-2.3.1-CVE-2020-6851.patch 1240 BLAKE2B 440efbd4960def0c98cc5d1874c2261ae263d3a398bf1ed14cb1bdc151ba2351c8d9899d498ea4c103acbbfb85924f6e1ba1690c7d6be46b444946f18710b82b SHA512 c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297 +AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd372b625bcddb01e532cbe418b718560729a09e332eefc066da05b1169feda056d9a518858cce4b252b28a2005ca6763d5b3d7 SHA512 9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698 +AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507 -EBUILD openjpeg-1.5.2-r1.ebuild 1927 BLAKE2B e7cf2a46d05563408544a15b2af7a64d412b84eb50b7ea33292c5df265fdd10375f195e5cf4398da73b2471d5dbcd950925f124ef77cb0db77bf10f46bb07978 SHA512 8b5d53e65c8a89bc5c27162bffab3c2dd04d44410c804f647018ab7112fcd7b42574800b91ff1258bd839c4495f19c4049ef3f3cbbe18c0f1479aa270d4f3063 -EBUILD openjpeg-2.3.1.ebuild 4185 BLAKE2B 0e09b5c3760189f8c8d54be4e1bccc9dc2b83bb6d682055442ab9b046dfef4b2292faceb633e0114d762f466cfe3909a3aa99a157062369399eb75261d8025b4 SHA512 e3200322df737576f1bc04729545df1a2d4bd6645c40e6007cd606d8e6dcd955cde983eb7b719f105187a1ec15d5b00ede417b5cdf8a7c914e065dbb672b413b +EBUILD openjpeg-1.5.2-r1.ebuild 1924 BLAKE2B 9e1db8cd8f7a2e395b30c2b095e44e6fd18403b5c51cde0624db1c85e91848fecfb584e93bd815c5b9b1095e8769be8ab77545eca0f2d2ebb2b0291b310332a8 SHA512 18768a2552149908e927342dd9f5a80b423f6d5b9303c299e99bb6a4f5d50e892f7698f7b0d0c4a357d9ee89daf79d4d40a265b01fba3bf23b4f139a78e6875a +EBUILD openjpeg-2.3.1-r1.ebuild 4307 BLAKE2B 52b1776e6dbc6d8053144e56a6ecfb3a22213eb1facf58c6ca5437eba4f814dcd8c7dfd774630442dc52cca62b303bb86f92618aa9615a9f801a2b7681af5ecf SHA512 82499a78d1c79443d0edef4c34cbb39bd095ddb2554afa3d173a07a791c7eaaa633157a8338885864b326c24c6a89a6c34da0fc0d1216e1370a4fbd5a9a1da9c MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch new file mode 100644 index 000000000000..9a70291f50e4 --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch @@ -0,0 +1,29 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 14f6ff41a..922550eb1 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, + 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 --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch new file mode 100644 index 000000000000..95cb8095f562 --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch @@ -0,0 +1,43 @@ +From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index deecc4dff..aa419030a 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* 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)(( diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch new file mode 100644 index 000000000000..53985b190933 --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch @@ -0,0 +1,210 @@ +From b5cb419faff300fdbc0b4e98dab5c9010db6f39d Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Fri, 7 Feb 2020 21:53:10 +0100 +Subject: [PATCH] tests: add alternate checksums for libtiff 4.1 + +Fixes #1233 + +libtiff 4.1 slightly modifies the way it generates files. So +add the new expected md5sum. + +Not super elegant solution admitedly. +--- + tests/nonregression/checkmd5refs.cmake | 5 ++ + tests/nonregression/md5refs.txt | 86 +++++++++++++++++++++++-- + tests/nonregression/test_suite.ctest.in | 16 ++--- + 3 files changed, 93 insertions(+), 14 deletions(-) + +diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake +index 75afbed05..76e2f245f 100644 +--- a/tests/nonregression/checkmd5refs.cmake ++++ b/tests/nonregression/checkmd5refs.cmake +@@ -46,10 +46,15 @@ foreach(pgxfullpath ${globfiles}) + + string(REGEX MATCH "[0-9a-f]+ ${pgxfile}" output_var "${variable}") + ++ # Search for variant md5sum for libtiff >= 4.1 ++ string(REGEX MATCH "libtiff_4_1:[0-9a-f]+ ${pgxfile}" alternate_output_var "${variable}") ++ + set(output "${output} ${pgxfile}") + + if("${output_var}" STREQUAL "${output}") + message(STATUS "equal: [${output_var}] vs [${output}]") ++ elseif("${alternate_output_var}" STREQUAL "libtiff_4_1:${output}") ++ message(STATUS "equal: [${alternate_output_var}] vs [libtiff_4_1:${output}]") + else() + message(SEND_ERROR "not equal: [${output_var}] vs [${output}]") + endif() +diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt +index a33e82a12..95d3d74cb 100644 +--- a/tests/nonregression/md5refs.txt ++++ b/tests/nonregression/md5refs.txt +@@ -180,6 +180,7 @@ dacaf60e4c430916a8c2a9ebec32e71c issue458.jp2_3.pgx + d33fb5dbddb9b9b4438eb51fa27445a3 issue495.jp2_0.pgx + 27db8c35e12a5d5eb94d403d2aae2909 issue495.jp2_1.pgx + 97da625d2f2d0b75bf891d8083ce8bfb issue495.jp2_2.pgx ++ + 86729c5f2b74b2dfd42cb0d8e47aef79 a1_mono_tif-1.tif + fa9b7b896536b25a7a1d8eeeacb59141 a1_mono_tif-10.tif + e1f194f69d1c58ce8bed62cd4f1d5b6a a1_mono_tif-11.tif +@@ -196,6 +197,24 @@ de53251a33356e206a793fbdbaf90db2 a1_mono_tif-13.tif + e164a6c0219737ee05a3d55d6e3a3104 a1_mono_tif-7.tif + c3ebfcf478b1c4fc786748813f2b5d53 a1_mono_tif-8.tif + 67adb084f1fe234f240a1d0b2698507e a1_mono_tif-9.tif ++ ++libtiff_4_1:fc19057ff2d65c24daf9c9e25e34a48a a1_mono_tif-1.tif ++libtiff_4_1:66246b6bbc83c06962f034235acb9924 a1_mono_tif-10.tif ++libtiff_4_1:ce1e07bdafe83a84a5df87fce2ffde6a a1_mono_tif-11.tif ++libtiff_4_1:614f1ab59ca8473f5f8b1772b7a19d24 a1_mono_tif-12.tif ++libtiff_4_1:941bdcdf9103a22f7b6f66aaca3276d1 a1_mono_tif-13.tif ++libtiff_4_1:38df45296861df2b44879e8a0787d43c a1_mono_tif-14.tif ++libtiff_4_1:387575ff38bed3d177776891e1b2804e a1_mono_tif-15.tif ++libtiff_4_1:ee4838fbd88ddcb73ef26df523a3bb5d a1_mono_tif-16.tif ++libtiff_4_1:6de7e8cbd95e2c465b587f2273daf9dc a1_mono_tif-2.tif ++libtiff_4_1:e1e026d7ed26e8f3334cf25a8884abbd a1_mono_tif-3.tif ++libtiff_4_1:c120fac03d1b3756a2deb9b92ba519d4 a1_mono_tif-4.tif ++libtiff_4_1:3a7b84ed9061e0b13996660fc2910e8a a1_mono_tif-5.tif ++libtiff_4_1:7ac8316261d54f22e6c847fbac01542b a1_mono_tif-6.tif ++libtiff_4_1:d714670f6746931c4e7defbfbe38b249 a1_mono_tif-7.tif ++libtiff_4_1:b28f4b92be5e3481d44f50f2cd7626aa a1_mono_tif-8.tif ++libtiff_4_1:2a12dcda3e9927384e7344c4ecabdcf1 a1_mono_tif-9.tif ++ + 31650ec40241737634179fff6ad306f8 basn4a08_tif-1.tif + abf884080bcfbf58c044a9d86bfa5e5d basn4a08_tif-10.tif + b0d82c12aa2c9b3ecd96c6a5b5663a8c basn4a08_tif-11.tif +@@ -212,6 +231,24 @@ fb5cf848d63c61dc485c87c9246ee9c7 basn4a08_tif-16.tif + 18a59ac6036ee64e92af19b7e3cd3d64 basn4a08_tif-7.tif + dc40cc1da6de28e7e973c8ba796ca189 basn4a08_tif-8.tif + 824b776a5aa3459b77894b5f77621311 basn4a08_tif-9.tif ++ ++libtiff_4_1:4c50df5b25e006041b05e8a6fb77c95e basn4a08_tif-1.tif ++libtiff_4_1:68cc9a9bc5f95474744d06ea4efb2cf3 basn4a08_tif-10.tif ++libtiff_4_1:f643c00bd0673c8f6092125e38759a35 basn4a08_tif-11.tif ++libtiff_4_1:cfcefece2fb08a437876d85941cdaa27 basn4a08_tif-12.tif ++libtiff_4_1:1c3850831691aa8b565e4cd0d13166f9 basn4a08_tif-13.tif ++libtiff_4_1:06059e0429956946ecd3b1893ad39d18 basn4a08_tif-14.tif ++libtiff_4_1:71557ba6728e6641ad289b1d142acade basn4a08_tif-15.tif ++libtiff_4_1:150c663277b43d0331112f24d47fd34e basn4a08_tif-16.tif ++libtiff_4_1:9b43011e7a19079c21d65318b4a1139b basn4a08_tif-2.tif ++libtiff_4_1:125ca7b2e45fafa4e003f5adc9f11da8 basn4a08_tif-3.tif ++libtiff_4_1:9fbc1a8f4d12c8152cde3e004cebd191 basn4a08_tif-4.tif ++libtiff_4_1:51c6b54e9d8b53355c3f73ad813bdeef basn4a08_tif-5.tif ++libtiff_4_1:604ac42b1a9e7a75d63e97ce40e43442 basn4a08_tif-6.tif ++libtiff_4_1:360d1ce74faffa1a736d5f30c22976ed basn4a08_tif-7.tif ++libtiff_4_1:2059aaa9e54c09f36d16107870c1546a basn4a08_tif-8.tif ++libtiff_4_1:07496859507882401d66d70dcf392505 basn4a08_tif-9.tif ++ + 59e32c45591fd3bb44fe99381a116ba1 basn6a08_tif-1.tif + 630e6fb6deba0b3efd93b610561d607a basn6a08_tif-10.tif + 5419fec92f0e0e5907d838dacf9712b4 basn6a08_tif-11.tif +@@ -228,6 +265,24 @@ d60864a6a5c8a49a202d98ae6f5165c7 basn6a08_tif-6.tif + 086fd12fec963995fe2e405dcef7e477 basn6a08_tif-7.tif + c3e93f61125f82a9832d0b9440468034 basn6a08_tif-8.tif + a9723dcc0732e74c9e8cd2bf93474a7d basn6a08_tif-9.tif ++ ++libtiff_4_1:98f777ca80a132d8ab820d4533daa5b6 basn6a08_tif-1.tif ++libtiff_4_1:9c5873a1fa5571aad9e73d36d5a4206a basn6a08_tif-10.tif ++libtiff_4_1:c05dac7d4c19bc4b78cea426e5e52430 basn6a08_tif-11.tif ++libtiff_4_1:0223432f61df2508d0195f696988ddeb basn6a08_tif-12.tif ++libtiff_4_1:ccc64d14279063ed9daf371be62077f7 basn6a08_tif-13.tif ++libtiff_4_1:ace0bab2c2fbb5f92a8214600df9159f basn6a08_tif-14.tif ++libtiff_4_1:9b54bda92a09bcac9870fa02b428b7e6 basn6a08_tif-15.tif ++libtiff_4_1:178665d070f54f2920521c4e1cb9d5d0 basn6a08_tif-16.tif ++libtiff_4_1:c4b1e96d19429137cd8871833af2ea5a basn6a08_tif-2.tif ++libtiff_4_1:44e8b5591740289d0ca52a3e19f19c22 basn6a08_tif-3.tif ++libtiff_4_1:70b4f469dd29c8e99d3f0525301286b8 basn6a08_tif-4.tif ++libtiff_4_1:bf7c35a2b05eecb406aab7959431a842 basn6a08_tif-5.tif ++libtiff_4_1:7d2ecb1c35869ddbafd11b4896357b81 basn6a08_tif-6.tif ++libtiff_4_1:2cd6ec32a0256806f46706c0ca564d9d basn6a08_tif-7.tif ++libtiff_4_1:116b611b7a358bee2c4f2695732ec357 basn6a08_tif-8.tif ++libtiff_4_1:ed9ca54d25fb5b0cd5339eedfa16cbea basn6a08_tif-9.tif ++ + cfe04d15cf9d615fc36357dcb3b3956b p0_14_tif-1.tif + 9ad87e7fddc77ac85e2e92509bee2365 p0_14_tif-10.tif + f144e26d6d5aa24d98f0415f10751025 p0_14_tif-11.tif +@@ -244,6 +299,24 @@ b6f71c941e3a5b8d2547792ccec58d54 p0_14_tif-4.tif + 951c99efbd922d8f3feb015e9ef8e350 p0_14_tif-7.tif + 6808377b760b4ef3559ba8b14ed9b91a p0_14_tif-8.tif + 96aa7dafa873d0ce33f84bb1ff78fa9b p0_14_tif-9.tif ++ ++libtiff_4_1:5f97d4bbab138f99b6b125e5a5bf96bd p0_14_tif-1.tif ++libtiff_4_1:686c7a1561d73e53c000800ec0c5fa0a p0_14_tif-10.tif ++libtiff_4_1:a8585d901cc1b7cbbda6e524ecb5db35 p0_14_tif-11.tif ++libtiff_4_1:17b5497c9b8a0c68739c0beae90aa432 p0_14_tif-12.tif ++libtiff_4_1:a024a04b96ccb13c81cd57a5ee6ad07a p0_14_tif-13.tif ++libtiff_4_1:aabadca3f87437a32878fef7e265b23a p0_14_tif-14.tif ++libtiff_4_1:5390a77296962268b73a793467092633 p0_14_tif-15.tif ++libtiff_4_1:47dc7cc71832e5739c32794a713966c3 p0_14_tif-16.tif ++libtiff_4_1:1a9247cd1fb26f5fffa870e8543f6d30 p0_14_tif-2.tif ++libtiff_4_1:e4c0c9481d4032ea6b7e6a08a39e9030 p0_14_tif-3.tif ++libtiff_4_1:c7d6ec9b235aaff146228875e69edbaa p0_14_tif-4.tif ++libtiff_4_1:d3b8110b2284a09cfb7d5c4ffd451aff p0_14_tif-5.tif ++libtiff_4_1:6189ee17c4a276f99302ac7e296b3daa p0_14_tif-6.tif ++libtiff_4_1:b4a3b9b63681448abb7c460702de4df9 p0_14_tif-7.tif ++libtiff_4_1:04deb4e9679e7971c2cd0449fcd255b7 p0_14_tif-8.tif ++libtiff_4_1:254443e438ed6a5b0631d6188cc84789 p0_14_tif-9.tif ++ + dd15b3d487d36a3682be0679300a4319 issue235.jp2_0.pgx + b9cd6dc76b141fb1fec15f50c1f70e01 issue235.jp2_1.pgx + 3edef2ae197ef30b08deda1b28825399 issue235.jp2_2.pgx +@@ -288,6 +361,7 @@ fc2844a9f3c8e924e349180ba9e122dd p0_14_png-2.png + 8d7685f1569d446787476c0a56c93750 dwt_interleave_h.gsr105.jp2_1.pgx + ddfff2ce2df4a9102518c92a362e6d25 dwt_interleave_h.gsr105.jp2_2.pgx + 63bf755af5a1f8a478d65079dc7c8964 issue205-tif.jp2.tif ++libtiff_4_1:f9678a9e12d540f768ebebaee2af8f14 issue205-tif.jp2.tif + b01ed87dbac424bc820b2ac590e4884e issue236-ESYCC-CDEF.jp2_0.pgx + 2635cc00b1e18ef11adcba09e845d459 issue236-ESYCC-CDEF.jp2_1.pgx + f9c95d0aec2f6e7b814fa1d09edcdbda issue236-ESYCC-CDEF.jp2_2.pgx +@@ -310,11 +384,11 @@ d1bb7f93f4c0eb984b2e9c54e544b7e9 broken.jpc_1.pgx + b704ad4c0cfefffd78c20a54f5541265 dwt_interleave_h.gsr105.jp2_d_1_1_33_33_0.pgx + 9d7fe43cd7a50b7bbaf712926ee11980 dwt_interleave_h.gsr105.jp2_d_1_1_33_33_1.pgx + 0960b580f991ff10f693b24aa41ad58b dwt_interleave_h.gsr105.jp2_d_1_1_33_33_2.pgx +-fa7382fd8b2e788b28b807e200dd95b9 file1.jp2-c0.tif +-ed79b7fe443955cdefba2b039ddc846a file1.jp2-c0_1_2.tif +-ac8f6ab3acc9c692ed7c41bd62a0e1e8 file1.jp2-c0-r1.tif +-fbfcf662b6f7549574b2885490fbcf12 file1.jp2-c0-d10_20_30_40.tif +-fa7382fd8b2e788b28b807e200dd95b9 file1.jp2-c0-t0.tif +-ac8f6ab3acc9c692ed7c41bd62a0e1e8 file1.jp2-c0-t0-r1.tif ++6e23ded7d3ca0b1dd8405448e3ff931b file1.jp2-c0.png ++5acabea0ef6d09d2c1f681773e886935 file1.jp2-c0_1_2.png ++1150acbee2c1e33c57592c05c76e565a file1.jp2-c0-r1.png ++1b8ab42d8ee4e28d2868c04a815fb569 file1.jp2-c0-d10_20_30_40.png ++6e23ded7d3ca0b1dd8405448e3ff931b file1.jp2-c0-t0.png ++1150acbee2c1e33c57592c05c76e565a file1.jp2-c0-t0-r1.png + f31bcb01c771f829054cdb013575e86a issue1043.png + 62bc654c830efddf1b23d6e208447dab tnsot_zero.png +diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in +index c42bad162..bda0681f7 100644 +--- a/tests/nonregression/test_suite.ctest.in ++++ b/tests/nonregression/test_suite.ctest.in +@@ -612,22 +612,22 @@ opj_decompress -i @INPUT_NR_PATH@/issue979.j2k -o @TEMP_PATH@/issue979.j2k.pgx + opj_decompress -i @INPUT_NR_PATH@/dwt_interleave_h.gsr105.jp2 -o @TEMP_PATH@/dwt_interleave_h.gsr105.jp2_d_1_1_33_33.pgx -d 1,1,33,33 + + # partial component decoding with opj_decode(): one component +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.tif -c 0 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.png -c 0 + # partial component decoding with opj_decode(): 3 components without MCT +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.tif -c 0,1,2 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.png -c 0,1,2 + # partial component decoding with opj_decode() and opj_set_decode_area() +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.tif -c 0 -d 10,20,30,40 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.png -c 0 -d 10,20,30,40 + # partial component decoding with opj_decode() and reduced resolution +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.tif -c 0 -r 1 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.png -c 0 -r 1 + # partial component decoding with opj_get_decoded_tile() +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.tif -c 0 -t 0 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.png -c 0 -t 0 + # partial component decoding with opj_get_decoded_tile() and reduced resolution +-opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.tif -c 0 -t 0 -r 1 ++opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.png -c 0 -t 0 -r 1 + + # try to map the same component several times +-!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.tif -c 0,0 ++!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.png -c 0,0 + # try to map an invalid component +-!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.tif -c 10 ++!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.png -c 10 + + opj_decompress -i @INPUT_NR_PATH@/db11217111510058.jp2 -o @TEMP_PATH@/issue1043.png + diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild index 2ef44a80bc31..2ef40a90123c 100644 --- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild +++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/5" # based on SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RDEPEND=" diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild new file mode 100644 index 000000000000..fb58d28a6ca0 --- /dev/null +++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +# Make sure that test data are not newer than release; +# otherwise we will see "Found-But-No-Test" test failures! +MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e" + +DESCRIPTION="Open-source JPEG 2000 library" +HOMEPAGE="https://www.openjpeg.org" +SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20180620.tar.gz )" + +LICENSE="BSD-2" +SLOT="2/7" # based on SONAME +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/tiff:0 + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen )" + +DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) + +PATCHES=( + "${FILESDIR}/${PN}-2.3.1-gnuinstalldirs.patch" # bug 667150 + "${FILESDIR}/${P}-CVE-2020-6851.patch" + "${FILESDIR}/${P}-CVE-2020-8112.patch" + "${FILESDIR}/${P}-libtiff-4.1-compat.patch" +) + +src_prepare() { + if use test; then + mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || + die "Failed to rename test data" + fi + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 + -DBUILD_TESTING="$(multilib_native_usex test)" + -DBUILD_DOC=$(multilib_native_usex doc ON OFF) + -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) + + cmake_src_configure +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + elog "Cannot run tests for non-multilib abi." + return 0 + fi + + local myctestargs= + + pushd "${BUILD_DIR}" > /dev/null || die + [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" + + [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) + + echo ctest "${myctestargs[@]}" "$@" + if ctest "${myctestargs[@]}" "$@" ; then + einfo "Tests succeeded." + popd > /dev/null || die + return 0 + else + local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" + + if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then + # Should never happen + die "Cannot analyze test failures: LastTestsFailed.log is missing!" + fi + + echo "" + einfo "Note: Upstream is maintaining a list of known test failures." + einfo "We will now compare our test results against this list and sort out any known failure." + + local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" + cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die + + local ARCH_SPECIFIC_FAILURES= + if use amd64 ; then + ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" + elif use x86 || use arm || use arm64; then + ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" + fi + + if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then + einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." + cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die + fi + + # Logic copied from $S/tools/travis-ci/run.sh + local FAILEDTEST= + local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" + local HAS_UNKNOWN_TEST_FAILURES=0 + + echo "" + + awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" + while read FAILEDTEST; do + # is this failure known? + if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then + ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." + continue + fi + + eerror "New/unknown test failure found: '${FAILEDTEST}'" + HAS_UNKNOWN_TEST_FAILURES=1 + done < "${FAILURES_LOG}" + + if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then + die "Test suite failed. New/unknown test failure(s) found!" + else + echo "" + einfo "Test suite passed. No new/unknown test failure(s) found!" + fi + + return 0 + fi +} diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild deleted file mode 100644 index b2d977dc0fc4..000000000000 --- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org" -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20180620.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib:=" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.3.1-gnuinstalldirs.patch" # bug 667150 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - local myctestargs= - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - - echo ctest "${myctestargs[@]}" "$@" - if ctest "${myctestargs[@]}" "$@" ; then - einfo "Tests succeeded." - popd > /dev/null || die - return 0 - else - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then - # Should never happen - die "Cannot analyze test failures: LastTestsFailed.log is missing!" - fi - - echo "" - einfo "Note: Upstream is maintaining a list of known test failures." - einfo "We will now compare our test results against this list and sort out any known failure." - - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= - if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then - einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die - fi - - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" - local HAS_UNKNOWN_TEST_FAILURES=0 - - echo "" - - awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" - while read FAILEDTEST; do - # is this failure known? - if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then - ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." - continue - fi - - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - done < "${FAILURES_LOG}" - - if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then - die "Test suite failed. New/unknown test failure(s) found!" - else - echo "" - einfo "Test suite passed. No new/unknown test failure(s) found!" - fi - - return 0 - fi -} -- cgit v1.2.3