diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-30 15:30:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-30 15:31:24 +0200 |
| commit | 3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e (patch) | |
| tree | f8f80b621b3231bcb29de1ad00ed8d89755df927 | |
| parent | ccc55347c5f8b0b1903ccf701bbcc01db5ba5a5b (diff) | |
| download | nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar.gz nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar.bz2 nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar.lz nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar.xz nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.tar.zst nixlib-3e17fe45223a3734971c8da5a68e4dbe3ebc2c2e.zip | |
ffmpeg{_4,-full}: 4.1.3 -> 4.1.4 (security)
Fixes #64656 CVE-2019-13312 CVE-2019-13390.
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index db6793df646b..65a48890e496 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -234,12 +234,17 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0gdnprc7gk4b7ckq8wbxbrj7i00r76r9a5g9mj7iln40512j0c0c"; + sha256 = "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i"; }; + patches = [(fetchpatch { # remove on update + name = "fix-hardcoded-tables.diff"; + url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; + sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; + })]; prePatch = '' patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 3066e0b12e58..3431943155e9 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,12 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.3"; - sha256 = "0aka5pibjhpks1wrsvqpy98v8cbvyvnngwqhh4ajkg6pbdl7k9i9"; + branch = "4.1.4"; + sha256 = "01w44ygm5bvc243hlhfnvb2lxfb0blz2cxnphxqgw30vj3c1prx7"; + patches = [(fetchpatch { # remove on update + name = "fix-hardcoded-tables.diff"; + url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; + sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; + })]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) |