Merge pull request #99907 from andir/zoneminder-CVE-2020-25729

zoneminder: fix CVE-2020-25729
This commit is contained in:
Martin Weinelt 2020-11-04 14:31:56 +01:00 committed by GitHub
commit f1c65de110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
, polkit, utillinuxMinimal, x264, zlib , polkit, utillinuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }: , coreutils, procps, psmisc, nixosTests }:
@ -78,13 +78,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zoneminder"; pname = "zoneminder";
version = "1.34.16"; version = "1.34.22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ZoneMinder"; owner = "ZoneMinder";
repo = "zoneminder"; repo = "zoneminder";
rev = version; rev = version;
sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE="; sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
}; };
patches = [ patches = [