summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2022-05-27 14:56:30 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-05-29 16:55:43 +0000
commit61ef2043dfca8c73d55013182932d63f7bd02470 (patch)
treece52ec08378522fecf28abcc1b5a9339a3ad9863
parentMerge pull request #175318 from NixOS/backport-174522-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-174933-to-release-22.05.tar.gz
zlog: fixes CVE-2021-43521origin/backport-174933-to-release-22.05
(cherry picked from commit a0a5f90ef209f058ee19d7cb5693faec2bfe56a4)
-rw-r--r--pkgs/development/libraries/zlog/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
index 99163ae5dc6c..82c08b46bc8b 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.2.15";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2021-43521.patch";
+ url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch";
+ sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8=";
+ })
+ ];
+
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {