head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.90 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.88 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.86 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.84 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.82 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.80 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.78 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.76 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.74 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.72 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.70 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.68 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.66 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.64 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.62 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.60 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.58 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.56 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.54 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.52 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.50 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.48 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.46 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.42 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.22 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.44 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.40 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.38 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.36 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.34 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.32 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.30 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.28 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.26 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.24 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.20 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.18 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.16 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.14 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.12 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.10 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.8 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.6 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.4 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.2 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.3.0.10 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.8 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.6 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.4 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.2 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.0.16 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.14 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.12 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.10 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.8 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.6 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.4 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.2 pkgsrc-2010Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2015.03.14.22.56.00; author tnn; state Exp; branches; next 1.3; commitid fXJssOac2BVYYCdy; 1.3 date 2013.10.02.14.21.27; author drochner; state Exp; branches; next 1.2; commitid L3jQS84gGeDB6J7x; 1.2 date 2012.12.18.14.42.29; author jperkin; state Exp; branches; next 1.1; 1.1 date 2010.12.27.05.32.49; author obache; state Exp; branches; next ; desc @@ 1.4 log @Update to sox-14.4.2 to fix CVE-2014-8145. SoX 14.4.2 (February 22, 2015): Read support for Ogg Opus files. Read support for RF64 WAV files. Deemph can now be used at 48kHz sample rates. Rate is now much faster in many cases. Support multi-channel LADSPA plugins and optional latency compensation. Many other bug fixes. @ text @$NetBSD$ * On DragonFly, FILE is hidden, only allowed to modify in __FILE_public. * Disable file-type pipe detection on 64-bit Solaris. --- src/formats.c.orig 2014-10-27 02:55:50.000000000 +0000 +++ src/formats.c @@@@ -411,18 +411,23 @@@@ static void UNUSED rewind_pipe(FILE * fp /* _FSTDIO is for Torek stdio (i.e. most BSD-derived libc's) * In theory, we no longer need to check _NEWLIB_VERSION or __APPLE__ */ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ +# ifdef __DragonFly__ + struct __FILE_public *fpp = (struct __FILE_public *)fp; + fpp->_p -= AUTO_DETECT_SIZE; + fpp->_r += AUTO_DETECT_SIZE; +# else fp->_p -= PIPE_AUTO_DETECT_SIZE; fp->_r += PIPE_AUTO_DETECT_SIZE; +# endif #elif defined __GLIBC__ fp->_IO_read_ptr = fp->_IO_read_base; #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || \ - defined _ISO_STDIO_ISO_H || defined __sgi + (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) || defined __sgi fp->_ptr = fp->_base; #else /* To fix this #error, either simply remove the #error line and live without * file-type detection with pipes, or add support for your compiler in the * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif @ 1.3 log @update to 14.4.1 changes: -Re-enable file-type detection when reading from a pipe -bugfixes @ text @d7 1 a7 1 --- src/formats.c.orig 2013-01-13 19:57:39.000000000 +0000 d9 1 a9 1 @@@@ -407,17 +407,22 @@@@ static void UNUSED rewind_pipe(FILE * fp d23 3 a25 2 -#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H +#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) @ 1.2 log @On 64-bit Solaris FILE is an opaque type, disable the rewind functionality. Fixes package build. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2010/12/27 05:32:49 obache Exp $ d7 3 a9 3 --- src/formats.c.orig 2012-03-04 22:54:16.000000000 +0000 +++ src/formats.c 2012-12-18 14:37:03.629252407 +0000 @@@@ -406,17 +406,22 @@@@ d18 2 a19 2 fp->_p -= AUTO_DETECT_SIZE; fp->_r += AUTO_DETECT_SIZE; d23 2 a24 2 -#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H +#elif defined _MSC_VER || defined __MINGW_H || (defined _ISO_STDIO_ISO_H && !(defined(__sun) && defined(_LP64))) d29 1 a29 1 * lines above. Test with cat monkey.au | ./sox --info - */ @ 1.1 log @Add patch-ak for DragonFly. @ text @d1 1 a1 1 $NetBSD$ d5 5 a9 3 --- src/formats.c.orig 2010-01-02 00:07:28.000000000 +0000 +++ src/formats.c @@@@ -397,8 +397,14 @@@@ static void UNUSED rewind_pipe(FILE * fp d23 11 a33 1 #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H @