Pullup ticket #5133 - requested by bsiegert

graphics/openjpeg: security update

Revisions pulled up:
- graphics/openjpeg/Makefile                                    1.14
- graphics/openjpeg/distinfo                                    1.11
- graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt 1.2

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Tue Oct  4 19:27:10 UTC 2016

   Modified Files:
           pkgsrc/graphics/openjpeg: Makefile distinfo
           pkgsrc/graphics/openjpeg/patches: patch-src_lib_openjp2_CMakeLists.txt

   Log Message:
   v2.1.2 (2016-09-28)

   Closed issues:

   null ptr dereference in convert.c:1331
   Out-of-Bounds Read in function bmp24toimage of convertbmp.c
   Disable automatic compilation of t1_generate_luts in CMakeLists.txt
   CVE-2016-7163 Integer overflow in opj_pi_create_decode
   Security Advisory for OpenJPEG
   Add dashboard with static lib
   hidden visibility for the static library / building with -DOPJ_STATIC against shared lib
   Optimization when building library from source
   unsigned int16 on Solaris 11.2/sparc
   appveyor
   Please make a new release
   FFMpeg will not link to 2.1.1 release built as shared library
   API change since v2: opj_event_mgr_t not available
   openjpeg.h needs dependencies
   "master" does not build on ubuntu
   Package 'openjp2', required by 'libopenjpip', not found

   Merged pull requests:

   Fix PNM file reading
   Fix some issues reported by Coverity Scan
   Fix potential out-of-bounds read (coverity)
   Remove TODO for overflow check
   Add overflow checks for opj_aligned_malloc
   Flags in T1 shall be unsigned
   Fix some warnings
   Fix issue 833.
   Add overflow checks for opj_aligned_malloc
   Add test for issue 820
   Add test for issue 826
   Fix coverity 113065 (CWE-484)
   Add sanity check for tile coordinates
   Add test for P-R-818
   Update to libpng 1.6.25
   fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc
   Add overflow check in opj_tcd_init_tile
   Fix leak & invalid behavior of opj_jp2_read_ihdr
   Add overflow check in opj_j2k_update_image_data
   Change 'restrict' define to 'OPJ_RESTRICT'
   Switch to clang 3.8
   Fix an integer overflow issue
   Update to lcms 2.8
   Update to libpng 1.6.24
   Reenable clang-3.9 build on travis
   Bit fields type
   Add compilation test for standalone inclusion of openjpeg.h
   jpwl: Remove non-portable data type u_int16_t
   Fix dependency for pkg-config
   Add .gitignore


   To generate a diff of this commit:
   cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/openjpeg/Makefile
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/openjpeg/distinfo
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt

3 files changed, 13 insertions, 13 deletions

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index a91d3399a36..16905c7b652 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2016/07/19 08:37:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2016/10/16 14:44:11 spz Exp $
 
-DISTNAME=	openjpeg-2.1.1
+DISTNAME=	openjpeg-2.1.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=uclouvain/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 9133501b3db..9fb307ab5f3 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2016/07/14 15:41:43 wiz Exp $
+$NetBSD: distinfo,v 1.10.2.1 2016/10/16 14:44:11 spz Exp $
 
-SHA1 (openjpeg-2.1.1.tar.gz) = b995742c41abe58828d72ffec52404ec91111194
-RMD160 (openjpeg-2.1.1.tar.gz) = 14c2b72b41cfef2c088a9b3d042c40793fc41dfe
-SHA512 (openjpeg-2.1.1.tar.gz) = c7c5cd95a3b8bc643207fecdfbffd45c3d91e48196455ae42061862aebcd558c3e508c39513285b8ebb4f57b7316116d15cc74c0b9cc3e31c2a7b70d3e5e2cdd
-Size (openjpeg-2.1.1.tar.gz) = 1984111 bytes
+SHA1 (openjpeg-2.1.2.tar.gz) = c8671e7f577fdc58abde1e1f32b10d372e6f9b07
+RMD160 (openjpeg-2.1.2.tar.gz) = 2e0f6d7d0fff05b9cd62251355bd041e92ecba31
+SHA512 (openjpeg-2.1.2.tar.gz) = 411067e33c8e4da9921d0281e932a4ac2af592cf822bfad828daea9e2b9c414859455bcec6d912ce76460ea462fa4cbd94a401333bda5716ec017d18b8e5942c
+Size (openjpeg-2.1.2.tar.gz) = 1987071 bytes
 SHA1 (patch-CMakeLists.txt) = 3738946db63df4d623c6ce486bd22fa4d57336e2
 SHA1 (patch-src_bin_jp2_CMakeLists.txt) = c9f709c23d6bab7a3c705640d66a00ec90ddabc7
-SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 85d7729bdebbc5ce520c69df7541575547b49708
+SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = d839121ec2d008e5d3e1676d3e7ac3642bc946f7
 SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = fc0c170789dbe0a2ebc9dce0ef0d21aa6b2edd49
diff --git a/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt b/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
index 91d1b98f5d3..8aeaea27589 100644
--- a/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
+++ b/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_lib_openjp2_CMakeLists.txt,v 1.1 2014/05/15 14:14:54 adam Exp $
+$NetBSD: patch-src_lib_openjp2_CMakeLists.txt,v 1.1.20.1 2016/10/16 14:44:11 spz Exp $
 
 Install man pages without building other docs.
 
---- src/lib/openjp2/CMakeLists.txt.orig	2014-05-15 11:14:06.000000000 +0000
+--- src/lib/openjp2/CMakeLists.txt.orig	2016-09-28 18:18:16.000000000 +0000
 +++ src/lib/openjp2/CMakeLists.txt
-@@ -68,12 +68,10 @@ install(FILES openjpeg.h opj_stdint.h
+@@ -103,12 +103,10 @@ install(FILES openjpeg.h opj_stdint.h
    DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
  )
  
@@ -15,5 +15,5 @@ Install man pages without building other docs.
    DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
 -endif()
  
- # internal utilities to generate t1_luts.h (part of the jp2 lib)
- # no need to install:
+ if(BUILD_LUTS_GENERATOR)
+ # internal utility to generate t1_luts.h (part of the jp2 lib)