mirror of
https://git.yoctoproject.org/meta-security
synced 2026-07-16 03:47:21 +00:00
nmap: update to 6.46
Updated to later version on nmap. remove patch which is included in update Added ndiff package Include zenmap build changes but commented out for now and untested Signed-off-by: Armin Kuster <akuster@mvista.com>
This commit is contained in:
@@ -1,79 +0,0 @@
|
||||
Added missing definitions which caused failuire at do_configure
|
||||
with --without-liblua option.
|
||||
|
||||
Upstream Status : pending
|
||||
|
||||
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
||||
--- a/output.h
|
||||
+++ b/output.h
|
||||
@@ -226,6 +226,10 @@
|
||||
void printscriptresults(ScriptResults *scriptResults, stype scantype);
|
||||
|
||||
void printhostscriptresults(Target *currenths);
|
||||
+
|
||||
+/*This is a helper function to determine the ordering of the script results
|
||||
+ based on their id */
|
||||
+bool comparescriptids(ScriptResult first, ScriptResult second);
|
||||
#endif
|
||||
|
||||
/* Print a table with traceroute hops. */
|
||||
@@ -253,8 +257,4 @@
|
||||
were found. */
|
||||
void printdatafilepaths();
|
||||
|
||||
-/*This is a helper function to determine the ordering of the script results
|
||||
- based on their id */
|
||||
-bool comparescriptids(ScriptResult first, ScriptResult second);
|
||||
-
|
||||
#endif /* OUTPUT_H */
|
||||
--- a/output.cc
|
||||
+++ b/output.cc
|
||||
@@ -2613,6 +2613,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef NOLUA
|
||||
/*This is a helper function to determine the ordering of the script results
|
||||
based on their id */
|
||||
bool comparescriptids(ScriptResult first, ScriptResult second){
|
||||
@@ -2625,5 +2626,6 @@
|
||||
else
|
||||
return false;
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
--- a/portlist.cc
|
||||
+++ b/portlist.cc
|
||||
@@ -144,6 +144,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef NOLUA
|
||||
void Port::freeScriptResults(void)
|
||||
{
|
||||
while (!scriptResults.empty()) {
|
||||
@@ -151,6 +152,7 @@
|
||||
scriptResults.pop_front();
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* Fills in namebuf (as long as there is space in buflen) with the
|
||||
Name nmap normal output will use to describe the port. This takes
|
||||
--- a/Target.cc
|
||||
+++ b/Target.cc
|
||||
@@ -162,10 +162,12 @@
|
||||
|
||||
Target::~Target() {
|
||||
FreeInternal();
|
||||
+#ifndef NOLUA
|
||||
while (!scriptResults.empty()) {
|
||||
scriptResults.front().clear();
|
||||
scriptResults.pop_front();
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void Target::FreeInternal() {
|
||||
|
||||
Reference in New Issue
Block a user