From 59cfaef2f9434561ff220688203240b7434e869e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 31 Dec 2020 21:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201231215849762387 - https://github.com/uclouvain/openjpeg/commit/2519439d7d4d0e51abf479afe73f30b1c7c70530 --- 2519439d7d4d0e51abf479afe73f30b1c7c70530.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 2519439d7d4d0e51abf479afe73f30b1c7c70530.patch diff --git a/2519439d7d4d0e51abf479afe73f30b1c7c70530.patch b/2519439d7d4d0e51abf479afe73f30b1c7c70530.patch new file mode 100644 index 0000000..1ac5c4f --- /dev/null +++ b/2519439d7d4d0e51abf479afe73f30b1c7c70530.patch @@ -0,0 +1,14 @@ +diff --git a/thirdparty/libz/gzguts.h b/thirdparty/libz/gzguts.h +index fb9198550..2c1a1bb73 100644 +--- a/thirdparty/libz/gzguts.h ++++ b/thirdparty/libz/gzguts.h +@@ -3,7 +3,9 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#ifndef _WIN32 + #include ++#endif + + #ifdef _LARGEFILE64_SOURCE + # ifndef _LARGEFILE_SOURCE -- Gitee From 36a711783ce227a7417678d71d653e99668f3622 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 31 Dec 2020 21:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201231215849762387 - update spec file --- openjpeg2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659..5a3a6e4 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: 2519439d7d4d0e51abf479afe73f30b1c7c70530.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 +* 20201231215849762387 patch-tracking 2.3.1-4 +- append patch file of upstream repository from <2519439d7d4d0e51abf479afe73f30b1c7c70530> to <2519439d7d4d0e51abf479afe73f30b1c7c70530> + * 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