Updated jasper to 2.0.12.

    Bumped the version number.

    Added some additional checking to prevent a potential integer overflow
    due to conversion in the JPC decoder.

    Added numerous more-detailed error messages for the JPC and JP2
    codecs.
    Added a partial verbose capability for the run_test_1 script.
    Moved a test case from the bad category to the good category, as the
    test case had been miscategorized.


    Added another regression test case.

    Fixed some potential double-free problems in the JPC codec.

4 files changed, 17 insertions, 18 deletions

diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 9af4fdff60c..c0cb659f39e 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2017/02/22 11:53:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2017/03/05 12:49:51 wiz Exp $
 
-DISTNAME=	jasper-2.0.10
-PKGREVISION=	2
+DISTNAME=	jasper-2.0.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ece.uvic.ca/~mdadams/jasper/software/
 
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index abb7688f69a..957495f4bac 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.27 2017/02/22 11:53:49 ryoon Exp $
+$NetBSD: distinfo,v 1.28 2017/03/05 12:49:51 wiz Exp $
 
-SHA1 (jasper-2.0.10.tar.gz) = 42518b05fd73242f8ee8047d2e35e0275a697a5f
-RMD160 (jasper-2.0.10.tar.gz) = 5c13f11b2f5f7eb2ef161e2e691398c3d65bfeba
-SHA512 (jasper-2.0.10.tar.gz) = 3cc08c9bc1f9ad1e4bac78a3246d6ee1a35a75d5b89b3b0f27cb5980420101256a2e05eeb7bf8a0c73d1a73c044b83b4cbca441c1418dced53d7a142e69129ed
-Size (jasper-2.0.10.tar.gz) = 1672392 bytes
+SHA1 (jasper-2.0.12.tar.gz) = bcd419c21f7b048d4643802faabf36cd26efeafa
+RMD160 (jasper-2.0.12.tar.gz) = a062262b337865e0f7e27d6a77e38b16e6735b30
+SHA512 (jasper-2.0.12.tar.gz) = 3b0f5a5640838b328d989a80461a23ca8ac98af054a7f15c13a543e769c98bb632b74114923c02c3b2de76747187747aec6e18a2cf14035a8d79eb3482fd553b
+Size (jasper-2.0.12.tar.gz) = 1674038 bytes
 SHA1 (patch-CMakeLists.txt) = 047ea526e4f4d81036043e0d831ef76be1e3b456
 SHA1 (patch-doc_CMakeLists.txt) = 08156df737458cec48ea1965586b9acdbf30753b
 SHA1 (patch-src_libjasper_base_jas__seq.c) = a0208cd0271388ae0fdc2e359da3223a35a7ae14
 SHA1 (patch-src_libjasper_base_jas__stream.c) = 2e9ad538ab2c0191063fef06202949b435b0085e
 SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = bfbe752e105d75fbad71a01080013c7a5a8645d8
 SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = df04d8af9004fb133d4ae1429ecda77197fc3e77
-SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = 4f23040e7039514bbbc60360121f1820e82017cc
+SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = 9a78860496f1d0ce35f94843f6a7d754a5565716
 SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = f76765ff7656af6b44cd4035b26656909abe45f9
-SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 10fbe41e67da4f2575fb541013833ed85992efea
+SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 83068e4f4ec96b7f9816f3dac1f68ef6efde986f
 SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2
diff --git a/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__enc.c b/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__enc.c
index a5c484ee6c8..18632ddf239 100644
--- a/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__enc.c
+++ b/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__enc.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_libjasper_jp2_jp2__enc.c,v 1.2 2016/12/16 09:44:44 he Exp $
+$NetBSD: patch-src_libjasper_jp2_jp2__enc.c,v 1.3 2017/03/05 12:49:52 wiz Exp $
 
 Replace an sprintf() with snprintf().
 
---- src/libjasper/jp2/jp2_enc.c.orig	2007-01-19 21:43:05.000000000 +0000
+--- src/libjasper/jp2/jp2_enc.c.orig	2017-03-02 18:03:10.000000000 +0000
 +++ src/libjasper/jp2/jp2_enc.c
-@@ -343,8 +343,9 @@ int jp2_encode(jas_image_t *image, jas_s
+@@ -385,8 +385,9 @@ int jp2_encode(jas_image_t *image, jas_s
  	/* Output the JPEG-2000 code stream. */
  
  	overhead = jas_stream_getrwcount(out);
@@ -15,4 +15,4 @@ Replace an sprintf() with snprintf().
 +		 (unsigned long) overhead);
  
  	if (jpc_encode(image, out, buf)) {
- 		goto error;
+ 		jas_eprintf("jpc_encode failed\n");
diff --git a/graphics/jasper/patches/patch-src_libjasper_jpc_jpc__enc.c b/graphics/jasper/patches/patch-src_libjasper_jpc_jpc__enc.c
index ee67fe8170b..1dd6b18b7bd 100644
--- a/graphics/jasper/patches/patch-src_libjasper_jpc_jpc__enc.c
+++ b/graphics/jasper/patches/patch-src_libjasper_jpc_jpc__enc.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_libjasper_jpc_jpc__enc.c,v 1.2 2016/12/16 09:44:44 he Exp $
+$NetBSD: patch-src_libjasper_jpc_jpc__enc.c,v 1.3 2017/03/05 12:49:52 wiz Exp $
 
 Replace an sprintf() with snprintf().
 
---- src/libjasper/jpc/jpc_enc.c.orig	2007-01-19 21:43:07.000000000 +0000
+--- src/libjasper/jpc/jpc_enc.c.orig	2017-03-02 18:03:10.000000000 +0000
 +++ src/libjasper/jpc/jpc_enc.c
-@@ -957,7 +957,8 @@ startoff = jas_stream_getrwcount(enc->ou
- 	if (!(enc->mrk = jpc_ms_create(JPC_MS_COM))) {
+@@ -966,7 +966,8 @@ startoff = jas_stream_getrwcount(enc->ou
+ 		jas_eprintf("cannot create COM marker\n");
  		return -1;
  	}
 -	sprintf(buf, "Creator: JasPer Version %s", jas_getversion());