From d4a7affa15b8b74d15a2fc59cca1d48580c43815 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 29 Dec 2020 06:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201229065849761212 - https://github.com/uclouvain/openjpeg/commit/b897e2cb369b6944d791209f491f382a983cda87 --- b897e2cb369b6944d791209f491f382a983cda87.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 b897e2cb369b6944d791209f491f382a983cda87.patch diff --git a/b897e2cb369b6944d791209f491f382a983cda87.patch b/b897e2cb369b6944d791209f491f382a983cda87.patch new file mode 100644 index 0000000..fb6dcc0 --- /dev/null +++ b/b897e2cb369b6944d791209f491f382a983cda87.patch @@ -0,0 +1,13 @@ +diff --git a/NEWS.md b/NEWS.md +index 6ac913351..441c10542 100644 +--- a/NEWS.md ++++ b/NEWS.md +@@ -2,7 +2,7 @@ + + More details in the [CHANGELOG](https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md) + +-## OpenJPEG 2.4.0 (December 2021) ++## OpenJPEG 2.4.0 (December 2020) + + No API/ABI break compared to v2.3.1, but additional symbols for subset of components decoding (hence the MINOR version bump). + -- Gitee From ca767eeb31c7392aed778c50b12970d40865aab1 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 29 Dec 2020 06:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201229065849761212 - update spec file --- openjpeg2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659..e680199 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: b897e2cb369b6944d791209f491f382a983cda87.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 +* 20201229065849761212 patch-tracking 2.3.1-4 +- append patch file of upstream repository from to + * 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 -- Gitee