update to latest stable version

1 files changed, 15 insertions, 10 deletions

diff --git a/package/nmap/patches/patch-output_cc b/package/nmap/patches/patch-output_cc
index 38058b98a..f43036e11 100644
--- a/package/nmap/patches/patch-output_cc
+++ b/package/nmap/patches/patch-output_cc
@@ -1,12 +1,17 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nmap-5.00.orig/output.cc	2009-06-24 23:35:54.000000000 +0200
-+++ nmap-5.00/output.cc	2009-07-20 20:33:41.267403513 +0200
-@@ -1966,7 +1966,7 @@ struct data_file_record {
+--- nmap-6.25.orig/output.cc	2012-11-29 04:19:52.000000000 +0100
++++ nmap-6.25/output.cc	2013-07-12 14:06:38.000000000 +0200
+@@ -2613,6 +2613,7 @@ void printdatafilepaths() {
+   }
+ }
+ 
++#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 @@ bool comparescriptids(ScriptResult first
+     else
+         return false;
+ }
++#endif
  
-   /* Compares this record to another. First compare the directory names, then
-      compare the file names. */
--  bool operator<(const struct data_file_record& other) {
-+  bool operator<(const struct data_file_record& other) const {
-     int cmp;
  
-     cmp = dir.compare(other.dir);