Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c06c2cda5105
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c917950c0513
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 27, 2017

  1. ffmpeg-3.4: apply fix CVE CVE-2017-16840 

    Details at [1].

[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
    @andir
    andir committed Nov 27, 2017
    Copy the full SHA
    2492f45 View commit details

  2. ffmpeg-full-3.4: apply patch for CVE-2017-16840

    @andir
    andir committed Nov 27, 2017
    Copy the full SHA
    64d8cc7 View commit details

Commits on Nov 28, 2017

  1. Merge #32126: ffmpeg-3.4: fix CVE CVE-2017-16840

    @vcunat
    vcunat committed Nov 28, 2017
    Copy the full SHA
    c917950 View commit details
Showing with 19 additions and 2 deletions.
  1. +9 −1 pkgs/development/libraries/ffmpeg-full/default.nix
  2. +10 −1 pkgs/development/libraries/ffmpeg/3.4.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/ffmpeg-full/default.nix
View file
Original file line number Diff line number Diff line change
@@ -238,7 +238,15 @@ stdenv.mkDerivation rec {
sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf";
};

patchPhase = ''patchShebangs .
patchPhase = let
cve_2017_16840_patch = (fetchurl{
name = "CVE-2017-16840.patch";
url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74";
sha256 = "1rjr9lc71cyy43wsa2zxb9ygya292h9jflvr5wk61nf0vp97gjg3";
});
in
'' patch -p1 < ${cve_2017_16840_patch}
patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c
'' + stdenv.lib.optionalString (frei0r != null) ''
11 changes: 10 additions & 1 deletion pkgs/development/libraries/ffmpeg/3.4.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
})
];

})