summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-11-04 12:20:20 -0500
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-11-04 12:20:29 -0500
commitd6582d8876717abef5c8e0b18cfac7b72f66e82c (patch)
tree73380cc0ecbbfcd3451b1e5aee0f92cff7224a96
parentlinux: 5.4.73 -> 5.4.74 (diff)
downloadnixpkgs-d6582d8876717abef5c8e0b18cfac7b72f66e82c.tar.gz
motion: fix CVE-2020-26566
https://nvd.nist.gov/vuln/detail/CVE-2020-26566
-rw-r--r--pkgs/applications/video/motion/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index dafc6abdb0a3..71ba925d0b61 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig
, ffmpeg, libjpeg, libmicrohttpd }:
stdenv.mkDerivation rec {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "08mm7ajgs0qnrydywxxyzcll09z80crjnjkjnckdi6ljsj6s96j8";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2020-26566.patch";
+ url = "https://github.com/Motion-Project/motion/commit/5c9b907ddd4d096f0485831869a29dc0fbfbb800.diff";
+ sha256 = "0q4yl5k5w37kgxsipxaw20mx238s50lmvhlqrsyh8w31qr3dwgx4";
+ excludes = [ ".travis.yml" ];
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ ffmpeg libjpeg libmicrohttpd ];