From 062e85c3602264007a8dbfa174f670ed7fb1513b Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 31 Dec 2020 18:58:52 +0800 Subject: [PATCH 1/2] [patch tracking] 20201231185849762215 - https://github.com/uclouvain/openjpeg/commit/433edd0eea934e25f6e97aaf912ebed191fa41d1 --- 433edd0eea934e25f6e97aaf912ebed191fa41d1.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 433edd0eea934e25f6e97aaf912ebed191fa41d1.patch diff --git a/433edd0eea934e25f6e97aaf912ebed191fa41d1.patch b/433edd0eea934e25f6e97aaf912ebed191fa41d1.patch new file mode 100644 index 0000000..7c321a3 --- /dev/null +++ b/433edd0eea934e25f6e97aaf912ebed191fa41d1.patch @@ -0,0 +1,13 @@ +diff --git a/thirdparty/libz/gzguts.h b/thirdparty/libz/gzguts.h +index d87659d03..fb9198550 100644 +--- a/thirdparty/libz/gzguts.h ++++ b/thirdparty/libz/gzguts.h +@@ -3,6 +3,8 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#include ++ + #ifdef _LARGEFILE64_SOURCE + # ifndef _LARGEFILE_SOURCE + # define _LARGEFILE_SOURCE 1 -- Gitee From 4541c1d6672bac60313d6f39efcd8dc6cb42da1e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 31 Dec 2020 18:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20201231185849762215 - update spec file --- openjpeg2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659..cc44d99 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: 433edd0eea934e25f6e97aaf912ebed191fa41d1.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 +* 20201231185849762215 patch-tracking 2.3.1-4 +- append patch file of upstream repository from <433edd0eea934e25f6e97aaf912ebed191fa41d1> to <433edd0eea934e25f6e97aaf912ebed191fa41d1> + * 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