diff options
Diffstat (limited to 'recipes-security/nmap/files/lua.patch')
-rw-r--r-- | recipes-security/nmap/files/lua.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/recipes-security/nmap/files/lua.patch b/recipes-security/nmap/files/lua.patch new file mode 100644 index 0000000..7cb86ab --- /dev/null +++ b/recipes-security/nmap/files/lua.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | Added missing definitions which caused failuire at do_configure | ||
2 | with --without-liblua option. | ||
3 | |||
4 | Upstream Status : pending | ||
5 | |||
6 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
7 | --- a/output.h | ||
8 | +++ b/output.h | ||
9 | @@ -226,6 +226,10 @@ | ||
10 | void printscriptresults(ScriptResults *scriptResults, stype scantype); | ||
11 | |||
12 | void printhostscriptresults(Target *currenths); | ||
13 | + | ||
14 | +/*This is a helper function to determine the ordering of the script results | ||
15 | + based on their id */ | ||
16 | +bool comparescriptids(ScriptResult first, ScriptResult second); | ||
17 | #endif | ||
18 | |||
19 | /* Print a table with traceroute hops. */ | ||
20 | @@ -253,8 +257,4 @@ | ||
21 | were found. */ | ||
22 | void printdatafilepaths(); | ||
23 | |||
24 | -/*This is a helper function to determine the ordering of the script results | ||
25 | - based on their id */ | ||
26 | -bool comparescriptids(ScriptResult first, ScriptResult second); | ||
27 | - | ||
28 | #endif /* OUTPUT_H */ | ||
29 | --- a/output.cc | ||
30 | +++ b/output.cc | ||
31 | @@ -2613,6 +2613,7 @@ | ||
32 | } | ||
33 | } | ||
34 | |||
35 | +#ifndef NOLUA | ||
36 | /*This is a helper function to determine the ordering of the script results | ||
37 | based on their id */ | ||
38 | bool comparescriptids(ScriptResult first, ScriptResult second){ | ||
39 | @@ -2625,5 +2626,6 @@ | ||
40 | else | ||
41 | return false; | ||
42 | } | ||
43 | +#endif | ||
44 | |||
45 | |||
46 | --- a/portlist.cc | ||
47 | +++ b/portlist.cc | ||
48 | @@ -144,6 +144,7 @@ | ||
49 | } | ||
50 | } | ||
51 | |||
52 | +#ifndef NOLUA | ||
53 | void Port::freeScriptResults(void) | ||
54 | { | ||
55 | while (!scriptResults.empty()) { | ||
56 | @@ -151,6 +152,7 @@ | ||
57 | scriptResults.pop_front(); | ||
58 | } | ||
59 | } | ||
60 | +#endif | ||
61 | |||
62 | /* Fills in namebuf (as long as there is space in buflen) with the | ||
63 | Name nmap normal output will use to describe the port. This takes | ||
64 | --- a/Target.cc | ||
65 | +++ b/Target.cc | ||
66 | @@ -162,10 +162,12 @@ | ||
67 | |||
68 | Target::~Target() { | ||
69 | FreeInternal(); | ||
70 | +#ifndef NOLUA | ||
71 | while (!scriptResults.empty()) { | ||
72 | scriptResults.front().clear(); | ||
73 | scriptResults.pop_front(); | ||
74 | } | ||
75 | +#endif | ||
76 | } | ||
77 | |||
78 | void Target::FreeInternal() { | ||
79 | |||