Update to version 12.17.6. Note that this version fixes some

buffer overflows in the WAV parser that could lead to arbitrary
code execution.

sox-12.17.6
-----------
  o Changed comment code to always use copies of strings to
    fix bug in WAV handlering freeing argv[] memory.
  o Use calloc() to create ft_t structures so that all
    memory is initialized before being referenced.
  o Fixed VOC EOF bug were it thought there was an extra
    block when there wasn't.
  o Restructured directory layout so that source code is in
    a seperate directory.
  o Modified SoX to accept multiple input files.  Concatenates
    files together in this case.
  o Removed map effect so that loops and instr could be removed
    from effects structures.  This makes effects engine stand
    alone from the rest of the sox package.
  o Benedikt Zeyen found a bug in synth effect when generating
    brown noise that could cause clipping.
  o David Leverton sent another patch to prevent crashes on
    amd64's when resampling.
  o Fixed a bug were MP3 files with large ID3v2 tags could
    cause SoX to stick in a loop forever.  Now, it will
    abort on IDv3 tags larger then 100k.  Could still be
    improved to handle any size.
  o Changed volume option (-v) so that it tracks the file
    it was specified.  This means that when specified with
    the input file, it changes volume before effects engine
    and when specified with output file, its done after effects
    engine.
  o Added crossfade_cat.sh script that will concatenate to
    audio files and do a crossfade between them.
  o Fixed bug in fade effect were it was impossible to do a
    fadeout starting from the beginning of the audio file.
  o Removed rounding error when changing volume of audio with
    "-v" option.  This error caused doing a "-v -1.0" twice
    to not result in the original file.
  o Fixed a possible overflow in lots of effects were MIN
    value was treated as -MAX instead of -MAX-1.
  o Modifed sox so its OK for effects to not process any
    input or output bytes as long as they return ST_EOF.
  o When effects output data and reported ST_EOF at the
    same time, that buffer was discarded as well as
    data from any chained effect.
  o Added patch from Eric Benson that attempts to do a seek()
    if the first effect is trim.  This greatly speeds up
    processing large files.
  o Daniel Pouzzner implemented a multi-band compander (using
    the butterworth filters to split the audio into bands).
  o Donnie Smith updated the silence effect so that its possible
    to remove silence from the middle of a sound file by
    using a negative value for stop_periods.
  o Changed float routines to only work with normalized values
    from -1:1.
  o Modifed .au handler to be able to read and write 32-bit
    and 64-bit float data.  Only tested reading so far.
  o WAV with GSM data now always pads data to even number of bytes.
  o Added support for writing 32-bit audio to AIFF.

sox-12.17.5
-----------
  o Thomas Klausner sent in patches to compile audio drivers under
    NetBSD.
  o Rahul Powar pointed out a memory leak in the WAV file handler.
    It wasn't calling the correct close() function when closing
    input files.
  o Modified play.1 man page to not use multiple name lines.  This
    appears to confuse some conversion programs.  Updated sox.1
    man page for typo in reverb option.
  o Andrew Church fixed problem with header of stereo 8SVX files.
  o Jimen Ching added support to scan over garbage data at the
    beginning of MP3 files to find valid frames.  This is useful
    to play WAV and AIFF files that have MP3 data in them until
    those handlers support it directly.  To play those, force
    sox to use the mp3 handler with the "-t mp3" option.
  o Added patch from Ulf Harnhammar to wav handler to prevent
    buffer overflows.
  o Added patch from Redhat to allow resample to work on certain 64-bit
    machines (Sam Varshavchik)
  o Tony Seebregts added a file handler for headerless Dialogic/OKI ADPCM
    files (VOX files).
  o Jan Paul Schmidt added a repeat effect to do loops the brute force way.
    This is also good for file format that don't support loops as well.
  o Fix for OSS driver in rate tolerance calcs that were off because
    of type conversion problems.  Guenter Geiger.
  o Allow reading sphere files with headers greater then 256 bytes.  Jimen
    Ching.
  o Fix for vorbis were comments are displayed in KEY=value format always.
    Stop printing some info to stdout in case output is a pipe. Guenter
    Geiger.
  o J Robert Ray submitted fix for AIFF handler to ignore lowercase
    chunks that are unknown.
  o Bugfix for 8-bit voc files.  Jimen Ching
  o General warning cleanups (cbagwell)
  o Memory leaks in reading WAV files (Ufuk Kayserilioglu)
  o Rearrange link order of ogg vorbis libraries so that they
    can be compiled as static. (Christian Weisgerbr)

2 files changed, 23 insertions, 26 deletions

diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
new file mode 100644
index 00000000000..a45fd016a1a
--- /dev/null
+++ b/audio/sox/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.8 2004/10/18 13:24:48 cube Exp $
+
+--- Makefile.in.orig	2004-09-02 00:04:02.000000000 +0200
++++ Makefile.in
+@@ -18,6 +18,8 @@ includedir = @includedir@
+ 
+ INSTALL	= @INSTALL@
+ LN_S    = @LN_S@
++RM      = rm -f
++PLAY_SUPPORT = @PLAY_SUPPORT@
+ 
+ all: 
+ 	cd src && $(MAKE) $@
+@@ -27,6 +29,9 @@ man: $(srcdir)/sox.1 $(srcdir)/soxexam.1
+ 	nroff -man $(srcdir)/soxexam.1 | col -b > soxexam.txt
+ 	nroff -man $(srcdir)/libst.3 | col -b > libst.txt
+ 
++PLAY_INSTALL_0 =
++PLAY_INSTALL_1 = install-play
++
+ install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
+ 	cd src && $(MAKE) $@
+ 	$(srcdir)/mkinstalldirs $(mandir)/man1
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
deleted file mode 100644
index 558568b60bf..00000000000
--- a/audio/sox/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/07/12 19:30:51 mycroft Exp $
-
---- sunaudio.c.orig	Sat Dec  1 02:17:18 2001
-+++ sunaudio.c	Fri Jul 12 19:18:31 2002
-@@ -31,7 +31,9 @@
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #endif
-+#ifndef __NetBSD__
- #include <stropts.h>
-+#endif
- #include <malloc.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -170,7 +172,11 @@
-         return(ST_EOF);
-     }
-     /* Flush any data in the buffers - its probably in the wrong format */
-+#ifdef __NetBSD__
-+    ioctl(fileno(ft->fp), AUDIO_FLUSH);
-+#else
-     ioctl(fileno(ft->fp), I_FLUSH, FLUSHR);
-+#endif
-     /* Change to non-buffered I/O*/
-     setvbuf(ft->fp, NULL, _IONBF, sizeof(char) * ft->file.size);
-     sigintreg(ft);      /* Prepare to catch SIGINT */