| 1 |
jer 12/12/02 15:57:07 |
| 2 |
|
| 3 |
Added: nmap-6.25-lua.patch |
| 4 |
Log: |
| 5 |
Fix building with USE=-lua by Anton Bolshakov (bug #445552). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/nmap/files/nmap-6.25-lua.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.25-lua.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-6.25-lua.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nmap-6.25-lua.patch |
| 16 |
=================================================================== |
| 17 |
--- a/output.h |
| 18 |
+++ b/output.h |
| 19 |
@@ -226,6 +226,10 @@ |
| 20 |
void printscriptresults(ScriptResults *scriptResults, stype scantype); |
| 21 |
|
| 22 |
void printhostscriptresults(Target *currenths); |
| 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 |
#endif |
| 28 |
|
| 29 |
/* Print a table with traceroute hops. */ |
| 30 |
@@ -253,8 +257,4 @@ |
| 31 |
were found. */ |
| 32 |
void printdatafilepaths(); |
| 33 |
|
| 34 |
-/*This is a helper function to determine the ordering of the script results |
| 35 |
- based on their id */ |
| 36 |
-bool comparescriptids(ScriptResult first, ScriptResult second); |
| 37 |
- |
| 38 |
#endif /* OUTPUT_H */ |
| 39 |
--- a/output.cc |
| 40 |
+++ b/output.cc |
| 41 |
@@ -2613,6 +2613,7 @@ |
| 42 |
} |
| 43 |
} |
| 44 |
|
| 45 |
+#ifndef NOLUA |
| 46 |
/*This is a helper function to determine the ordering of the script results |
| 47 |
based on their id */ |
| 48 |
bool comparescriptids(ScriptResult first, ScriptResult second){ |
| 49 |
@@ -2625,5 +2626,6 @@ |
| 50 |
else |
| 51 |
return false; |
| 52 |
} |
| 53 |
+#endif |
| 54 |
|
| 55 |
|
| 56 |
--- a/portlist.cc |
| 57 |
+++ b/portlist.cc |
| 58 |
@@ -144,6 +144,7 @@ |
| 59 |
} |
| 60 |
} |
| 61 |
|
| 62 |
+#ifndef NOLUA |
| 63 |
void Port::freeScriptResults(void) |
| 64 |
{ |
| 65 |
while (!scriptResults.empty()) { |
| 66 |
@@ -151,6 +152,7 @@ |
| 67 |
scriptResults.pop_front(); |
| 68 |
} |
| 69 |
} |
| 70 |
+#endif |
| 71 |
|
| 72 |
/* Fills in namebuf (as long as there is space in buflen) with the |
| 73 |
Name nmap normal output will use to describe the port. This takes |
| 74 |
--- a/Target.cc |
| 75 |
+++ b/Target.cc |
| 76 |
@@ -162,10 +162,12 @@ |
| 77 |
|
| 78 |
Target::~Target() { |
| 79 |
FreeInternal(); |
| 80 |
+#ifndef NOLUA |
| 81 |
while (!scriptResults.empty()) { |
| 82 |
scriptResults.front().clear(); |
| 83 |
scriptResults.pop_front(); |
| 84 |
} |
| 85 |
+#endif |
| 86 |
} |
| 87 |
|
| 88 |
void Target::FreeInternal() { |
Archives