diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-05-11 18:56:21 +0100 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2024-05-11 18:56:51 +0100 |
| commit | 4230c04c74490357bb0af56a833a74e7180100d3 (patch) | |
| tree | 33119fd549ad4b02f91cba11d5c7a0b63fe025f1 /pkgs/development/libraries/ffmpeg | |
| parent | c0c22d9f5d12487e859e4a6c6a20bcdfedf641eb (diff) | |
ffmpeg_5: add patch for CVE-2024-31585
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 92a28d8a7705b..85ebd8a56f747 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -427,6 +427,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; } + { + name = "5.x-CVE-2024-31585.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8711cea3841fc385cccb1e7255176479e865cd4d"; + hash = "sha256-WT+ly/l04yM/tRVbhkESA3sDDjwvtd/Cg2y8tQo4ApI="; + } ]) ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ { # this can be removed post 6.1 |