head 1.3; access; symbols pkgsrc-2014Q4:1.2.0.92 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.90 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.88 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.86 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.84 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.82 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.80 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.78 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.76 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.74 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.72 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.70 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.68 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.66 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.64 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.62 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.60 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.58 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.56 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.54 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.3 date 2015.01.01.14.15.27; author he; state dead; branches; next 1.2; commitid PdStbIzr5wzRpk4y; 1.2 date 2004.03.02.10.28.18; author adam; state Exp; branches 1.2.92.1; next 1.1; 1.1 date 2002.11.13.14.24.22; author dillo; state Exp; branches; next ; 1.2.92.1 date 2015.02.19.21.18.52; author tron; state dead; branches; next ; commitid 9KM6NPHYSCRLbFay; desc @@ 1.3 log @Rename patches to conform to the "new" style. Add comments to the patches. Add fix for oCERT-2014-012, pulled from RedHat. Add fix from Debian bug 469786. Add LICENSE setting, I think modified-bsd is fitting. Bump PKGREVISION. @ text @$NetBSD: patch-ae,v 1.2 2004/03/02 10:28:18 adam Exp $ --- src/libjasper/jp2/jp2_dec.c.orig 2004-02-09 01:34:40.000000000 +0000 +++ src/libjasper/jp2/jp2_dec.c @@@@ -293,7 +293,9 @@@@ jas_image_t *jp2_decode(jas_stream_t *in dec->colr->data.colr.iccplen); assert(iccprof); jas_iccprof_gethdr(iccprof, &icchdr); - jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); + if (jas_getdbglevel() >= 1) { + jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); + } jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); dec->image->cmprof_ = jas_cmprof_createfromiccprof(iccprof); assert(dec->image->cmprof_); @ 1.2 log @Changes 1.701.0: * A preliminary attempt at a color management subsystem has been added to JasPer * Previously, the configure process did not generate a configuration header file * Temporary files created with the jas_stream_tmpfile function were not correctly removed upon file close under Microsoft Windows * An option has been added to the JPEG encoder to allow a quality factor to be specified * A new make target has been added for RPM building * The code now compiles with many fewer warnings on most platforms * The JasPer software license has been made slightly less restrictive * The configure-based build process has been updated to use newer versions of the GNU configure tools @ text @d1 1 a1 1 $NetBSD$ @ 1.2.92.1 log @Pullup ticket #4624 - requested by taca graphics/jasper: security patch Revisions pulled up: - graphics/jasper/Makefile 1.39-1.40 - graphics/jasper/distinfo 1.16-1.17 - graphics/jasper/patches/patch-CVE-2014-9029 deleted - graphics/jasper/patches/patch-ad deleted - graphics/jasper/patches/patch-ae deleted - graphics/jasper/patches/patch-ag deleted - graphics/jasper/patches/patch-ah deleted - graphics/jasper/patches/patch-ai deleted - graphics/jasper/patches/patch-aj deleted - graphics/jasper/patches/patch-configure 1.1 - graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c 1.1 - graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c 1.1 - graphics/jasper/patches/patch-src_libjasper_jpc_jpc__cs.c 1.1 - graphics/jasper/patches/patch-src_libjasper_jpc_jpc__dec.c 1.1-1.2 - graphics/jasper/patches/patch-src_libjasper_jpc_jpc__qmfb.c 1.1 --- Module Name: pkgsrc Committed By: he Date: Thu Jan 1 14:15:27 UTC 2015 Modified Files: pkgsrc/graphics/jasper: Makefile distinfo Added Files: pkgsrc/graphics/jasper/patches: patch-configure patch-src_libjasper_jp2_jp2__cod.c patch-src_libjasper_jp2_jp2__dec.c patch-src_libjasper_jpc_jpc__cs.c patch-src_libjasper_jpc_jpc__dec.c Removed Files: pkgsrc/graphics/jasper/patches: patch-CVE-2014-9029 patch-ad patch-ae patch-ag patch-ah patch-ai patch-aj Log Message: Rename patches to conform to the "new" style. Add comments to the patches. Add fix for oCERT-2014-012, pulled from RedHat. Add fix from Debian bug 469786. Add LICENSE setting, I think modified-bsd is fitting. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: snj Date: Sun Feb 8 23:04:22 UTC 2015 Modified Files: pkgsrc/graphics/jasper: Makefile distinfo pkgsrc/graphics/jasper/patches: patch-src_libjasper_jpc_jpc__dec.c Added Files: pkgsrc/graphics/jasper/patches: patch-src_libjasper_jpc_jpc__qmfb.c Log Message: Fix CVE-2014-8157 and CVE-2014-8158. Bump PKGREVISION to 10. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2004/03/02 10:28:18 adam Exp $ @ 1.1 log @fix warning in installed include file (jas_image.h) make debug output conditional on debug level > 0 bump PKGREVISION @ text @d3 1 a3 1 --- src/libjasper/jp2/jp2_dec.c.orig Fri Oct 18 23:53:57 2002 d5 5 a9 5 @@@@ -339,7 +339,9 @@@@ jas_image_t *jp2_decode(jas_stream_t *in iccp = dec->colr->data.colr.iccp; cs = (iccp[16] << 24) | (iccp[17] << 16) | (iccp[18] << 8) | iccp[19]; - jas_eprintf("ICC Profile CS %08x\n", cs); d11 1 a11 1 + jas_eprintf("ICC Profile CS %08x\n", cs); d13 3 a15 14 jas_image_setcolorspace(dec->image, fromiccpcs(cs)); break; } @@@@ -453,7 +455,9 @@@@ jas_image_t *jp2_decode(jas_stream_t *in jas_eprintf("error: no components\n"); goto error; } -fprintf(stderr, "no of components is %d\n", jas_image_numcmpts(dec->image)); + if (jas_getdbglevel() >= 1) { + fprintf(stderr, "no of components is %d\n", jas_image_numcmpts(dec->image)); + } /* Prevent the image from being destroyed later. */ image = dec->image; @