diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
| commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
| tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/development/libraries/faad2 | |
| parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
| parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
| download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip | |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/faad2')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/faad2/default.nix | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix index 50323846e980..e7e4835d2ed3 100644 --- a/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -12,6 +12,30 @@ stdenv.mkDerivation rec { sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; + patches = let + fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { + url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" + + "/debian/patches/${pname}.patch?inline=false"; + inherit name sha256; + }; + in [ + (fp { + # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) + pname = "0004-Fix-a-couple-buffer-overflows"; + sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; + }) + (fp { + name = "CVE-2018-20362.patch"; + pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; + sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; + }) + (fp { + name = "CVE-2018-20194.patch"; + pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; + sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; + }) + ]; + configureFlags = [] ++ optional drmSupport "--with-drm"; |