about summary refs log tree commit diff
path: root/pkgs/development/libraries/ffmpeg
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2017-11-28 00:14:05 +0100
committerAndreas Rammhold <andreas@rammhold.de>2017-11-28 00:14:05 +0100
commit2492f4556590e0565bcbf3cebb38b1b99b89f1c3 (patch)
treef8abbf4f48846f3097efd2b081bf5ab22031f6e3 /pkgs/development/libraries/ffmpeg
parent7a87f165ebb0ff7a662654b2c5a3820feedd54ab (diff)
downloadnixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar.gz
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar.bz2
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar.lz
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar.xz
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.tar.zst
nixlib-2492f4556590e0565bcbf3cebb38b1b99b89f1c3.zip
ffmpeg-3.4: apply fix CVE CVE-2017-16840
Details at [1].

[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
-rw-r--r--pkgs/development/libraries/ffmpeg/3.4.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index 513654e98f74..9890d030e44e 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage
+{ stdenv, callPackage, fetchpatch
 # Darwin frameworks
 , Cocoa, CoreMedia
 , ...
@@ -9,4 +9,13 @@ callPackage ./generic.nix (args // rec {
   branch = "3.4";
   sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax";
   darwinFrameworks = [ Cocoa CoreMedia ];
+
+  patches = [
+    (fetchpatch{
+      name = "CVE-2017-16840.patch";
+      url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74";
+      sha256 = "1rjr9lc71cyy43wsa2zxb9ygya292h9jflvr5wk61nf0vp97gjg3";
+    })
+  ];
+
 })