net-analyzer/zmap: remove unused patches.

Closes: https://github.com/gentoo/gentoo/pull/3511

diff --git a/net-analyzer/zmap/files/zmap-1.1.0-out-of-src.patch b/net-analyzer/zmap/files/zmap-1.1.0-out-of-src.patch
deleted file mode 100644 (file)
index 38f39ef..0000000
--- a/net-analyzer/zmap/files/zmap-1.1.0-out-of-src.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- CMakeLists.txt             | 2 +-
- src/CMakeLists.txt         | 4 ++--
- zmap_conf_install.cmake.in | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bea62ab..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 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 358a97d..aba7a60 100644
---- a/zmap_conf_install.cmake.in
-+++ b/zmap_conf_install.cmake.in
-@@ -1,6 +1,6 @@
- foreach(conf_file ${CONF_FILES})
-       message(STATUS "${conf_file}")
-       if(NOT EXISTS "/etc/zmap/${conf_file}")
--              file(INSTALL "conf/${conf_file}" DESTINATION "/etc/zmap")
-+              file(INSTALL "${CMAKE_CURRENT_SOURCE_DIR}/conf/${conf_file}" DESTINATION "/etc/zmap")
-       endif()
- endforeach()

diff --git a/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch
deleted file mode 100644 (file)
index d5f7e3c..0000000
--- a/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08c00b66555612ed69d7f253b277f44cf8da0c62 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Mon, 30 Dec 2013 10:50:34 +0100
-Subject: [PATCH] Fix name of josn-c pkg-config file
-
-Over 2 years ago json-c renamed its pc file from json.pc -> json-c.pc.
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ebf9316..a9c8e5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ endif()
- 
- if(WITH_JSON)
-       include(FindPkgConfig)
--      pkg_check_modules(JSON json)
-+      pkg_check_modules(JSON json-c)
-       if(JSON_FOUND)
-               include_directories(JSON_INCLUDE_DIRS)
-       else()
--- 
-1.8.5.2
-

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
deleted file mode 100644 (file)
index bd99ee3..0000000
--- a/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- 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-cmake.patch b/net-analyzer/zmap/files/zmap-9999-cmake.patch
deleted file mode 100644 (file)
index fe57de9..0000000
--- a/net-analyzer/zmap/files/zmap-9999-cmake.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-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/files/zmap-9999-out-of-src.patch b/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
deleted file mode 100644 (file)
index 7d281f8..0000000
--- a/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- 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")