From f4189e6b09a8a0267dd358f0e214f9776ec7bbd9 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 4 Jan 2021 17:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20210104175849761542 - https://github.com/uclouvain/openjpeg/commit/eb27272a79cd81256e475b9aad8461fda8b7f989 --- ...272a79cd81256e475b9aad8461fda8b7f989.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 eb27272a79cd81256e475b9aad8461fda8b7f989.patch diff --git a/eb27272a79cd81256e475b9aad8461fda8b7f989.patch b/eb27272a79cd81256e475b9aad8461fda8b7f989.patch new file mode 100644 index 0000000..648bb09 --- /dev/null +++ b/eb27272a79cd81256e475b9aad8461fda8b7f989.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a4107837..136d72878 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + #string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) + set(OPENJPEG_LIBRARY_NAME openjp2) + +-project(${OPENJPEG_NAMESPACE}) ++project(${OPENJPEG_NAMESPACE} C) + + # Do full dependency headers. + include_regular_expression("^.*$") +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index b0b229c8d..ebdcd9d4d 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -120,5 +120,6 @@ endif(BUILD_THIRDPARTY) + + #------------ + IF (WITH_ASTYLE) ++ enable_language(CXX) + ADD_SUBDIRECTORY(astyle) + ENDIF(WITH_ASTYLE) -- Gitee From c98f3c4dafd49e8511412f0e065122d3672db8ff Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 4 Jan 2021 17:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20210104175849761542 - update spec file --- openjpeg2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659..e6d6f38 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: eb27272a79cd81256e475b9aad8461fda8b7f989.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 +* 20210104175849761542 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