mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-09 08:27:15 +00:00
5db1cb3137
The nmap has changed its license to NPSL (Nmap Public Source License) since 7.90[1][2]. See [3] for a discussion of this license. According to [1] and [4], 7.92 is the last dual-licensed (GPL-2.0 and NPSL)version: "Note that some releases of Nmap may fall under a previous version of this license, or a different license entirely. The exact terms for a given version of Nmap can be found in the included LICENSE or COPYING file. To ease the transition to the NPSL, the first three Nmap releases made under that license (Nmap 7.90, 7.91, and 7.92) may also be used under the previous Nmap license terms by anyone who prefers those. " Add 7.92 recipe with GPLv2 license. [1] https://nmap.org/npsl/ [2] https://lwn.net/Articles/842436/ [3] https://github.com/nmap/nmap/issues/2199 [4] https://nmap.org/changelog.html#7.92 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
77 lines
1.6 KiB
Diff
77 lines
1.6 KiB
Diff
From e9d876bedc8a7bc96856ecf38bbeeafee2d5b206 Mon Sep 17 00:00:00 2001
|
|
From: Peiran Hong <peiran.hong@windriver.com>
|
|
Date: Fri, 20 Sep 2019 15:02:45 -0400
|
|
Subject: [PATCH] Include time.h header to pass clang compilation
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
|
|
---
|
|
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 5ec938f..83ba6cc 100644
|
|
--- a/nmap_error.cc
|
|
+++ b/nmap_error.cc
|
|
@@ -67,16 +67,7 @@
|
|
#include "xml.h"
|
|
|
|
#include <errno.h>
|
|
-#if TIME_WITH_SYS_TIME
|
|
-# include <sys/time.h>
|
|
-# include <time.h>
|
|
-#else
|
|
-# if HAVE_SYS_TIME_H
|
|
-# include <sys/time.h>
|
|
-# else
|
|
-# include <time.h>
|
|
-# endif
|
|
-#endif
|
|
+#include <time.h>
|
|
|
|
extern NmapOps o;
|
|
|
|
diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc
|
|
index dea2851..c80efb4 100644
|
|
--- a/nping/EchoServer.cc
|
|
+++ b/nping/EchoServer.cc
|
|
@@ -69,6 +69,7 @@
|
|
#include "NpingOps.h"
|
|
#include "ProbeMode.h"
|
|
#include <signal.h>
|
|
+#include <time.h>
|
|
|
|
extern NpingOps o;
|
|
extern EchoServer es;
|
|
diff --git a/osscan2.cc b/osscan2.cc
|
|
index efe6da0..392c65f 100644
|
|
--- a/osscan2.cc
|
|
+++ b/osscan2.cc
|
|
@@ -80,6 +80,7 @@
|
|
|
|
#include <list>
|
|
#include <math.h>
|
|
+#include <time.h>
|
|
|
|
extern NmapOps o;
|
|
#ifdef WIN32
|
|
diff --git a/service_scan.cc b/service_scan.cc
|
|
index 66e0d92..161f2a1 100644
|
|
--- a/service_scan.cc
|
|
+++ b/service_scan.cc
|
|
@@ -77,6 +77,7 @@
|
|
#include "nmap_tty.h"
|
|
|
|
#include <errno.h>
|
|
+#include <time.h>
|
|
|
|
#if HAVE_OPENSSL
|
|
/* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads
|
|
--
|
|
2.34.1
|
|
|