diff --git a/a335b4d008359a32656026fa6780ef185b35cf0a.patch b/a335b4d008359a32656026fa6780ef185b35cf0a.patch new file mode 100644 index 0000000000000000000000000000000000000000..53448fa39d4bf7a7e862175bc23a8ea4e678c5de --- /dev/null +++ b/a335b4d008359a32656026fa6780ef185b35cf0a.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h +index 4bbd9a8b2..269ac329a 100644 +--- a/src/lib/openjp2/openjpeg.h ++++ b/src/lib/openjp2/openjpeg.h +@@ -78,7 +78,7 @@ Most compilers implement their own version of this keyword ... + + #if defined(OPJ_STATIC) || !defined(_WIN32) + /* http://gcc.gnu.org/wiki/Visibility */ +-# if __GNUC__ >= 4 ++# if !defined(_WIN32) && __GNUC__ >= 4 + # if defined(OPJ_STATIC) /* static library uses "hidden" */ + # define OPJ_API __attribute__ ((visibility ("hidden"))) + # else diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659b73c65905a1966d52fcfe88112813f68a..644cde99b7fe911ed80ae92eec36f28d0e4d3fe0 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: a335b4d008359a32656026fa6780ef185b35cf0a.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 +* 20201229045849760318 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