From b4071d74b14c60c5f8c3c1517e19e049b0af6c01 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 26 Jun 2023 11:19:16 +0200
Subject: [PATCH] zmap: 2.1.1 -> 3.0.0

ChangeLog: https://github.com/zmap/zmap/releases/tag/v3.0.0
---
 pkgs/tools/security/zmap/cmake-json-0.14-fix.patch | 13 -------------
 pkgs/tools/security/zmap/default.nix               | 14 ++++----------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/tools/security/zmap/cmake-json-0.14-fix.patch

diff --git a/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch b/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch
deleted file mode 100644
index 1c132948af6..00000000000
--- a/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8bd825f..694d9b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,6 +72,8 @@ if(WITH_JSON)
-     endif()
- 
-     add_definitions("-DJSON")
-+    # JSON_CFLAGS is a list, i.e. semicolon-separated, convert it to space-separated
-+    string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
- endif()
- 
diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix
index 0e37b725db4..de1bc354cf6 100644
--- a/pkgs/tools/security/zmap/default.nix
+++ b/pkgs/tools/security/zmap/default.nix
@@ -1,28 +1,22 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp
-, libpcap
+, libpcap, libunistring
 }:
 
 stdenv.mkDerivation rec {
   pname = "zmap";
-  version = "2.1.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs";
+    sha256 = "sha256-OJZKcnsuBi3z/AI05RMBitgn01bhVTqx2jFYJLuIJk4=";
   };
 
-  patches = [
-    # fix build with json-c 0.14 https://github.com/zmap/zmap/pull/609
-    ./cmake-json-0.14-fix.patch
-  ];
-
   cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];
-  dontUseCmakeBuildDir = true;
 
   nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ];
-  buildInputs = [ libjson json_c gmp libpcap ];
+  buildInputs = [ libjson json_c gmp libpcap libunistring ];
 
   outputs = [ "out" "man" ];