| 1 |
commit: 35f2f281e6a5efc3be4624e136facf329bab9bde |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 18:47:59 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 26 18:48:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f2f281 |
| 7 |
|
| 8 |
net-analyzer/zmap: Version Bump |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=580810 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
net-analyzer/zmap/Manifest | 1 + |
| 16 |
net-analyzer/zmap/metadata.xml | 5 ++++- |
| 17 |
net-analyzer/zmap/zmap-1.1.1.ebuild | 4 ++-- |
| 18 |
net-analyzer/zmap/zmap-1.1.2.ebuild | 4 ++-- |
| 19 |
net-analyzer/zmap/zmap-1.2.0.ebuild | 4 ++-- |
| 20 |
net-analyzer/zmap/zmap-1.2.1.ebuild | 4 ++-- |
| 21 |
.../zmap/{zmap-1.2.1.ebuild => zmap-2.1.1.ebuild} | 23 +++++++++++++++------- |
| 22 |
net-analyzer/zmap/zmap-9999.ebuild | 4 ++-- |
| 23 |
8 files changed, 31 insertions(+), 18 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest |
| 26 |
index a625e81..9adecce 100644 |
| 27 |
--- a/net-analyzer/zmap/Manifest |
| 28 |
+++ b/net-analyzer/zmap/Manifest |
| 29 |
@@ -2,3 +2,4 @@ DIST zmap-1.1.1.tar.gz 84325 SHA256 e3a740a97f217840b6afa81e2c84e11d44f91346cb9f |
| 30 |
DIST zmap-1.1.2.tar.gz 84364 SHA256 3766b1cee8287184e4f475761b78633639e130fd004ae067ce4abf79b3a2da0d SHA512 b0f3834f30b97166576fb64814791f4aec1fa9326dfe965d65c66e7375cdeae48b6a25156c65a5af6a74e739df3964538d4c29b2d6e1c3d71b9ed3c756bb7821 WHIRLPOOL b6d0629f0aee3d6321c2179395fad97a2d5f0bb5e9cdf7a08606baf2d9bfe6f3bfe19e403147fd568a164a8d75c3e1db5f996e5d4ecdf9df366a3f1395681b3f |
| 31 |
DIST zmap-1.2.0.tar.gz 100594 SHA256 7658aef8338c592bebef82336f58598b2fa305d56779f6c81bffeef8c90472b0 SHA512 68fa49647444f18adfc86b4ee85ed3e93945611ca75687eedc259504e0d66edcded267b4fba9a975299984551c88193feacb850f46432d3f3f22f1430ed7c9bd WHIRLPOOL e4a50f86dfcae802d6b432e51c0f78ca37d56a3540326f076fcc002fbb23aeb85dbb57ad4a84b4b10d863f0f41b8d06510fdec1b9264d77c80cf0ffa69e5e01a |
| 32 |
DIST zmap-1.2.1.tar.gz 99840 SHA256 ff01f2b139e98a7e64ed2872ae332929c500dd6120888d57900fac82dccfeea8 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2 WHIRLPOOL 842ad32286883b554440dcb5ccfd8655997321612fd9ec49f591a6151819b6b605bc518281100c55ca8a9113819960710f870a745ebcb9994a6224b47d9a49ee |
| 33 |
+DIST zmap-2.1.1.tar.gz 131689 SHA256 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 WHIRLPOOL 09d7fb4e522b207b0b7f1d1ea9efcd9be49f7296d6c5e96858d795de61bf4a9d10ece07f7fa3bd56338dd3e410b5e474b51ed2c917a4b093fdc1689deec43d62 |
| 34 |
|
| 35 |
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml |
| 36 |
index 7716af9..c17fdf9 100644 |
| 37 |
--- a/net-analyzer/zmap/metadata.xml |
| 38 |
+++ b/net-analyzer/zmap/metadata.xml |
| 39 |
@@ -16,10 +16,13 @@ availability, and help us better understand large systems distributed |
| 40 |
across the Internet. |
| 41 |
</longdescription> |
| 42 |
<use> |
| 43 |
+ <flag name="json">Add support to store results JSON based</flag> |
| 44 |
+ <flag name="mongo"> |
| 45 |
+ Add support for storing in a mongo DB via <pkg>dev-db/mongodb</pkg> |
| 46 |
+ </flag> |
| 47 |
<flag name="redis"> |
| 48 |
Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg> |
| 49 |
</flag> |
| 50 |
- <flag name="json">Add support to store results JSON based</flag> |
| 51 |
</use> |
| 52 |
<upstream> |
| 53 |
<remote-id type="github">zmap/zmap</remote-id> |
| 54 |
|
| 55 |
diff --git a/net-analyzer/zmap/zmap-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild |
| 56 |
index 55a0bcd..99fac3e 100644 |
| 57 |
--- a/net-analyzer/zmap/zmap-1.1.1.ebuild |
| 58 |
+++ b/net-analyzer/zmap/zmap-1.1.1.ebuild |
| 59 |
@@ -1,4 +1,4 @@ |
| 60 |
-# Copyright 1999-2013 Gentoo Foundation |
| 61 |
+# Copyright 1999-2016 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
# $Id$ |
| 64 |
|
| 65 |
@@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" |
| 66 |
IUSE="json redis" |
| 67 |
|
| 68 |
RDEPEND=" |
| 69 |
- dev-libs/gmp |
| 70 |
+ dev-libs/gmp:0 |
| 71 |
net-libs/libpcap |
| 72 |
json? ( dev-libs/json-c ) |
| 73 |
redis? ( dev-libs/hiredis )" |
| 74 |
|
| 75 |
diff --git a/net-analyzer/zmap/zmap-1.1.2.ebuild b/net-analyzer/zmap/zmap-1.1.2.ebuild |
| 76 |
index 6641d20..2d594f6 100644 |
| 77 |
--- a/net-analyzer/zmap/zmap-1.1.2.ebuild |
| 78 |
+++ b/net-analyzer/zmap/zmap-1.1.2.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2014 Gentoo Foundation |
| 81 |
+# Copyright 1999-2016 Gentoo Foundation |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
# $Id$ |
| 84 |
|
| 85 |
@@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" |
| 86 |
IUSE="json redis" |
| 87 |
|
| 88 |
RDEPEND=" |
| 89 |
- dev-libs/gmp |
| 90 |
+ dev-libs/gmp:0 |
| 91 |
net-libs/libpcap |
| 92 |
json? ( dev-libs/json-c ) |
| 93 |
redis? ( dev-libs/hiredis )" |
| 94 |
|
| 95 |
diff --git a/net-analyzer/zmap/zmap-1.2.0.ebuild b/net-analyzer/zmap/zmap-1.2.0.ebuild |
| 96 |
index 34fe0aa..6b00599 100644 |
| 97 |
--- a/net-analyzer/zmap/zmap-1.2.0.ebuild |
| 98 |
+++ b/net-analyzer/zmap/zmap-1.2.0.ebuild |
| 99 |
@@ -1,4 +1,4 @@ |
| 100 |
-# Copyright 1999-2014 Gentoo Foundation |
| 101 |
+# Copyright 1999-2016 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
# $Id$ |
| 104 |
|
| 105 |
@@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" |
| 106 |
IUSE="json redis" |
| 107 |
|
| 108 |
RDEPEND=" |
| 109 |
- dev-libs/gmp |
| 110 |
+ dev-libs/gmp:0 |
| 111 |
net-libs/libpcap |
| 112 |
json? ( dev-libs/json-c ) |
| 113 |
redis? ( dev-libs/hiredis )" |
| 114 |
|
| 115 |
diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-1.2.1.ebuild |
| 116 |
index ad8d504..db504be 100644 |
| 117 |
--- a/net-analyzer/zmap/zmap-1.2.1.ebuild |
| 118 |
+++ b/net-analyzer/zmap/zmap-1.2.1.ebuild |
| 119 |
@@ -1,4 +1,4 @@ |
| 120 |
-# Copyright 1999-2015 Gentoo Foundation |
| 121 |
+# Copyright 1999-2016 Gentoo Foundation |
| 122 |
# Distributed under the terms of the GNU General Public License v2 |
| 123 |
# $Id$ |
| 124 |
|
| 125 |
@@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" |
| 126 |
IUSE="json redis" |
| 127 |
|
| 128 |
RDEPEND=" |
| 129 |
- dev-libs/gmp |
| 130 |
+ dev-libs/gmp:0 |
| 131 |
net-libs/libpcap |
| 132 |
json? ( dev-libs/json-c ) |
| 133 |
redis? ( dev-libs/hiredis )" |
| 134 |
|
| 135 |
diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild |
| 136 |
similarity index 63% |
| 137 |
copy from net-analyzer/zmap/zmap-1.2.1.ebuild |
| 138 |
copy to net-analyzer/zmap/zmap-2.1.1.ebuild |
| 139 |
index ad8d504..30d206f 100644 |
| 140 |
--- a/net-analyzer/zmap/zmap-1.2.1.ebuild |
| 141 |
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild |
| 142 |
@@ -1,8 +1,8 @@ |
| 143 |
-# Copyright 1999-2015 Gentoo Foundation |
| 144 |
+# Copyright 1999-2016 Gentoo Foundation |
| 145 |
# Distributed under the terms of the GNU General Public License v2 |
| 146 |
# $Id$ |
| 147 |
|
| 148 |
-EAPI=5 |
| 149 |
+EAPI=6 |
| 150 |
|
| 151 |
inherit cmake-utils fcaps |
| 152 |
|
| 153 |
@@ -12,26 +12,35 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 154 |
|
| 155 |
SLOT="0" |
| 156 |
LICENSE="Apache-2.0" |
| 157 |
-KEYWORDS=" ~amd64 ~x86" |
| 158 |
-IUSE="json redis" |
| 159 |
+KEYWORDS="~amd64 ~x86" |
| 160 |
+IUSE="json mongo redis" |
| 161 |
|
| 162 |
RDEPEND=" |
| 163 |
- dev-libs/gmp |
| 164 |
+ dev-libs/gmp:0 |
| 165 |
net-libs/libpcap |
| 166 |
json? ( dev-libs/json-c ) |
| 167 |
+ mongo? ( dev-db/mongodb ) |
| 168 |
redis? ( dev-libs/hiredis )" |
| 169 |
DEPEND="${RDEPEND} |
| 170 |
dev-util/gengetopt |
| 171 |
sys-devel/flex |
| 172 |
dev-util/byacc" |
| 173 |
|
| 174 |
+src_prepare() { |
| 175 |
+ sed \ |
| 176 |
+ -e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \ |
| 177 |
+ -i src/CMakeLists.txt || die |
| 178 |
+ cmake-utils_src_prepare |
| 179 |
+} |
| 180 |
+ |
| 181 |
src_configure() { |
| 182 |
local mycmakeargs=( |
| 183 |
-DENABLE_DEVELOPMENT=OFF |
| 184 |
-DENABLE_HARDENING=OFF |
| 185 |
-DWITH_WERROR=OFF |
| 186 |
- $(cmake-utils_use_with json) |
| 187 |
- $(cmake-utils_use_with redis) |
| 188 |
+ -DWITH_json="$(usex json)" |
| 189 |
+ -DWITH_json="$(usex mongo)" |
| 190 |
+ -DWITH_json="$(usex redis)" |
| 191 |
) |
| 192 |
cmake-utils_src_configure |
| 193 |
} |
| 194 |
|
| 195 |
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild |
| 196 |
index d4ba748..05f9c807 100644 |
| 197 |
--- a/net-analyzer/zmap/zmap-9999.ebuild |
| 198 |
+++ b/net-analyzer/zmap/zmap-9999.ebuild |
| 199 |
@@ -1,4 +1,4 @@ |
| 200 |
-# Copyright 1999-2015 Gentoo Foundation |
| 201 |
+# Copyright 1999-2016 Gentoo Foundation |
| 202 |
# Distributed under the terms of the GNU General Public License v2 |
| 203 |
# $Id$ |
| 204 |
|
| 205 |
@@ -17,7 +17,7 @@ KEYWORDS="" |
| 206 |
IUSE="json redis" |
| 207 |
|
| 208 |
RDEPEND=" |
| 209 |
- dev-libs/gmp |
| 210 |
+ dev-libs/gmp:0 |
| 211 |
net-libs/libpcap |
| 212 |
json? ( dev-libs/json-c ) |
| 213 |
redis? ( dev-libs/hiredis )" |
Archives