net-analyzer/zmap: Add live version of zmap. Versioned ebuild comes when upstream has merged my cmake patch

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 260 insertions, 2 deletions

diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 0c26569121e8..330463bbbf72 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX zmap-9999-cmake.patch 4219 SHA256 f1797fde49c0606d3e519cf7cd9a697b13f300bee1011ae6a8457ca9e184d640 SHA512 20af7f34556f9b53c9500656345b366a42b0af3b465f8dae2b5d980cb848048fdb6fc50e3d12766ab11f93b85d1c2288173c993daaae0f87ef64fe0d4f1c7ff1 WHIRLPOOL 46b7bfdfad30397a4f211eaea2d72e9a43295473bac0bea76eb3c7d2ca4bff2435f9a3b44e00e192f7baf667386f31551ee52550b8419765325488a837221509
-EBUILD zmap-9999.ebuild 719 SHA256 8de95eb50cfb6c271febd9e2fb26c0edb5e40995c60e43e9389c51511b4e45c0 SHA512 c7d2f4fe63564876b9950b2655a808e521ded0da794622811ac8cbcc49d01aed5a2ce0d74a7540fe52ba69466dd8123cce4a260bbd6a4e1f25841fc54ebd261e WHIRLPOOL a80e52a369825abbb0c39a948d5a72afa765006d7b1680af9107c2177b86f55159c069d3a7ad67b7c35cad1292677b96e2e258d865f7456f47f970ec6dc90528
-MISC ChangeLog 351 SHA256 b5486fe6aa8d55be17c1368af12edcf8478a4542ceeacacb18245fe74bd91f13 SHA512 e2b676a36103dc56fee5be195b0ea698f6d5a4a040c38a995d82cc9684bd86b41c331046cea6107da85c0669eabec1a81d904de27f5b568b5f966628a7374a07 WHIRLPOOL ad3e9aabaf1b8e7638e66b32966f8bc39ab0657abe008ab8e534d1986f4149dc067ae4e280ad611c276847deaf0067162036d63e63f51ec6a83d75c759943266
+EBUILD zmap-9999.ebuild 813 SHA256 618a35d34ab40e3d737ace953dc6e6512522bece1de6f3870a48231d5bec8bd6 SHA512 369e2b83b8f1d57a023931ab3e4c4a9308a952fc3a15b5c9f2f4d33d8bccb9ec69188bd50fd0dbeceb7af816eef818df30aed85dd753e419e65bba2e5bef41c5 WHIRLPOOL 46d4fe7ee67a4d5859fe1a2068e85377282bd161bc546bd172657154477c8541aa6e9a82c1d7ea3f2fe3f3fee299ea6a2b1fac4122794513024d1452a6237238
+MISC ChangeLog 438 SHA256 8f616af4d3cf631e5f6dc9602dc51376daeca7a4f8c4f3a484fa6781a66e748f SHA512 82cea1c1de1c7885c856107593330ea07fb4222350b257d364be097d88612a48d94a686c93a5fb146f4fa5090147fec5d0cde3e211bc3f1f1cac8a525a88c729 WHIRLPOOL e2b0a57af97a283f375e6da33dc8550697c40c0672407580313bbd7b33d4a7ef385d9b4715597c3389182dc7a802143de06f211352061a9af5f00f6fb58df910
 MISC metadata.xml 926 SHA256 4e0a218758e17eb36b8d0ab156f981771b9c70025f4369be0f1d56d5880d4108 SHA512 81c5abcd25c3fdf47cd43b06bccb872a6d74f78a69928f83b8315465d7e75b7c95bedd95b0bef670ecc087dda08acf51d0f96a5c7e0f9d10e5664ac22aeca25e WHIRLPOOL 5d290ffa1f00a4eed25f0ec42b00fcd53be7e6540771af4f70a6edca6cf3bcdbcb1f260634d9785bf15b1b69eebd0ec2a58958e45ca2a5a37333e0bc607661fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQIcBAEBCgAGBQJSPHGYAAoJELnU8jG9FVir5n4P/3cIgOmriS/ZoMGxiTCj6ub+
+4STtM5730kkCIBYUlBD1+pGS2IKIrDkI5+UyuZIJNOjgSu38Lt8uxC1+elcv3Wz8
++6D3/ro4iDuJ5kLXfhuLkOtP2zcxY7MqjrAqIUIiO5ZtXpwNEBkvKLlVXrNhxqSr
+2QGMUjR48BYA0yMrwBQA71NilljKZU1IVDHb+9kLpweaSr1RE74/quFU+4Foap/S
+lKZSiiX1aKDYK3dAj7lDlN1JC07NaqtAFFF5hGNbMRvz2eI6451NJsL/llMkawUG
+O4M1iTWLPE39w8AheHo0L8YqasGJrT/64pg7IPlIhFXINHNL95i5RP/ZSZGecoEe
+Y2l9v00WLplm6KpuePfbClsVwagxl6Tj/X478XCPEHy8C2SOWc6sRuE+HouspovX
+CrCK/+gMcrdr2+X3mp9kUqO2NczEbmwd9oeV688gnjQy1T29drFrr2+TKn9RRMA+
+5OOThw5l7JRTiBd81lju2GnBLfib+mHq4xuDCTgXn0Bl2gd4yW3bM4LTpvAvIhBk
+X0H0UGt0zFxcrNs8UNtXl8lkJwC9Jy0OZbgDSnRtgK4/zT3wIyUpOvMBrDovml3X
+fOji+adiX+Zg9v4U40NHP6wc5Z6Cm7DvxRwVB6M+D5Fds9Jql8oEV8cYbdNCahRU
+bJqrpvZaA6c9PanMAkMN
+=1/3M
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/zmap/files/zmap-9999-cmake.patch b/net-analyzer/zmap/files/zmap-9999-cmake.patch
new file mode 100644
index 000000000000..fe57de933562
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-9999-cmake.patch
@@ -0,0 +1,178 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..8e2d2b4
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,72 @@
++cmake_minimum_required (VERSION 2.6)
++project (ZMAP C)
++
++option(WITH_REDIS "Build with support for Redis DB" OFF)
++option(WITH_JSON "Build with support for JSON" OFF)
++option(ENABLE_DEVELOPMENT "Enable development specific compiler and linker flags" OFF)
++option(ENABLE_HARDENING "Add hardening specific compiler and linker flags" OFF)
++
++if(ENABLE_DEVELOPMENT)
++	# Hardening and warnings for building with gcc
++	# Maybe add -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
++	set(GCCWARNINGS 
++		"-Wall -Wformat=2 -Wno-format-nonliteral"
++		"-pedantic -fno-strict-aliasing"
++		"-Wextra"
++		"-Wfloat-equal -Wundef -Wwrite-strings -Wredundant-decls"
++		"-Wnested-externs -Wbad-function-cast -Winit-self"
++		"-Wmissing-noreturn -Wnormalized=id"
++		"-Wstack-protector"
++		"-Werror"
++		)
++
++	# Fix line breaks
++	string(REPLACE ";" " "  GCCWARNINGS "${GCCWARNINGS}")
++
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCCWARNINGS} -g")
++	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -g")
++endif()
++
++if(ENABLE_HARDENING)
++	set(GCCHARDENING "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all -fwrapv -fPIC --param ssp-buffer-size=1")
++	set(LDHARDENING "-z relro -z now")
++
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCCHARDENING}")
++	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LDHARDENING}")
++endif()
++
++if(WITH_REDIS)
++	set(REDIS_LIBS hiredis)
++	add_definitions("-DREDIS")
++endif()
++
++if(WITH_JSON)
++	include(FindPkgConfig)
++	pkg_check_modules(JSON json-c)
++	if(NOT JSON_FOUND)
++		set(JSON_CFLAGS "")
++		set(JSON_LIBS "-ljson-c")
++		include_directories("/usr/local/include/json-c/")
++	endif()
++
++	add_definitions("-DJSON")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
++endif()
++
++# Standard FLAGS
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
++
++# Extra target FLAGS
++set(CMAKE_C_FLAGS_DEBUG "-O2 -g")
++set(CMAKE_C_FLAGS_RELEASE "-O2")
++
++add_subdirectory(src)
++
++# Install conf files
++FILE(GLOB CONF_FILES "conf/*")
++install(
++	FILES
++	${CONF_FILES}
++	DESTINATION "/etc/zmap/"
++	)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+new file mode 100644
+index 0000000..50bf1ee
+--- /dev/null
++++ b/src/CMakeLists.txt
+@@ -0,0 +1,94 @@
++include_directories(
++	"${CMAKE_CURRENT_BINARY_DIR}"
++	${PROJECT_SOURCE_DIR}/lib
++	${PROJECT_SOURCE_DIR}/src
++	${PROJECT_SOURCE_DIR}/src/output_modules
++	)
++
++SET(LIB_SOURCES
++	${PROJECT_SOURCE_DIR}/lib/blacklist.c
++	${PROJECT_SOURCE_DIR}/lib/constraint.c
++	${PROJECT_SOURCE_DIR}/lib/logger.c
++	${PROJECT_SOURCE_DIR}/lib/random.c
++	${PROJECT_SOURCE_DIR}/lib/rijndael-alg-fst.c
++)
++
++# ADD YOUR PROBE MODULE HERE
++SET(EXTRA_PROBE_MODULES
++
++	)
++
++# ADD YOUR OUTPUT MODULE HERE
++SET(EXTRA_OUTPUT_MODULES
++
++	)
++
++SET(OUTPUT_MODULE_SOURCES
++#	output_modules/module_extended_file.c
++#	output_modules/module_simple_file.c
++	output_modules/module_csv.c
++	output_modules/output_modules.c
++	)
++
++SET(PROBE_MODULE_SOURCES
++	probe_modules/module_icmp_echo.c
++	probe_modules/module_tcp_synscan.c
++	probe_modules/module_udp.c
++	probe_modules/packet.c
++	probe_modules/probe_modules.c
++	)
++
++SET(SOURCES
++	aesrand.c
++	cyclic.c
++	fieldset.c
++	get_gateway.c
++	monitor.c
++	recv.c
++	send.c
++	state.c
++	validate.c
++	zmap.c
++	zopt_compat.c
++	"${CMAKE_CURRENT_BINARY_DIR}/zopt.h"
++	${EXTRA_PROBE_MODULES}
++	${EXTRA_OUTPUT_MODULES}
++	${PROBE_MODULE_SOURCES}
++	${OUTPUT_MODULE_SOURCES}
++	${LIB_SOURCES}
++	)
++
++if (WITH_JSON)
++	SET(SOURCES ${SOURCES} output_modules/module_json.c)
++endif()
++
++if (WITH_REDIS)
++	SET(SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/lib/redis.c output_modules/module_redis.c)
++endif()
++
++add_custom_command(OUTPUT zopt.h
++	COMMAND gengetopt -C --no-help --no-version -i "${CMAKE_CURRENT_SOURCE_DIR}/zopt.ggo" -F "${CMAKE_CURRENT_BINARY_DIR}/zopt"
++	)
++
++add_executable(zmap ${SOURCES})
++
++target_link_libraries(
++	zmap 
++	pcap gmp m
++	${REDIS_LIBS}
++	${JSON_LIBRARIES}
++	)
++
++# Install binary
++install(
++	TARGETS
++	zmap
++	RUNTIME DESTINATION sbin
++)
++
++# Install Manpages
++install(
++	FILES
++	zmap.1
++	DESTINATION share/man/man1
++	)
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
new file mode 100644
index 000000000000..8fbea4056e31
--- /dev/null
+++ b/net-analyzer/zmap/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <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 
+provisioned network uplink, ZMap is capable of performing a complete scan of 
+the IPv4 address space in under 45 minutes, approaching the theoretical limit 
+of gigabit Ethernet.
+
+ZMap can be used to study protocol adoption over time, monitor service 
+availability, and help us better understand large systems distributed 
+across the Internet.
+</longdescription>
+  <use>
+    <flag name="redis">
+		Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg>
+	</flag>
+    <flag name="json">Add support to store results JSON based</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
new file mode 100644
index 000000000000..e98ac35185e2
--- /dev/null
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-9999.ebuild,v 1.1 2013/09/20 16:02:31 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils git-2
+
+DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
+HOMEPAGE="https://zmap.io/"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/zmap/zmap.git"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS=""
+IUSE="json redis"
+
+RDEPEND="
+	dev-libs/gmp
+	net-libs/libpcap
+	json? ( dev-libs/json-c )
+	redis? ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	dev-util/gengetopt"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+EPATCH_OPTS="-p1"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with json)
+		$(cmake-utils_use_with redis)
+		)
+	cmake-utils_src_configure
+}