added my Recipes
This commit is contained in:
@@ -0,0 +1,73 @@
|
||||
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
|
||||
|
||||
---
|
||||
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 <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 ccdcf9c2d..c403aeda5 100644
|
||||
--- a/nping/EchoServer.cc
|
||||
+++ b/nping/EchoServer.cc
|
||||
@@ -137,6 +137,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 aa31feb12..89673e108 100644
|
||||
--- a/osscan2.cc
|
||||
+++ b/osscan2.cc
|
||||
@@ -147,6 +147,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 57a92ed28..ef277bb1f 100644
|
||||
--- a/service_scan.cc
|
||||
+++ b/service_scan.cc
|
||||
@@ -145,6 +145,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.21.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,48 @@
|
||||
From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Fri, 14 Feb 2020 08:19:54 +0000
|
||||
Subject: [PATCH] configure.ac: make ndiff depend on python3
|
||||
|
||||
Python 2 ceased being maintained on the 1st January 2020.
|
||||
We've already removed all users of it from oe-core, so
|
||||
let ndiff depend on python3.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
.../nmap/7.80-r0/nmap-7.80/configure.ac | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9d2fff8..5ffdd55 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then
|
||||
HAVE_PYTHON2=true
|
||||
fi
|
||||
|
||||
+HAVE_PYTHON3=false
|
||||
+if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then
|
||||
+ HAVE_PYTHON3=true
|
||||
+fi
|
||||
+
|
||||
NDIFFDIR=ndiff
|
||||
|
||||
# Do they want Ndiff?
|
||||
AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check])
|
||||
-if $HAVE_PYTHON2 ; then : ;
|
||||
+if $HAVE_PYTHON3 ; then : ;
|
||||
else
|
||||
if test "$with_ndiff" = "check" ; then
|
||||
- AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found])
|
||||
+ AC_MSG_WARN([Not building Ndiff because Python3 was not found])
|
||||
elif test "$with_ndiff" = "yes"; then
|
||||
- AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4])
|
||||
+ AC_MSG_FAILURE([--with-ndiff requires Python3])
|
||||
fi
|
||||
with_ndiff=no
|
||||
fi
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
From 2a361989b5f84ec23ba7ccb6e527a5590ff55deb Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 20 Jan 2019 23:11:56 -0800
|
||||
Subject: [PATCH] Fix building with libc++
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
nping/EchoServer.cc | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc
|
||||
index 40cd4d6..04433e1 100644
|
||||
--- a/nping/EchoServer.cc
|
||||
+++ b/nping/EchoServer.cc
|
||||
@@ -282,14 +282,14 @@ int EchoServer::nep_listen_socket(){
|
||||
server_addr6.sin6_len = sizeof(struct sockaddr_in6);
|
||||
#endif
|
||||
/* Bind to local address and the specified port */
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr6.sin6_addr), port);
|
||||
/* If the bind failed for the supplied address, just try again with in6addr_any */
|
||||
if( o.spoofSource() ){
|
||||
server_addr6.sin6_addr = in6addr_any;
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
|
||||
- }else{
|
||||
+ }else{
|
||||
nping_print(VB_1, "Server bound to port %d", port);
|
||||
}
|
||||
}
|
||||
@@ -320,12 +320,12 @@ int EchoServer::nep_listen_socket(){
|
||||
#endif
|
||||
|
||||
/* Bind to local address and the specified port */
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr4.sin_addr), port);
|
||||
/* If the bind failed for the supplied address, just try again with in6addr_any */
|
||||
if( o.spoofSource() ){
|
||||
server_addr4.sin_addr.s_addr=INADDR_ANY;
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
|
||||
}else{
|
||||
nping_print(VB_1, "Server bound to port %d", port);
|
||||
@@ -561,7 +561,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe
|
||||
nping_print(DBG_3, ";");
|
||||
/* The payload magic may affect the score only between
|
||||
* zero and 4 bytes. This is done to prevent long
|
||||
- * common strings like "GET / HTTP/1.1\r\n"
|
||||
+ * common strings like "GET / HTTP/1.1\r\n"
|
||||
* increasing the score a lot and cause problems for
|
||||
* the matching logic. */
|
||||
current_score+= MIN(4, fspec->len)*FACTOR_PAYLOAD_MAGIC;
|
||||
@@ -571,7 +571,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe
|
||||
default:
|
||||
nping_warning(QT_2, "Bogus field specifier found in client #%d context. Please report a bug", ctx->getIdentifier());
|
||||
break;
|
||||
- }
|
||||
+ }
|
||||
} /* End of field specifiers loop */
|
||||
|
||||
nping_print(DBG_3, "%s() current_score=%.02f candidate_score=%.02f", __func__, current_score, candidate_score);
|
||||
@@ -650,7 +650,7 @@ clientid_t EchoServer::nep_match_packet(const u8 *pkt, size_t pktlen){
|
||||
}else{
|
||||
if( (tcplen=tcp.validate())==OP_FAILURE){
|
||||
return CLIENT_NOT_FOUND;
|
||||
- }else{
|
||||
+ }else{
|
||||
if( (int)pktlen > (iplen+tcplen) ){
|
||||
if( payload.storeRecvData(pkt+iplen+tcplen, pktlen-iplen-tcplen)!=OP_FAILURE)
|
||||
payload_included=true;
|
||||
@@ -0,0 +1,37 @@
|
||||
[PATCH] redefine the python library install dir
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
If install-lib is not defined, it is always /usr/lib/, but it
|
||||
maybe /usr/lib64 for multilib
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 1bb062c..cced2fb 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
|
||||
|
||||
install-zenmap: $(ZENMAPDIR)/setup.py
|
||||
$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
|
||||
# Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
|
||||
# already a link.
|
||||
@@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD
|
||||
@cd $(NPINGDIR) && $(MAKE)
|
||||
|
||||
install-ndiff:
|
||||
- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
|
||||
NSE_FILES = scripts/script.db scripts/*.nse
|
||||
NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
[PATCH] replace "./shtool mkdir" with coreutils mkdir command
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
"./shtool mkdir" is used when mkdir has not -p parameter, but mkdir in today
|
||||
most release has supportted the -p parameter, not need to use shtool, and it
|
||||
can not fix the race if two process are running mkdir to create same dir
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
ncat/Makefile.in | 4 ++--
|
||||
nmap-update/Makefile.in | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ncat/Makefile.in b/ncat/Makefile.in
|
||||
index cfd306d..2166e08 100644
|
||||
--- a/ncat/Makefile.in
|
||||
+++ b/ncat/Makefile.in
|
||||
@@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
|
||||
|
||||
install: $(TARGET)
|
||||
@echo Installing Ncat;
|
||||
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
+ mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
$(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat
|
||||
$(STRIP) -x $(DESTDIR)$(bindir)/ncat
|
||||
if [ -n "$(DATAFILES)" ]; then \
|
||||
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgdatadir); \
|
||||
+ mkdir -p -m 755 $(DESTDIR)$(pkgdatadir); \
|
||||
$(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \
|
||||
fi
|
||||
$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
|
||||
diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in
|
||||
index 89ff928..93f48d8 100644
|
||||
--- a/nmap-update/Makefile.in
|
||||
+++ b/nmap-update/Makefile.in
|
||||
@@ -37,7 +37,7 @@ $(NBASELIB):
|
||||
cd $(NBASEDIR) && $(MAKE)
|
||||
|
||||
install: nmap-update
|
||||
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
+ mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
$(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir)
|
||||
$(STRIP) -x $(DESTDIR)$(bindir)/nmap-update
|
||||
$(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/
|
||||
--
|
||||
1.9.1
|
||||
|
||||
Reference in New Issue
Block a user