From 7eb6efcb4e40f6f30a701f660ee4afad917ca6c5 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 12 Apr 2022 21:31:42 -0300
Subject: [PATCH] samurai: rewrite

---
 .../tools/build-managers/samurai/default.nix  | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix
index cd058bfc2632..b13762d63b16 100644
--- a/pkgs/development/tools/build-managers/samurai/default.nix
+++ b/pkgs/development/tools/build-managers/samurai/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+}:
 
 stdenv.mkDerivation rec {
   pname = "samurai";
@@ -8,17 +12,21 @@ stdenv.mkDerivation rec {
     owner = "michaelforney";
     repo = pname;
     rev = version;
-    sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
+    hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
   };
 
   makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
 
   patches = [
+    # NULL pointer dereference in writefile() in util.c; remove this at the next
+    # release
     (fetchpatch {
       name = "CVE-2021-30218.patch";
       url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch";
       sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw=";
     })
+    # NULL pointer dereference in printstatus() in build.c; remove this at the
+    # next release
     (fetchpatch {
       name = "CVE-2021-30219.patch";
       url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch";
@@ -27,10 +35,24 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "ninja-compatible build tool written in C";
     homepage = "https://github.com/michaelforney/samurai";
+    description = "ninja-compatible build tool written in C";
+    longDescription = ''
+      samurai is a ninja-compatible build tool with a focus on simplicity,
+      speed, and portability.
+
+      It is written in C99, requires various POSIX.1-2008 interfaces, and
+      nowadays implements ninja build language through version 1.9.0 except for
+      Microsoft (R) Visual C++ (TM) dependency handling (deps = msvc).
+
+      It is feature-complete (but not bug-compatible) and supports most of the
+      same options as ninja, using the same format for .ninja_log and
+      .ninja_deps as the original ninja tool, currently version 5 and 4
+      respectively.
+    '';
     license = with licenses; [ mit asl20 ]; # see LICENSE
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ dtzWill AndersonTorres ];
+    platforms = platforms.all;
   };
 }