lol

lame: 3.99.5 -> 3.100 for multiple CVEs

Fixes CVE-2017-9410, CVE-2017-9411, CVE-2017-9412.

+3 -38
+3 -5
pkgs/development/libraries/lame/default.nix
··· 23 23 with stdenv.lib; 24 24 stdenv.mkDerivation rec { 25 25 name = "lame-${version}"; 26 - version = "3.99.5"; 26 + version = "3.100"; 27 27 28 28 src = fetchurl { 29 29 url = "mirror://sourceforge/lame/${name}.tar.gz"; 30 - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; 30 + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; 31 31 }; 32 - 33 - patches = [ ./gcc-4.9.patch ]; 34 32 35 33 outputs = [ "out" "lib" "doc" ]; # a small single header 36 34 outputMan = "out"; ··· 61 59 description = "A high quality MPEG Audio Layer III (MP3) encoder"; 62 60 homepage = http://lame.sourceforge.net; 63 61 license = licenses.lgpl2; 64 - maintainers = with maintainers; [ codyopel ]; 62 + maintainers = with maintainers; [ codyopel fpletz ]; 65 63 platforms = platforms.all; 66 64 }; 67 65 }
-33
pkgs/development/libraries/lame/gcc-4.9.patch
··· 1 - fix sse optimizations build on 32-bit with gcc 4.9 2 - http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933 3 - 4 - xmm_quantize_sub.c: In function 'init_xrpow_core_sse': 5 - xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W 6 - psabi] 7 - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); 8 - ^ 9 - In file included from xmm_quantize_sub.c:37:0: 10 - /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 11 - _mm_loadu_ps (float const *__P) 12 - ^ 13 - xmm_quantize_sub.c:65:18: error: called from here 14 - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); 15 - ^ 16 - --- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700 17 - +++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700 18 - @@ -35,6 +35,7 @@ 19 - #ifdef HAVE_XMMINTRIN_H 20 - 21 - #include <xmmintrin.h> 22 - +#pragma GCC target("sse") 23 - 24 - typedef union { 25 - int32_t _i_32[4]; /* unions are initialized by its first member */ 26 - @@ -124,6 +125,7 @@ 27 - } 28 - 29 - 30 - +#pragma GCC target("sse2") 31 - void 32 - fht_SSE2(FLOAT * fz, int n) 33 - {