diff --git a/CVE-2024-31047.patch b/CVE-2024-31047.patch deleted file mode 100644 index 0b63645b5dafffc47112fd7516a9e63391eb7f27..0000000000000000000000000000000000000000 --- a/CVE-2024-31047.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ecc14d498b69617c29a2bb90ead2affd3677eca Mon Sep 17 00:00:00 2001 -From: shafeipaozi <2829702579@qq.com> -Date: Sun, 14 Jul 2024 18:42:21 +0800 -Subject: [PATCH] 2 - ---- - src/bin/exrmultipart/exrmultipart.cpp | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/bin/exrmultipart/exrmultipart.cpp b/src/bin/exrmultipart/exrmultipart.cpp -index f641a1e..64d4e0e 100644 ---- a/src/bin/exrmultipart/exrmultipart.cpp -+++ b/src/bin/exrmultipart/exrmultipart.cpp -@@ -295,13 +295,16 @@ convert ( - } - - Box2i dataWindow = infile.header (0).dataWindow (); -- int pixel_count = -- (dataWindow.size ().y + 1) * (dataWindow.size ().x + 1); -- int pixel_width = dataWindow.size ().x + 1; -- -+ // -+ // use int64_t for dimensions, since possible overflow int storage -+ // -+ int64_t pixel_count = (static_cast(dataWindow.size ().y) + 1) * (static_cast(dataWindow.size ().x) + 1); -+ int64_t pixel_width = static_cast(dataWindow.size ().x) + 1; -+ // - // offset in pixels between base of array and 0,0 -- int pixel_base = dataWindow.min.y * pixel_width + dataWindow.min.x; -- -+ // use int64_t for dimensions, since dataWindow.min.y * pixel_width could overflow int storage -+ // -+ int64_t pixel_base = static_cast(dataWindow.min.y) * pixel_width + static_cast(dataWindow.min.x); - vector> channelstore (channel_count); - - // --- -2.42.0 - diff --git a/OpenEXR.spec b/OpenEXR.spec index 47044864c1b4b3565a130ddb2438e52e8265471c..3a69629ec79c53f127348c25a86721e3b93d6ab1 100644 --- a/OpenEXR.spec +++ b/OpenEXR.spec @@ -1,17 +1,14 @@ - -%global sover 31 +%global sover 32 Name: OpenEXR Summary: A high dynamic-range (HDR) image file format for use in computer imaging applications -Version: 3.2.4 -Release: 2 +Version: 3.3.5 +Release: 1 License: BSD-3-Clause URL: http://www.openexr.com/ Source0: https://github.com/AcademySoftwareFoundation/openexr/archive/v%{version}/openexr-%{version}.tar.gz # for test images Source1: https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz -# https://github.com/AcademySoftwareFoundation/openexr/commit/df4d77471f2722025011da2e699d581d1e757f6b -Patch0: CVE-2024-31047.patch BuildRequires: gcc-c++ zlib-devel pkgconfig python3-devel BuildRequires: cmake gcc boost-devel pkgconfig(Imath) BuildRequires: libdeflate-devel @@ -69,11 +66,11 @@ EXCLUDE_REGEX='DWA[AB]Compression' %{_bindir}/* %files libs -%{_libdir}/libIex-3_2.so.%{sover}{,.*} -%{_libdir}/libIlmThread-3_2.so.%{sover}{,.*} -%{_libdir}/libOpenEXR-3_2.so.%{sover}{,.*} -%{_libdir}/libOpenEXRCore-3_2.so.%{sover}{,.*} -%{_libdir}/libOpenEXRUtil-3_2.so.%{sover}{,.*} +%{_libdir}/libIex-3_3.so.%{sover}{,.*} +%{_libdir}/libIlmThread-3_3.so.%{sover}{,.*} +%{_libdir}/libOpenEXR-3_3.so.%{sover}{,.*} +%{_libdir}/libOpenEXRCore-3_3.so.%{sover}{,.*} +%{_libdir}/libOpenEXRUtil-3_3.so.%{sover}{,.*} %files devel %doc %{_docdir}/%{name}/examples @@ -83,6 +80,9 @@ EXCLUDE_REGEX='DWA[AB]Compression' %{_libdir}/pkgconfig/OpenEXR.pc %changelog +* Mon Jul 28 2025 Funda Wang - 3.3.5-1 +- update to 3.3.5 + * Sat Mar 01 2025 Funda Wang - 3.2.4-2 - ship test images for use offline diff --git a/openexr-3.2.4.tar.gz b/openexr-3.3.5.tar.gz similarity index 32% rename from openexr-3.2.4.tar.gz rename to openexr-3.3.5.tar.gz index 1089185ba4b8f669ee574bdf417001980f15b445..973e0b1e78f2eb4f2ce58028b11f90709597fc14 100644 --- a/openexr-3.2.4.tar.gz +++ b/openexr-3.3.5.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81e6518f2c4656fdeaf18a018f135e96a96e7f66dbe1c1f05860dd94772176cc -size 18856440 +oid sha256:8f9241f0e9d6b7aec7e9509cf2a9224416b9cd9d41740deab3827b1f2d01c662 +size 21207074