openexr: update to 2.2.1.

November 30, 2017 - OpenEXR v2.2.1 has been released and is available
for download.

This maintenance release addresses the reported OpenEXR security
vulnerabilities, specifically CVE-2017-9110, CVE-2017-9111,
CVE-2017-9112, CVE-2017-9113, CVE-2017-9114, CVE-2017-9115,
CVE-2017-9116.

3 files changed, 30 insertions, 31 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index fcb119be055..11e62c1941e 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2016/12/04 23:40:33 rodent Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/28 19:58:17 wiz Exp $
 
-DISTNAME=	openexr-2.2.0
-PKGREVISION=	3
+DISTNAME=	openexr-2.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 64ef63245b5..79036aa9b14 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2016/08/26 17:19:49 joerg Exp $
+$NetBSD: distinfo,v 1.30 2018/01/28 19:58:17 wiz Exp $
 
-SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92
-RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956
-SHA512 (openexr-2.2.0.tar.gz) = 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
-Size (openexr-2.2.0.tar.gz) = 14489661 bytes
+SHA1 (openexr-2.2.1.tar.gz) = 585cf77cdc3dc0d9d71531dfa747c4a11c5ec9e8
+RMD160 (openexr-2.2.1.tar.gz) = eb2fbbefe1399d87a4a60807cb7386ed3b300eaa
+SHA512 (openexr-2.2.1.tar.gz) = 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480
+Size (openexr-2.2.1.tar.gz) = 18176639 bytes
 SHA1 (patch-IlmImf_ImfFastHuf.cpp) = bf583b5e0efb1af6e00d671b07d4cc154e13ac44
 SHA1 (patch-IlmImf_ImfSystemSpecific.cpp) = 79bf644181650fa7dc13c04dfeb68142bde6a2b6
 SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2
 SHA1 (patch-IlmImf_dwaLookups.cpp) = 7bcc32f3de10cea5467d054f1b1aa0fd12d49d46
-SHA1 (patch-aa) = 8633b04f9c13f163947e7ac81eb4ef7a6fd9eb88
+SHA1 (patch-aa) = a969c6df4af16d84630e4b36cd1c718cd9d8db76
 SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
index 061d5ff852a..eb03796f12b 100644
--- a/graphics/openexr/patches/patch-aa
+++ b/graphics/openexr/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.10 2015/04/13 18:45:46 jperkin Exp $
+$NetBSD: patch-aa,v 1.11 2018/01/28 19:58:17 wiz Exp $
 
 Shell portability fix: see
 https://savannah.nongnu.org/bugs/index.php?22222
 Ensure asm instructions are checked correctly.
 
---- configure.orig	2014-08-10 04:48:26.000000000 +0000
+--- configure.orig	2017-11-17 23:09:24.000000000 +0000
 +++ configure
-@@ -15660,7 +15660,7 @@ else
+@@ -15484,7 +15484,7 @@ else
  fi
  
  
@@ -15,7 +15,7 @@ Ensure asm instructions are checked correctly.
  
  
  
-@@ -17584,10 +17584,10 @@ main ()
+@@ -16579,10 +16579,10 @@ main ()
                   int n   = 0;
                   int eax = 0;
                   int edx = 0;
@@ -28,25 +28,25 @@ Ensure asm instructions are checked correctly.
               #else
                   #error No GCC style inline asm supported for AVX instructions
               #endif
-@@ -17631,7 +17631,7 @@ fi
+@@ -16605,7 +16605,7 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $gcc_inline_asm_avx" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_inline_asm_avx" >&5
  $as_echo "$gcc_inline_asm_avx" >&6; }
 -if test "x${gcc_inline_asm_avx}" == xyes ; then
 +if test "x${gcc_inline_asm_avx}" = xyes ; then
-     cat >>confdefs.h <<\_ACEOF
- #define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1
- _ACEOF
-@@ -17689,7 +17689,7 @@ fi
+     $as_echo "#define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1" >>confdefs.h
+ 
+ fi
+@@ -16636,7 +16636,7 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $sysconf_nproc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sysconf_nproc" >&5
  $as_echo "$sysconf_nproc" >&6; }
 -if test "x${sysconf_nproc}" == xyes ; then
 +if test "x${sysconf_nproc}" = xyes ; then
-     cat >>confdefs.h <<\_ACEOF
- #define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1
- _ACEOF
-@@ -17816,7 +17816,7 @@ LIB_SUFFIX=""
+     $as_echo "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1" >>confdefs.h
+ 
+ fi
+@@ -16750,7 +16750,7 @@ LIB_SUFFIX=""
  lib_suffix_valid="no"
  
  lib_namespace="Imf"
@@ -55,7 +55,7 @@ Ensure asm instructions are checked correctly.
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}
  _ACEOF
-@@ -17829,7 +17829,7 @@ _ACEOF
+@@ -16761,7 +16761,7 @@ _ACEOF
      lib_namespace="Imf_${OPENEXR_VERSION_API}"
      LIB_SUFFIX="${OPENEXR_VERSION_API}"
      lib_suffix_valid="yes"
@@ -64,7 +64,7 @@ Ensure asm instructions are checked correctly.
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf
  _ACEOF
-@@ -17852,7 +17852,7 @@ _ACEOF
+@@ -16782,7 +16782,7 @@ _ACEOF
  fi
  
  
@@ -73,16 +73,16 @@ Ensure asm instructions are checked correctly.
  LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
  
   if true; then
-@@ -17887,7 +17887,7 @@ else
+@@ -16817,7 +16817,7 @@ else
  fi
  
  
 -if test "x${custom_usr_namespace}" == xyes ; then
 +if test "x${custom_usr_namespace}" = xyes ; then
-     { $as_echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5
  $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&2;}
      cat >>confdefs.h <<_ACEOF
-@@ -17895,7 +17895,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
+@@ -16825,7 +16825,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
  _ACEOF
  
      usr_namespace="Imf"
@@ -91,12 +91,12 @@ Ensure asm instructions are checked correctly.
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_NAMESPACE Imf
  _ACEOF
-@@ -20626,7 +20628,7 @@ enable large stack optimizations        
+@@ -19539,7 +19539,7 @@ enable large stack optimizations        
  internal library namespace                      $lib_namespace
  user-client namespace                           $usr_namespace" >&6; }
  
 -if test "x$build_osxuniversal" == xyes; then
 +if test "x$build_osxuniversal" = xyes; then
- { $as_echo "$as_me:$LINENO: result:
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
  build OS X universal binaries                   $build_osxuniversal" >&5
  $as_echo "