net-analyzer/zmap: Version Bump, #494988; fix missing dep, #494990

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

2 files changed, 77 insertions, 0 deletions

diff --git a/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch b/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch
new file mode 100644
index 000000000000..bd99ee31bb43
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch
@@ -0,0 +1,48 @@
+ CMakeLists.txt             | 2 +-
+ src/CMakeLists.txt         | 4 ++--
+ zmap_conf_install.cmake.in | 7 -------
+ 3 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aeb1c7f..0378f44 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,4 +67,4 @@ add_subdirectory(src)
+ FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*")
+ message(STATUS "${CONF_FILES}")
+ configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake)
+-install(SCRIPT "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
++install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6e51f12..2c1ae5a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,11 +75,11 @@ add_custom_command(OUTPUT zopt.h
+ 	)
+ 
+ add_custom_command(OUTPUT lexer.c
+-	COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" lexer.l
++	COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" "${CMAKE_CURRENT_SOURCE_DIR}/lexer.l"
+ 	)
+ 
+ add_custom_command(OUTPUT parser.c
+-	COMMAND byacc -d -o parser.c parser.y
++	COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+ 	)
+ 
+ add_executable(zmap ${SOURCES})
+diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
+index c1b2f61..695e7dd 100644
+--- a/zmap_conf_install.cmake.in
++++ b/zmap_conf_install.cmake.in
+@@ -1,10 +1,3 @@
+-message(STATUS "Creating /etc/zmap")
+-if (NOT EXISTS "/etc/zmap/")
+-        file(MAKE_DIRECTORY "/etc/zmap")
+-else()
+-        message(STATUS "/etc/zmap exists, skipping...")
+-endif()
+-
+ message(STATUS "Installing blacklist.conf...")
+ if (NOT EXISTS "/etc/zmap/blacklist.conf")
+         file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")
diff --git a/net-analyzer/zmap/files/zmap-9999-out-of-src.patch b/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
new file mode 100644
index 000000000000..7d281f8dbe00
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
@@ -0,0 +1,29 @@
+ CMakeLists.txt             | 2 +-
+ zmap_conf_install.cmake.in | 7 -------
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ebf9316..f18c112 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,4 +77,4 @@ add_subdirectory(src)
+ FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*")
+ message(STATUS "${CONF_FILES}")
+ configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake)
+-install(SCRIPT "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
++install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
+diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
+index 7f36f12..d5fe9d9 100644
+--- a/zmap_conf_install.cmake.in
++++ b/zmap_conf_install.cmake.in
+@@ -1,10 +1,3 @@
+-message(STATUS "Creating /etc/zmap")
+-if (NOT EXISTS "/etc/zmap/")
+-	file(MAKE_DIRECTORY "/etc/zmap")
+-else()
+-	message(STATUS "/etc/zmap exists, skipping...")
+-endif()
+-
+ message(STATUS "Installing blacklist.conf...")
+ if (NOT EXISTS "/etc/zmap/blacklist.conf")
+ 	file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")