update to 1.5.0

This fixes a vulnerability caused due to an error when parsing a CMAP
record which can be exploited to cause an out-of-bounds write via
specially crafted JPEG files. (SA48498)

5 files changed, 40 insertions, 49 deletions

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 3e0806cf980..e714662bede 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,43 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/24 13:25:00 drochner Exp $
 #
 
-DISTNAME=		openjpeg_v1_3
-PKGNAME=		openjpeg-1.3
+DISTNAME=		openjpeg-1.5.0
 CATEGORIES=		graphics
 MASTER_SITES=		http://openjpeg.googlecode.com/files/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.openjpeg.org
+HOMEPAGE=		http://www.openjpeg.org/
 COMMENT=		JPEG 2000 library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 LICENSE=		2-clause-bsd
 
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-doc
 USE_LIBTOOL=		yes
 
-INSTALLATION_DIRS=	include lib
-
-WRKSRC=		${WRKDIR}/OpenJPEG_v1_3
-
-SRCS=  bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c mct.c \
-  mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c
-
-.include "../../mk/bsd.prefs.mk"
-
 CFLAGS+=	-DHAVE_POSIX_MEMALIGN
 
-do-build:
-	${RUN} cd ${WRKSRC}/libopenjpeg && for src in ${SRCS}; do \
-		libtool --mode=compile ${CC} ${CFLAGS} -c $$src; \
-	done
-	${RUN} cd ${WRKSRC}/libopenjpeg && libtool --mode=link \
-	    ${CC} -o libopenjpeg.la ${SRCS:C/\.c$/.lo/} \
-	    -rpath ${PREFIX}/lib -version-info 0:0:0
-
-do-install:
-	libtool --mode=install ${INSTALL_LIB} \
-	    ${WRKSRC}/libopenjpeg/libopenjpeg.la ${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h \
-	    ${DESTDIR}${PREFIX}/include
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openjpeg/PLIST b/graphics/openjpeg/PLIST
index 30a0b4bec49..e8983344b71 100644
--- a/graphics/openjpeg/PLIST
+++ b/graphics/openjpeg/PLIST
@@ -1,3 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/24 13:25:01 drochner Exp $
+bin/image_to_j2k
+bin/j2k_dump
+bin/j2k_to_image
+include/openjpeg-1.5/openjpeg.h
 include/openjpeg.h
 lib/libopenjpeg.la
+lib/pkgconfig/libopenjpeg.pc
+lib/pkgconfig/libopenjpeg1.pc
+man/man1/image_to_j2k.1
+man/man1/j2k_dump.1
+man/man1/j2k_to_image.1
+man/man1/jpwl_image_to_j2k.1
+man/man1/jpwl_j2k_to_image.1
+man/man3/jpwl_libopenjpeg.3
+man/man3/libopenjpeg.3
+share/doc/openjpeg-1.5/CHANGES
+share/doc/openjpeg-1.5/LICENSE
diff --git a/graphics/openjpeg/buildlink3.mk b/graphics/openjpeg/buildlink3.mk
index e0429a09973..5c33e58ef5c 100644
--- a/graphics/openjpeg/buildlink3.mk
+++ b/graphics/openjpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/03/24 13:25:01 drochner Exp $
 
 BUILDLINK_TREE+=	openjpeg
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	openjpeg
 OPENJPEG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openjpeg+=	openjpeg>=1.3
+BUILDLINK_ABI_DEPENDS.openjpeg+=	openjpeg>=1.5
 BUILDLINK_PKGSRCDIR.openjpeg?=	../../graphics/openjpeg
 .endif	# OPENJPEG_BUILDLINK3_MK
 
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 6bebb242d89..98b3b407e90 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
+$NetBSD: distinfo,v 1.2 2012/03/24 13:25:01 drochner Exp $
 
-SHA1 (openjpeg_v1_3.tar.gz) = 8d6870d9500ea09e0b1d30b981bea1c8de534de4
-RMD160 (openjpeg_v1_3.tar.gz) = 2a22cc123058b1974cd1bf3898044acabceba26c
-Size (openjpeg_v1_3.tar.gz) = 1004678 bytes
-SHA1 (patch-aa) = ed29c12b2e56b7f4d35241970f54351395174097
+SHA1 (openjpeg-1.5.0.tar.gz) = dce705ae45f137e4698a8cf39d1fbf22bc434fa8
+RMD160 (openjpeg-1.5.0.tar.gz) = ffa85dbb0a3ba1545bc6974f4950f466789c04ef
+Size (openjpeg-1.5.0.tar.gz) = 2117572 bytes
+SHA1 (patch-aa) = 503b565958dc74a17b68f968a44c5c861d84b343
diff --git a/graphics/openjpeg/patches/patch-aa b/graphics/openjpeg/patches/patch-aa
index 3fbb2228f1b..33c3a3eb81e 100644
--- a/graphics/openjpeg/patches/patch-aa
+++ b/graphics/openjpeg/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2012/03/24 13:25:01 drochner Exp $
 
---- libopenjpeg/opj_malloc.h.orig	2010-08-14 23:23:47.000000000 +0000
+--- libopenjpeg/opj_malloc.h.orig	2012-02-07 10:49:55.000000000 +0000
 +++ libopenjpeg/opj_malloc.h
-@@ -61,29 +61,6 @@ Allocate memory aligned to a 16 byte bou
+@@ -69,26 +69,6 @@ Allocate memory aligned to a 16 byte bou
  @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available

  */

  /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */

--#ifdef WIN32

+-#ifdef _WIN32

 -	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */

 -	#ifdef __GNUC__

 -		#include <mm_malloc.h>

@@ -17,18 +17,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $
 -			#define HAVE_MM_MALLOC

 -		#endif

 -	#endif

--#else /* Not WIN32 */

+-#else /* Not _WIN32 */

 -	#if defined(__sun)

--			#define HAVE_MEMALIGN

--		#elif defined(__GNUC__)

--			#define HAVE_MEMALIGN

--			#include <malloc.h>		

--		/* Linux x86_64 and OSX always align allocations to 16 bytes */

--		#elif !defined(__amd64__) && !defined(__APPLE__)	

--			/* FIXME: Yes, this is a big assumption */

--			#define HAVE_POSIX_MEMALIGN

+-		#define HAVE_MEMALIGN

+-	/* Linux x86_64 and OSX always align allocations to 16 bytes */

+-	#elif !defined(__amd64__) && !defined(__APPLE__)	

+-		#define HAVE_MEMALIGN

+-		#include <malloc.h>			

 -	#endif

 -#endif

  

- 

- 

+ #define opj_aligned_malloc(size) malloc(size)

+ #define opj_aligned_free(m) free(m)