Fix bug #301878.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 46 insertions, 7 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 3553d5d88272..2d4a0b35812b 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.214 2010/01/22 20:41:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.215 2010/01/23 09:07:14 spock Exp $
+
+  23 Jan 2010; Michał Januszewski <spock@gentoo.org> nmap-5.20.ebuild,
+  +files/nmap-5.20-nolua.patch:
+  Fix bug #301878.
 
 *nmap-5.20 (21 Jan 2010)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index dd3c45436198..a0e08a8b7dc7 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
 AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-5.10_beta1-string.patch 252 RMD160 58dc7f4dfb660519a51af2f5619eca144cfd6480 SHA1 b080ef5618b3666bf85f011ce6edc969d8a2132d SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506
+AUX nmap-5.20-nolua.patch 1237 RMD160 b670ecd0630d0f13f8f5a46cc8ffb84b86374c3d SHA1 e64d645b6b4e3a73482945632eba7aa7f6730d4a SHA256 ce215ce6666e4518121d6a5996c7e7a29037fc77b2d43d0ffbf77d9d7c00e985
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-4.76.tar.bz2 6061317 RMD160 ec93522e05e7233e8950b28ab12b45355e63c0c7 SHA1 a71141738b4512b6d5b35ef94258e525df30a586 SHA256 4e24328ca6ec97afb2a8caf312b1f111a15cf41763a5ac41e7a633fdb217d66d
@@ -18,13 +19,13 @@ EBUILD nmap-4.90_rc1.ebuild 1570 RMD160 aa966c36cc0be41dba40476f68e2c4785e088b13
 EBUILD nmap-5.00-r2.ebuild 1484 RMD160 852ef37ef74988cd3b98eb62d47086577deb7192 SHA1 aa2fbd07d78b5ef7ed1d728ce7a64a3402c188c8 SHA256 676947c82b5c9a8703e1ac35dab1394e3468b1757666eae4d1aaf873fd7201d8
 EBUILD nmap-5.00.ebuild 1566 RMD160 25216ab94dabeede619569e4110c19710c9116dc SHA1 88f3725e6a4472fe5e7bea493067e4281af87e40 SHA256 879897c9f604e4895f50dc21c6b6a7570652bbb551bb4702379a855b625f3212
 EBUILD nmap-5.10_beta1.ebuild 1533 RMD160 131d53ea0981f81b084d5cde72a4cec3a5f33952 SHA1 c3a01d832411288b50bbfbb88c0ca58b7b55c7d7 SHA256 ab9281463b95d9fcef8eec13ef582089f0d65bdcf020b1bde54a6643634242ad
-EBUILD nmap-5.20.ebuild 1541 RMD160 c63ba2e6364f54491de1d21e845a66d26a30a2a6 SHA1 456e2c5f7119291456bf73c2defe1eabffd652ce SHA256 06a9a68723d2bd123e241066472017e9e033479b12ac5b788b65ef81e7a7e75a
-MISC ChangeLog 26137 RMD160 4c99e52e2b7e158287701e823bf4f5c47bcd0ea4 SHA1 e70e562e381639cd1cb8f9e560a30b3c1f7e3e16 SHA256 cae4b515703f985271f70b63dd32cfcbdd3f07a5b1d6673f6639e3e8ee04dc03
+EBUILD nmap-5.20.ebuild 1586 RMD160 5c0492cb7bd191996b601ac390191808321d3d4b SHA1 e3aac52d185d5b73208eb1fe3d71f62a4625f7b9 SHA256 66c10c084cadad29605d2b7a85a2f2ec9baf04c20bdaf525e7c4f889f913e8c2
+MISC ChangeLog 26261 RMD160 5afa2e9854aa52261e761f27c0bb03a1c55692f8 SHA1 16e843afd6f4652c2056ba37f3c01ac872dd91b1 SHA256 ae2c18630997845db7eeb8ca23f2da971a59288bb628d16f9ed89fa1c500626c
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktaDWUACgkQchej4aZK9/duBgCfd+fYOFUYhK/L+sHUa1R4eUPe
-WEIAn134/Q+EnqysrPEsq7iLC0HyJ+2F
-=royi
+iEYEARECAAYFAktavFAACgkQchej4aZK9/ebdQCcDPqDgDadHDBgcNhXFxgqIphQ
+7/YAn3BXlmuUokqtFEiDcGDRiCm3kGfQ
+=R+vT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.20-nolua.patch b/net-analyzer/nmap/files/nmap-5.20-nolua.patch
new file mode 100644
index 000000000000..5e158c568b3b
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.20-nolua.patch
@@ -0,0 +1,33 @@
+diff -Naurp nmap-5.20/portlist.cc nmap-5.20-fixed/portlist.cc
+--- nmap-5.20/portlist.cc	2009-12-20 04:22:19.000000000 +0100
++++ nmap-5.20-fixed/portlist.cc	2010-01-23 09:59:21.000000000 +0100
+@@ -412,7 +412,7 @@ void PortList::setRPCProbeResults(u16 po
+   }
+ }
+ 
+-
++#ifndef NOLUA
+ void PortList::addScriptResult(u16 portno, int protocol, ScriptResult& sr) {
+   Port *port;
+ 
+@@ -420,6 +420,7 @@ void PortList::addScriptResult(u16 portn
+ 
+   port->scriptResults.push_back(sr);
+ }
++#endif
+ 
+ /*****************************************************************************/
+ /* Convert protocol name from in.h to enum portlist_proto.
+diff -Naurp nmap-5.20/portlist.h nmap-5.20-fixed/portlist.h
+--- nmap-5.20/portlist.h	2009-12-20 04:22:19.000000000 +0100
++++ nmap-5.20-fixed/portlist.h	2010-01-23 09:56:20.000000000 +0100
+@@ -278,7 +278,9 @@ class PortList {
+   void setRPCProbeResults(u16 portno, int proto, int rpc_status, unsigned long rpc_program, 
+ 			  unsigned int rpc_lowver, unsigned int rpc_highver);
+ 
++#ifndef NOLUA
+   void addScriptResult(u16 portno, int protocol, ScriptResult& sr);
++#endif
+ 
+   /* Cycles through the 0 or more "ignored" ports which should be
+    consolidated for Nmap output.  They are returned sorted by the
diff --git a/net-analyzer/nmap/nmap-5.20.ebuild b/net-analyzer/nmap/nmap-5.20.ebuild
index 401a0e4314e7..a2ea64d81463 100644
--- a/net-analyzer/nmap/nmap-5.20.ebuild
+++ b/net-analyzer/nmap/nmap-5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.20.ebuild,v 1.1 2010/01/22 20:41:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.20.ebuild,v 1.2 2010/01/23 09:07:14 spock Exp $
 
 EAPI="2"
 
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.75-include.patch"
 	epatch "${FILESDIR}/${PN}-4.75-nolua.patch"
 	epatch "${FILESDIR}/${PN}-5.10_beta1-string.patch"
+	epatch "${FILESDIR}/${PN}-5.20-nolua.patch"
 	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
 }