diff --git a/4980f46210f19bd2d83dffdfeb8496f29d68b9c9.patch b/4980f46210f19bd2d83dffdfeb8496f29d68b9c9.patch new file mode 100644 index 0000000000000000000000000000000000000000..6d841941e4bb22866b4dcf270ec1e72b64f8dcf5 --- /dev/null +++ b/4980f46210f19bd2d83dffdfeb8496f29d68b9c9.patch @@ -0,0 +1,13 @@ +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index d4f3ddbe6..e4f9b37cc 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) + + # install HTML documentation (install png files too): + install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html +- DESTINATION share/doc ++ DESTINATION ${OPENJPEG_INSTALL_DOC_DIR} + PATTERN ".svn" EXCLUDE + ) + else() diff --git a/6c5acd4d656870882432ff28d4103de80d109a8d.patch b/6c5acd4d656870882432ff28d4103de80d109a8d.patch new file mode 100644 index 0000000000000000000000000000000000000000..38d0c7ffb1575d7774c9c71e11e89eb3ab6235ac --- /dev/null +++ b/6c5acd4d656870882432ff28d4103de80d109a8d.patch @@ -0,0 +1,26 @@ +diff --git a/thirdparty/include/zlib.h b/thirdparty/include/zlib.h +index 3e0c7672a..d0fe3b8de 100644 +--- a/thirdparty/include/zlib.h ++++ b/thirdparty/include/zlib.h +@@ -487,7 +487,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. When processing + gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output +- producted so far. The CRC-32 is checked against the gzip trailer. ++ produced so far. The CRC-32 is checked against the gzip trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has +diff --git a/thirdparty/libz/zlib.h b/thirdparty/libz/zlib.h +index 3e0c7672a..d0fe3b8de 100644 +--- a/thirdparty/libz/zlib.h ++++ b/thirdparty/libz/zlib.h +@@ -487,7 +487,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. When processing + gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output +- producted so far. The CRC-32 is checked against the gzip trailer. ++ produced so far. The CRC-32 is checked against the gzip trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659b73c65905a1966d52fcfe88112813f68a..78e8f04e3abe1ef8c53e0432242d9dcd6fd7deef 100644 --- a/openjpeg2.spec +++ b/openjpeg2.spec @@ -1,6 +1,6 @@ Name: openjpeg2 Version: 2.3.1 -Release: 3 +Release: 4 Summary: C-Library for JPEG 2000 License: BSD and MIT URL: https://github.com/uclouvain/openjpeg @@ -12,6 +12,8 @@ Patch1: openjpeg2_opj2.patch Patch6000: CVE-2016-10505.patch Patch6001: CVE-2016-7445.patch Patch6002: CVE-2020-15389.patch +Patch6003: 6c5acd4d656870882432ff28d4103de80d109a8d.patch +Patch6004: 4980f46210f19bd2d83dffdfeb8496f29d68b9c9.patch BuildRequires: cmake gcc-c++ make zlib-devel libpng-devel libtiff-devel lcms2-devel doxygen @@ -87,6 +89,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump. %{_mandir}/man3/*.3* %changelog +* 20201229025849762823 patch-tracking 2.3.1-4 +- append patch file of upstream repository from <6c5acd4d656870882432ff28d4103de80d109a8d> to <4980f46210f19bd2d83dffdfeb8496f29d68b9c9> + * Sat Jul 25 2020 zhangnaru -2.3.1-3 - fix CVE-2020-15389 @@ -94,4 +99,4 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump. - fix CVE-2016-10505 and CVE-2016-7445 * Thu Sep 19 2019 openEuler Buildteam - 2.3.1-1 -- Package init +- Package init \ No newline at end of file