pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics openexr: Update to 2.4.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7dbef37f2441
branches:  trunk
changeset: 401657:7dbef37f2441
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Sep 21 21:34:44 2019 +0000

description:
openexr: Update to 2.4.0

Summary of changes:

    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

This version fixes the following security vulnerabilities:

    CVE-2018-18444 Issue #351 Out of Memory
    CVE-2018-18443 Issue #350 heap-buffer-overflow

diffstat:

 graphics/ilmbase/Makefile                                         |   28 +-
 graphics/ilmbase/PLIST                                            |    3 +-
 graphics/ilmbase/distinfo                                         |   16 +-
 graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp                 |   17 -
 graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp           |   13 -
 graphics/ilmbase/patches/patch-Imath_ImathFun.h                   |   13 -
 graphics/ilmbase/patches/patch-bootstrap                          |   15 -
 graphics/ilmbase/patches/patch-configure                          |  121 ----------
 graphics/openexr/Makefile                                         |   34 +-
 graphics/openexr/Makefile.common                                  |   36 ++
 graphics/openexr/PLIST                                            |    5 +-
 graphics/openexr/distinfo                                         |   15 +-
 graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp       |   71 -----
 graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h         |   15 -
 graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h |   15 +
 graphics/openexr/patches/patch-bootstrap                          |   15 -
 graphics/openexr/patches/patch-configure                          |  119 ---------
 17 files changed, 86 insertions(+), 465 deletions(-)

diffs (truncated from 668 to 300 lines):

diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/Makefile
--- a/graphics/ilmbase/Makefile Sat Sep 21 21:10:49 2019 +0000
+++ b/graphics/ilmbase/Makefile Sat Sep 21 21:34:44 2019 +0000
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile,v 1.22 2019/07/08 10:36:27 nia Exp $
+# $NetBSD: Makefile,v 1.23 2019/09/21 21:34:44 nia Exp $
 
-DISTNAME=      ilmbase-2.3.0
-CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_PROJECT=        openexr
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+.include "../../graphics/openexr/Makefile.common"
 
-MAINTAINER=    adam%NetBSD.org@localhost
-HOMEPAGE=      https://www.openexr.com/
-COMMENT=       High dynamic-range (HDR) image file format library and tools
-LICENSE=       modified-bsd
+PKGNAME=       ${DISTNAME:S/openexr/ilmbase/}
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_TOOLS+=            bash gmake
-GNU_CONFIGURE=         yes
-GCC_REQD+=             6
-TEST_TARGET=           check
-LIBS.SunOS=            -lm
-CONFIG_SHELL=          bash
+CONFIGURE_DIRS=        IlmBase
+BUILD_DIRS=    IlmBase
 
 PKGCONFIG_OVERRIDE=    IlmBase.pc.in
-PTHREAD_OPTS=          require
 
 CONFLICTS=             openexr<1.6
 
-BUILDLINK_TRANSFORM+=  rm:-Wno-long-double
+pre-configure:
+       cd ${WRKSRC}/IlmBase && ./bootstrap
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/PLIST
--- a/graphics/ilmbase/PLIST    Sat Sep 21 21:10:49 2019 +0000
+++ b/graphics/ilmbase/PLIST    Sat Sep 21 21:34:44 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/09 11:39:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/09/21 21:34:44 nia Exp $
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
@@ -12,6 +12,7 @@
 include/OpenEXR/IexNamespace.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmBaseConfig.h
+include/OpenEXR/IlmBaseConfigInternal.h
 include/OpenEXR/IlmThread.h
 include/OpenEXR/IlmThreadExport.h
 include/OpenEXR/IlmThreadForward.h
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/distinfo
--- a/graphics/ilmbase/distinfo Sat Sep 21 21:10:49 2019 +0000
+++ b/graphics/ilmbase/distinfo Sat Sep 21 21:34:44 2019 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.16 2018/10/02 12:05:35 adam Exp $
+$NetBSD: distinfo,v 1.17 2019/09/21 21:34:44 nia Exp $
 
-SHA1 (ilmbase-2.3.0.tar.gz) = 1cddb28b14b60025b1e1604d5616540ed038cb16
-RMD160 (ilmbase-2.3.0.tar.gz) = bd60ebfdc114e186db87f8c8b92c4f031b17e0d9
-SHA512 (ilmbase-2.3.0.tar.gz) = db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-Size (ilmbase-2.3.0.tar.gz) = 595490 bytes
-SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
-SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
-SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
-SHA1 (patch-bootstrap) = 16e655c408fdb0d275d8da8f77b83cebca132637
-SHA1 (patch-configure) = 5f20c43310a099b3ce888db7f39cdc33127b4d24
+SHA1 (openexr-2.4.0.tar.gz) = 0b9a24b8fa6b3f7f1d8813e91234308d3e43d10f
+RMD160 (openexr-2.4.0.tar.gz) = 5e7c5612c3b4a7d40d2fc9c3d45f0a46ebc738f9
+SHA512 (openexr-2.4.0.tar.gz) = b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+Size (openexr-2.4.0.tar.gz) = 26806627 bytes
+SHA1 (patch-IlmBase_configure.ac) = 02d03927d37703c4e9919b445afa8245b0c2da85
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp
--- a/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp Sat Sep 21 21:10:49 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-Iex_IexBaseExc.cpp,v 1.1 2013/12/26 15:59:27 tron Exp $
-
-Fix build with C compilers other GCC.
-
---- Iex/IexBaseExc.cpp.orig    2013-10-15 23:55:09.000000000 +0100
-+++ Iex/IexBaseExc.cpp 2013-12-26 15:17:54.000000000 +0000
-@@ -149,8 +149,10 @@
- void
- iex_debugTrap()
- {
-+#ifdef __GNUC__
-     // how to in Linux?
-     if (0 != ::getenv("IEXDEBUGTHROW"))
-         __builtin_trap();
-+#endif
- }
- #endif
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
--- a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp   Sat Sep 21 21:10:49 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-Iex_IexThrowErrnoExc.cpp,v 1.2 2013/05/08 17:48:33 adam Exp $
-
---- Iex/IexThrowErrnoExc.cpp.orig      Thu Jul 26 10:46:21 2012
-+++ Iex/IexThrowErrnoExc.cpp
-@@ -419,7 +419,7 @@ void throwErrnoExc (const std::string &t
-           throw EnametoolongExc (tmp);
-       #endif
- 
--      #if defined (EOVERFLOW)
-+      #if defined (EOVERFLOW) && EOVERFLOW != ERANGE
-         case EOVERFLOW:
-           throw EoverflowExc (tmp);
-       #endif
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/patches/patch-Imath_ImathFun.h
--- a/graphics/ilmbase/patches/patch-Imath_ImathFun.h   Sat Sep 21 21:10:49 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-Imath_ImathFun.h,v 1.1 2013/12/02 23:39:09 bsiegert Exp $
-
---- Imath/ImathFun.h.orig      Thu Sep 19 17:07:20 2013
-+++ Imath/ImathFun.h
-@@ -48,6 +48,8 @@
- #include "ImathInt64.h"
- #include "ImathNamespace.h"
- 
-+#undef abs
-+
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
- 
- template <class T>
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/patches/patch-bootstrap
--- a/graphics/ilmbase/patches/patch-bootstrap  Sat Sep 21 21:10:49 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-bootstrap,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portability fix.
-
---- bootstrap.orig     2018-08-10 01:34:57.000000000 +0000
-+++ bootstrap
-@@ -1,7 +1,7 @@
- #!/bin/bash
- # If we're on OS X, use glibtoolize instead of toolize when available
- HOSTTYPE=`uname`
--if [ "$HOSTTYPE" == "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-+if [ "$HOSTTYPE" = "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-         LIBTOOLIZE=glibtoolize
- else
-         LIBTOOLIZE=libtoolize
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/ilmbase/patches/patch-configure
--- a/graphics/ilmbase/patches/patch-configure  Sat Sep 21 21:10:49 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portablity fixes.
-Disable ucontext.h detection, which leads to problems on some platforms.
-Disable univeral binary build on Mac OS X.
-
---- configure.orig     2018-08-10 01:35:09.000000000 +0000
-+++ configure
-@@ -15253,7 +15253,7 @@ else
- fi
- 
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-       ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not 
- 
-       CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-         ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
- 
-       CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-         ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
- 
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
- 
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
- 
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-             CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-               CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -22447,7 +22447,7 @@ $as_echo "#define STDC_HEADERS 1" >>conf
- 
- fi
- 
--for ac_header in limits.h unistd.h ucontext.h
-+for ac_header in limits.h unistd.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
- _ACEOF
-@@ -22787,7 +22787,7 @@ _ACEOF
-     lib_namespace="${ILMBASE_VERSION_API}"
-     LIB_SUFFIX="${ILMBASE_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath
- _ACEOF
-@@ -22823,7 +22823,7 @@ _ACEOF
- fi
- 
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
- 
-  if true; then
-@@ -22858,7 +22858,7 @@ else
- fi
- 
- 
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
-@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
- 
-     public_namespace=""
-     custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
- 
-     $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h
-@@ -22911,7 +22911,7 @@ else
- fi
- 
- 
--  if test "${osx_arch}" != default ; then
-+  if false ; then
-           osx_arch_flags="-arch ${osx_arch// / -arch }"
-      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
- 
diff -r 5c160661d6d6 -r 7dbef37f2441 graphics/openexr/Makefile
--- a/graphics/openexr/Makefile Sat Sep 21 21:10:49 2019 +0000
+++ b/graphics/openexr/Makefile Sat Sep 21 21:34:44 2019 +0000
@@ -1,34 +1,20 @@
-# $NetBSD: Makefile,v 1.39 2018/11/20 08:59:29 maya Exp $
+# $NetBSD: Makefile,v 1.40 2019/09/21 21:34:44 nia Exp $
 
-DISTNAME=      openexr-2.3.0
-CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+.include "Makefile.common"
 
-MAINTAINER=    adam%NetBSD.org@localhost
-HOMEPAGE=      http://www.openexr.com/
-COMMENT=       High dynamic-range (HDR) image file format library and tools
-LICENSE=       modified-bsd
+CONFIGURE_DIRS=        OpenEXR
+BUILD_DIRS=    OpenEXR
 
-USE_LANGUAGES=         c c++



Home | Main Index | Thread Index | Old Index