gentoo auto-resync : 19:06:2024 - 00:09:54

5 files changed, 87 insertions, 6 deletions

diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 74dfc12aa8cf..5ab324245a4c 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,5 +1,8 @@
 AUX zmap-2.1.1-always-install-config.patch 973 BLAKE2B cdba75ff09b19c851234745cce6ff4a82bbca3b944b442885aab81eb7a10221cfe62f34d2842f3c4c7c8e38f19c25dcf2aacf155aed3bb8251840f9690175a9e SHA512 c583fd3acdbfb21ab613fac1c4cf0da82e2e0d1d7f537415f6eb5f0b7e5f0101c518c336590590f4a153c191c12fed1ba35c934bacc95cbf63053f43a80c8485
+AUX zmap-2.1.1-json-c.patch 1084 BLAKE2B 524f7525695eeb542db33c3bb547f235558a4e0cc1fc48ace8c9f3c302d4db2e14d0edcae283dbc9306a5c7bca165e376422bcbf3c9ccbeafcbf17803b98bad7 SHA512 8aa5456885a6725a8004b5009f43ae7cf58dd6a454e581b03d9d6cb86125f023ea5ef359d907fd7ebe8122a0a71ea81d1ac9ebd878a5ba684bfd5809c1aca3b9
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r5.ebuild 1070 BLAKE2B 8e895f8399d5722f3f389757b3ef5828ac921b8015e16a91c7b5f8986a134067322465fba92148644013c38f1523291387438efd426e7684cc6fee0d1b8b6e3b SHA512 29625442112d396e93ac1e6d1e7e687ec05e9fc7ca6f8e0071b7367328a0ec025ad116b3082a79b23f2e992315abfe58bb4878d436dfd76f51af65172f0863f1
+DIST zmap-4.1.1.tar.gz 202697 BLAKE2B 35bc21e4d4c4c452deb2e34ac837ee4ae728b3adf97aefb5b88f55dde719bd78787b8a2826a89eaff92170b3eb2e5003194e3dc636616a845efef82bea663114 SHA512 eff32c9bda7b28a48fce85e3acb598c6adc8dc952ffec21cd4d581462e481a3cf61a6285a71c16741d8e9deedf7c8e3b71d4f375a931244b96acc8779c225929
+EBUILD zmap-2.1.1-r5.ebuild 1110 BLAKE2B 78761eb99e5f25ad78597edcb8b25441f7b9eb4a3f018a28dd67b0f9f47576444a407ff12ae3227ee8ba0b50584deaf86a0b8290bde8c30a8d890a9fc7a92eaa SHA512 d47a6bf16166049b63193e1492ad1c2d8d4e1f8061a8b4b757b8933f22bf8ddf21a45bd9c1d0c20e7f991caa77673508002e26d7aff5c4cf6e11463be61473f9
+EBUILD zmap-4.1.1.ebuild 941 BLAKE2B 32ca7ccee234e99e7e289da4620a22957932d14a73a44629f86417d8b0039f24f35aa46c7aee788c2d144e338f9150b9b04813b66eab0b48c4f750a66112625f SHA512 42e5e0370bf63fb985e8f246eadd6dc9f9445c62854e559660fd2ba9bb8b6e75a5abf46ae6ef6b7f0af8986dc0c8ecefea430f9fee5fb4e409781635a0c64ddf
 EBUILD zmap-9999.ebuild 783 BLAKE2B 88d5404704dcfbb926a6e6667ebc182ab1624dc075dff4695a306555fdb8a3536876b9da52b95379de4d3839eff6ea977573d6a0c88a44e02b34eaf37feb9cfa SHA512 484f739745c3e5029c70a346f8727deb58db4eb17b33be51aa12430439cbef0b3975a9cc1be902bea9502ee3c056ee3158b08360831e4122822f2e46a520f6f0
-MISC metadata.xml 1103 BLAKE2B e4f1a96e95895158f2ae5eddfd27705b3838a50b3b2188f6ab1b6ea8cf1713d1e7519e3ba61c87f82acccf59c172f559f68fb55f2d8885cd99ae1450475f483d SHA512 090657110d0e299669504e3f021147d2c4601783a9240326d2cd5c7965c7ffeecef6512455f57f54c7056a9da8b312a8f89b18ed7c309a797ea044e80a506f66
+MISC metadata.xml 1018 BLAKE2B 6fc528ec8899c2c3bd9bd4ac1398e17293abe54de6d200f4b88ff5a977fa7ce0da23be70a56a259d96a70dd07272750a14903e16e223709ae7b99cc6a5942bbc SHA512 c650e83b8db50447bbb9e39f7bda0c8c312ebfcf9f3a1a204d9eecf7512f086dcd3c5c9411d8a2c2929cea6634822ab6a2a32b5a72e6b164ffe230244a3e5257
diff --git a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
new file mode 100644
index 000000000000..78a80b801218
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
@@ -0,0 +1,31 @@
+From 5473b6a907ff47e813e8ac3509a0f63d1253023b Mon Sep 17 00:00:00 2001
+From: Martin Milata <martin@martinmilata.cz>
+Date: Wed, 1 Jul 2020 16:47:18 +0200
+Subject: [PATCH] Fix build against json-c-0.14 (#609)
+
+The new pkgconfig file contains two include directories:
+
+  Cflags: -I${includedir} -I${includedir}/json-c
+
+Apparently pkg_check_modules returns them as a semicolon-separated
+string ("CMake list"), which causes the build to fail when appended
+directly to CMAKE_C_FLAGS.
+
+Origin: backport, https://github.com/zmap/zmap/commit/5473b6a907ff47e813e8ac3509a0f63d1253023b
+Applied-Upstream: 3.0
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: zmap-2.1.1/CMakeLists.txt
+===================================================================
+--- zmap-2.1.1.orig/CMakeLists.txt	2024-01-23 15:29:55.436869754 -0500
++++ zmap-2.1.1/CMakeLists.txt	2024-01-23 15:30:32.505023070 -0500
+@@ -72,6 +72,7 @@
+     endif()
+ 
+     add_definitions("-DJSON")
++    string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
+ endif()
+ 
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 378248ac6c65..741c091de292 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jsmolic@gentoo.org</email>
-    <name>Jakov Smolić</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 ZMap is an open-source network scanner that enables researchers to easily 
 perform Internet-wide network studies. With a single machine and a well 
diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
index b413d47fc165..2a7eb5b56829 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.1-always-install-config.patch
+	"${FILESDIR}"/${PN}-2.1.1-json-c.patch
 )
 
 FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-4.1.1.ebuild b/net-analyzer/zmap/zmap-4.1.1.ebuild
new file mode 100644
index 000000000000..2ffbd683d165
--- /dev/null
+++ b/net-analyzer/zmap/zmap-4.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake fcaps
+
+DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
+HOMEPAGE="https://zmap.io/"
+SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mongo redis"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/judy
+	dev-util/gengetopt
+	net-libs/libpcap
+	dev-libs/json-c:=
+	redis? ( dev-libs/hiredis:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/lex
+	dev-util/gengetopt
+	dev-util/byacc
+	virtual/pkgconfig
+"
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
+
+src_prepare() {
+	sed \
+		-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
+		-i src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEVELOPMENT=OFF
+		-DWITH_WERROR=OFF
+	)
+
+	cmake_src_configure
+}