mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 19:47:17 +00:00
Khem Raj
13bafd2753
License-Update: relicensed to NPSL (Nmap Public Source License) fix bundled libdnet configure and static link Add a patch fixing the libdnet PF_PACKET conftest, which used a nested function definition clang rejects, making configure wrongly conclude there is no Ethernet support. Clear DISABLE_STATIC so the bundled libdnet libtool build also produces libdnet.a (nmap links it statically), and serialize the make since the top-level Makefile does not order the link after the recursive libdnet build. Also regenerate an existing patch to apply without fuzz. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
69 lines
1.4 KiB
Diff
69 lines
1.4 KiB
Diff
From a068952a20880fc864e8cb8b49f8a6b143a5ac30 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
|
|
|
|
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
|
|
--- a/nmap_error.cc
|
|
+++ b/nmap_error.cc
|
|
@@ -66,16 +66,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
|
|
--- a/nping/EchoServer.cc
|
|
+++ b/nping/EchoServer.cc
|
|
@@ -68,6 +68,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
|
|
--- a/osscan2.cc
|
|
+++ b/osscan2.cc
|
|
@@ -78,6 +78,7 @@
|
|
|
|
#include <list>
|
|
#include <math.h>
|
|
+#include <time.h>
|
|
|
|
extern NmapOps o;
|
|
|
|
diff --git a/service_scan.cc b/service_scan.cc
|
|
--- a/service_scan.cc
|
|
+++ b/service_scan.cc
|
|
@@ -78,6 +78,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
|