| 1 |
spock 08/07/02 20:45:51 |
| 2 |
|
| 3 |
Added: nmap-4.68-nolua.patch |
| 4 |
Log: |
| 5 |
Fix bug #230443. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-analyzer/nmap/files/nmap-4.68-nolua.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nmap/files/nmap-4.68-nolua.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nmap/files/nmap-4.68-nolua.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nmap-4.68-nolua.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naurp nmap-4.68-orig/nmap.cc nmap-4.68/nmap.cc |
| 17 |
--- nmap-4.68-orig/nmap.cc 2008-07-02 22:37:00.000000000 +0200 |
| 18 |
+++ nmap-4.68/nmap.cc 2008-07-02 22:37:20.000000000 +0200 |
| 19 |
@@ -1899,7 +1899,9 @@ void nmap_free_mem() { |
| 20 |
if (o.dns_servers) free(o.dns_servers); |
| 21 |
if (o.extra_payload) free(o.extra_payload); |
| 22 |
if (o.ipoptions) free(o.ipoptions); |
| 23 |
+#ifndef NOLUA |
| 24 |
free(o.scriptargs); |
| 25 |
+#endif |
| 26 |
} |
| 27 |
|
| 28 |
/* Reads in a (normal or machine format) Nmap log file and gathers enough |
| 29 |
diff -Naurp nmap-4.68-orig/NmapOps.cc nmap-4.68/NmapOps.cc |
| 30 |
--- nmap-4.68-orig/NmapOps.cc 2008-07-02 22:37:00.000000000 +0200 |
| 31 |
+++ nmap-4.68/NmapOps.cc 2008-07-02 22:38:37.000000000 +0200 |
| 32 |
@@ -457,9 +457,11 @@ void NmapOps::ValidateOptions() { |
| 33 |
if(ipoptions && osscan) |
| 34 |
error("WARNING: Ip options are NOT used while OS scanning!"); |
| 35 |
|
| 36 |
+#ifndef NOLUA |
| 37 |
/* Make sure nmap.registry.args is available (even if it's empty) */ |
| 38 |
if (!scriptargs) |
| 39 |
scriptargs = strdup(""); |
| 40 |
+#endif |
| 41 |
} |
| 42 |
|
| 43 |
void NmapOps::setMaxOSTries(int mot) { |
| 44 |
diff -Naurp nmap-4.68-orig/nse_main.h nmap-4.68/nse_main.h |
| 45 |
--- nmap-4.68-orig/nse_main.h 2008-07-02 22:37:00.000000000 +0200 |
| 46 |
+++ nmap-4.68/nse_main.h 2008-07-02 22:39:54.000000000 +0200 |
| 47 |
@@ -1,11 +1,13 @@ |
| 48 |
#ifndef NMAP_LUA_H |
| 49 |
#define NMAP_LUA_H |
| 50 |
|
| 51 |
+#ifndef NOLUA |
| 52 |
extern "C" { |
| 53 |
#include "lua.h" |
| 54 |
#include "lualib.h" |
| 55 |
#include "lauxlib.h" |
| 56 |
} |
| 57 |
+#endif |
| 58 |
|
| 59 |
#include <vector> |
| 60 |
#include <list> |
| 61 |
diff -Naurp nmap-4.68-orig/portlist.cc nmap-4.68/portlist.cc |
| 62 |
--- nmap-4.68-orig/portlist.cc 2008-07-02 22:37:00.000000000 +0200 |
| 63 |
+++ nmap-4.68/portlist.cc 2008-07-02 22:38:16.000000000 +0200 |
| 64 |
@@ -150,11 +150,13 @@ Port::~Port() { |
| 65 |
free(serviceprobe_service); |
| 66 |
if (serviceprobe_fp) |
| 67 |
free(serviceprobe_fp); |
| 68 |
+#ifndef NOLUA |
| 69 |
if (o.script) { |
| 70 |
ScriptResults::iterator sriter; |
| 71 |
for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++) |
| 72 |
free((*sriter).id); |
| 73 |
} |
| 74 |
+#endif |
| 75 |
} |
| 76 |
|
| 77 |
// Uses the sd->{product,version,extrainfo} if available to fill |
| 78 |
diff -Naurp nmap-4.68-orig/Target.cc nmap-4.68/Target.cc |
| 79 |
--- nmap-4.68-orig/Target.cc 2008-07-02 22:37:00.000000000 +0200 |
| 80 |
+++ nmap-4.68/Target.cc 2008-07-02 22:39:02.000000000 +0200 |
| 81 |
@@ -179,11 +179,13 @@ void Target::FreeInternal() { |
| 82 |
|
| 83 |
if (FPR) delete FPR; |
| 84 |
|
| 85 |
+#ifndef NOLUA |
| 86 |
if (o.script) { |
| 87 |
ScriptResults::iterator sriter; |
| 88 |
for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++) |
| 89 |
free((*sriter).id); |
| 90 |
} |
| 91 |
+#endif |
| 92 |
} |
| 93 |
|
| 94 |
/* Creates a "presentation" formatted string out of the IPv4/IPv6 address. |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
-- |
| 99 |
gentoo-commits@l.g.o mailing list |
Archives