diff --git a/61ff143ad63b9bbe12b6da266f8619b2cb2c3559.patch b/61ff143ad63b9bbe12b6da266f8619b2cb2c3559.patch new file mode 100644 index 0000000000000000000000000000000000000000..05c1d83b61eb4e16914099b4b57e5fafc82bcc14 --- /dev/null +++ b/61ff143ad63b9bbe12b6da266f8619b2cb2c3559.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openjp2/dwt.c b/src/lib/openjp2/dwt.c +index ee9eb5e63..4164ba090 100644 +--- a/src/lib/openjp2/dwt.c ++++ b/src/lib/openjp2/dwt.c +@@ -1976,7 +1976,7 @@ void opj_dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, OPJ_UINT32 prec) + if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) { + stepsize = 1.0; + } else { +- OPJ_FLOAT64 norm = opj_dwt_norms_real[orient][level]; ++ OPJ_FLOAT64 norm = opj_dwt_getnorm_real(level, orient); + stepsize = (1 << (gain)) / norm; + } + opj_dwt_encode_stepsize((OPJ_INT32) floor(stepsize * 8192.0), diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659b73c65905a1966d52fcfe88112813f68a..5ddc925fa59fae6084eefbca6fd50c47f84fc443 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,7 @@ Patch1: openjpeg2_opj2.patch Patch6000: CVE-2016-10505.patch Patch6001: CVE-2016-7445.patch Patch6002: CVE-2020-15389.patch +Patch6003: 61ff143ad63b9bbe12b6da266f8619b2cb2c3559.patch BuildRequires: cmake gcc-c++ make zlib-devel libpng-devel libtiff-devel lcms2-devel doxygen @@ -87,6 +88,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump. %{_mandir}/man3/*.3* %changelog +* 20201201185849762645 patch-tracking 2.3.1-4 +- append patch file of upstream repository from <61ff143ad63b9bbe12b6da266f8619b2cb2c3559> to <61ff143ad63b9bbe12b6da266f8619b2cb2c3559> + * Sat Jul 25 2020 zhangnaru -2.3.1-3 - fix CVE-2020-15389 @@ -94,4 +98,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