From 145768bf9b96f2d7cd8fdc8ce9dbf3b27a713796 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Jul 2015 08:11:05 -0400 Subject: Unmaintain a bunch of packages --- pkgs/applications/misc/audio/sox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/misc/audio') diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 07dbde2939b..fa6e53bcf97 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; - maintainers = [ lib.maintainers.marcweber lib.maintainers.shlevy ]; + maintainers = [ lib.maintainers.marcweber ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -- cgit 1.4.1 From cec63e87a28f830ce668a48405a6f2b459f7d940 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 Sep 2015 20:49:41 +0900 Subject: sox: 14.4.1 -> 14.4.2 --- ...001-Check-for-minimum-size-sphere-headers.patch | 28 ---------------------- ...2-More-checks-for-invalid-MS-ADPCM-blocks.patch | 28 ---------------------- pkgs/applications/misc/audio/sox/default.nix | 11 ++------- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch delete mode 100644 pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch (limited to 'pkgs/applications/misc/audio') diff --git a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch b/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch deleted file mode 100644 index f01fec390d4..00000000000 --- a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 55e33019afcb3256cccedf606548b86816f6da59 Mon Sep 17 00:00:00 2001 -From: Chris Bagwell -Date: Sat, 13 Dec 2014 12:48:37 -0600 -Subject: [PATCH 1/2] Check for minimum size sphere headers - ---- - src/sphere.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/sphere.c b/src/sphere.c -index 479a552..a3fd1c6 100644 ---- a/src/sphere.c -+++ b/src/sphere.c -@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft) - - /* Determine header size, and allocate a buffer large enough to hold it. */ - sscanf(fldsval, "%lu", &header_size_ul); -+ if (header_size_ul < 16) { -+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header"); -+ return (SOX_EOF); -+ } -+ - buf = lsx_malloc(header_size = header_size_ul); - - /* Skip what we have read so far */ --- -2.1.0 - diff --git a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch b/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch deleted file mode 100644 index 72c2d765a94..00000000000 --- a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ebb64cddde59ecc9cedf3741ce2337c72148cc0c Mon Sep 17 00:00:00 2001 -From: Chris Bagwell -Date: Sat, 13 Dec 2014 12:49:55 -0600 -Subject: [PATCH 2/2] More checks for invalid MS ADPCM blocks. - -If block doesn't exacty match blockAlign then do not allow -number of samples in invalid size block to ever be more than -what WAV header defined as samplesPerBlock. ---- - src/wav.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/wav.c b/src/wav.c -index 61d5908..5202556 100644 ---- a/src/wav.c -+++ b/src/wav.c -@@ -168,7 +168,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft) - /* work with partial blocks. Specs say it should be null */ - /* padded but I guess this is better than trailing quiet. */ - samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t)0); -- if (samplesThisBlock == 0) -+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock) - { - lsx_warn("Premature EOF on .wav input file"); - return 0; --- -2.1.0 - diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index fa6e53bcf97..9a30e4669ee 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -11,20 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sox-14.4.1"; + name = "sox-14.4.2"; src = fetchurl { url = "mirror://sourceforge/sox/${name}.tar.gz"; - sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s"; + sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; - patches = [ - # Patches for CVE-2014-8145, found via RedHat bug 1174792. It was not - # clear whether these address a NULL deref and a division by zero. - ./0001-Check-for-minimum-size-sphere-headers.patch - ./0002-More-checks-for-invalid-MS-ADPCM-blocks.patch - ]; - buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional enableLibao libao ++ -- cgit 1.4.1 From e48c2d520ec27eea32a89464cc66e92f7e381235 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 Sep 2015 21:23:30 +0900 Subject: sox: enable libsndfile, amr-nb, amr-wb (close #9824) --- pkgs/applications/misc/audio/sox/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/misc/audio') diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9a30e4669ee..b4f01bc642b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,6 +6,9 @@ , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null +, enableLibsndfile ? true, libsndfile ? null +# amrnb and amrwb are unfree, disabled by default +, enableAMR ? false, amrnb ? null, amrwb ? null }: with stdenv.lib; @@ -25,13 +28,15 @@ stdenv.mkDerivation rec { optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ optional enableFLAC flac ++ - optional enablePNG libpng; + optional enablePNG libpng ++ + optional enableLibsndfile libsndfile ++ + optionals enableAMR [ amrnb amrwb ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } -- cgit 1.4.1 From 5c4ad05f9655da667d6e6f0cd51aab6a5f31b3e0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:14:58 -0700 Subject: soxr: 0.1.1 -> 0.1.2 --- pkgs/applications/misc/audio/soxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/misc/audio') diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 084a95b962a..135ae47aa84 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.1"; + name = "soxr-0.1.2"; src = fetchurl { url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; - sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; + sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; }; preConfigure = if stdenv.isDarwin then '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src ''; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "An audio resampling library"; -- cgit 1.4.1