Sat Mar 24 13:25:01 2012 UTC ()
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)


(drochner)
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/buildlink3.mk
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/openjpeg/Makefile 2010/09/09 02:15:22 1.1.1.1
+++ pkgsrc/graphics/openjpeg/Makefile 2012/03/24 13:25:00 1.2
@@ -1,43 +1,21 @@ @@ -1,43 +1,21 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $ 1# $NetBSD: Makefile,v 1.2 2012/03/24 13:25:00 drochner Exp $
2# 2#
3 3
4DISTNAME= openjpeg_v1_3 4DISTNAME= openjpeg-1.5.0
5PKGNAME= openjpeg-1.3 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= http://openjpeg.googlecode.com/files/ 6MASTER_SITES= http://openjpeg.googlecode.com/files/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.openjpeg.org 9HOMEPAGE= http://www.openjpeg.org/
11COMMENT= JPEG 2000 library 10COMMENT= JPEG 2000 library
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
15 14
 15GNU_CONFIGURE= yes
 16CONFIGURE_ARGS+= --disable-doc
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17 18
18INSTALLATION_DIRS= include lib 
19 
20WRKSRC= ${WRKDIR}/OpenJPEG_v1_3 
21 
22SRCS= bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c mct.c \ 
23 mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c 
24 
25.include "../../mk/bsd.prefs.mk" 
26 
27CFLAGS+= -DHAVE_POSIX_MEMALIGN 19CFLAGS+= -DHAVE_POSIX_MEMALIGN
28 20
29do-build: 
30 ${RUN} cd ${WRKSRC}/libopenjpeg && for src in ${SRCS}; do \ 
31 libtool --mode=compile ${CC} ${CFLAGS} -c $$src; \ 
32 done 
33 ${RUN} cd ${WRKSRC}/libopenjpeg && libtool --mode=link \ 
34 ${CC} -o libopenjpeg.la ${SRCS:C/\.c$/.lo/} \ 
35 -rpath ${PREFIX}/lib -version-info 0:0:0 
36 
37do-install: 
38 libtool --mode=install ${INSTALL_LIB} \ 
39 ${WRKSRC}/libopenjpeg/libopenjpeg.la ${DESTDIR}${PREFIX}/lib 
40 ${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h \ 
41 ${DESTDIR}${PREFIX}/include 
42 
43.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/openjpeg/PLIST 2010/09/09 02:15:22 1.1.1.1
+++ pkgsrc/graphics/openjpeg/PLIST 2012/03/24 13:25:01 1.2
@@ -1,3 +1,18 @@ @@ -1,3 +1,18 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/03/24 13:25:01 drochner Exp $
 2bin/image_to_j2k
 3bin/j2k_dump
 4bin/j2k_to_image
 5include/openjpeg-1.5/openjpeg.h
2include/openjpeg.h 6include/openjpeg.h
3lib/libopenjpeg.la 7lib/libopenjpeg.la
 8lib/pkgconfig/libopenjpeg.pc
 9lib/pkgconfig/libopenjpeg1.pc
 10man/man1/image_to_j2k.1
 11man/man1/j2k_dump.1
 12man/man1/j2k_to_image.1
 13man/man1/jpwl_image_to_j2k.1
 14man/man1/jpwl_j2k_to_image.1
 15man/man3/jpwl_libopenjpeg.3
 16man/man3/libopenjpeg.3
 17share/doc/openjpeg-1.5/CHANGES
 18share/doc/openjpeg-1.5/LICENSE
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/openjpeg/buildlink3.mk 2010/09/09 02:15:22 1.1.1.1
+++ pkgsrc/graphics/openjpeg/buildlink3.mk 2012/03/24 13:25:01 1.2
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2012/03/24 13:25:01 drochner Exp $
2 2
3BUILDLINK_TREE+= openjpeg 3BUILDLINK_TREE+= openjpeg
4 4
5.if !defined(OPENJPEG_BUILDLINK3_MK) 5.if !defined(OPENJPEG_BUILDLINK3_MK)
6OPENJPEG_BUILDLINK3_MK:= 6OPENJPEG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.openjpeg+= openjpeg>=1.3 8BUILDLINK_API_DEPENDS.openjpeg+= openjpeg>=1.3
 9BUILDLINK_ABI_DEPENDS.openjpeg+= openjpeg>=1.5
9BUILDLINK_PKGSRCDIR.openjpeg?= ../../graphics/openjpeg 10BUILDLINK_PKGSRCDIR.openjpeg?= ../../graphics/openjpeg
10.endif # OPENJPEG_BUILDLINK3_MK 11.endif # OPENJPEG_BUILDLINK3_MK
11 12
12BUILDLINK_TREE+= -openjpeg 13BUILDLINK_TREE+= -openjpeg
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/openjpeg/distinfo 2010/09/09 02:15:22 1.1.1.1
+++ pkgsrc/graphics/openjpeg/distinfo 2012/03/24 13:25:01 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $ 1$NetBSD: distinfo,v 1.2 2012/03/24 13:25:01 drochner Exp $
2 2
3SHA1 (openjpeg_v1_3.tar.gz) = 8d6870d9500ea09e0b1d30b981bea1c8de534de4 3SHA1 (openjpeg-1.5.0.tar.gz) = dce705ae45f137e4698a8cf39d1fbf22bc434fa8
4RMD160 (openjpeg_v1_3.tar.gz) = 2a22cc123058b1974cd1bf3898044acabceba26c 4RMD160 (openjpeg-1.5.0.tar.gz) = ffa85dbb0a3ba1545bc6974f4950f466789c04ef
5Size (openjpeg_v1_3.tar.gz) = 1004678 bytes 5Size (openjpeg-1.5.0.tar.gz) = 2117572 bytes
6SHA1 (patch-aa) = ed29c12b2e56b7f4d35241970f54351395174097 6SHA1 (patch-aa) = 503b565958dc74a17b68f968a44c5c861d84b343
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/openjpeg/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/openjpeg/patches/Attic/patch-aa 2010/09/09 02:15:22 1.1.1.1
+++ pkgsrc/graphics/openjpeg/patches/Attic/patch-aa 2012/03/24 13:25:01 1.2
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/09/09 02:15:22 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2012/03/24 13:25:01 drochner Exp $
2 2
3--- libopenjpeg/opj_malloc.h.orig 2010-08-14 23:23:47.000000000 +0000 3--- libopenjpeg/opj_malloc.h.orig 2012-02-07 10:49:55.000000000 +0000
4+++ libopenjpeg/opj_malloc.h 4+++ libopenjpeg/opj_malloc.h
5@@ -61,29 +61,6 @@ Allocate memory aligned to a 16 byte bou 5@@ -69,26 +69,6 @@ Allocate memory aligned to a 16 byte bou
6 @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available  6 @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
7 */  7 */
8 /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */  8 /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
9-#ifdef WIN32  9-#ifdef _WIN32
10- /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */  10- /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
11- #ifdef __GNUC__  11- #ifdef __GNUC__
12- #include <mm_malloc.h>  12- #include <mm_malloc.h>
13- #define HAVE_MM_MALLOC  13- #define HAVE_MM_MALLOC
14- #else /* MSVC, Intel C++ */  14- #else /* MSVC, Intel C++ */
15- #include <malloc.h>  15- #include <malloc.h>
16- #ifdef _mm_malloc  16- #ifdef _mm_malloc
17- #define HAVE_MM_MALLOC  17- #define HAVE_MM_MALLOC
18- #endif  18- #endif
19- #endif  19- #endif
20-#else /* Not WIN32 */  20-#else /* Not _WIN32 */
21- #if defined(__sun)  21- #if defined(__sun)
22- #define HAVE_MEMALIGN  22- #define HAVE_MEMALIGN
23- #elif defined(__GNUC__)  23- /* Linux x86_64 and OSX always align allocations to 16 bytes */
24- #define HAVE_MEMALIGN  24- #elif !defined(__amd64__) && !defined(__APPLE__)
25- #include <malloc.h>  25- #define HAVE_MEMALIGN
26- /* Linux x86_64 and OSX always align allocations to 16 bytes */  26- #include <malloc.h>
27- #elif !defined(__amd64__) && !defined(__APPLE__)  
28- /* FIXME: Yes, this is a big assumption */  
29- #define HAVE_POSIX_MEMALIGN  
30- #endif  27- #endif
31-#endif  28-#endif
32  29
33  30 #define opj_aligned_malloc(size) malloc(size)
34  31 #define opj_aligned_free(m) free(m)