wok rev 14118
nmap: add patch for nolua support
author | Samuel Trassare <samuel_trassare@yahoo.com> |
---|---|
date | Mon Feb 25 08:44:23 2013 -0800 (2013-02-25) |
parents | 8dfbb2202f36 |
children | 589cbe28ac3a |
files | nmap/receipt nmap/stuff/nmap-6.25-nolua.patch |
line diff
1.1 --- a/nmap/receipt Mon Feb 25 17:17:17 2013 +0100 1.2 +++ b/nmap/receipt Mon Feb 25 08:44:23 2013 -0800 1.3 @@ -15,6 +15,7 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + patch -p1 < $stuff-$PACKAGE-$VERSION-nolua.patch 1.8 ./configure \ 1.9 --cache-file=$PWD/config.cache \ 1.10 --without-liblua \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/nmap/stuff/nmap-6.25-nolua.patch Mon Feb 25 08:44:23 2013 -0800 2.3 @@ -0,0 +1,72 @@ 2.4 +--- nmap-6.25/output.h 2012-08-15 00:36:25.000000000 +0800 2.5 ++++ nmap-6.25-fixed/output.h 2012-12-02 10:30:45.003319377 +0800 2.6 +@@ -226,6 +226,10 @@ 2.7 + void printscriptresults(ScriptResults *scriptResults, stype scantype); 2.8 + 2.9 + void printhostscriptresults(Target *currenths); 2.10 ++ 2.11 ++/*This is a helper function to determine the ordering of the script results 2.12 ++ based on their id */ 2.13 ++bool comparescriptids(ScriptResult first, ScriptResult second); 2.14 + #endif 2.15 + 2.16 + /* Print a table with traceroute hops. */ 2.17 +@@ -253,8 +257,4 @@ 2.18 + were found. */ 2.19 + void printdatafilepaths(); 2.20 + 2.21 +-/*This is a helper function to determine the ordering of the script results 2.22 +- based on their id */ 2.23 +-bool comparescriptids(ScriptResult first, ScriptResult second); 2.24 +- 2.25 + #endif /* OUTPUT_H */ 2.26 +--- nmap-6.25.orig/output.cc 2012-11-29 11:19:52.000000000 +0800 2.27 ++++ nmap-6.25/output.cc 2012-12-02 10:44:50.986325233 +0800 2.28 +@@ -2613,6 +2613,7 @@ 2.29 + } 2.30 + } 2.31 + 2.32 ++#ifndef NOLUA 2.33 + /*This is a helper function to determine the ordering of the script results 2.34 + based on their id */ 2.35 + bool comparescriptids(ScriptResult first, ScriptResult second){ 2.36 +@@ -2625,5 +2626,6 @@ 2.37 + else 2.38 + return false; 2.39 + } 2.40 ++#endif 2.41 + 2.42 + 2.43 +--- nmap-6.25.orig/portlist.cc 2012-10-11 12:45:50.000000000 +0800 2.44 ++++ nmap-6.25/portlist.cc 2012-12-02 10:51:28.930327962 +0800 2.45 +@@ -144,6 +144,7 @@ 2.46 + } 2.47 + } 2.48 + 2.49 ++#ifndef NOLUA 2.50 + void Port::freeScriptResults(void) 2.51 + { 2.52 + while (!scriptResults.empty()) { 2.53 +@@ -151,6 +152,7 @@ 2.54 + scriptResults.pop_front(); 2.55 + } 2.56 + } 2.57 ++#endif 2.58 + 2.59 + /* Fills in namebuf (as long as there is space in buflen) with the 2.60 + Name nmap normal output will use to describe the port. This takes 2.61 +--- nmap-6.25.orig/Target.cc 2012-08-15 00:36:25.000000000 +0800 2.62 ++++ nmap-6.25/Target.cc 2012-12-02 10:55:28.097329636 +0800 2.63 +@@ -162,10 +162,12 @@ 2.64 + 2.65 + Target::~Target() { 2.66 + FreeInternal(); 2.67 ++#ifndef NOLUA 2.68 + while (!scriptResults.empty()) { 2.69 + scriptResults.front().clear(); 2.70 + scriptResults.pop_front(); 2.71 + } 2.72 ++#endif 2.73 + } 2.74 + 2.75 + void Target::FreeInternal() {