From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 030CF138206 for ; Tue, 26 Apr 2016 18:48:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7374D21C015; Tue, 26 Apr 2016 18:48:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC72421C015 for ; Tue, 26 Apr 2016 18:48:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2AFA340B81 for ; Tue, 26 Apr 2016 18:48:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C491964 for ; Tue, 26 Apr 2016 18:48:33 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1461696510.35f2f281e6a5efc3be4624e136facf329bab9bde.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zmap/Manifest net-analyzer/zmap/metadata.xml net-analyzer/zmap/zmap-1.1.1.ebuild net-analyzer/zmap/zmap-1.1.2.ebuild net-analyzer/zmap/zmap-1.2.0.ebuild net-analyzer/zmap/zmap-1.2.1.ebuild net-analyzer/zmap/zmap-2.1.1.ebuild net-analyzer/zmap/zmap-9999.ebuild X-VCS-Directories: net-analyzer/zmap/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 35f2f281e6a5efc3be4624e136facf329bab9bde X-VCS-Branch: master Date: Tue, 26 Apr 2016 18:48:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7bdff06b-d4bc-4bcc-acd0-966f911bcdde X-Archives-Hash: aaebb46760d9c1ffb646ae17fb700f69 commit: 35f2f281e6a5efc3be4624e136facf329bab9bde Author: Justin Lecher gentoo org> AuthorDate: Tue Apr 26 18:47:59 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Apr 26 18:48:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f2f281 net-analyzer/zmap: Version Bump Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=580810 Package-Manager: portage-2.2.28 Signed-off-by: Justin Lecher gentoo.org> net-analyzer/zmap/Manifest | 1 + net-analyzer/zmap/metadata.xml | 5 ++++- net-analyzer/zmap/zmap-1.1.1.ebuild | 4 ++-- net-analyzer/zmap/zmap-1.1.2.ebuild | 4 ++-- net-analyzer/zmap/zmap-1.2.0.ebuild | 4 ++-- net-analyzer/zmap/zmap-1.2.1.ebuild | 4 ++-- .../zmap/{zmap-1.2.1.ebuild => zmap-2.1.1.ebuild} | 23 +++++++++++++++------- net-analyzer/zmap/zmap-9999.ebuild | 4 ++-- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest index a625e81..9adecce 100644 --- a/net-analyzer/zmap/Manifest +++ b/net-analyzer/zmap/Manifest @@ -2,3 +2,4 @@ DIST zmap-1.1.1.tar.gz 84325 SHA256 e3a740a97f217840b6afa81e2c84e11d44f91346cb9f DIST zmap-1.1.2.tar.gz 84364 SHA256 3766b1cee8287184e4f475761b78633639e130fd004ae067ce4abf79b3a2da0d SHA512 b0f3834f30b97166576fb64814791f4aec1fa9326dfe965d65c66e7375cdeae48b6a25156c65a5af6a74e739df3964538d4c29b2d6e1c3d71b9ed3c756bb7821 WHIRLPOOL b6d0629f0aee3d6321c2179395fad97a2d5f0bb5e9cdf7a08606baf2d9bfe6f3bfe19e403147fd568a164a8d75c3e1db5f996e5d4ecdf9df366a3f1395681b3f DIST zmap-1.2.0.tar.gz 100594 SHA256 7658aef8338c592bebef82336f58598b2fa305d56779f6c81bffeef8c90472b0 SHA512 68fa49647444f18adfc86b4ee85ed3e93945611ca75687eedc259504e0d66edcded267b4fba9a975299984551c88193feacb850f46432d3f3f22f1430ed7c9bd WHIRLPOOL e4a50f86dfcae802d6b432e51c0f78ca37d56a3540326f076fcc002fbb23aeb85dbb57ad4a84b4b10d863f0f41b8d06510fdec1b9264d77c80cf0ffa69e5e01a DIST zmap-1.2.1.tar.gz 99840 SHA256 ff01f2b139e98a7e64ed2872ae332929c500dd6120888d57900fac82dccfeea8 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2 WHIRLPOOL 842ad32286883b554440dcb5ccfd8655997321612fd9ec49f591a6151819b6b605bc518281100c55ca8a9113819960710f870a745ebcb9994a6224b47d9a49ee +DIST zmap-2.1.1.tar.gz 131689 SHA256 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 WHIRLPOOL 09d7fb4e522b207b0b7f1d1ea9efcd9be49f7296d6c5e96858d795de61bf4a9d10ece07f7fa3bd56338dd3e410b5e474b51ed2c917a4b093fdc1689deec43d62 diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml index 7716af9..c17fdf9 100644 --- a/net-analyzer/zmap/metadata.xml +++ b/net-analyzer/zmap/metadata.xml @@ -16,10 +16,13 @@ availability, and help us better understand large systems distributed across the Internet. + Add support to store results JSON based + + Add support for storing in a mongo DB via dev-db/mongodb + Add support for storing in a redis DB via dev-libs/hiredis - Add support to store results JSON based zmap/zmap diff --git a/net-analyzer/zmap/zmap-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild index 55a0bcd..99fac3e 100644 --- a/net-analyzer/zmap/zmap-1.1.1.ebuild +++ b/net-analyzer/zmap/zmap-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" IUSE="json redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) redis? ( dev-libs/hiredis )" diff --git a/net-analyzer/zmap/zmap-1.1.2.ebuild b/net-analyzer/zmap/zmap-1.1.2.ebuild index 6641d20..2d594f6 100644 --- a/net-analyzer/zmap/zmap-1.1.2.ebuild +++ b/net-analyzer/zmap/zmap-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" IUSE="json redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) redis? ( dev-libs/hiredis )" diff --git a/net-analyzer/zmap/zmap-1.2.0.ebuild b/net-analyzer/zmap/zmap-1.2.0.ebuild index 34fe0aa..6b00599 100644 --- a/net-analyzer/zmap/zmap-1.2.0.ebuild +++ b/net-analyzer/zmap/zmap-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" IUSE="json redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) redis? ( dev-libs/hiredis )" diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-1.2.1.ebuild index ad8d504..db504be 100644 --- a/net-analyzer/zmap/zmap-1.2.1.ebuild +++ b/net-analyzer/zmap/zmap-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ KEYWORDS=" ~amd64 ~x86" IUSE="json redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) redis? ( dev-libs/hiredis )" diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild similarity index 63% copy from net-analyzer/zmap/zmap-1.2.1.ebuild copy to net-analyzer/zmap/zmap-2.1.1.ebuild index ad8d504..30d206f 100644 --- a/net-analyzer/zmap/zmap-1.2.1.ebuild +++ b/net-analyzer/zmap/zmap-2.1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils fcaps @@ -12,26 +12,35 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" -KEYWORDS=" ~amd64 ~x86" -IUSE="json redis" +KEYWORDS="~amd64 ~x86" +IUSE="json mongo redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) + mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )" DEPEND="${RDEPEND} dev-util/gengetopt sys-devel/flex dev-util/byacc" +src_prepare() { + sed \ + -e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \ + -i src/CMakeLists.txt || die + cmake-utils_src_prepare +} + src_configure() { local mycmakeargs=( -DENABLE_DEVELOPMENT=OFF -DENABLE_HARDENING=OFF -DWITH_WERROR=OFF - $(cmake-utils_use_with json) - $(cmake-utils_use_with redis) + -DWITH_json="$(usex json)" + -DWITH_json="$(usex mongo)" + -DWITH_json="$(usex redis)" ) cmake-utils_src_configure } diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild index d4ba748..05f9c807 100644 --- a/net-analyzer/zmap/zmap-9999.ebuild +++ b/net-analyzer/zmap/zmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="json redis" RDEPEND=" - dev-libs/gmp + dev-libs/gmp:0 net-libs/libpcap json? ( dev-libs/json-c ) redis? ( dev-libs/hiredis )"