Hello community, here is the log from the commit of package ilmbase for openSUSE:Factory checked in at 2019-11-18 20:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ilmbase (Old) and /work/SRC/openSUSE:Factory/.ilmbase.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ilmbase" Mon Nov 18 20:05:21 2019 rev:16 rq:748753 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ilmbase/ilmbase.changes 2018-11-12 09:50:30.528366870 +0100 +++ /work/SRC/openSUSE:Factory/.ilmbase.new.26869/ilmbase.changes 2019-11-18 20:05:42.821733815 +0100 @@ -1,0 +2,35 @@ +Thu Nov 14 18:39:07 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add Fix-the-symlinks-creation.patch to fix the symlinks creation. + +------------------------------------------------------------------- +Tue Oct 8 17:01:31 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Set correct includedir in IlmBase.pc pkgconfig file + +------------------------------------------------------------------- +Thu Sep 26 08:25:31 UTC 2019 - pgaj...@suse.com + +- version update to 2.4.0 + * Completely re-written CMake configuration files + * Improved support for building on Windows, via CMake + * Improved support for building on macOS, via CMake + * All code compiles without warnings on gcc, clang, msvc + * Cleanup of license and copyright notices + * floating-point exception handling is disabled by default + * New Slice::Make method to reliably compute base pointer for a slice. + * Miscellaneous bug fixes + * CVE-2018-18444 Issue #351 Out of Memory + * CVE-2018-18443 Issue #350 heap-buffer-overflow +- upstream does not provide gpg signature anymore + https://github.com/openexr/openexr/issues/565 +- modified sources + % baselibs.conf +- deleted patches + - testBox.patch (upstreamed) + - testBoxAlgo.patch (upstreamed) +- deleted sources + - ilmbase-2.3.0.tar.gz.sig (not needed) + - ilmbase.keyring (not needed) + +------------------------------------------------------------------- Old: ---- ilmbase-2.3.0.tar.gz ilmbase-2.3.0.tar.gz.sig ilmbase.keyring testBox.patch testBoxAlgo.patch New: ---- Fix-the-symlinks-creation.patch v2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ilmbase.spec ++++++ --- /var/tmp/diff_new_pack.gW2xTB/_old 2019-11-18 20:05:44.461732992 +0100 +++ /var/tmp/diff_new_pack.gW2xTB/_new 2019-11-18 20:05:44.465732990 +0100 @@ -1,7 +1,7 @@ # # spec file for package ilmbase # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,24 +19,19 @@ %define asan_build 0 %define debug_build 0 %define sonum 24 -%global so_suffix -2_3-24 +%global so_suffix -2_4 Name: ilmbase -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Base library for ILM software (OpenEXR) License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://www.openexr.com -Source0: https://github.com/openexr/openexr/releases/download/v%{version}/ilmbase-%{version}.tar.gz -Source1: https://github.com/openexr/openexr/releases/download/v%{version}/ilmbase-%{version}.tar.gz.sig -Source2: baselibs.conf -Source3: https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=openexr&download=1#/ilmbase.keyring -#PATCH-FIX-OPENSUSE: testBox.patch allow fuzzy comparison of floats, doubles -Patch0: testBox.patch -#PATCH-FIX-OPENSUSE: testBoxAlgo.patch allow fuzzy match of b12 == b2 -Patch1: testBoxAlgo.patch -BuildRequires: autoconf -BuildRequires: automake +Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz +Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: Fix-the-symlinks-creation.patch +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -64,114 +59,64 @@ # Renamed to libilmbase6 to met the Shared Library Policy License: BSD-3-Clause AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libHalf%{sonum} -Requires: libIex%{so_suffix} -Requires: libIexMath%{so_suffix} -Requires: libIlmThread%{so_suffix} -Requires: libImath%{so_suffix} +Requires: libHalf%{so_suffix}-%{sonum} +Requires: libIex%{so_suffix}-%{sonum} +Requires: libIexMath%{so_suffix}-%{sonum} +Requires: libIlmThread%{so_suffix}-%{sonum} +Requires: libImath%{so_suffix}-%{sonum} Requires: libstdc++-devel -Obsoletes: IlmBase-devel <= 1.0.1 -Provides: IlmBase-devel = %{version} -Obsoletes: libilmbase-devel <= 1.0.2 -Provides: libilmbase-devel = %{version} %description devel Devel files for ilmbase Base library for Industrial Light & Magic software (OpenEXR). -%files devel -%doc AUTHORS ChangeLog NEWS README* -%license LICENSE -%{_includedir}/OpenEXR -%{_libdir}/libHalf.so -%{_libdir}/libIex.so -%{_libdir}/libImath.so -%{_libdir}/libIlmThread.so -%{_libdir}/libIexMath.so -%{_libdir}/pkgconfig/IlmBase.pc - -%package -n libHalf%{sonum} +%package -n libHalf%{so_suffix}-%{sonum} Summary: 16-bit floating-point encapsulation class for OpenEXR License: BSD-3-Clause Group: System/Libraries -%description -n libHalf%{sonum} +%description -n libHalf%{so_suffix}-%{sonum} %{summary}. -%post -n libHalf%{sonum} -p /sbin/ldconfig -%postun -n libHalf%{sonum} -p /sbin/ldconfig - -%files -n libHalf%{sonum} -%{_libdir}/libHalf.so.* - -%package -n libIexMath%{so_suffix} +%package -n libIexMath%{so_suffix}-%{sonum} Summary: Exception-based vector/matrix library for OpenEXR License: BSD-3-Clause Group: System/Libraries -%description -n libIexMath%{so_suffix} +%description -n libIexMath%{so_suffix}-%{sonum} %{summary}. -%post -n libIexMath%{so_suffix} -p /sbin/ldconfig -%postun -n libIexMath%{so_suffix} -p /sbin/ldconfig - -%files -n libIexMath%{so_suffix} -%{_libdir}/libIexMath*.so.* - -%package -n libIex%{so_suffix} +%package -n libIex%{so_suffix}-%{sonum} Summary: Exception handling library for OpenEXR License: BSD-3-Clause Group: System/Libraries -%description -n libIex%{so_suffix} +%description -n libIex%{so_suffix}-%{sonum} %{summary}. -%post -n libIex%{so_suffix} -p /sbin/ldconfig -%postun -n libIex%{so_suffix} -p /sbin/ldconfig - -%files -n libIex%{so_suffix} -%{_libdir}/libIex-*.so.* - -%package -n libIlmThread%{so_suffix} +%package -n libIlmThread%{so_suffix}-%{sonum} Summary: Thread abstraction library for OpenEXR License: BSD-3-Clause Group: System/Libraries -%description -n libIlmThread%{so_suffix} +%description -n libIlmThread%{so_suffix}-%{sonum} %{summary}. -%post -n libIlmThread%{so_suffix} -p /sbin/ldconfig -%postun -n libIlmThread%{so_suffix} -p /sbin/ldconfig - -%files -n libIlmThread%{so_suffix} -%{_libdir}/libIlmThread*.so.* - -%package -n libImath%{so_suffix} +%package -n libImath%{so_suffix}-%{sonum} Summary: Vector/matrix library for OpenEXR License: BSD-3-Clause Group: System/Libraries -%description -n libImath%{so_suffix} +%description -n libImath%{so_suffix}-%{sonum} %{summary}. -%post -n libImath%{so_suffix} -p /sbin/ldconfig -%postun -n libImath%{so_suffix} -p /sbin/ldconfig - -%files -n libImath%{so_suffix} -%{_libdir}/libImath*.so.* - %prep -%setup -q +%setup -q -n openexr-%{version} %patch0 -p1 -%patch1 -p1 %build -./bootstrap -export PTHREAD_LIBS="-lpthread" -%if %{debug_build} -export CXXFLAGS="%{optflags} -O0" -%endif -%configure --disable-static +pushd IlmBase +%cmake -DCMAKE_INSTALL_INCLUDE_DIR:path=%{_includedir} %if %{asan_build} vmemlimit=$(ulimit -v) if [ $vmemlimit != unlimited ]; then @@ -185,12 +130,68 @@ done %endif make %{?_smp_mflags} +popd %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +pushd IlmBase +%cmake_install +popd %check -make %{?_smp_mflags} check +# https://github.com/openexr/openexr/issues/570 +%ifnarch i586 +pushd IlmBase +export LD_LIBRARY_PATH="$PWD/build/Imath:$PWD/build/Iex:$PWD/build/Half:$LD_LIBRARY_PATH" +%ctest +popd +%endif + +%post -n libHalf%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libHalf%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libIexMath%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIexMath%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libImath%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libImath%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%files devel +%doc CHANGES.md CODE_OF_CONDUCT.md CODEOWNERS CONTRIBUTING.md CONTRIBUTORS.md README.md SECURITY.md +%license LICENSE.md +%{_includedir}/OpenEXR +%{_libdir}/libHalf.so +%{_libdir}/libHalf%{so_suffix}.so +%{_libdir}/libIex.so +%{_libdir}/libIex%{so_suffix}.so +%{_libdir}/libImath.so +%{_libdir}/libImath%{so_suffix}.so +%{_libdir}/libIlmThread.so +%{_libdir}/libIlmThread%{so_suffix}.so +%{_libdir}/libIexMath.so +%{_libdir}/libIexMath%{so_suffix}.so +%{_libdir}/pkgconfig/IlmBase.pc +%dir %{_libdir}/cmake/IlmBase/ +%{_libdir}/cmake/IlmBase/*.cmake + +%files -n libHalf%{so_suffix}-%{sonum} +%{_libdir}/libHalf%{so_suffix}.so.* + +%files -n libIexMath%{so_suffix}-%{sonum} +%{_libdir}/libIexMath%{so_suffix}.so.* + +%files -n libIex%{so_suffix}-%{sonum} +%{_libdir}/libIex%{so_suffix}.so.* + +%files -n libIlmThread%{so_suffix}-%{sonum} +%{_libdir}/libIlmThread%{so_suffix}.so.* + +%files -n libImath%{so_suffix}-%{sonum} +%{_libdir}/libImath%{so_suffix}.so.* %changelog ++++++ Fix-the-symlinks-creation.patch ++++++ >From 4e54bde78f65c0fef8a9f794aaacea07813fba09 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <aro...@archlinux.org> Date: Sat, 19 Oct 2019 09:58:10 +0200 Subject: [PATCH] Take DESTDIR into account when creating library symlinks --- IlmBase/config/LibraryDefine.cmake | 2 +- OpenEXR/config/LibraryDefine.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake index 0502825f..9fb92c1c 100644 --- a/IlmBase/config/LibraryDefine.cmake +++ b/IlmBase/config/LibraryDefine.cmake @@ -100,7 +100,7 @@ function(ILMBASE_DEFINE_LIBRARY libname) if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") set(verlibname) set(baselibname) diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake index 6946ca94..c5b6096a 100644 --- a/OpenEXR/config/LibraryDefine.cmake +++ b/OpenEXR/config/LibraryDefine.cmake @@ -94,7 +94,7 @@ function(OPENEXR_DEFINE_LIBRARY libname) if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") set(verlibname) set(baselibname) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.gW2xTB/_old 2019-11-18 20:05:44.513732965 +0100 +++ /var/tmp/diff_new_pack.gW2xTB/_new 2019-11-18 20:05:44.521732962 +0100 @@ -1,7 +1,7 @@ -libHalf24 -libImath-2_3-24 -libIlmThread-2_3-24 -libIexMath-2_3-24 -libIex-2_3-24 +libHalf-2_4-24 +libImath-2_4-24 +libIlmThread-2_4-24 +libIexMath-2_4-24 +libIex-2_4-24 obsoletes "IlmBase-<targettype> < <version>"
