Really fix bug #230443.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

4 files changed, 26 insertions, 9 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 4a78eee9eef5..f3898829838f 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.175 2008/07/02 20:45:50 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.176 2008/07/03 06:43:41 spock Exp $
+
+  03 Jul 2008; Michał Januszewski <spock@gentoo.org>
+  files/nmap-4.68-nolua.patch, nmap-4.68.ebuild:
+  Really fix bug #230443.
 
   02 Jul 2008; Michał Januszewski <spock@gentoo.org>
   +files/nmap-4.68-nolua.patch, nmap-4.68.ebuild:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 113c760b29ff..b66b5dde81d0 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX nmap-4.01-nostrip.patch 1776 RMD160 643efbf516bf48af90c82c6e9c4c8bf587673053 SHA1 6e8e6bca94ce7bfcf83175ab58ab2c5bbfa56a31 SHA256 8ad526d6766d93ff5b76410982b18fd4f47fe504afe8e7e087cab072331b3de0
 AUX nmap-4.20-osscan.patch 728 RMD160 b8b78c31941a37d0ffce1a193c41beae4a90ea16 SHA1 563c11bd67f3810b61b275be0f7da04f9dabd6f6 SHA256 3d525248f414504712f8cb25ea4bed1e6330882c1e69fb176629cb731d811101
-AUX nmap-4.68-nolua.patch 2500 RMD160 98be8c97dc8aa630b81cc43d769f92c1f8aedfba SHA1 cf8c5ea5bcdf7858047fe81561ed2a9bd4634ca7 SHA256 c281fc4e1b9cf9cd11523ed3d4248c2f83d3efaf38b6549d24c12927c9e9257d
+AUX nmap-4.68-nolua.patch 2929 RMD160 be3cf17c4f3dffe9139189f860c8168c1a4a34ef SHA1 96e81abb565ae585302ba9c4bc22addfbf15e1e8 SHA256 32be40197422d56fd3c273fc59ec777e1cb25c3bbf89fe735f6ac1c16e5e5fb8
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX nmap-shtool-nls.patch 646 RMD160 308bf5925393716ccb01d914c6b06c63144bbdfd SHA1 ae013892b7c13974cf905bfc58d36ffaf9a345ee SHA256 639749d61339186fe16e8302e601b74f0aec1121140968e015ac9dd833855bb4
 DIST nmap-4.20.tar.bz2 2156077 RMD160 d4794618c72f46e3c9446ce9e0c705ccf32c7115 SHA1 641bf8ec28313f3fd110d7fa84c3a233cf79c36b SHA256 c923a6cfa6d3683dc7ee27a721c19d15fd66f264f8ca6dbc9cfac710591f32a8
@@ -21,13 +21,13 @@ EBUILD nmap-4.53.ebuild 1692 RMD160 91fdbf435136029f019d1e4e4b1f971bc12b732a SHA
 EBUILD nmap-4.60.ebuild 1683 RMD160 c9576c1f9f7b1ecc1adb8856cdbc074749ac95ce SHA1 85d33c73133d73c39f5a51d5221ff22ca737b46e SHA256 4149066d6b4c18262034610b43537ba0cd22b56e353198c9d069e28e0d3048f1
 EBUILD nmap-4.62.ebuild 1686 RMD160 df3a84b9b8f1c53cdb959fd18443a1d9c54b1029 SHA1 3cf9a3890a8747cc640a6a08e37d2a3559633988 SHA256 85c60d4bb5dc5260804f309ac3e7cd725a2df30649d510a3552f7f476760af0c
 EBUILD nmap-4.65.ebuild 1686 RMD160 2c4ea5a3d490b8c070b835ac4db66e89e74319e6 SHA1 aa5f4cda221fa76ae3385099b1123cb304a7899b SHA256 76abd1a282192e608a308ea4a04f7e2c8c159b90fe18d3b29993299ed77d3741
-EBUILD nmap-4.68.ebuild 1767 RMD160 b6050314b11f92d066401e50c66ab0d3d945c153 SHA1 c780fb6940a38f341f3f89e141b1ccf66536c165 SHA256 70cc07126cb2f967c3e58a55b03f9d4ce368e43642ea6a28b1fb23c51c0bc1d5
-MISC ChangeLog 20960 RMD160 bec915b8f3588807108429836fefe03f8dbe9aa3 SHA1 f36ef0ee9343b1f6e774fb25f5add132f7cc2173 SHA256 abf65899e3669de56a61bf20165f28883699a324b99bf21b1721f19b7677c1d3
+EBUILD nmap-4.68.ebuild 1808 RMD160 19e4a2ed921c1b4531335e01ba7bde10ca9c5260 SHA1 e0c7209c188f2e70f10e94d46f8fad97ce9717ce SHA256 bc39801ffc83d41d827f796bb279205ebde96248a1d2f4977c6eb343cdc2e92a
+MISC ChangeLog 21090 RMD160 caf02b47ca5474e45bbf4475747712c10a246003 SHA1 2e39a9e70012ebdc839af33f1792f2d9917f3700 SHA256 c4aef6f735921f7e29a6bd5048c33bf1156feb560fdc2a576172eda111612ed8
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhr6PYACgkQchej4aZK9/f8uACeJU3NY01303eCO5X7+YtgNsIJ
-mxcAn0IB/+q1EEK3nUp7cbqohlOKMVjz
-=9nqG
+iEYEARECAAYFAkhsdQMACgkQchej4aZK9/cEEQCgh+AkrhBxaZBkne8TDh/tgu8j
+WCQAn3mD/x6dHNsrh0BxLnOnxWAXZ8nF
+=sTB5
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-4.68-nolua.patch b/net-analyzer/nmap/files/nmap-4.68-nolua.patch
index 1346ec94c6da..02d81069ff32 100644
--- a/net-analyzer/nmap/files/nmap-4.68-nolua.patch
+++ b/net-analyzer/nmap/files/nmap-4.68-nolua.patch
@@ -1,3 +1,15 @@
+diff -Naurp nmap-4.68-orig/configure.ac nmap-4.68/configure.ac
+--- nmap-4.68-orig/configure.ac	2008-07-02 22:37:00.000000000 +0200
++++ nmap-4.68/configure.ac	2008-07-03 08:23:54.000000000 +0200
+@@ -524,7 +524,7 @@ AC_HELP_STRING([--without-liblua], [Comp
+ 
+ # They don't want lua
+ if test "$no_lua" = "yes"; then
+-  CXXFLAGS="-DNOLUA $CXXFLAGS"
++  CPPFLAGS="-DNOLUA $CPPFLAGS"
+   LIBLUA_LIBS=""
+   LUA_DEPENDS=""
+   LUA_BUILD=""
 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
diff --git a/net-analyzer/nmap/nmap-4.68.ebuild b/net-analyzer/nmap/nmap-4.68.ebuild
index 85894d6af9b6..5422f3e84006 100644
--- a/net-analyzer/nmap/nmap-4.68.ebuild
+++ b/net-analyzer/nmap/nmap-4.68.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2008/07/02 20:45:50 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.68.ebuild,v 1.3 2008/07/03 06:43:41 spock Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="A utility for network exploration or security auditing"
 HOMEPAGE="http://nmap.org/"
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-nolua.patch"
+	AT_NO_RECURSIVE=1 eautoreconf
 }
 
 pkg_setup() {