pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/jasper Rename patches to conform to the "new"...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e8b262256c0c
branches: trunk
changeset: 643919:e8b262256c0c
user: he <he%pkgsrc.org@localhost>
date: Thu Jan 01 14:15:27 2015 +0000
description:
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.
diffstat:
graphics/jasper/Makefile | 5 +-
graphics/jasper/distinfo | 14 +-
graphics/jasper/patches/patch-CVE-2014-9029 | 34 --
graphics/jasper/patches/patch-ad | 23 -
graphics/jasper/patches/patch-ae | 15 -
graphics/jasper/patches/patch-ag | 23 -
graphics/jasper/patches/patch-ah | 177 ------------
graphics/jasper/patches/patch-ai | 36 --
graphics/jasper/patches/patch-aj | 21 -
graphics/jasper/patches/patch-configure | 179 +++++++++++++
graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c | 25 +
graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c | 33 ++
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__cs.c | 38 ++
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__dec.c | 73 +++++
14 files changed, 357 insertions(+), 339 deletions(-)
diffs (truncated from 768 to 300 lines):
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/Makefile
--- a/graphics/jasper/Makefile Thu Jan 01 13:00:12 2015 +0000
+++ b/graphics/jasper/Makefile Thu Jan 01 14:15:27 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2014/12/11 20:18:09 tez Exp $
+# $NetBSD: Makefile,v 1.39 2015/01/01 14:15:27 he Exp $
DISTNAME= jasper-1.900.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/
EXTRACT_SUFX= .zip
@@ -9,6 +9,7 @@
MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= http://www.ece.uvic.ca/~mdadams/jasper/
COMMENT= Software-based reference implementation of the JPEG-2000 codec
+LICENSE= modified-bsd
USE_LANGUAGES= c99
USE_LIBTOOL= yes
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/distinfo
--- a/graphics/jasper/distinfo Thu Jan 01 13:00:12 2015 +0000
+++ b/graphics/jasper/distinfo Thu Jan 01 14:15:27 2015 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.15 2014/12/11 20:18:09 tez Exp $
+$NetBSD: distinfo,v 1.16 2015/01/01 14:15:27 he Exp $
SHA1 (jasper-1.900.1.zip) = 9c5735f773922e580bf98c7c7dfda9bbed4c5191
RMD160 (jasper-1.900.1.zip) = fb2c188abf5b8c297078ac1f913101734f72db5c
Size (jasper-1.900.1.zip) = 1415752 bytes
-SHA1 (patch-CVE-2014-9029) = e8db6f31a06773dd385b40d684f4be8eb8676723
-SHA1 (patch-ad) = 85637e42cdb1245babd5736c2d039558025738a6
-SHA1 (patch-ae) = bfe00f76582a44ad748706c3fc81c4d6b8aede35
-SHA1 (patch-ag) = 0a3cf7ffff67001529198c23c3ca2499c71be7fa
-SHA1 (patch-ah) = 5455854277ad52adb4a22be08219facd796bbf1a
-SHA1 (patch-ai) = 39a16368197d180d9d925bc12b9fc1c6985f06f0
-SHA1 (patch-aj) = a2f5b3b31220767cd6f22ff236e3789ab6a5ba4f
+SHA1 (patch-configure) = c8aa09f8432f0e3f5667ecb3ccd738c3c03f3f05
+SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = 7902e9900130f466fa60a5389409cc9495b6260c
+SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = 5a795502f9241829afa1acf0a2a341155b954108
+SHA1 (patch-src_libjasper_jpc_jpc__cs.c) = 794de4dcf8f809275a5bee5cb60d95cf9608e0a7
+SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = f51f025c9756ed0751f24997926cccefc2ef8afe
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/patches/patch-CVE-2014-9029
--- a/graphics/jasper/patches/patch-CVE-2014-9029 Thu Jan 01 13:00:12 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-CVE-2014-9029,v 1.1 2014/12/11 20:18:09 tez Exp $
-
-Patch for CVE-2014-9029 from https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-9029
-
-
---- src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100
-+++ src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100
-@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t
- jpc_coc_t *coc = &ms->parms.coc;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, coc->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in COC marker segment\n");
- return -1;
- }
-@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t
- jpc_rgn_t *rgn = &ms->parms.rgn;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in RGN marker segment\n");
- return -1;
- }
-@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t
- jpc_qcc_t *qcc = &ms->parms.qcc;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in QCC marker segment\n");
- return -1;
- }
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/patches/patch-ad
--- a/graphics/jasper/patches/patch-ad Thu Jan 01 13:00:12 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/01/06 23:28:07 wiz Exp $
-
---- src/libjasper/jp2/jp2_cod.c.orig 2006-12-08 00:23:36.000000000 +0000
-+++ src/libjasper/jp2/jp2_cod.c
-@@ -795,11 +795,15 @@ static void jp2_cmap_dumpdata(jp2_box_t
- jp2_cmap_t *cmap = &box->data.cmap;
- unsigned int i;
- jp2_cmapent_t *ent;
-- fprintf(out, "numchans = %d\n", (int) cmap->numchans);
-+ if (jas_getdbglevel() >= 1) {
-+ fprintf(out, "numchans = %d\n", (int) cmap->numchans);
-+ }
- for (i = 0; i < cmap->numchans; ++i) {
- ent = &cmap->ents[i];
-- fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
-- (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
-+ if (jas_getdbglevel() >= 1) {
-+ fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
-+ (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
-+ }
- }
- }
-
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/patches/patch-ae
--- a/graphics/jasper/patches/patch-ae Thu Jan 01 13:00:12 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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_);
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/patches/patch-ag
--- a/graphics/jasper/patches/patch-ag Thu Jan 01 13:00:12 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2008/03/20 19:58:16 drochner Exp $
-
---- ./src/libjasper/jpc/jpc_dec.c.orig 2007-01-19 22:43:07.000000000 +0100
-+++ ./src/libjasper/jpc/jpc_dec.c
-@@ -1234,6 +1234,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- }
- for (compno = 0, cmpt = dec->cmpts, tcomp = tile->tcomps;
- compno < dec->numcomps; ++compno, ++cmpt, ++tcomp) {
-+ tcomp->numrlvls = 0;
- tcomp->rlvls = 0;
- tcomp->data = 0;
- tcomp->xstart = JPC_CEILDIV(tile->xstart, cmpt->hstep);
-@@ -1466,7 +1467,9 @@ static int jpc_dec_process_unk(jpc_dec_t
- dec = 0;
-
- jas_eprintf("warning: ignoring unknown marker segment\n");
-- jpc_ms_dump(ms, stderr);
-+ if (jas_getdbglevel() >= 1) {
-+ jpc_ms_dump(ms, stderr);
-+ }
- return 0;
- }
-
diff -r cc9c0cca1f93 -r e8b262256c0c graphics/jasper/patches/patch-ah
--- a/graphics/jasper/patches/patch-ah Thu Jan 01 13:00:12 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/08/12 21:53:42 salo Exp $
-
---- configure.orig 2007-01-19 21:54:48.000000000 +0000
-+++ configure 2007-08-12 20:56:30.000000000 +0000
-@@ -20979,6 +20979,163 @@ _ACEOF
-
- fi
-
-+echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
-+if test "${ac_cv_header_stdbool_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <stdbool.h>
-+#ifndef bool
-+# error bool is not defined
-+#endif
-+#ifndef false
-+# error false is not defined
-+#endif
-+#if false
-+# error false is not 0
-+#endif
-+#ifndef true
-+# error true is not defined
-+#endif
-+#if true != 1
-+# error true is not 1
-+#endif
-+#ifndef __bool_true_false_are_defined
-+# error __bool_true_false_are_defined is not defined
-+#endif
-+
-+ struct s { _Bool s: 1; _Bool t; } s;
-+
-+ char a[true == 1 ? 1 : -1];
-+ char b[false == 0 ? 1 : -1];
-+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+ char d[(bool) -0.5 == true ? 1 : -1];
-+ bool e = &s;
-+ char f[(_Bool) -0.0 == false ? 1 : -1];
-+ char g[true];
-+ char h[sizeof (_Bool)];
-+ char i[sizeof s.t];
-+
-+int
-+main ()
-+{
-+ return !a + !b + !c + !d + !e + !f + !g + !h + !i;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_header_stdbool_h=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdbool_h=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
-+echo "$as_me:$LINENO: checking for _Bool" >&5
-+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
-+if test "${ac_cv_type__Bool+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((_Bool *) 0)
-+ return 0;
-+if (sizeof (_Bool))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type__Bool=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
Home |
Main Index |
Thread Index |
Old Index