head 1.4; access; symbols pkgsrc-2019Q3:1.3.0.102 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.100 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.98 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.96 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.94 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.92 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.90 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.88 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.86 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.82 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.80 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.78 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.76 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.74 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.72 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.70 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.68 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.66 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.64 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.62 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.60 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.58 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.56 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.54 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.52 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.48 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.46 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.44 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.42 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.40 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.36 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.32 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.30 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.28 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.26 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.24 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2; locks; strict; comment @# @; 1.4 date 2019.11.17.13.07.03; author nia; state dead; branches; next 1.3; commitid acfR3eCd8oSfNcLB; 1.3 date 2007.11.16.12.03.42; author dillo; state Exp; branches 1.3.102.1; next 1.2; 1.2 date 2003.09.01.10.17.37; author cjep; state Exp; branches; next 1.1; 1.1 date 2003.08.25.12.11.30; author mrg; state Exp; branches; next ; 1.3.102.1 date 2019.11.24.19.29.18; author bsiegert; state dead; branches; next ; commitid EjJxe4U9eRmxG8MB; desc @@ 1.4 log @bchunk: Update to 1.2.2 1.2.2 - Nov 14 2017 - Hessu Fixes CVE-2017-15953, a heap-based buffer overflow. Fix provided by Yegor Timoshenko. Fixes CVE-2017-15955, Access violation near NULL on destination operand and crash when processing a malformed CUE (.cue) file. Fix provided by Yegor Timoshenko. Fix wrong track size calculation when having multiple tracks in one image. (Closes debian bug: #261274). Fix provided by Piotr Kaczuba. Clarify manual page for input/output file types Improvement from Reuben Thomas, debian bug: #503151 @ text @$NetBSD: patch-ab,v 1.3 2007/11/16 12:03:42 dillo Exp $ --- bchunk.c.orig 2004-06-29 22:42:33.000000000 +0200 +++ bchunk.c @@@@ -470,13 +470,15 @@@@ int main(int argc, char **argv) *t = '\0'; t++; idx = atoi(p); + if (idx != 1) + continue; printf(" %s %s", p, t); track->startsect = time2frames(t); track->start = track->startsect * SECTLEN; if (verbose) printf(" (startsect %ld ofs %ld)", track->startsect, track->start); if ((prevtrack) && (prevtrack->stopsect < 0)) { - prevtrack->stopsect = track->startsect; + prevtrack->stopsect = track->startsect - 1; prevtrack->stop = track->start - 1; } } @ 1.3 log @Update to 1.2.0 and fix two bugs: - Only use index 1 as track boundary. Previously, the first index was taken as the end of the previous track and the last index as the start of this track. All sectors in between were silently dropped. - Stop output of a track *before* the first sector of the next track. Previously, the first sector was output twice, once as the last sector of the previous track, once as the first sector of the current track. Patches will be sent upstream shortly. Take maintainership, ok pooka. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.102.1 log @Pullup ticket #6087 - requested by nia sysutils/bchunk: security fix Revisions pulled up: - sysutils/bchunk/Makefile 1.14 - sysutils/bchunk/distinfo 1.9 - sysutils/bchunk/patches/patch-ab deleted --- Module Name: pkgsrc Committed By: nia Date: Sun Nov 17 13:07:03 UTC 2019 Modified Files: pkgsrc/sysutils/bchunk: Makefile distinfo Removed Files: pkgsrc/sysutils/bchunk/patches: patch-ab Log Message: bchunk: Update to 1.2.2 1.2.2 - Nov 14 2017 - Hessu Fixes CVE-2017-15953, a heap-based buffer overflow. Fix provided by Yegor Timoshenko. Fixes CVE-2017-15955, Access violation near NULL on destination operand and crash when processing a malformed CUE (.cue) file. Fix provided by Yegor Timoshenko. Fix wrong track size calculation when having multiple tracks in one image. (Closes debian bug: #261274). Fix provided by Piotr Kaczuba. Clarify manual page for input/output file types Improvement from Reuben Thomas, debian bug: #503151 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2007/11/16 12:03:42 dillo Exp $ @ 1.2 log @Add NetBSD RCS tags @ text @d2 20 a21 49 --- bchunk.c.orig 2001-08-07 21:18:29.000000000 +1000 +++ bchunk.c 2003-07-18 23:56:09.000000000 +1000 @@@@ -25,10 +25,11 @@@@ #include #define VERSION "1.1.1" -#define USAGE "Usage: bchunk [-v] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \ +#define USAGE "Usage: bchunk [-v] [-r] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \ " \n" \ "Example: bchunk foo.bin foo.cue foo\n" \ " -v Verbose mode\n" \ + " -r Raw mode\n" \ " -p PSX mode: truncate MODE2/2352 to 2336 bytes instead of normal 2048\n" \ " -w Output audio files in WAV format\n" \ " -s swabaudio: swap byte order in audio tracks\n" @@@@ -88,6 +89,7 @@@@ char *cuefile = NULL; int verbose = 0; int psxtruncate = 0; +int raw = 0; int swabaudio = 0; int towav = 0; @@@@ -99,8 +101,11 @@@@ { int s; - while ((s = getopt(argc, argv, "swvp?h")) != -1) { + while ((s = getopt(argc, argv, "swvp?hr")) != -1) { switch (s) { + case 'r': + raw = 1; + break; case 'v': verbose = 1; break; @@@@ -190,7 +195,11 @@@@ } else if (!strcasecmp(modes, "MODE2/2352")) { track->extension = ext_iso; - if (psxtruncate) { + if (raw) { + /* Raw MODE2/2352 */ + track->bstart = 0; + track->bsize = 2352; + } else if (psxtruncate) { /* PSX: truncate from 2352 to 2336 byte tracks */ track->bstart = 0; track->bsize = 2336; @ 1.1 log @add a "-r" flag that enables a "raw" mode - copy the data out in 2352 sector chunks. this flag has already been included by the upstream and will be in the next release of bchunk. @ text @d1 1 @