diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-02-28 16:49:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 16:49:07 +0800 |
| commit | 6822d48580763d24e73ef03a92d622d378843fd8 (patch) | |
| tree | d3b1c807d4a350d753824f0ca1a42ad29819fd6b /pkgs | |
| parent | f35d1b8568eea107c19ede62e6260d30ff36fa9e (diff) | |
| parent | a08b85f477ed3351025b1b57213297271b9eda47 (diff) | |
| download | nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar.gz nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar.bz2 nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar.lz nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar.xz nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.tar.zst nixpkgs-6822d48580763d24e73ef03a92d622d378843fd8.zip | |
Merge pull request #157592 from dtzWill/fix/samurai-cves-2021-30218-and-30219
samurai: apply upstream CVE fixes (security)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/samurai/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 1fb4206d5ce..cd058bfc263 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-30218.patch"; + url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; + sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; + }) + (fetchpatch { + name = "CVE-2021-30219.patch"; + url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; + sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; + }) + ]; + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; |