SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/nmap/stuff/nmap-6.25-nolua.patch	Sat Jul 20 13:14:04 2013 +0000
     1.3 @@ -0,0 +1,72 @@
     1.4 +--- nmap-6.25/output.h	2012-08-15 00:36:25.000000000 +0800
     1.5 ++++ nmap-6.25-fixed/output.h	2012-12-02 10:30:45.003319377 +0800
     1.6 +@@ -226,6 +226,10 @@
     1.7 + void printscriptresults(ScriptResults *scriptResults, stype scantype);
     1.8 + 
     1.9 + void printhostscriptresults(Target *currenths);
    1.10 ++
    1.11 ++/*This is a helper function to determine the ordering of the script results
    1.12 ++  based on their id */
    1.13 ++bool comparescriptids(ScriptResult first, ScriptResult second);
    1.14 + #endif
    1.15 + 
    1.16 + /* Print a table with traceroute hops. */
    1.17 +@@ -253,8 +257,4 @@
    1.18 +    were found. */
    1.19 + void printdatafilepaths();
    1.20 + 
    1.21 +-/*This is a helper function to determine the ordering of the script results
    1.22 +-  based on their id */
    1.23 +-bool comparescriptids(ScriptResult first, ScriptResult second);
    1.24 +-
    1.25 + #endif /* OUTPUT_H */
    1.26 +--- nmap-6.25.orig/output.cc	2012-11-29 11:19:52.000000000 +0800
    1.27 ++++ nmap-6.25/output.cc	2012-12-02 10:44:50.986325233 +0800
    1.28 +@@ -2613,6 +2613,7 @@
    1.29 +   }
    1.30 + }
    1.31 + 
    1.32 ++#ifndef NOLUA
    1.33 + /*This is a helper function to determine the ordering of the script results
    1.34 +   based on their id */
    1.35 + bool comparescriptids(ScriptResult first, ScriptResult second){
    1.36 +@@ -2625,5 +2626,6 @@
    1.37 +     else
    1.38 +         return false;
    1.39 + }
    1.40 ++#endif
    1.41 + 
    1.42 + 
    1.43 +--- nmap-6.25.orig/portlist.cc	2012-10-11 12:45:50.000000000 +0800
    1.44 ++++ nmap-6.25/portlist.cc	2012-12-02 10:51:28.930327962 +0800
    1.45 +@@ -144,6 +144,7 @@
    1.46 +   }
    1.47 + }
    1.48 + 
    1.49 ++#ifndef NOLUA
    1.50 + void Port::freeScriptResults(void)
    1.51 + {
    1.52 +     while (!scriptResults.empty()) {
    1.53 +@@ -151,6 +152,7 @@
    1.54 +         scriptResults.pop_front();
    1.55 +     }
    1.56 + }
    1.57 ++#endif
    1.58 + 
    1.59 + /* Fills in namebuf (as long as there is space in buflen) with the
    1.60 +    Name nmap normal output will use to describe the port.  This takes
    1.61 +--- nmap-6.25.orig/Target.cc	2012-08-15 00:36:25.000000000 +0800
    1.62 ++++ nmap-6.25/Target.cc	2012-12-02 10:55:28.097329636 +0800
    1.63 +@@ -162,10 +162,12 @@
    1.64 + 
    1.65 + Target::~Target() {
    1.66 +   FreeInternal();
    1.67 ++#ifndef NOLUA
    1.68 +   while (!scriptResults.empty()) {
    1.69 +     scriptResults.front().clear();
    1.70 +     scriptResults.pop_front();
    1.71 +   }
    1.72 ++#endif
    1.73 + }
    1.74 + 
    1.75 + void Target::FreeInternal() {