head 1.11; access; symbols pkgsrc-2020Q4:1.10.0.48 pkgsrc-2020Q4-base:1.10 pkgsrc-2020Q3:1.10.0.46 pkgsrc-2020Q3-base:1.10 pkgsrc-2020Q2:1.10.0.42 pkgsrc-2020Q2-base:1.10 pkgsrc-2020Q1:1.10.0.22 pkgsrc-2020Q1-base:1.10 pkgsrc-2019Q4:1.10.0.44 pkgsrc-2019Q4-base:1.10 pkgsrc-2019Q3:1.10.0.40 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.38 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.36 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.10.0.34 pkgsrc-2018Q4-base:1.10 pkgsrc-2018Q3:1.10.0.32 pkgsrc-2018Q3-base:1.10 pkgsrc-2018Q2:1.10.0.30 pkgsrc-2018Q2-base:1.10 pkgsrc-2018Q1:1.10.0.28 pkgsrc-2018Q1-base:1.10 pkgsrc-2017Q4:1.10.0.26 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.24 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.20 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.18 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.16 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.14 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.12 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.10 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.8 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.6 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.4 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.2 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.9.0.34 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.32 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.30 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.28 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.26 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.24 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.22 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.20 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.18 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.16 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.14 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.12 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.10 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.8 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.6 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.4 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.2 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.8.0.26 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.24 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.22 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.20 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.18 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.16 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.14 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.12 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.10 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.8 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.6 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.4 pkgsrc-2008Q1:1.8.0.2 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.7.0.8 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.6 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.4 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.2 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.4 netbsd-1-5-PATCH001:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.11 date 2021.02.09.20.26.28; author nia; state dead; branches; next 1.10; commitid uoir4E4Kenh6L4HC; 1.10 date 2015.03.21.19.06.54; author bsiegert; state Exp; branches; next 1.9; commitid 8Oxh2fbvn0Dtuvey; 1.9 date 2010.11.09.13.13.03; author adam; state Exp; branches 1.9.34.1; next 1.8; 1.8 date 2008.03.14.18.55.54; author wiz; state Exp; branches; next 1.7; 1.7 date 2007.01.13.15.35.52; author wiz; state Exp; branches; next 1.6; 1.6 date 2003.12.08.14.43.48; author wiz; state Exp; branches; next 1.5; 1.5 date 2003.09.05.19.16.23; author explorer; state Exp; branches; next 1.4; 1.4 date 2001.08.08.10.05.30; author lukem; state dead; branches; next 1.3; 1.3 date 2001.03.23.16.18.56; author wiz; state Exp; branches; next 1.2; 1.2 date 2001.03.15.21.42.44; author wiz; state dead; branches; next 1.1; 1.1 date 2001.03.15.20.53.06; author wiz; state Exp; branches 1.1.1.1; next ; 1.9.34.1 date 2015.04.01.15.32.04; author hiramatsu; state Exp; branches; next ; commitid 2FMN4MHKYGtlWTfy; 1.1.1.1 date 2001.03.15.20.53.06; author wiz; state Exp; branches; next ; desc @@ 1.11 log @vorbis-tools: update to 1.4.2 vorbis-tools 1.4.2 -- 2021-01-21 * Cleanup of the build system * Code cleanup * Removed outdated debian/, and vorbis-tools.spec * Updated po/ to reflect new code positions * ogg123, ogginfo: Added support to decode METADATA_BLOCK_PICTURE * ogginfo: Added support for decoding Skeleton @ text @$NetBSD: patch-ac,v 1.10 2015/03/21 19:06:54 bsiegert Exp $ https://trac.xiph.org/changeset/19117 oggenc: fix crash on raw file close, reported by Hanno in issue #2009. pointer to a non-static struct was escaping its scope. --- oggenc/oggenc.c.orig 2010-03-26 07:07:07.000000000 +0000 +++ oggenc/oggenc.c @@@@ -97,6 +97,8 @@@@ int main(int argc, char **argv) .3,-1, 0,0,0.f, 0, 0, 0, 0, 0}; + input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", + N_("RAW file reader")}; int i; @@@@ -239,9 +241,6 @@@@ int main(int argc, char **argv) if(opt.rawmode) { - input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", - N_("RAW file reader")}; - enc_opts.rate=opt.raw_samplerate; enc_opts.channels=opt.raw_channels; enc_opts.samplesize=opt.raw_samplesize; @@@@ -779,6 +778,8 @@@@ static void parse_options(int argc, char break; case 'a': + if (strlen(optarg) == 0) + break; opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *)); opt->artist[opt->artist_count - 1] = strdup(optarg); break; @@@@ -791,10 +792,14 @@@@ static void parse_options(int argc, char opt->comments[opt->comment_count - 1] = strdup(optarg); break; case 'd': + if (strlen(optarg) == 0) + break; opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *)); opt->dates[opt->date_count - 1] = strdup(optarg); break; case 'G': + if (strlen(optarg) == 0) + break; opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *)); opt->genre[opt->genre_count - 1] = strdup(optarg); break; @@@@ -803,6 +808,8 @@@@ static void parse_options(int argc, char exit(0); break; case 'l': + if (strlen(optarg) == 0) + break; opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *)); opt->album[opt->album_count - 1] = strdup(optarg); break; @@@@ -815,6 +822,8 @@@@ static void parse_options(int argc, char opt->fixedserial = 1; break; case 't': + if (strlen(optarg) == 0) + break; opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *)); opt->title[opt->title_count - 1] = strdup(optarg); break; @ 1.10 log @SECURITY: Fix CVE-2014-9640. https://trac.xiph.org/changeset/19117 oggenc: fix crash on raw file close, reported by Hanno in issue #2009. pointer to a non-static struct was escaping its scope. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.9 2010/11/09 13:13:03 adam Exp $ @ 1.9 log @Changes 1.4.0: * Implement corrected channel mappings for all input and playback file types * Correct an possible infinite loop in WAV input reading code when header is corrupt * Implement disable_coupling option for oggenc * Fix Ctrl-C lockup bug in ogg123 * ogg123 playback in sorted order * Add WAVEFORMATEXTENSIBLE support * More translations * Add '-' as stdin/out filename in vcut * Add -lnetwork check for socket in configure * Remove 'extra' F parameter from ogg123 remote output @ text @d1 1 a1 1 $NetBSD$ d3 3 d8 20 a27 1 @@@@ -779,6 +779,8 @@@@ static void parse_options(int argc, char d36 1 a36 1 @@@@ -791,10 +793,14 @@@@ static void parse_options(int argc, char d51 1 a51 1 @@@@ -803,6 +809,8 @@@@ static void parse_options(int argc, char d60 1 a60 1 @@@@ -815,6 +823,8 @@@@ static void parse_options(int argc, char @ 1.9.34.1 log @Pullup ticket #4647 - requested by bsiegert audio/vorbis-tools: security patch Revisions pulled up: - audio/vorbis-tools/Makefile 1.61 - audio/vorbis-tools/distinfo 1.24 - audio/vorbis-tools/patches/patch-ac 1.10 --- Module Name: pkgsrc Committed By: bsiegert Date: Sat Mar 21 19:06:54 UTC 2015 Modified Files: pkgsrc/audio/vorbis-tools: Makefile distinfo pkgsrc/audio/vorbis-tools/patches: patch-ac Log Message: SECURITY: Fix CVE-2014-9640. https://trac.xiph.org/changeset/19117 oggenc: fix crash on raw file close, reported by Hanno in issue #2009. pointer to a non-static struct was escaping its scope. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2015/03/21 19:06:54 bsiegert Exp $ a2 3 https://trac.xiph.org/changeset/19117 oggenc: fix crash on raw file close, reported by Hanno in issue #2009. pointer to a non-static struct was escaping its scope. d5 1 a5 20 @@@@ -97,6 +97,8 @@@@ int main(int argc, char **argv) .3,-1, 0,0,0.f, 0, 0, 0, 0, 0}; + input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", + N_("RAW file reader")}; int i; @@@@ -239,9 +241,6 @@@@ int main(int argc, char **argv) if(opt.rawmode) { - input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", - N_("RAW file reader")}; - enc_opts.rate=opt.raw_samplerate; enc_opts.channels=opt.raw_channels; enc_opts.samplesize=opt.raw_samplesize; @@@@ -779,6 +778,8 @@@@ static void parse_options(int argc, char d14 1 a14 1 @@@@ -791,10 +792,14 @@@@ static void parse_options(int argc, char d29 1 a29 1 @@@@ -803,6 +808,8 @@@@ static void parse_options(int argc, char d38 1 a38 1 @@@@ -815,6 +822,8 @@@@ static void parse_options(int argc, char @ 1.8 log @Update to 1.2.0: vorbis-tools 1.2.0 -- 2008-02-21 * FLAC support now relies on libFLAC * Support for large files * Fixed acinclude.m4 to properly support --no switches * ogg123: added remote control support * ogg123: fixed a bug in esd when pressing CTRL + C * ogg123: fixed a type mismatch in option parsing for 64 bit systems * ogg123: configuration no longer hardcoded to /etc * oggdec: limited support for chained Ogg bitstreams * ogg123: compiles with older versions of libcurl * oggdec: support decoding of multiple files into a single one * oggenc: -k, switch for Skeleton bitstream encoding * oggenc: fixed issues with Skeleton on big endian systems * oggenc: proper 5.1 channel mapping support * oggenc: FLAC module does not confuse every Ogg file as its own * oggenc: compiles with older versions of libvorbis * ogginfo: recognizes Skeleton, Dirac, FLAC and Kate bitstreams * vcut: solved issues described in ticket #1313 * vorbiscomment: support for creation of long comments * vorbiscomment: support for multiplexed Vorbis * Several minor bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2007/01/13 15:35:52 wiz Exp $ d3 1 a3 1 --- oggenc/oggenc.c.orig 2008-03-03 05:37:27.000000000 +0000 d5 1 a5 1 @@@@ -676,6 +676,8 @@@@ static void parse_options(int argc, char d14 1 a14 1 @@@@ -688,10 +690,14 @@@@ static void parse_options(int argc, char d29 1 a29 1 @@@@ -700,6 +706,8 @@@@ static void parse_options(int argc, char d38 1 a38 1 @@@@ -712,6 +720,8 @@@@ static void parse_options(int argc, char @ 1.7 log @Add support for flac-1.1.3 based on Josh Coalson's patches. Bump PKGREVISION because previously it would just disable flac support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2003/12/08 14:43:48 wiz Exp $ d3 1 a3 1 --- oggenc/oggenc.c.orig 2005-06-03 10:15:10.000000000 +0000 d5 1 a5 1 @@@@ -659,6 +659,8 @@@@ static void parse_options(int argc, char d7 16 a22 16 break; case 'a': + if (strlen(optarg) == 0) + break; opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *)); opt->artist[opt->artist_count - 1] = strdup(optarg); break; @@@@ -671,10 +673,14 @@@@ static void parse_options(int argc, char opt->comments[opt->comment_count - 1] = strdup(optarg); break; case 'd': + if (strlen(optarg) == 0) + break; opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *)); opt->dates[opt->date_count - 1] = strdup(optarg); break; d24 2 a25 2 + if (strlen(optarg) == 0) + break; d29 18 a46 18 @@@@ -683,6 +689,8 @@@@ static void parse_options(int argc, char exit(0); break; case 'l': + if (strlen(optarg) == 0) + break; opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *)); opt->album[opt->album_count - 1] = strdup(optarg); break; @@@@ -693,6 +701,8 @@@@ static void parse_options(int argc, char opt->serial = 0; /* Failed, so just set to zero */ break; case 't': + if (strlen(optarg) == 0) + break; opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *)); opt->title[opt->title_count - 1] = strdup(optarg); break; @ 1.6 log @Update to 1.0.1: ogg123 * Support for playing FLAC and Speex files. Both the native FLAC and Ogg FLAC varieties are supported. Special thanks to OldMan, adiabatic, and smack from #vorbis for sponsoring the development of this feature. * Send correct User Agent and Accept strings in the HTTP 1.1 headers * Fixed bug preventing the status line from showing the total time information in certain circumstances * Fixed a pthread crash bug on certain platforms (like NetBSD) * Added support for the --end option to specify at what time playback should stop. Both --skip and --end also now accept times in hh:mm:ss format. Thanks to Hans Schou. * If the --skip option is greater than the length of the file, ogg123 now terminates with an error. oggdec * Fixed small memory leak. * Fixed error that caused oggdec to crash when output file was not specified. oggenc * Patch from Jordan Mendelson to support reading little-endian AIFF files (which happen to be made by MacOS X when ripping CDs?). * --scale option to allow scaling the volume of the input. Helps with clipping inputs. * Fixed usage messages. * 24 bit input support * FLAC and Ogg FLAC read support. Comments from the FLAC file are preserved unless explicitly dropped with the --discard-comments option. Also funded by OldMan, adiabatic, and smack. * Less frequent status updates. ogginfo * Minor typo and portability fixes. * Emits fewer spurious errors when minor errors are detected. * Return a useful status code. * Fixed overflow bug on really long files. vcut * Patch from Jared Anderson allows the cutpoint to be specified in (integer) seconds by prefixing it with a +. vorbiscomment * More forgiving of Ogg files that begin with garbage (like ID3v2 tags). @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- oggenc/oggenc.c.orig Tue Sep 16 00:04:00 2003 d5 1 a5 1 @@@@ -640,6 +640,8 @@@@ static void parse_options(int argc, char d14 1 a14 1 @@@@ -652,10 +654,14 @@@@ static void parse_options(int argc, char d29 1 a29 1 @@@@ -664,6 +670,8 @@@@ static void parse_options(int argc, char d38 1 a38 1 @@@@ -674,6 +682,8 @@@@ static void parse_options(int argc, char @ 1.5 log @add a patch to stop crashing on -d '' or -G '' which abcde wants to use when a date or genre is unknown @ text @d3 3 a5 4 diff -ur oggenc/oggenc.c.orig oggenc/oggenc.c --- oggenc/oggenc.c.orig 2002-07-11 19:55:11.000000000 -0700 +++ oggenc/oggenc.c 2003-09-05 12:09:59.000000000 -0700 @@@@ -613,6 +613,8 @@@@ d14 1 a14 1 @@@@ -625,10 +627,14 @@@@ d29 1 a29 1 @@@@ -637,6 +643,8 @@@@ d38 1 a38 1 @@@@ -647,6 +655,8 @@@@ @ 1.4 log @update vorbistools from 1.0beta4 to 1.0rc1, including: - use buildlink - remove unnecessary patches for stuff now fixed in main distribution - modify patch-aa to fix ogginfo man page installation @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2001/03/23 16:18:56 wiz Exp $ d3 45 a47 12 --- ogg123/buffer.c.orig Tue Jan 30 11:42:48 2001 +++ ogg123/buffer.c @@@@ -92,6 +92,9 @@@@ perror ("shmat"); exit (1); } + + /* Remove segment after last process detaches it or terminates. */ + shmctl(shmid, IPC_RMID, 0); buffer_init (buf, size); @ 1.3 log @Add a patch supplied by Christian Weisgerber : Remove shared memory segments (created when using -b) after exiting. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Don't default to oss, use the standard way (null device). Note in a MESSAGE how to set the default to oss. By Jeremy C. Reed. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2001/03/15 20:53:06 wiz Exp $ d3 12 a14 13 --- ../vorbis-tools-1.0beta4.orig/ogg123/ogg123.c Fri Feb 23 16:52:22 2001 +++ ogg123/ogg123.c Thu Mar 15 10:40:21 2001 @@@@ -170,7 +170,9 @@@@ if (temp_driver_id < 0) { temp_driver_id = get_default_device(); if(temp_driver_id < 0) { - temp_driver_id = ao_get_driver_id(NULL); +/* temp_driver_id = ao_get_driver_id(NULL); */ +/* For the NetBSD package, I am assuming that audio is desired. */ + temp_driver_id = ao_get_driver_id("oss"); } if (temp_driver_id < 0) { fprintf(stderr, @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of vorbis-tools: Ogg Vorbis encoder and player. Replaces audio/vorbis. Package by Jeremy C. Reed, submitted in pkg/12415. (Note: -d wav output seems to be broken right now, output to /dev/audio works fine.) @ text @@