faad2: 2.8.8 -> 2.9.2

- change upstream to GitHub
- use autoreconfHook

Fixes: https://nvd.nist.gov/vuln/detail/CVE-2019-6956
Changelog: https://github.com/knik0/faad2/blob/2_9_2/ChangeLog
This commit is contained in:
Martin Milata 2020-06-17 13:26:03 +02:00
parent 75a9b7f905
commit 3068eb8e90

View File

@ -1,44 +1,24 @@
{stdenv, fetchurl {stdenv, fetchFromGitHub, autoreconfHook
, drmSupport ? false # Digital Radio Mondiale , drmSupport ? false # Digital Radio Mondiale
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "faad2"; pname = "faad2";
version = "2.8.8"; version = "2.9.2";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; owner = "knik0";
sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; repo = "faad2";
rev = builtins.replaceStrings [ "." ] [ "_" ] version;
sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c";
}; };
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 = [] configureFlags = []
++ optional drmSupport "--with-drm"; ++ optional drmSupport "--with-drm";
nativeBuildInputs = [ autoreconfHook ];
meta = { meta = {
description = "An open source MPEG-4 and MPEG-2 AAC decoder"; description = "An open source MPEG-4 and MPEG-2 AAC decoder";
homepage = "https://www.audiocoding.com/faad2.html"; homepage = "https://www.audiocoding.com/faad2.html";