summaryrefslogtreecommitdiff
path: root/net-analyzer/zmap
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/zmap')
-rw-r--r--net-analyzer/zmap/Manifest6
-rw-r--r--net-analyzer/zmap/metadata.xml1
-rw-r--r--net-analyzer/zmap/zmap-2.1.1-r2.ebuild (renamed from net-analyzer/zmap/zmap-2.1.1-r1.ebuild)19
-rw-r--r--net-analyzer/zmap/zmap-9999.ebuild12
4 files changed, 17 insertions, 21 deletions
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 48dd16b3ca95..be09dd4d71ae 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r1.ebuild 973 BLAKE2B add50cd653eb43697d66db3c3957fa41a2c5decd97da8db98c9e7d6c70ef73fb3f983bb14d52450a085e8282f05b45a4b59db6c39e551975e1e404ab07b231db SHA512 43f95ca9088ebfc686a4c4951a51991af43321ba9085a96111d954bdcb3867a3ca49c57bb8ff8e516d2788e93e197fb5f19a448d116790ba73d8cd5948270f99
-EBUILD zmap-9999.ebuild 732 BLAKE2B d5d0719da6d299fe4dc99f95ea8259fc14210bfd0026c2965fb1081072005623cdb6c6b91c80c753923bf51b2f877fc1fa5345128d85e6fee7a72538fc356953 SHA512 e0c4b11ed47483c28e2f9fca033be8e0c25d3c172b7d4229d2b0b14a0e5250b8a68de7d6d2b7470eacaf4b3bb399d13c45c417bedb583ac4fc2b5d80e83d21dd
-MISC metadata.xml 1298 BLAKE2B 3dfab71d1b2bada9a1e04c6097f4cf245299142b429fab93809d2e45446e22a04a339cb5a188861d7b3b29a540638debca59fccabea96faa22fd9dd19afbf69d SHA512 44560e99499065e9e95eba68340ebe67b3e6dcacb11c7b392568be24af12134634a453ccd9f54c77116f473c9a64e587d862ec317c48871eed644585ee7f8193
+EBUILD zmap-2.1.1-r2.ebuild 943 BLAKE2B 32d8e39e880cf29f411d527b5830963939b95a2e6a019e1290b7bfdfbe83da6d0431e3cb8bf06d289234cbaf6910138c547228a44465eb3ee3b4de1265e05e15 SHA512 e050474a7764ba68f916cd3492fcfc75176bae9cf398d707f4000da43efe2468d5a72634c3ecc210d3c407ed9dd3408236a1728da520771817b149a70ae12ad9
+EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
+MISC metadata.xml 1229 BLAKE2B a7adf10c6b6ee12c6bdca30375582ccba8541bd70321fc055682d12343149d7ac4162cdcde4abab160b760eb04a644045fac14c878fc2219db497055234ec3d2 SHA512 b457bdfbba7318412aac2d759bf616f2417c0946bd534cc0b5066ffc226e586f277ffa6c317e13504766c35d881ad77797321b377e4350a7a4f5dd22624cfc1b
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index fc168991253e..2204ae3c97cf 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -21,7 +21,6 @@ availability, and help us better understand large systems distributed
across the Internet.
</longdescription>
<use>
- <flag name="json">Add support to store results JSON based</flag>
<flag name="mongo">
Add support for storing in a mongo DB via <pkg>dev-db/mongodb</pkg>
</flag>
diff --git a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
index dac6ede5634e..be82641d5c7a 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
@@ -1,21 +1,20 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils fcaps
+inherit cmake fcaps
DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="json mongo redis"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="mongo redis"
-RDEPEND="
- dev-libs/gmp:0
+RDEPEND="dev-libs/gmp:0
net-libs/libpcap
dev-libs/json-c:=
mongo? ( dev-db/mongodb )
@@ -29,7 +28,7 @@ src_prepare() {
sed \
-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
-i src/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -39,7 +38,7 @@ src_configure() {
-DWITH_MONGO="$(usex mongo)"
-DWITH_REDIS="$(usex redis)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 04e4602032d2..4d5b862277d5 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -1,18 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils fcaps git-r3
+inherit cmake fcaps git-r3
DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
HOMEPAGE="https://zmap.io/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/zmap/zmap.git"
-SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS=""
+SLOT="0"
IUSE="redis"
RDEPEND="
@@ -32,7 +30,7 @@ src_configure() {
-DWITH_WERROR=OFF
-DWITH_REDIS="$(usex redis)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
FILECAPS=( cap_net_raw=ep usr/sbin/zmap )