From 15a504cac21834a3afaa0ee53be5e2f46e2bb4046812f954b881870f056797c7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 5 Nov 2018 12:02:16 +0000 Subject: [PATCH 1/7] - updated to 2.3.0 * ThreadPool overhead improvements, enable custom thread pool to be registered via ThreadPoolProvider class * Fixes to enable custom namespaces for Iex, Imf * Improve read performance for deep/zipped data, and SIMD-accelerated uncompress support * Added rawPixelDataToBuffer() function for access to compressed scanlines * Iex::BaseExc no longer derived from std::string. * Imath throw() specifiers removed * Initial Support for Python 3 * removed patch OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=12 --- baselibs.conf | 4 ++-- ilmbase-2.3.0.tar.gz.sig | Bin 0 -> 566 bytes openexr-2.2.1.tar.gz | 3 --- openexr-2.2.1.tar.gz.sig | Bin 566 -> 0 bytes openexr-2.3.0.tar.gz | 3 +++ openexr.changes | 16 ++++++++++++++++ openexr.spec | 36 +++++++++++++++--------------------- 7 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 ilmbase-2.3.0.tar.gz.sig delete mode 100644 openexr-2.2.1.tar.gz delete mode 100644 openexr-2.2.1.tar.gz.sig create mode 100644 openexr-2.3.0.tar.gz diff --git a/baselibs.conf b/baselibs.conf index fc2bb05..8e2a8a5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libIlmImf-2_2-23 -libIlmImfUtil-2_2-23 +libIlmImf-2_3-24 +libIlmImfUtil-2_3-24 obsoletes "OpenEXR- < " diff --git a/ilmbase-2.3.0.tar.gz.sig b/ilmbase-2.3.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..934b292d95b99ca6a33a35c5842609a012d336782948b80e70bd6851da169051 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*UAYy0qaeZ*Fs6tAxD;(dV_##&Y0$ZSg5C94Z5U?v8 z-=g>;SFWBA0IrP4M((FWmlYNvQy3PI1^4G-Q0x#pT4wB;Et@CVMS_boE=~Z1jWwB^ zb>No^K*hcCWnR%kQ%hcnSVL4;U#+Fh7;%G29NOyA#n0hxm% z#E14`PW9?($6#okp6_^73pmk;wbfI^gVT(-6#vdpCJKzzNY&>{{&-9O<^3vXYJRZA z9%ks*sx@;ep@Fn=!m1OeXCf0`A6`;2oI*l+u7r#iV%m1y8<9fRY|G*jWM&SrTx|=_ zD2xBOQ=)s+to7f<@EYCAP@jzbbMEh0+)~M8;{A)PPl@B`G4Shn4lt_vT-947&5NZU zrGIgPFj6LK;X_uZ*(6zkdjwNa-49Y%Ll)Rh3H{|;OQ`6%2-s~x;)^&?BA;St>bewn z?xzUo?u{GwZ<9+Yp<_qMLsRy|V7VKu@F9RFL_5ed zLnLJ;Y;E#2bDMjbo0<-s?tPCYjadz=PO?e)!vtjykC4jMM5ia;Ds1UwLp19dPuEXd z)btqM(9Op=ES{<-R-8e9IM*8xH}?d7HJ-ax$@qL(9+TTO09&tr|{i=YgT`lUa Exf*p8&;S4c literal 0 HcmV?d00001 diff --git a/openexr-2.2.1.tar.gz b/openexr-2.2.1.tar.gz deleted file mode 100644 index 0e06d34..0000000 --- a/openexr-2.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd -size 18176639 diff --git a/openexr-2.2.1.tar.gz.sig b/openexr-2.2.1.tar.gz.sig deleted file mode 100644 index 9ffdf6b4087a4e059029c11e91f93675063cb6b1bf07244eed32fe02e64f8989..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*UAYy0qaeZ*Fs6tAxD;(dV_##&Y0$Lr`3jhiU5U?v8 z-=g>;S3tE7|76&P+1~b#`tG@2>`2T#{s+OIPzk!@ngrmZywbVek9_&D1HpLIz6Nj9 z{+|thWG2D`#!)GJwwUH-&8ctUf7#ijQ@r`zEaVQc_T;@aH{REt=jL{z?~@kY6A2r2GQTBslLYM}~i( z$mNY_)ykz=jc(51X6JcPc0_I9SVx$)jv$=-V#Z($;ifeX>ViQ~Eo{KUM3?nSiHF&z z7J4t?o`==9Y*rLroSa@P8KYIvC>=WhpdOSHzjK1Bh8PO^nO`&O+jRaKKsf5g*G#!d z1Uo&H8HVho=~yLCEqsTH9-I_QeXwgCc~m0a>n^`z`t-yet!`hRc#gp1e{SCG5e50K z8simQ6Rl!MdZX$MFJ9@rd2D##^SXB0XqDXelux=h z3RXlU0WYmNuCEnP(h(E#f>+gk?lsw7_Y##XfH9MFH$G{X?j^j14?e#PUxX2OfNu>$ EDezSg(EtDd diff --git a/openexr-2.3.0.tar.gz b/openexr-2.3.0.tar.gz new file mode 100644 index 0000000..d6935fc --- /dev/null +++ b/openexr-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd6cb3a87f8c1a233be17b94c74799e6241d50fc5efd4df75c7a4b9cf4e25ea6 +size 18412067 diff --git a/openexr.changes b/openexr.changes index 13ec75c..5924cee 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 5 11:19:12 UTC 2018 - Petr Gajdos + +- updated to 2.3.0 + * ThreadPool overhead improvements, enable custom thread pool + to be registered via ThreadPoolProvider class + * Fixes to enable custom namespaces for Iex, Imf + * Improve read performance for deep/zipped data, and + SIMD-accelerated uncompress support + * Added rawPixelDataToBuffer() function for access to + compressed scanlines + * Iex::BaseExc no longer derived from std::string. + * Imath throw() specifiers removed + * Initial Support for Python 3 + * removed patch + ------------------------------------------------------------------- Mon Jan 15 05:19:19 UTC 2018 - avindra@opensuse.org diff --git a/openexr.spec b/openexr.spec index 398ea05..868d710 100644 --- a/openexr.spec +++ b/openexr.spec @@ -12,23 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global so_suffix -2_2-23 +%global so_suffix -2_3-24 # tests should run at least during local build # but do expect a HUGE number of memory, so beware %bcond_with tests Name: openexr -Version: 2.2.1 +Version: 2.3.0 Release: 0 Summary: Utilities for work with HDR images in OpenEXR format License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://www.openexr.com/ -Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz -Source1: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz.sig +Source0: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz +Source1: https://github.com/openexr/openexr/releases/download/v%{version}/ilmbase-%{version}.tar.gz.sig Source2: baselibs.conf Source3: openexr.keyring BuildRequires: automake @@ -68,7 +68,7 @@ This package contains shared library libIlmImf %postun -n libIlmImf%{so_suffix} -p /sbin/ldconfig %files -n libIlmImf%{so_suffix} -%doc COPYING +%license LICENSE %{_libdir}/libIlmImf-*.so.* %package -n libIlmImfUtil%{so_suffix} @@ -85,7 +85,7 @@ This package contains shared library libIlmImfUtil %postun -n libIlmImfUtil%{so_suffix} -p /sbin/ldconfig %files -n libIlmImfUtil%{so_suffix} -%doc COPYING +%license LICENSE %{_libdir}/libIlmImfUtil-*.so.* %package devel @@ -122,18 +122,10 @@ This package contains a documentation %prep %setup -q -# poor man's fdupes -if cmp COPYING LICENSE; then - rm -rf LICENSE - ln -sf COPYING LICENSE -fi - -# remove non-linux file -rm README.OSX - %build export PTHREAD_LIBS="-lpthread" %configure \ + --docdir=%{_docdir}/%{name} \ --disable-static \ --with-pic \ --enable-large-stack \ @@ -146,16 +138,14 @@ make %{?_smp_mflags} %make_install find %{buildroot} -type f -name "*.la" -delete -print -install -d -m 0755 %{buildroot}%{_defaultdocdir}/ -mv %{buildroot}%{_datadir}/doc/OpenEXR-2* %{buildroot}%{_defaultdocdir}/%{name}-%{version} - %check %if %{with tests} make %{?_smp_mflags} check %endif %files -%doc AUTHORS ChangeLog COPYING LICENSE NEWS README* +%license LICENSE +%doc AUTHORS ChangeLog NEWS README* %{_bindir}/exrenvmap %{_bindir}/exrheader %{_bindir}/exrmakepreview @@ -172,6 +162,10 @@ make %{?_smp_mflags} check %{_datadir}/aclocal/openexr.m4 %files doc -%{_docdir}/%{name}-%{version} +%{_docdir}/%{name} +%exclude %{_docdir}/%{name}/AUTHORS +%exclude %{_docdir}/%{name}/ChangeLog +%exclude %{_docdir}/%{name}/NEWS +%exclude %{_docdir}/%{name}/README* %changelog From 3a209879db403e494f08c124a4f410647c8e3ab5030662a3a2ec6bc4b8466696 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 5 Nov 2018 15:47:17 +0000 Subject: [PATCH 2/7] Accepting request 646423 from home:jengelh:branches:graphics Remove useless trailing whitespace from changelog - Remove useless --with-pic. - Adjust RPM groups and repair sentence structure. OBS-URL: https://build.opensuse.org/request/show/646423 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=13 --- openexr.changes | 40 +++++++++++++++++++++++----------------- openexr.spec | 15 +++++++-------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/openexr.changes b/openexr.changes index 5924cee..2ba5820 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Mon Nov 5 13:22:33 UTC 2018 - Jan Engelhardt + +- Remove useless --with-pic. +- Adjust RPM groups and repair sentence structure. + ------------------------------------------------------------------- Mon Nov 5 11:19:12 UTC 2018 - Petr Gajdos - updated to 2.3.0 - * ThreadPool overhead improvements, enable custom thread pool + * ThreadPool overhead improvements, enable custom thread pool to be registered via ThreadPoolProvider class * Fixes to enable custom namespaces for Iex, Imf * Improve read performance for deep/zipped data, and @@ -17,14 +23,14 @@ Mon Nov 5 11:19:12 UTC 2018 - Petr Gajdos ------------------------------------------------------------------- Mon Jan 15 05:19:19 UTC 2018 - avindra@opensuse.org -- Update to 2.2.1 +- Update to 2.2.1 * Fix reported OpenEXR security vulnerabilities: CVE-2017-9110, CVE-2017-9111, CVE-2017-9112, CVE-2017-9113, CVE-2017-9114, CVE-2017-9115 and CVE-2017-9116 - pgajdos@suse.com: but really seem to fix only: CVE-2017-9110 [bsc#1040107], CVE-2017-9114 [bsc#1040114], CVE-2017-9116 [bsc#1040116], CVE-2017-12596 [bsc#1052522]; for - the rest of issues see [bsc#1040109], [bsc#1040112], + the rest of issues see [bsc#1040109], [bsc#1040112], [bsc#1040113], [bsc#1040114], [bsc#1040115], and [bsc#1061305] ------------------------------------------------------------------- @@ -64,7 +70,7 @@ Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com Thu Nov 28 10:22:05 UTC 2013 - toganm@opensuse.org - add openexr-2.1.0-headers.patch to install - ImfDeepImageStateAttribute.h header too + ImfDeepImageStateAttribute.h header too ------------------------------------------------------------------- Wed Nov 27 09:17:45 UTC 2013 - mvyskocil@suse.com @@ -74,7 +80,7 @@ Wed Nov 27 09:17:45 UTC 2013 - mvyskocil@suse.com data, optimisations for some of the python bindings to Imath, improvements to the cmake build environment as well as additional documentation describing deep data in more detail. -- make tests conditional, enable fuzz test and huge test +- make tests conditional, enable fuzz test and huge test ------------------------------------------------------------------- Mon Jul 15 11:00:04 UTC 2013 - mvyskocil@suse.com @@ -97,14 +103,14 @@ Fri Apr 12 13:43:33 UTC 2013 - mvyskocil@suse.com - update to 2.0.0 * Deep Data support - Pixels can now store a variable-length list of samples. The main rationale behind deep images is to enable the storage of multiple - values at different depths for each pixel. OpenEXR 2.0 supports both - hard-surface and volumetric representations for Deep Compositing workflows. + values at different depths for each pixel. OpenEXR 2.0 supports both + hard-surface and volumetric representations for Deep Compositing workflows. * Multi-part Image Files - With OpenEXR 2.0, files can now contain a number of separate, but related, data parts in one file. Access to any part is independent of the others, pixels from parts that are not required in the current operation don't need to be accessed, resulting in quicker read - times when accessing only a subset of channels. The multipart interface - also incorporates support for Stereo images where views are stored in + times when accessing only a subset of channels. The multipart interface + also incorporates support for Stereo images where views are stored in separate parts. This makes stereo OpenEXR 2.0 files significantly faster to work with than the previous multiview support in OpenEXR. * Optimized pixel reading - decoding RGB(A) scanline images has been @@ -112,7 +118,7 @@ Fri Apr 12 13:43:33 UTC 2013 - mvyskocil@suse.com both old and new format images, including multipart and multiview files. * Namespacing - The library introduces versioned namespaces to avoid conflicts between packages compiled with different versions of the library. -- obsoleted +- obsoleted openexr-suse-docdir.patch (moved in install phase) openexr-disable-tests.patch @@ -125,12 +131,12 @@ Thu Sep 27 14:51:27 UTC 2012 - cfarrell@suse.com ------------------------------------------------------------------- Thu Sep 27 09:20:21 UTC 2012 - idonmez@suse.com -- Update baselibs.conf +- Update baselibs.conf ------------------------------------------------------------------- Thu Aug 2 12:46:25 UTC 2012 - mvyskocil@suse.cz -- Update to 1.7.1 +- Update to 1.7.1 * Updated the .so verison to 7. * obsoletes openexr-includes.patch - require new ilmbase-devel for build @@ -141,7 +147,7 @@ Thu Aug 2 12:46:25 UTC 2012 - mvyskocil@suse.cz Tue Apr 24 13:26:54 UTC 2012 - mvyskocil@suse.cz - disable the test at all, as running them in OBS seems not to be - reliable + reliable ------------------------------------------------------------------- Sun Jan 29 17:50:27 UTC 2012 - jengelh@medozas.de @@ -194,7 +200,7 @@ Tue Aug 4 07:09:30 UTC 2009 - mvyskocil@suse.cz ------------------------------------------------------------------- Mon Mar 2 05:41:46 CET 2009 - crrodriguez@suse.de -- save 6.7MB by removing static libraries and "la" files +- save 6.7MB by removing static libraries and "la" files ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de @@ -239,7 +245,7 @@ Tue Jan 16 10:44:14 CET 2007 - meissner@suse.de ------------------------------------------------------------------- Mon Jun 12 15:40:26 CEST 2006 - dmueller@suse.de -- fix shared lib dependencies +- fix shared lib dependencies - fix installed headers ------------------------------------------------------------------- @@ -255,7 +261,7 @@ Mon Nov 7 15:06:31 CET 2005 - sndirsch@suse.de ------------------------------------------------------------------- Wed Nov 2 21:53:50 CET 2005 - dmueller@suse.de -- don't build as root +- don't build as root ------------------------------------------------------------------- Wed May 25 14:49:41 CEST 2005 - adrian@suse.de @@ -270,7 +276,7 @@ Mon May 23 16:21:09 CEST 2005 - schwab@suse.de ------------------------------------------------------------------- Thu Jan 13 14:30:26 CET 2005 - ro@suse.de -- try to fix docu installation +- try to fix docu installation ------------------------------------------------------------------- Mon Jun 28 13:59:35 CEST 2004 - adrian@suse.de diff --git a/openexr.spec b/openexr.spec index 868d710..f035f9d 100644 --- a/openexr.spec +++ b/openexr.spec @@ -23,7 +23,7 @@ Name: openexr Version: 2.3.0 Release: 0 -Summary: Utilities for work with HDR images in OpenEXR format +Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://www.openexr.com/ @@ -56,7 +56,7 @@ contains a set of utilities to work with this format. %package -n libIlmImf%{so_suffix} Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libIlmImf%{so_suffix} OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -73,7 +73,7 @@ This package contains shared library libIlmImf %package -n libIlmImfUtil%{so_suffix} Summary: Library to simplify development of OpenEXR utilities -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libIlmImfUtil%{so_suffix} OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -89,7 +89,7 @@ This package contains shared library libIlmImfUtil %{_libdir}/libIlmImfUtil-*.so.* %package devel -Summary: Library to Handle EXR Pictures (16-bit floating-point format) +Summary: Development files for the 16-bit FP EXR picture handling library Group: Development/Libraries/C and C++ Requires: libIlmImf%{so_suffix} = %{version} Requires: libIlmImfUtil%{so_suffix} = %{version} @@ -108,8 +108,8 @@ Industrial Light & Magic for use in computer imaging applications. This package contains header files. %package doc -Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format -Group: Development/Libraries/C and C++ +Summary: Documentatino for the 16-bit FP EXR picture handling library +Group: Documentation/PDF Obsoletes: OpenEXR-doc <= 1.6.1 Provides: OpenEXR-doc = %{version} @@ -117,7 +117,7 @@ Provides: OpenEXR-doc = %{version} OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. -This package contains a documentation +This package contains documentation. %prep %setup -q @@ -127,7 +127,6 @@ export PTHREAD_LIBS="-lpthread" %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ - --with-pic \ --enable-large-stack \ --enable-imfexamples \ --enable-imffuzztest \ From 810a498b42f2fc3c87c79fa99ad79b96215cdca69f36001260c902cb85496a4a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 6 Nov 2018 09:41:12 +0000 Subject: [PATCH 3/7] - asan_build: build ASAN included - debug_build: build more suitable for debugging OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=14 --- ilmbase-2.3.0.tar.gz.sig | Bin 566 -> 0 bytes openexr-2.3.0.tar.gz.sig | Bin 0 -> 566 bytes openexr.changes | 6 ++++++ openexr.spec | 19 ++++++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) delete mode 100644 ilmbase-2.3.0.tar.gz.sig create mode 100644 openexr-2.3.0.tar.gz.sig diff --git a/ilmbase-2.3.0.tar.gz.sig b/ilmbase-2.3.0.tar.gz.sig deleted file mode 100644 index 934b292d95b99ca6a33a35c5842609a012d336782948b80e70bd6851da169051..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*UAYy0qaeZ*Fs6tAxD;(dV_##&Y0$ZSg5C94Z5U?v8 z-=g>;SFWBA0IrP4M((FWmlYNvQy3PI1^4G-Q0x#pT4wB;Et@CVMS_boE=~Z1jWwB^ zb>No^K*hcCWnR%kQ%hcnSVL4;U#+Fh7;%G29NOyA#n0hxm% z#E14`PW9?($6#okp6_^73pmk;wbfI^gVT(-6#vdpCJKzzNY&>{{&-9O<^3vXYJRZA z9%ks*sx@;ep@Fn=!m1OeXCf0`A6`;2oI*l+u7r#iV%m1y8<9fRY|G*jWM&SrTx|=_ zD2xBOQ=)s+to7f<@EYCAP@jzbbMEh0+)~M8;{A)PPl@B`G4Shn4lt_vT-947&5NZU zrGIgPFj6LK;X_uZ*(6zkdjwNa-49Y%Ll)Rh3H{|;OQ`6%2-s~x;)^&?BA;St>bewn z?xzUo?u{GwZ<9+Yp<_qMLsRy|V7VKu@F9RFL_5ed zLnLJ;Y;E#2bDMjbo0<-s?tPCYjadz=PO?e)!vtjykC4jMM5ia;Ds1UwLp19dPuEXd z)btqM(9Op=ES{<-R-8e9IM*8xH}?d7HJ-ax$@qL(9+TTO09&tr|{i=YgT`lUa Exf*p8&;S4c diff --git a/openexr-2.3.0.tar.gz.sig b/openexr-2.3.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..86c6eaccb699a2f77f3dd29303eca454070fb63f85c9261a5bb5a2f5ce3b9611 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*UAYy0qaeZ*Fs6tAxD;(dV_##&Y0$ZSg8UP9j5U?v8 z-=g>;S0BI+{SdNSW_ZOF-nmLy=B|TC=olIY9z@v3;6`2?Aex&ETeu?4(fg> zz_!0is}7X+a>cj=pofAt;_W$o35h!5bsrhMIan9=p}7sKBQwz%sBWclk$PwOUNsO& z!(Sk{kib*8!zk3Sz@sUsgo97+n;UiM;=2H7=7fZpW(e^S20R5j%>K&BNfESTADa%b z`Yt@8kvDD_hut$%xSkpmb^9K5BLjE*e+|4Jh$xu8d`i=ala+#UA>?XA*!m=GoIDeLVo-DVwSVB|Ajx-ye;d%ml7mFKi1Ap8^*CgLs6>-hzcS56Fo zX?WCL;o&sGU7PBRHJuh>#+P<<85b(-oQ;P4 zV3lCRNxf@=pXzU&EC?JdT=xfTRup=Z`=iKy^GemK(wd@F%m&+#SHRYn@S%0=aMYCO zEnQpaIipmOlWGPJf%k8g&{h4vYeNUl%Jnyt4kf3%WCQJnhD*KQbLW7G%P9)CGeXN| z{o0Mxt61P4L@-fMm{?QQONtsP + +- asan_build: build ASAN included +- debug_build: build more suitable for debugging + ------------------------------------------------------------------- Mon Nov 5 13:22:33 UTC 2018 - Jan Engelhardt diff --git a/openexr.spec b/openexr.spec index f035f9d..b983bf3 100644 --- a/openexr.spec +++ b/openexr.spec @@ -16,6 +16,9 @@ # +# perhaps you want to build against corresponding ilmbase build +%define asan_build 0 +%define debug_build 0 %global so_suffix -2_3-24 # tests should run at least during local build # but do expect a HUGE number of memory, so beware @@ -28,7 +31,7 @@ License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://www.openexr.com/ Source0: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz -Source1: https://github.com/openexr/openexr/releases/download/v%{version}/ilmbase-%{version}.tar.gz.sig +Source1: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz.sig Source2: baselibs.conf Source3: openexr.keyring BuildRequires: automake @@ -124,6 +127,9 @@ This package contains documentation. %build export PTHREAD_LIBS="-lpthread" +%if %{debug_build} +export CXXFLAGS="%{optflags} -O0" +%endif %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ @@ -131,6 +137,17 @@ export PTHREAD_LIBS="-lpthread" --enable-imfexamples \ --enable-imffuzztest \ --enable-imfhugetest +%if %{asan_build} +for i in $(find -name Makefile | grep -v 'IlmImf/Makefile'); do + sed -i -e 's/\(^CXXFLAGS.*\)/\1 -fsanitize=address/' \ + -e 's/\(^LIBS =.*\)/\1 -lasan/' \ + $i +done +# IlmImf/Makefile requires special handling: IlmImf/b44ExpLogTable and IlmImf/eLut +# helpers will run during build; but asan is not compatible with ulimit -v limitation +sed -i -e 's/\($(AM_V_CXX)$(LTCXXCOMPILE)\)/\1 -fsanitize=address/' IlmImf/Makefile +sed -i -e 's/\(^libIlmImf_la_LIBADD.*\)/\1 -lasan/' IlmImf/Makefile +%endif make %{?_smp_mflags} %install From 86e367887f4b3a89574d7fbee6582c88c211ec5669735a811d5bed04b825431a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 6 Nov 2018 12:36:12 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=15 --- openexr.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openexr.spec b/openexr.spec index b983bf3..8ffbd0e 100644 --- a/openexr.spec +++ b/openexr.spec @@ -138,15 +138,16 @@ export CXXFLAGS="%{optflags} -O0" --enable-imffuzztest \ --enable-imfhugetest %if %{asan_build} -for i in $(find -name Makefile | grep -v 'IlmImf/Makefile'); do +vmemlimit=$(ulimit -v) +if [ $vmemlimit != unlimited ]; then + echo "ulimit -v has to be unlimited (currently $vmemlimit) to run ASAN build" + exit 1 +fi +for i in $(find -name Makefile); do sed -i -e 's/\(^CXXFLAGS.*\)/\1 -fsanitize=address/' \ -e 's/\(^LIBS =.*\)/\1 -lasan/' \ $i done -# IlmImf/Makefile requires special handling: IlmImf/b44ExpLogTable and IlmImf/eLut -# helpers will run during build; but asan is not compatible with ulimit -v limitation -sed -i -e 's/\($(AM_V_CXX)$(LTCXXCOMPILE)\)/\1 -fsanitize=address/' IlmImf/Makefile -sed -i -e 's/\(^libIlmImf_la_LIBADD.*\)/\1 -lasan/' IlmImf/Makefile %endif make %{?_smp_mflags} From 80f89c3affbd753db6405eeafe5be02b65dd230ea129537a203013c415c9d6ae Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 6 Nov 2018 14:50:35 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=16 --- openexr.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openexr.spec b/openexr.spec index 8ffbd0e..9d4ad13 100644 --- a/openexr.spec +++ b/openexr.spec @@ -19,6 +19,7 @@ # perhaps you want to build against corresponding ilmbase build %define asan_build 0 %define debug_build 0 +%define sonum 24 %global so_suffix -2_3-24 # tests should run at least during local build # but do expect a HUGE number of memory, so beware @@ -41,6 +42,14 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(IlmBase) >= 2.2.0 BuildRequires: pkgconfig(zlib) +%if %{asan_build} || %{debug_build} +BuildRequires: ilmbase-debugsource +BuildRequires: libHalf%{sonum}-debuginfo +BuildRequires: libIex%{so_suffix}-debuginfo +BuildRequires: libIexMath%{so_suffix}-debuginfo +BuildRequires: libIlmThread%{so_suffix}-debuginfo +BuildRequires: libImath%{so_suffix}-debuginfo +%endif Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} From 6c8b6b0f6f208ecccc1ca4d47d485683008cd6e7d66d446495fc0f104f34acc9 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 7 Nov 2018 11:02:53 +0000 Subject: [PATCH 6/7] - security update * CVE-2018-18444 [bsc#1113455] + openexr-CVE-2018-18444.patch OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=17 --- openexr-CVE-2018-18444.patch | 13 +++++++++++++ openexr.changes | 7 +++++++ openexr.spec | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 openexr-CVE-2018-18444.patch diff --git a/openexr-CVE-2018-18444.patch b/openexr-CVE-2018-18444.patch new file mode 100644 index 0000000..2c10172 --- /dev/null +++ b/openexr-CVE-2018-18444.patch @@ -0,0 +1,13 @@ +Index: openexr-2.3.0/exrmultiview/Image.h +=================================================================== +--- openexr-2.3.0.orig/exrmultiview/Image.h 2018-08-10 03:35:00.000000000 +0200 ++++ openexr-2.3.0/exrmultiview/Image.h 2018-11-07 09:07:48.072431858 +0100 +@@ -227,7 +227,7 @@ template + void + TypedImageChannel::black () + { +- memset(&_pixels[0][0],0,image().width()/_xSampling*image().height()/_ySampling*sizeof(T)); ++ memset(&_pixels[0][0],0,image().width()/_xSampling*(image().height()/_ySampling)*sizeof(T)); + } + + diff --git a/openexr.changes b/openexr.changes index fc6353b..53e9697 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 7 09:42:59 UTC 2018 - Petr Gajdos + +- security update + * CVE-2018-18444 [bsc#1113455] + + openexr-CVE-2018-18444.patch + ------------------------------------------------------------------- Tue Nov 6 09:35:55 UTC 2018 - Petr Gajdos diff --git a/openexr.spec b/openexr.spec index 9d4ad13..5cd450b 100644 --- a/openexr.spec +++ b/openexr.spec @@ -35,6 +35,7 @@ Source0: https://github.com/openexr/openexr/releases/download/v%{version} Source1: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz.sig Source2: baselibs.conf Source3: openexr.keyring +Patch0: openexr-CVE-2018-18444.patch BuildRequires: automake BuildRequires: fltk-devel BuildRequires: freeglut-devel @@ -133,6 +134,7 @@ This package contains documentation. %prep %setup -q +%patch0 -p1 %build export PTHREAD_LIBS="-lpthread" From 3144d33607f6c721d71dc70d3f54beb51fedaa025d92abe06a75567b7c506809 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 8 Nov 2018 09:13:20 +0000 Subject: [PATCH 7/7] Accepting request 646947 from home:jengelh:branches:graphics - Codify new ilmbase requirements. OBS-URL: https://build.opensuse.org/request/show/646947 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=18 --- openexr.changes | 5 +++++ openexr.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openexr.changes b/openexr.changes index 53e9697..e90ad0d 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 11:07:19 UTC 2018 - Jan Engelhardt + +- Codify new ilmbase requirements. + ------------------------------------------------------------------- Wed Nov 7 09:42:59 UTC 2018 - Petr Gajdos diff --git a/openexr.spec b/openexr.spec index 5cd450b..ea32fbe 100644 --- a/openexr.spec +++ b/openexr.spec @@ -41,7 +41,7 @@ BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(IlmBase) >= 2.2.0 +BuildRequires: pkgconfig(IlmBase) >= 2.3.0 BuildRequires: pkgconfig(zlib) %if %{asan_build} || %{debug_build} BuildRequires: ilmbase-debugsource @@ -106,7 +106,7 @@ Summary: Development files for the 16-bit FP EXR picture handling library Group: Development/Libraries/C and C++ Requires: libIlmImf%{so_suffix} = %{version} Requires: libIlmImfUtil%{so_suffix} = %{version} -Requires: libilmbase-devel +Requires: libilmbase-devel >= 2.3.0 Requires: pkgconfig Requires: pkgconfig(zlib) Obsoletes: OpenEXR-devel <= 1.6.1