From b315c1a024d8b1d1444934de738bb7a239eae9aa Mon Sep 17 00:00:00 2001 From: Peiran Hong Date: Mon, 23 Sep 2019 13:54:32 -0400 Subject: nmap: Update to 7.80 Updates nmap to v7.80, this solves the following CVEs: - CVE-2017-18594 - CVE-2018-15173 and addressed numerous bugs as well. The patch '0001-include-time.h-for-time-structure-definition.patch' is modified to be applicable to the new version while serving for the same purpose. The license changed in the commit https://github.com/nmap/nmap/commit/d639a53 and is only a date bump without modification of any content in the license. Signed-off-by: Peiran Hong Signed-off-by: Khem Raj --- ...e-time.h-header-to-pass-clang-compilation.patch | 73 ++++++++++++++++++++ ...lude-time.h-for-time-structure-definition.patch | 78 ---------------------- 2 files changed, 73 insertions(+), 78 deletions(-) create mode 100644 meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch delete mode 100644 meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch (limited to 'meta-oe/recipes-security/nmap/files') diff --git a/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch b/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch new file mode 100644 index 0000000000..f93af2d793 --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch @@ -0,0 +1,73 @@ +From a068952a20880fc864e8cb8b49f8a6b143a5ac30 Mon Sep 17 00:00:00 2001 +From: Peiran Hong +Date: Fri, 20 Sep 2019 15:02:45 -0400 +Subject: [PATCH] Include time.h header to pass clang compilation + +--- + nmap_error.cc | 11 +---------- + nping/EchoServer.cc | 1 + + osscan2.cc | 1 + + service_scan.cc | 1 + + 4 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/nmap_error.cc b/nmap_error.cc +index 588b13c33..254107ff5 100644 +--- a/nmap_error.cc ++++ b/nmap_error.cc +@@ -135,16 +135,7 @@ + #include "xml.h" + + #include +-#if TIME_WITH_SYS_TIME +-# include +-# include +-#else +-# if HAVE_SYS_TIME_H +-# include +-# else +-# include +-# endif +-#endif ++#include + + extern NmapOps o; + +diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc +index ccdcf9c2d..c403aeda5 100644 +--- a/nping/EchoServer.cc ++++ b/nping/EchoServer.cc +@@ -137,6 +137,7 @@ + #include "NpingOps.h" + #include "ProbeMode.h" + #include ++#include + + extern NpingOps o; + extern EchoServer es; +diff --git a/osscan2.cc b/osscan2.cc +index aa31feb12..89673e108 100644 +--- a/osscan2.cc ++++ b/osscan2.cc +@@ -147,6 +147,7 @@ + + #include + #include ++#include + + extern NmapOps o; + #ifdef WIN32 +diff --git a/service_scan.cc b/service_scan.cc +index 57a92ed28..ef277bb1f 100644 +--- a/service_scan.cc ++++ b/service_scan.cc +@@ -145,6 +145,7 @@ + #include "nmap_tty.h" + + #include ++#include + + #if HAVE_OPENSSL + /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads +-- +2.21.0 + diff --git a/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch b/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch deleted file mode 100644 index 561c8c82cf..0000000000 --- a/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c774f2b129fd5acd5647d92c57a2079ae638a62b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 20 Jan 2019 23:07:39 -0800 -Subject: [PATCH] include time.h for time structure definition - -Exposed by musl/clang - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - nmap_error.cc | 1 + - nping/EchoServer.cc | 1 + - osscan.cc | 1 + - osscan2.cc | 1 + - service_scan.cc | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/nmap_error.cc b/nmap_error.cc -index 19beafb..ea14e08 100644 ---- a/nmap_error.cc -+++ b/nmap_error.cc -@@ -135,6 +135,7 @@ - #include "xml.h" - - #include -+#include - - extern NmapOps o; - -diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc -index 70f39b0..40cd4d6 100644 ---- a/nping/EchoServer.cc -+++ b/nping/EchoServer.cc -@@ -137,6 +137,7 @@ - #include "NpingOps.h" - #include "ProbeMode.h" - #include -+#include - - extern NpingOps o; - extern EchoServer es; -diff --git a/osscan.cc b/osscan.cc -index f851f60..6ae0c83 100644 ---- a/osscan.cc -+++ b/osscan.cc -@@ -149,6 +149,7 @@ - # include - # endif - #endif -+#include - - #include - #include -diff --git a/osscan2.cc b/osscan2.cc -index e341947..887fbd2 100644 ---- a/osscan2.cc -+++ b/osscan2.cc -@@ -147,6 +147,7 @@ - - #include - #include -+#include - - extern NmapOps o; - #ifdef WIN32 -diff --git a/service_scan.cc b/service_scan.cc -index 9780ae3..e07b940 100644 ---- a/service_scan.cc -+++ b/service_scan.cc -@@ -145,6 +145,7 @@ - #include "nmap_tty.h" - - #include -+#include - - #if HAVE_OPENSSL - /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads -- cgit v1.2.3-54-g00ecf