diff options
author | Michael Januszewski <spock@gentoo.org> | 2008-07-02 20:45:50 +0000 |
---|---|---|
committer | Michael Januszewski <spock@gentoo.org> | 2008-07-02 20:45:50 +0000 |
commit | dcbd47a766fd3c56f07badd13d5a5bcdb471a9fb (patch) | |
tree | 93d6e29472c155629c4e78d06819e8c3dfc6d2ce /net-analyzer/nmap | |
parent | bump to 2.22.3. Translation updates. (diff) | |
download | gentoo-2-dcbd47a766fd3c56f07badd13d5a5bcdb471a9fb.tar.gz gentoo-2-dcbd47a766fd3c56f07badd13d5a5bcdb471a9fb.tar.bz2 gentoo-2-dcbd47a766fd3c56f07badd13d5a5bcdb471a9fb.zip |
Fix bug #230443.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64)
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r-- | net-analyzer/nmap/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/nmap/files/nmap-4.68-nolua.patch | 79 | ||||
-rw-r--r-- | net-analyzer/nmap/nmap-4.68.ebuild | 8 |
3 files changed, 91 insertions, 2 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index c9fb338df57a..4a78eee9eef5 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nmap # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.174 2008/07/01 19:26:54 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.175 2008/07/02 20:45:50 spock Exp $ + + 02 Jul 2008; Michał Januszewski <spock@gentoo.org> + +files/nmap-4.68-nolua.patch, nmap-4.68.ebuild: + Fix bug #230443. *nmap-4.68 (01 Jul 2008) diff --git a/net-analyzer/nmap/files/nmap-4.68-nolua.patch b/net-analyzer/nmap/files/nmap-4.68-nolua.patch new file mode 100644 index 000000000000..1346ec94c6da --- /dev/null +++ b/net-analyzer/nmap/files/nmap-4.68-nolua.patch @@ -0,0 +1,79 @@ +diff -Naurp nmap-4.68-orig/nmap.cc nmap-4.68/nmap.cc +--- nmap-4.68-orig/nmap.cc 2008-07-02 22:37:00.000000000 +0200 ++++ nmap-4.68/nmap.cc 2008-07-02 22:37:20.000000000 +0200 +@@ -1899,7 +1899,9 @@ void nmap_free_mem() { + if (o.dns_servers) free(o.dns_servers); + if (o.extra_payload) free(o.extra_payload); + if (o.ipoptions) free(o.ipoptions); ++#ifndef NOLUA + free(o.scriptargs); ++#endif + } + + /* Reads in a (normal or machine format) Nmap log file and gathers enough +diff -Naurp nmap-4.68-orig/NmapOps.cc nmap-4.68/NmapOps.cc +--- nmap-4.68-orig/NmapOps.cc 2008-07-02 22:37:00.000000000 +0200 ++++ nmap-4.68/NmapOps.cc 2008-07-02 22:38:37.000000000 +0200 +@@ -457,9 +457,11 @@ void NmapOps::ValidateOptions() { + if(ipoptions && osscan) + error("WARNING: Ip options are NOT used while OS scanning!"); + ++#ifndef NOLUA + /* Make sure nmap.registry.args is available (even if it's empty) */ + if (!scriptargs) + scriptargs = strdup(""); ++#endif + } + + void NmapOps::setMaxOSTries(int mot) { +diff -Naurp nmap-4.68-orig/nse_main.h nmap-4.68/nse_main.h +--- nmap-4.68-orig/nse_main.h 2008-07-02 22:37:00.000000000 +0200 ++++ nmap-4.68/nse_main.h 2008-07-02 22:39:54.000000000 +0200 +@@ -1,11 +1,13 @@ + #ifndef NMAP_LUA_H + #define NMAP_LUA_H + ++#ifndef NOLUA + extern "C" { + #include "lua.h" + #include "lualib.h" + #include "lauxlib.h" + } ++#endif + + #include <vector> + #include <list> +diff -Naurp nmap-4.68-orig/portlist.cc nmap-4.68/portlist.cc +--- nmap-4.68-orig/portlist.cc 2008-07-02 22:37:00.000000000 +0200 ++++ nmap-4.68/portlist.cc 2008-07-02 22:38:16.000000000 +0200 +@@ -150,11 +150,13 @@ Port::~Port() { + free(serviceprobe_service); + if (serviceprobe_fp) + free(serviceprobe_fp); ++#ifndef NOLUA + if (o.script) { + ScriptResults::iterator sriter; + for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++) + free((*sriter).id); + } ++#endif + } + + // Uses the sd->{product,version,extrainfo} if available to fill +diff -Naurp nmap-4.68-orig/Target.cc nmap-4.68/Target.cc +--- nmap-4.68-orig/Target.cc 2008-07-02 22:37:00.000000000 +0200 ++++ nmap-4.68/Target.cc 2008-07-02 22:39:02.000000000 +0200 +@@ -179,11 +179,13 @@ void Target::FreeInternal() { + + if (FPR) delete FPR; + ++#ifndef NOLUA + if (o.script) { + ScriptResults::iterator sriter; + for (sriter = scriptResults.begin(); sriter != scriptResults.end(); sriter++) + free((*sriter).id); + } ++#endif + } + + /* Creates a "presentation" formatted string out of the IPv4/IPv6 address. diff --git a/net-analyzer/nmap/nmap-4.68.ebuild b/net-analyzer/nmap/nmap-4.68.ebuild index 72ff3341af6c..85894d6af9b6 100644 --- a/net-analyzer/nmap/nmap-4.68.ebuild +++ b/net-analyzer/nmap/nmap-4.68.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.68.ebuild,v 1.1 2008/07/01 19:26:54 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.68.ebuild,v 1.2 2008/07/02 20:45:50 spock Exp $ inherit eutils flag-o-matic @@ -22,6 +22,12 @@ DEPEND="dev-libs/libpcre ) ssl? ( dev-libs/openssl )" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-nolua.patch" +} + pkg_setup() { if use gtk && has_version ">=dev-lang/python-2.5" && ! has_version ">=dev-python/pysqlite-2" && |