diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 11:05:14 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 13:20:38 +0200 |
| commit | f269f319856f41ae562bf91a44e612d22f1e5f88 (patch) | |
| tree | bd7c94817f1e91407d00f4acdd5f3d240a5657ef /pkgs/development/libraries/lame | |
| parent | 5072f4792e890c809a43763c8e0b283a22ee0c14 (diff) | |
| download | nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar.gz nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar.bz2 nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar.lz nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar.xz nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.tar.zst nixlib-f269f319856f41ae562bf91a44e612d22f1e5f88.zip | |
lame: 3.99.5 -> 3.100 for multiple CVEs
Fixes CVE-2017-9410, CVE-2017-9411, CVE-2017-9412.
Diffstat (limited to 'pkgs/development/libraries/lame')
| -rw-r--r-- | pkgs/development/libraries/lame/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/lame/gcc-4.9.patch | 33 |
2 files changed, 3 insertions, 38 deletions
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index b324494faff7..8ad7cb95a5d7 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -23,15 +23,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lame-${version}"; - version = "3.99.5"; + version = "3.100"; src = fetchurl { url = "mirror://sourceforge/lame/${name}.tar.gz"; - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; - patches = [ ./gcc-4.9.patch ]; - outputs = [ "out" "lib" "doc" ]; # a small single header outputMan = "out"; @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch deleted file mode 100644 index 59f8e00e4a8e..000000000000 --- a/pkgs/development/libraries/lame/gcc-4.9.patch +++ /dev/null @@ -1,33 +0,0 @@ -fix sse optimizations build on 32-bit with gcc 4.9 -http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933 - -xmm_quantize_sub.c: In function 'init_xrpow_core_sse': -xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W -psabi] - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ -In file included from xmm_quantize_sub.c:37:0: -/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch - _mm_loadu_ps (float const *__P) - ^ -xmm_quantize_sub.c:65:18: error: called from here - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ ---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700 -+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700 -@@ -35,6 +35,7 @@ - #ifdef HAVE_XMMINTRIN_H - - #include <xmmintrin.h> -+#pragma GCC target("sse") - - typedef union { - int32_t _i_32[4]; /* unions are initialized by its first member */ -@@ -124,6 +125,7 @@ - } - - -+#pragma GCC target("sse2") - void - fht_SSE2(FLOAT * fz, int n) - { |