From e7ea672b1791b106732310052f34660cb62dcf6f5f665f38893cf9faa4c1afa2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 29 Jun 2020 12:44:27 +0000 Subject: [PATCH 1/2] - version update to 2.5.2 2.5.2 * Invalid input could cause a heap-use-after-free error in DeepScanLineInputFile::DeepScanLineInputFile() * Invalid chunkCount attributes could cause heap buffer overflow in getChunkOffsetTableSize() * Invalid tiled input file could cause invalid memory access TiledInputFile::TiledInputFile() * OpenEXRConfig.h now correctly sets OPENEXR_PACKAGE_STRING to "OpenEXR" (rather than "IlmBase") 2.5.1 * A patch release that corrects the SO version for the v2.5 release, which missed getting bumped in v2.5.0. * This release also fixes an improper failure in IlmImfTest when running on ARMv7 and AAarch64. 2.5.0 * No more build-time header generation: toFloat.h, eLut.h, b44ExpLogTable.h, and dwaLookups.h are now ordinary header files, no longer generated on the fly. * New StdISSTream class, an "input" stringstream version of StdOSStream * New Matrix22 class in Imath * Chromaticity comparison operator now includes white (formerly ignored) * Various cmake fixes * Bug fixes for various memory leaks * Bug fixes for various invalid memory accesses * New checks to detect damaged input files * OpenEXR_Viewers has been deprecated, removed from the top-level cmake build and documentation. - modified patches % 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch (refreshed) - modified sources % baselibs.conf OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=49 --- ...KE_INSTALL_FULL_LIBDIR-for-libdir-in.patch | 53 ++++++------------- baselibs.conf | 4 +- openexr.changes | 32 +++++++++++ openexr.spec | 6 +-- v2.5.2.tar.gz | 3 ++ 5 files changed, 57 insertions(+), 41 deletions(-) create mode 100644 v2.5.2.tar.gz diff --git a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch b/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch index e788a15..0acc8ea 100644 --- a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch +++ b/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch @@ -18,10 +18,10 @@ Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595 OpenEXR/config/CMakeLists.txt | 5 ++--- 4 files changed, 4 insertions(+), 8 deletions(-) -diff --git a/IlmBase/IlmBase.pc.in b/IlmBase/IlmBase.pc.in -index 45fc4de..1edd055 100644 ---- a/IlmBase/IlmBase.pc.in -+++ b/IlmBase/IlmBase.pc.in +Index: openexr-2.5.2/IlmBase/IlmBase.pc.in +=================================================================== +--- openexr-2.5.2.orig/IlmBase/IlmBase.pc.in 2020-06-14 03:26:22.000000000 +0200 ++++ openexr-2.5.2/IlmBase/IlmBase.pc.in 2020-06-29 13:41:03.671230961 +0200 @@ -4,7 +4,6 @@ ## @@ -30,26 +30,10 @@ index 45fc4de..1edd055 100644 libdir=@libdir@ includedir=@includedir@ libsuffix=@LIB_SUFFIX_DASH@ -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index 508176a..e533987 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -71,9 +71,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) - # use a helper function to avoid variable pollution, but pretty simple - function(ilmbase_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) -- set(libdir ${CMAKE_INSTALL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions -diff --git a/OpenEXR/OpenEXR.pc.in b/OpenEXR/OpenEXR.pc.in -index cf72f88..4df6035 100644 ---- a/OpenEXR/OpenEXR.pc.in -+++ b/OpenEXR/OpenEXR.pc.in +Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in +=================================================================== +--- openexr-2.5.2.orig/OpenEXR/OpenEXR.pc.in 2020-06-14 03:26:22.000000000 +0200 ++++ openexr-2.5.2/OpenEXR/OpenEXR.pc.in 2020-06-29 13:41:03.671230961 +0200 @@ -4,7 +4,6 @@ ## @@ -58,22 +42,19 @@ index cf72f88..4df6035 100644 libdir=@libdir@ includedir=@includedir@ OpenEXR_includedir=@includedir@/OpenEXR -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index 1ef829a..e068d2f 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt +Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt +=================================================================== +--- openexr-2.5.2.orig/OpenEXR/config/CMakeLists.txt 2020-06-29 13:41:03.671230961 +0200 ++++ openexr-2.5.2/OpenEXR/config/CMakeLists.txt 2020-06-29 13:42:39.243805692 +0200 @@ -72,9 +72,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) # use a helper function to avoid variable pollution, but pretty simple function(openexr_pkg_config_help pcinfile) set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) -- set(libdir ${CMAKE_INSTALL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +- set(exec_prefix "\${prefix}") +- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) if(TARGET Threads::Threads) # hrm, can't use properties as they end up as generator expressions --- -2.25.0 - diff --git a/baselibs.conf b/baselibs.conf index a1475c8..2116423 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libIlmImf-2_4-24 -libIlmImfUtil-2_4-24 +libIlmImf-2_5-25 +libIlmImfUtil-2_5-25 obsoletes "OpenEXR- < " diff --git a/openexr.changes b/openexr.changes index fa0c9a0..2a794d4 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Jun 29 12:44:02 UTC 2020 - pgajdos@suse.com + +- version update to 2.5.2 + 2.5.2 + * Invalid input could cause a heap-use-after-free error in DeepScanLineInputFile::DeepScanLineInputFile() + * Invalid chunkCount attributes could cause heap buffer overflow in getChunkOffsetTableSize() + * Invalid tiled input file could cause invalid memory access TiledInputFile::TiledInputFile() + * OpenEXRConfig.h now correctly sets OPENEXR_PACKAGE_STRING to "OpenEXR" (rather than "IlmBase") + 2.5.1 + * A patch release that corrects the SO version for the v2.5 release, + which missed getting bumped in v2.5.0. + * This release also fixes an improper failure in IlmImfTest when running + on ARMv7 and AAarch64. + 2.5.0 + * No more build-time header generation: toFloat.h, eLut.h, + b44ExpLogTable.h, and dwaLookups.h are now ordinary header files, no + longer generated on the fly. + * New StdISSTream class, an "input" stringstream version of StdOSStream + * New Matrix22 class in Imath + * Chromaticity comparison operator now includes white (formerly ignored) + * Various cmake fixes + * Bug fixes for various memory leaks + * Bug fixes for various invalid memory accesses + * New checks to detect damaged input files + * OpenEXR_Viewers has been deprecated, removed from the top-level + cmake build and documentation. +- modified patches + % 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch (refreshed) +- modified sources + % baselibs.conf + ------------------------------------------------------------------- Thu Apr 16 10:44:44 UTC 2020 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 5871fb2..edb97ad 100644 --- a/openexr.spec +++ b/openexr.spec @@ -19,10 +19,10 @@ # perhaps you want to build against corresponding ilmbase build %define asan_build 0 %define debug_build 0 -%define sonum 24 -%global so_suffix -2_4 +%define sonum 25 +%global so_suffix -2_5 Name: openexr -Version: 2.4.1 +Version: 2.5.2 Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause diff --git a/v2.5.2.tar.gz b/v2.5.2.tar.gz new file mode 100644 index 0000000..471ea0b --- /dev/null +++ b/v2.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5da8dff448d0c4a529e52c97daf238a461d01cd233944f75095668d6d7528761 +size 27525326 From b7a805a92fb5fdbf40d8b14bda6bea96655c436cc77cbe6f58f99cf10c222bb8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 6 Jul 2020 08:04:05 +0000 Subject: [PATCH 2/2] Accepting request 818885 from home:StefanBruens:branches:graphics - Fix 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch so pkgconfig file has no duplicate prefix. - Run test suite also on all other archs but i586 and ppc64(be) OBS-URL: https://build.opensuse.org/request/show/818885 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=50 --- ...KE_INSTALL_FULL_LIBDIR-for-libdir-in.patch | 74 ++++++++++++++----- openexr.changes | 7 ++ openexr.spec | 8 +- v2.4.1.tar.gz | 3 - 4 files changed, 65 insertions(+), 27 deletions(-) delete mode 100644 v2.4.1.tar.gz diff --git a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch b/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch index 0acc8ea..7292321 100644 --- a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch +++ b/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch @@ -1,4 +1,4 @@ -From d874a3ce5ad741ea61f42953c779d50ae93b66d6 Mon Sep 17 00:00:00 2001 +From e1084440d543f3045038cc4e5fdc0a67eabf06d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Mon, 10 Feb 2020 18:37:32 +0100 Subject: [PATCH] Use absolute CMAKE_INSTALL_FULL_LIBDIR for libdir in @@ -12,16 +12,17 @@ Remove unused exec_prefix variable. Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595 --- - IlmBase/IlmBase.pc.in | 1 - - IlmBase/config/CMakeLists.txt | 5 ++--- - OpenEXR/OpenEXR.pc.in | 1 - - OpenEXR/config/CMakeLists.txt | 5 ++--- - 4 files changed, 4 insertions(+), 8 deletions(-) + IlmBase/IlmBase.pc.in | 1 - + IlmBase/config/CMakeLists.txt | 4 ++-- + OpenEXR/OpenEXR.pc.in | 1 - + OpenEXR/config/CMakeLists.txt | 5 ++--- + PyIlmBase/config/CMakeLists.txt | 4 ++-- + 5 files changed, 6 insertions(+), 9 deletions(-) -Index: openexr-2.5.2/IlmBase/IlmBase.pc.in -=================================================================== ---- openexr-2.5.2.orig/IlmBase/IlmBase.pc.in 2020-06-14 03:26:22.000000000 +0200 -+++ openexr-2.5.2/IlmBase/IlmBase.pc.in 2020-06-29 13:41:03.671230961 +0200 +diff --git a/IlmBase/IlmBase.pc.in b/IlmBase/IlmBase.pc.in +index 45fc4de..1edd055 100644 +--- a/IlmBase/IlmBase.pc.in ++++ b/IlmBase/IlmBase.pc.in @@ -4,7 +4,6 @@ ## @@ -30,10 +31,25 @@ Index: openexr-2.5.2/IlmBase/IlmBase.pc.in libdir=@libdir@ includedir=@includedir@ libsuffix=@LIB_SUFFIX_DASH@ -Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in -=================================================================== ---- openexr-2.5.2.orig/OpenEXR/OpenEXR.pc.in 2020-06-14 03:26:22.000000000 +0200 -+++ openexr-2.5.2/OpenEXR/OpenEXR.pc.in 2020-06-29 13:41:03.671230961 +0200 +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index d9c5ae4..fc161b0 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -76,8 +76,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) + function(ilmbase_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") +- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions +diff --git a/OpenEXR/OpenEXR.pc.in b/OpenEXR/OpenEXR.pc.in +index cf72f88..4df6035 100644 +--- a/OpenEXR/OpenEXR.pc.in ++++ b/OpenEXR/OpenEXR.pc.in @@ -4,7 +4,6 @@ ## @@ -42,10 +58,10 @@ Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in libdir=@libdir@ includedir=@includedir@ OpenEXR_includedir=@includedir@/OpenEXR -Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt -=================================================================== ---- openexr-2.5.2.orig/OpenEXR/config/CMakeLists.txt 2020-06-29 13:41:03.671230961 +0200 -+++ openexr-2.5.2/OpenEXR/config/CMakeLists.txt 2020-06-29 13:42:39.243805692 +0200 +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index b52ad0d..59f4916 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt @@ -72,9 +72,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) # use a helper function to avoid variable pollution, but pretty simple function(openexr_pkg_config_help pcinfile) @@ -53,8 +69,26 @@ Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -+ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(includedir "\${prefix}/${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) if(TARGET Threads::Threads) # hrm, can't use properties as they end up as generator expressions +diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt +index 1872c89..a971723 100644 +--- a/PyIlmBase/config/CMakeLists.txt ++++ b/PyIlmBase/config/CMakeLists.txt +@@ -16,8 +16,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) + function(pyilmbase_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) ++ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) + set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) + string(REPLACE ".in" "" pcout ${pcinfile}) + configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY) +-- +2.27.0 + diff --git a/openexr.changes b/openexr.changes index 2a794d4..bbdecd4 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 5 22:46:48 UTC 2020 - Stefan Brüns + +- Fix 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch + so pkgconfig file has no duplicate prefix. +- Run test suite also on all other archs but i586 and ppc64(be) + ------------------------------------------------------------------- Mon Jun 29 12:44:02 UTC 2020 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index edb97ad..6bc1a29 100644 --- a/openexr.spec +++ b/openexr.spec @@ -102,7 +102,7 @@ Industrial Light & Magic for use in computer imaging applications. This package contains header files. %package doc -Summary: Documentatino for the 16-bit FP EXR picture handling library +Summary: Documentation for the 16-bit FP EXR picture handling library Group: Documentation/Other Obsoletes: OpenEXR-doc <= 1.6.1 Provides: OpenEXR-doc = %{version} @@ -137,7 +137,7 @@ for i in $(find -name Makefile); do $i done %endif -make %{?_smp_mflags} +%cmake_build popd %install @@ -146,9 +146,9 @@ pushd OpenEXR popd %check -%ifarch x86_64 +%ifnarch i586 ppc64 pushd OpenEXR -export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}" # tests can take longer than the default timeout of 25 minutes %if 0%{?suse_version} < 1550 # HACK - older versions of the ctest macro do not allow passing additional parameters diff --git a/v2.4.1.tar.gz b/v2.4.1.tar.gz deleted file mode 100644 index ab2d0e9..0000000 --- a/v2.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1 -size 26809861